Report - "Outstanding" seen as status when cancelling payment offline with approvals disabled by mohammadjafarinejad · Pull Request #73936 · Expensify/App

mohammadjafarinejad · 2025-10-31T16:20:29Z

Explanation of Change

This PR fixes the issue where canceled payments incorrectly showed "Outstanding" status instead of "Done" when approvals are disabled.

Fixed Issues

$ #72750
PROPOSAL: #72750 (comment)

Tests

Test 1

When payment of an expense is canceled, the status should change to "Done" instead of "Outstanding" if approvals are disabled.

Prerequisite: Delayed submissions enabled and approvals disabled.

Create a manual expense.
Tap on "Submit" on the expense preview.
Note that the status changes to "Done".
Mark the expense as paid.
Turn off the internet connection.
Open the expense report.
Tap on "More" and cancel the payment.
✅ Status now correctly changes from "Paid" to "Done"

Test 2

Prerequisite: Add approvals disabled and Delayed Submission disabled.

Create an expense
Turn off the internet connection
Click "Pay elsewhere" on the expense
Open the report header and click "Cancel payment"
Open the report header again
✅ Verify you see "Retract" option
After retracting, verify you see "Delete expense" option

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

FIX_72750_ANDROID.mp4

Android: mWeb Chrome

FIX_72750_ANDROID_WEB.mp4

iOS: Native

FIX_72750_IOS.mp4

iOS: mWeb Safari

MacOS: Chrome / Safari

FIX_72750_WEB.mp4

MacOS: Desktop

FIX_72750_DESKTOP.mp4

github-actions · 2025-10-31T16:23:25Z

LGTM . Thank you for your hard work!

codecov · 2025-10-31T16:30:49Z

Codecov Report

✅ All modified and coverable lines are covered by tests.

Files with missing lines	Coverage Δ
src/libs/actions/IOU.ts	`63.61% <100.00%> (+<0.01%)`	⬆️

... and 217 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

… closed

melvin-bot · 2025-11-01T13:27:03Z

@suneox 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]

mohammadjafarinejad · 2025-11-01T13:47:10Z

Hi @suneox 👋

We need two test steps for this issue, right?
One for the current issue that we are solving, and a second for #55319 to make sure we don't break the current behavior.

I'm using the test steps from this PR #56950, but I cannot see the delete button until I retract the expense. Am I doing something wrong, or has the behavior changed since the PR is 9 months old?
If the behavior has changed, we might not need to modify canDeleteMoneyRequestReport() as I suggested in my proposal.

REC-20251101173812.mp4

Thanks.

suneox · 2025-11-03T18:45:33Z

Hi @suneox 👋

We need two test steps for this issue, right? One for the current issue that we are solving, and a second for #55319 to make sure we don't break the current behavior.

Yes, please do that.

I'm using the test steps from this PR #56950, but I cannot see the delete button until I retract the expense. Am I doing something wrong, or has the behavior changed since the PR is 9 months old? If the behavior has changed, we might not need to modify canDeleteMoneyRequestReport() as I suggested in my proposal.

the Retract action is simply a new label for Undo submit, so your steps are correct with the current flow

suneox · 2025-11-03T18:54:35Z

@mohammadjafarinejad Could you please also address the bot’s code review comment about the redundant ternary operator? Also update the test steps to match your current testing behavior.

mohammadjafarinejad · 2025-11-04T00:26:48Z

@mohammadjafarinejad Could you please also address the bot’s code review comment about the redundant ternary operator? Also update the test steps to match your current testing behavior.

Added Test 2

suneox · 2025-11-05T18:15:39Z

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
- MacOS: Desktop
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 there are no new alerts related to the canBeMissing param for useOnyx
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

Screen.Recording.2025-11-06.at.01.09.20.mp4

Android: mWeb Chrome

Screen.Recording.2025-11-06.at.01.04.47.mp4

iOS: HybridApp

Screen.Recording.2025-11-06.at.01.07.41.mp4

iOS: mWeb Safari

Screen.Recording.2025-11-06.at.01.01.19.mp4

MacOS: Chrome / Safari

Screen.Recording.2025-11-06.at.00.56.15.mp4

MacOS: Desktop

Screen.Recording.2025-11-06.at.00.58.35.mp4

OSBotify · 2025-11-05T19:28:55Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2025-11-05T20:38:28Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.2.45-0 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

OSBotify · 2025-11-06T23:21:01Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.2.45-6 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

…ix/72750" This reverts commit 0c9e5f3, reversing changes made to 926540a.

…ext step separately Reverts the statusNum change that caused regression on Expensify#72750. The optimistic stateNum/statusNum (Approved/Closed) was correctly set by PR Expensify#73936. Instead of changing the report status, we now pass SUBMITTED as the predictedNextStatus only to the next step builders, so the report status stays CLOSED while the next step message correctly shows "waiting to pay". Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>

situchan · 2026-05-22T22:41:51Z

