Fix: "Waiting for you to pay expenses" shown incorrectly for $0.00 reports without Pay button by marufsharifi · Pull Request #88612 · Expensify/App

marufsharifi · 2026-04-23T15:51:33Z

Explanation of Change

These changes make the experience for $0.00 expense reports match what users can actually do.

Before this update, the app could still tell someone “Waiting for you to pay expenses” or show the report in Spend> Ready to Pay even when there was nothing to pay and the Pay action was hidden. That created a confusing mismatch between the status shown in the UI and the actions available to the user.

This update fixes that by treating zero-value reimbursable reports as requiring no further action once they reach the relevant submitted or approved states, and by removing them from the Spend > Ready to Pay view when they are not truly payable. In product terms, it keeps the report status, header messaging, and Pay list aligned so users only see payment prompts when a payment can actually happen.

Fixed Issues

$ #75396
PROPOSAL: #75396 (comment)

Tests

Go to workspace chat.
Create an expense with 0.00 amount.
Open the report.
Click the Submit and Approve button.
Verify it will not show "Waiting for you to pay expenses" as the Pay button is hidden for a 0.00 report
Go to Spend > Ready for Pay
Verify it doesn't show that 0.00 report.

Verify that no errors appear in the JS console

Offline tests

Same as Tests.

QA Steps

Same as Tests.

// TODO: These must be filled out, or the issue title must include "[No QA]."

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-04-24.at.7.00.17.PM.mp4

Android: mWeb Chrome

REC-2026042461149.PM.mp4

iOS: Native

REC-2026042463350.PM.mp4

iOS: mWeb Safari

REC-2026042460136.PM.mp4

MacOS: Chrome / Safari

REC-2026042431830.PM.mp4

…0 reports when Pay button is not shown

codecov · 2026-04-23T16:01:55Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/libs/NextStepUtils.ts	`71.53% <50.00%> (-0.65%)`	⬇️
src/libs/SearchUIUtils.ts	`63.78% <58.33%> (-0.03%)`	⬇️
... and 14 files with indirect coverage changes

melvin-bot · 2026-04-24T13:07:03Z

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

melvin-bot · 2026-04-24T13:07:09Z

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

ZhenjaHorbach · 2026-04-24T13:08:53Z

    }

