Clear iouReportID on parent chat when unapproving cancelled expense report by MelvinBot · Pull Request #91563 · Expensify/App

MelvinBot · 2026-05-25T05:01:50Z

Explanation of Change

After the Pay → Cancel payment → Unapprove sequence on an expense report, the parent chat's iouReportID still points to the old expense report. When the admin creates a new expense from the FAB, it gets appended to the cancelled-and-unapproved report instead of creating a fresh one.

unapproveExpenseReport now clears iouReportID on the parent chat report (with a matching failureData entry to restore it on rollback), mirroring the cleanup that submitReport already performs.

Fixed Issues

$ #89203
PROPOSAL: #89203 (comment)

Tests

Precondition:

Admin create a workspace and set Workflows: Submissions manually, enable Approvals and Payments

As an admin, open the workspace chat
Create and submit an expense
Click the submitted expense report to open the expense detail page
Approve the report and mark it as paid
Click More > Cancel Payment
Click More > Unapprove Report
Click the browser/device back button to return to the workspace chat (don't click on the header to return workspace chat)
Create a new expense
Verify the new expense creates a fresh expense report — it should NOT be appended to the old cancelled-and-unapproved report

Offline tests

Same as Tests

QA Steps

Same as Tests

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

… report After Pay → Cancel payment → Unapprove, the parent chat's iouReportID still points to the old expense report. When the admin then creates a new expense from the FAB, it gets appended to the cancelled-and-unapproved report instead of creating a fresh one. unapproveExpenseReport now clears iouReportID on the parent chat report (with a matching failureData entry to restore it on rollback), mirroring the cleanup that submitReport already performs. Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>

codecov · 2026-05-25T05:10:44Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/libs/actions/IOU/ReportWorkflow.ts	`79.60% <ø> (+0.88%)`	⬆️
... and 468 files with indirect coverage changes

nyomanjyotisa · 2026-05-25T05:18:56Z

@MelvinBot Please add a simple test case for this change

Verify that unapproveExpenseReport optimistically clears iouReportID on the parent chat report when chatReportID is present, and restores it in failureData for rollback. Also verify no parent chat update is added when chatReportID is absent. Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>

MelvinBot · 2026-05-25T05:24:33Z

Added two test cases in a new unapproveExpenseReport clears iouReportID on parent chat describe block:

Optimistically clears iouReportID and restores on failure — verifies the optimistic data sets iouReportID: null on the parent chat, and the failure data restores iouReportID to the original expense report ID.
No parent chat update when chatReportID is absent — verifies no spurious iouReportID: null update is added when the expense report has no chatReportID.

Both tests pass locally ✅

…type Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>

MelvinBot · 2026-05-25T05:31:32Z

Fixed the failing typecheck check: made the value property optional in the .find() callback parameter type at tests/actions/IOUTest/ReportWorkflowTest.ts:2059. The Onyx clear method type defines value?: undefined (optional), so the callback must accept entries without a value property.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 1e7aab8c81

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-05-25T06:13:51Z

+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${expenseReport.chatReportID}`,
+            value: {
+                iouReportID: expenseReport.reportID,


Restore prior chat iouReportID on unapprove rollback

The failure rollback now hard-codes iouReportID: expenseReport.reportID, which can corrupt chat state when the API call fails and the chat’s prior pointer was null (or pointed to a different report). In that case, the rollback introduces a stale pointer to an approved/cancelled report, so later FAB expenses can be routed to the wrong report. The rollback should restore the previous chat iouReportID value (read before optimistic mutation) rather than always writing the current expense report ID.

Useful? React with 👍 / 👎.

@MelvinBot Please address this review

Fixed. The failure rollback now reads the chat report's actual iouReportID via getReportOrDraftReport before the optimistic mutation and restores that value instead of hard-coding expenseReport.reportID. Updated the test to verify this by seeding a chat report with a different iouReportID and asserting it's properly restored on failure.

Read the chat report's actual iouReportID via getReportOrDraftReport before the optimistic mutation and use that value in failureData, instead of hard-coding expenseReport.reportID. This prevents corrupting chat state when the prior pointer was null or pointed to a different report. Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>

nyomanjyotisa · 2026-05-25T07:37:14Z

+    // iouReportID so the next expense from the FAB creates a fresh report instead of
+    // appending to the cancelled-and-unapproved one. This mirrors submitReport's cleanup.
+    const chatReport = expenseReport.chatReportID ? getReportOrDraftReport(expenseReport.chatReportID) : undefined;
+    if (chatReport) {


@MelvinBot Please add expenseReport.isCancelledIOU check here to narrow the fix to the cancel-payment bug. Do the same for failureData

Done. Added expenseReport.isCancelledIOU guard to both the optimistic and failure data blocks. Updated the test to set isCancelledIOU: true and renamed the negative test case to verify the guard (isCancelledIOU: false → no parent chat update).

Add expenseReport.isCancelledIOU guard to both the optimistic and failure data blocks that clear/restore iouReportID on the parent chat. This ensures the fix only applies to the cancel-payment → unapprove flow and does not affect normal unapprove operations. Update test to set isCancelledIOU: true and rename the negative test to verify the guard (isCancelledIOU: false skips the update). Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>

MelvinBot · 2026-05-25T07:40:48Z

⚠️ MelvinBot CI Fix Loop Detected

MelvinBot has made 5 consecutive commits trying to fix CI failures. Automatic CI fix dispatches are now paused for this PR.

Next steps: A human should review the recent commits and resolve the conflicting CI errors manually.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4100392910

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-05-25T07:52:33Z

+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
+            value: {
+                iouReportID: chatReport.iouReportID ?? null,


Avoid stale iouReportID rollback after concurrent updates

The rollback path restores chatReport.iouReportID unconditionally, which can overwrite newer optimistic state if the user creates another expense before UNAPPROVE_EXPENSE_REPORT fails. In that case, money-request creation updates the same chat report’s iouReportID to the new report, but this failure merge reverts it back to the old cancelled report ID, causing later FAB expenses to attach to the wrong report again. This should only restore when the pointer is still in the expected pre-unapprove state (or otherwise guard against clobbering newer writes).

Useful? React with 👍 / 👎.

nyomanjyotisa · 2026-05-25T08:00:17Z

@MelvinBot Please add tests in the PR description that verify the implemented fix and complete all checkboxes in the PR Author Checklist

MelvinBot · 2026-05-25T08:02:14Z

Updated the PR description:

Tests section: Added step-by-step reproduction flow (Submit → Approve → Pay → Cancel → Unapprove → verify new expense creates fresh report)
Offline tests: Added steps for optimistic clearing and rollback on failure
QA Steps: Added staging test steps
PR Author Checklist: Checked all boxes (no new files, CSS, assets, UI changes, deeplinks, or message-editing code — all conditional items are N/A for this pure Onyx data change)

nyomanjyotisa · 2026-05-25T08:25:51Z

@MelvinBot Update the test steps to this and set the QA steps and Offline tests to "Same as Tests"

Tests

Precondition:

Admin create a workspace and set Workflows: Submissions manually, enable Approvals and Payments

As an admin, open the workspace chat
Create and submit an expense
Click the submitted expense report to open the expense detail page
Approve the report and mark it as paid
Click More > Cancel Payment
Click More > Unapprove Report
Click the browser/device back button to return to the workspace chat (don't click on the header to return workspace chat)
Create a new expense
Verify the new expense creates a fresh expense report — it should NOT be appended to the old cancelled-and-unapproved report

MelvinBot · 2026-05-25T08:28:50Z

Updated the PR body:

Tests section replaced with the provided steps
Offline tests set to "Same as Tests"
QA Steps set to "Same as Tests"

nyomanjyotisa · 2026-05-25T08:41:42Z

@MelvinBot Please mark the PR as ready for review

melvin-bot · 2026-05-25T08:43:27Z

@nyomanjyotisa Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

MelvinBot · 2026-05-25T08:43:28Z

Done — PR is now marked as ready for review ✅

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4100392910

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-05-25T08:48:51Z

+    if (chatReport && expenseReport.isCancelledIOU) {
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
+            value: {
+                iouReportID: null,
+            },


Clear chat pointer only when it matches this report

The new isCancelledIOU branch clears the parent chat’s iouReportID unconditionally whenever a chat report exists, but it does not verify that the pointer currently targets the report being unapproved. If another expense report has already become the active chat pointer (for example from another tab/device or a prior optimistic update), this code will wipe that newer pointer and cause subsequent FAB expenses to be routed to an unintended fresh report. Please gate this clear on chatReport.iouReportID === expenseReport.reportID (or equivalent) before nulling it.

Useful? React with 👍 / 👎.

It's an edge case, but still worth handling. @MelvinBot Could you address this?

Done. Both the optimistic and failure blocks now check chatReport.iouReportID === expenseReport.reportID before clearing. Added a test for the mismatch case (chat points to a different report → no clearing happens).

Only clear the parent chat's iouReportID when it currently points to the expense report being unapproved. This prevents wiping a newer pointer set by a concurrent expense or another tab/device. Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>

melvin-bot · 2026-05-27T16:24:20Z

@neil-marcellini Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

nyomanjyotisa · 2026-05-27T16:33:42Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Android-Native.mp4

Android: mWeb Chrome

Android-mWeb.Chrome.mp4

iOS: HybridApp

iOS-Native.mp4

iOS: mWeb Safari

iOS-mWeb.Safari.mp4

MacOS: Chrome / Safari

MacOS-Chrome.mp4

neil-marcellini · 2026-05-27T21:29:52Z

Closing this since the issue is not reproducible. Lmk if you disagree for some reason.

#89203 (comment)

MelvinBot assigned nyomanjyotisa May 25, 2026

MelvinBot requested a review from a team May 25, 2026 05:01

MelvinBot mentioned this pull request May 25, 2026

[$250] [Exploratory] Expense - New expense added to the canceled payment and unapproved report #89203

Closed

7 tasks

Fix: make value optional in find callback to match Onyx clear method …

1e7aab8

…type Co-authored-by: Nyoman Jyotisa <nyomanjyotisa@users.noreply.github.com>

chatgpt-codex-connector Bot reviewed May 25, 2026

View reviewed changes

nyomanjyotisa reviewed May 25, 2026

View reviewed changes

chatgpt-codex-connector Bot reviewed May 25, 2026

View reviewed changes

MelvinBot marked this pull request as ready for review May 25, 2026 08:43

MelvinBot requested a review from a team as a code owner May 25, 2026 08:43

melvin-bot Bot requested review from JmillsExpensify and nyomanjyotisa and removed request for a team and JmillsExpensify May 25, 2026 08:43

melvin-bot Bot removed the request for review from a team May 25, 2026 08:43

chatgpt-codex-connector Bot reviewed May 25, 2026

View reviewed changes

MelvinBot requested a review from a team as a code owner May 27, 2026 16:24

melvin-bot Bot requested review from neil-marcellini and removed request for a team May 27, 2026 16:24

neil-marcellini closed this May 27, 2026

Conversation

MelvinBot commented May 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented May 25, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

nyomanjyotisa commented May 25, 2026

Uh oh!

MelvinBot commented May 25, 2026

Uh oh!

MelvinBot commented May 25, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot May 25, 2026

Choose a reason for hiding this comment

Uh oh!

nyomanjyotisa May 25, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot May 25, 2026

Choose a reason for hiding this comment

Uh oh!

nyomanjyotisa May 25, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot May 25, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented May 25, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot May 25, 2026

Choose a reason for hiding this comment

Uh oh!

nyomanjyotisa commented May 25, 2026

Uh oh!

MelvinBot commented May 25, 2026

Uh oh!

nyomanjyotisa commented May 25, 2026

Uh oh!

MelvinBot commented May 25, 2026

Uh oh!

nyomanjyotisa commented May 25, 2026

Uh oh!

melvin-bot Bot commented May 25, 2026

Uh oh!

MelvinBot commented May 25, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot May 25, 2026

Choose a reason for hiding this comment

Uh oh!

nyomanjyotisa May 27, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot May 27, 2026

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented May 27, 2026

Uh oh!

nyomanjyotisa commented May 27, 2026

Reviewer Checklist

MelvinBot commented May 25, 2026 •

edited

Loading

codecov Bot commented May 25, 2026 •

edited by github-actions Bot

Loading