-    const stateNum: ValueOf<typeof CONST.REPORT.STATE_NUM> = approvalMode === CONST.POLICY.APPROVAL_MODE.OPTIONAL ? CONST.REPORT.STATE_NUM.SUBMITTED : CONST.REPORT.STATE_NUM.APPROVED;
-    const statusNum: ValueOf<typeof CONST.REPORT.STATUS_NUM> = approvalMode === CONST.POLICY.APPROVAL_MODE.OPTIONAL ? CONST.REPORT.STATUS_NUM.SUBMITTED : CONST.REPORT.STATUS_NUM.APPROVED;
+    const stateNum: ValueOf<typeof CONST.REPORT.STATE_NUM> = CONST.REPORT.STATE_NUM.APPROVED;
+    const statusNum: ValueOf<typeof CONST.REPORT.STATUS_NUM> = approvalMode === CONST.POLICY.APPROVAL_MODE.OPTIONAL ? CONST.REPORT.STATUS_NUM.CLOSED : CONST.REPORT.STATUS_NUM.APPROVED;


This change was too broad. Next step message was not considered so it caused Expense - "Waiting for you to approve expenses" after Cancel Payment if Approvals is OFF

For OPTIONAL approval mode with a connected bank account, the report status is CLOSED but the next step should show "waiting to pay", so we should use SUBMITTED as the predictedNextStatus which routes through the correct next step path. Without a bank account, keep CLOSED which shows "no further action required".

Fixed in #90719

Update payment cancellation logic for approval modes

08bb600

melvin-bot Bot assigned mohammadjafarinejad Oct 31, 2025

github-actions Bot reviewed Oct 31, 2025

View reviewed changes

Comment thread src/libs/actions/IOU.ts Outdated

github-actions Bot reviewed Oct 31, 2025

View reviewed changes

Comment thread src/libs/actions/IOU.ts

mohammadjafarinejad added 6 commits October 31, 2025 20:34

Allow deletion of reports with OPTIONAL approval mode if approved and…

302e023

… closed

Fix prettier formatting

fd715c1

revet deletion logic fix

98fe7bb

Fix stateNum assignment for optional approval mode

917f2ba

Fix stateNum assignment for optional approval mode

caf0773

Merge branch 'Expensify:main' into fix/72750

ff16324

mohammadjafarinejad marked this pull request as ready for review November 1, 2025 13:26

mohammadjafarinejad requested a review from a team as a code owner November 1, 2025 13:26

melvin-bot Bot requested review from suneox and removed request for a team November 1, 2025 13:27

github-actions Bot reviewed Nov 1, 2025

View reviewed changes

Comment thread src/libs/actions/IOU.ts Outdated

chore: remove redundant check

4267343

chore: empty commit to rereun tests

093555f

mohammadjafarinejad requested a review from a team as a code owner November 5, 2025 14:54

melvin-bot Bot requested review from JmillsExpensify and removed request for a team November 5, 2025 14:54

suneox approved these changes Nov 5, 2025

View reviewed changes

melvin-bot Bot requested a review from Julesssss November 5, 2025 18:18

Julesssss approved these changes Nov 5, 2025

View reviewed changes

Julesssss merged commit 0c9e5f3 into Expensify:main Nov 5, 2025
25 checks passed

OSBotify mentioned this pull request Nov 5, 2025

Deploy Checklist: New Expensify 2025-11-05 #74371

Closed

79 tasks

melvin-bot Bot mentioned this pull request Nov 6, 2025

[Due for payment 2025-11-13] [$250] Report - "Outstanding" seen as status when cancelling payment offline with approvals disabled #72750

Closed

8 tasks

fahimj mentioned this pull request Nov 7, 2025

Report - "No further action required" message seen again after retracting expense offline #74431

Closed

8 tasks

fahimj added a commit to fahimj/App that referenced this pull request Nov 7, 2025

Revert "Merge pull request Expensify#73936 from mohammadjafarinejad/f…

86a5502

…ix/72750" This reverts commit 0c9e5f3, reversing changes made to 926540a.

MelvinBot mentioned this pull request May 14, 2026

Use SUBMITTED status for cancel payment optimistic data when approvals disabled #90719

Merged

50 tasks

MelvinBot mentioned this pull request May 22, 2026

[Due for payment 2026-05-26] [$250] Expense - "Waiting for you to approve expenses" after Cancel Payment if Approvals is OFF #75500

Closed

8 tasks

situchan reviewed May 22, 2026

View reviewed changes

Uh oh!

Conversation

mohammadjafarinejad commented Oct 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Test 1

Test 2

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

github-actions Bot commented Oct 31, 2025

Uh oh!

Uh oh!

Uh oh!

codecov Bot commented Oct 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot Bot commented Nov 1, 2025

Uh oh!

Uh oh!

mohammadjafarinejad commented Nov 1, 2025

Uh oh!

suneox commented Nov 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

suneox commented Nov 3, 2025

Uh oh!

mohammadjafarinejad commented Nov 4, 2025

Uh oh!

suneox commented Nov 5, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

OSBotify commented Nov 5, 2025

Uh oh!

OSBotify commented Nov 5, 2025

Uh oh!

OSBotify commented Nov 6, 2025

Uh oh!

situchan May 22, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

mohammadjafarinejad commented Oct 31, 2025 •

edited

Loading

codecov Bot commented Oct 31, 2025 •

edited

Loading

suneox commented Nov 3, 2025 •

edited

Loading