+    if (shouldShowNoFurtherAction) {
+        return buildNextStepNew({


chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d9a1fec709

ℹ️ 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".

grgia · 2026-04-24T13:29:10Z

        case CONST.REPORT.STATUS_NUM.SUBMITTED: {
            if (policy?.approvalMode === CONST.POLICY.APPROVAL_MODE.OPTIONAL) {
-                nextStep = nextStepFixOrPayExpense;
+                nextStep = reimbursableSpend === 0 ? nextStepNoActionRequired : nextStepFixOrPayExpense;


App/src/libs/SearchUIUtils.ts

Line 2312 in c4ba24a

} else {

@marufsharifi just checking- does the report slip through these checks?

Yes, it can. getActions() correctly removes PAY for a $0 report, but before this change the section builders could still render the row based on status/type alone, so it could still appear in Ready to Pay.

grgia · 2026-04-24T13:29:52Z

+    const shouldShowNoFurtherAction =
+        reimbursableSpend === 0 &&
+        (moneyRequestReport?.statusNum === CONST.REPORT.STATUS_NUM.APPROVED ||
+            (moneyRequestReport?.statusNum === CONST.REPORT.STATUS_NUM.SUBMITTED && policy?.approvalMode === CONST.POLICY.APPROVAL_MODE.OPTIONAL));


does this need to be hardcoded? has was it shown before

Yes, I think this override is needed. The header still reads from the deprecated nextStep object via getReportNextStep(), so fixing only buildOptimisticNextStep() would not update a stale "Waiting to pay" value. This just overrides that stale case for $0 submitted/approved reports while still using the existing legacy builder for the message shape

marufsharifi · 2026-04-27T10:36:31Z

@ZhenjaHorbach kindly bump. thanks.

marufsharifi · 2026-04-29T08:38:26Z

@ZhenjaHorbach, friendly bump. thanks.

ZhenjaHorbach · 2026-04-29T16:45:42Z

Sorry for the delay
I had technical issues

@marufsharifi
Could you fix the conflicts, please?

ZhenjaHorbach · 2026-04-30T07:42:22Z

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

2026-04-30.09.55.01.mov

Android: mWeb Chrome

2026-04-30.09.53.10.mov

iOS: HybridApp

2026-04-30.09.55.01.mov

iOS: mWeb Safari

2026-04-30.09.53.10.mov

MacOS: Chrome / Safari

2026-04-30.09.51.44.mov

grgia

Thanks for your work on this one

marufsharifi · 2026-05-01T06:21:03Z

@heyjennahay, could you please take a look at this when you get a chance? Thanks.

github-actions · 2026-05-01T10:03:33Z

🚧 @grgia has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-05-01T10:07:53Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #88612.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-4e601f1-df9359b-5f40686476f1858158110ebc162766b41aea1c8d/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-4e601f1-df9359b-c3d8d150cfaae63aa7782e5ed07db07ce31be85d/index.html

Web 🕸️
https://88612.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-05-01T10:10:23Z

✋ 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 · 2026-05-04T13:27:38Z

🚀 Deployed to staging by https://github.com/grgia in version: 9.3.66-0 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	cancelled 🔪
🍎 iOS 🍎	cancelled 🔪

MelvinBot · 2026-05-04T13:29:33Z

No help site changes are required for this PR.

I reviewed the following articles against the changes in this PR:

Pay-Expenses.md
Understanding-Report-Statuses-and-Actions.md
Expense-and-Report-Actions.md
Getting-Started-with-the-Spend-Page.md

This PR is a bug fix that stops $0.00 reimbursable reports from showing "Waiting for you to pay expenses" and removes them from the Pay filter view. None of the existing help site articles make claims that would become incorrect — the docs describe the general payment workflow without covering this edge case at that granularity.

fix(expense): hide "Waiting for you to pay expenses" message for $0.0…

d9a1fec

…0 reports when Pay button is not shown

melvin-bot Bot assigned marufsharifi Apr 23, 2026

marufsharifi marked this pull request as ready for review April 24, 2026 13:06

marufsharifi requested review from a team as code owners April 24, 2026 13:06

melvin-bot Bot requested review from ZhenjaHorbach and heyjennahay and removed request for a team April 24, 2026 13:07

melvin-bot Bot requested review from a team and grgia and removed request for a team April 24, 2026 13:07

ZhenjaHorbach reviewed Apr 24, 2026

View reviewed changes

chatgpt-codex-connector Bot reviewed Apr 24, 2026

View reviewed changes

Comment thread src/libs/SearchUIUtils.ts Outdated

grgia reviewed Apr 24, 2026

View reviewed changes

marufsharifi added 3 commits April 25, 2026 09:26

Merge branch 'main' into fix/expense-hide-waiting-message-zero-report

4f47b80

fix: handle -action:pay correctly

bdadbdc

fix: suppress legacy fallback lint

b094089

Merge branch 'main' into fix/expense-hide-waiting-message-zero-report

7219dd8

ZhenjaHorbach approved these changes Apr 30, 2026

View reviewed changes

melvin-bot Bot requested a review from grgia April 30, 2026 07:58

grgia approved these changes Apr 30, 2026

View reviewed changes

grgia merged commit 4e601f1 into Expensify:main May 1, 2026
39 checks passed

OSBotify mentioned this pull request May 4, 2026

Deploy Checklist: New Expensify 2026-05-04 #89508

Open

76 tasks

Conversation

marufsharifi commented Apr 23, 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 Apr 23, 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!

melvin-bot Bot commented Apr 24, 2026

Uh oh!

melvin-bot Bot commented Apr 24, 2026

Uh oh!

ZhenjaHorbach Apr 24, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

grgia Apr 24, 2026

Choose a reason for hiding this comment

Uh oh!

marufsharifi Apr 25, 2026

Choose a reason for hiding this comment

Uh oh!

grgia Apr 24, 2026

Choose a reason for hiding this comment

Uh oh!

marufsharifi Apr 25, 2026

Choose a reason for hiding this comment

Uh oh!

marufsharifi commented Apr 27, 2026

Uh oh!

marufsharifi commented Apr 29, 2026

Uh oh!

ZhenjaHorbach commented Apr 29, 2026

Uh oh!

ZhenjaHorbach commented Apr 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

grgia left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

marufsharifi commented May 1, 2026

Uh oh!

Uh oh!

github-actions Bot commented May 1, 2026

Uh oh!

github-actions Bot commented May 1, 2026

Uh oh!

OSBotify commented May 1, 2026

Uh oh!

OSBotify commented May 4, 2026

Uh oh!

MelvinBot commented May 4, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

marufsharifi commented Apr 23, 2026 •

edited

Loading

codecov Bot commented Apr 23, 2026 •

edited by github-actions Bot

Loading

ZhenjaHorbach commented Apr 30, 2026 •

edited

Loading

grgia left a comment •

edited

Loading