Skip to content

Don't show non-reimbursable reports in the Pay to-do queu - #87459

Merged
rlinoz merged 1 commit into
Expensify:mainfrom
twilight2294:patch-52
Apr 9, 2026
Merged

rlinoz merged 1 commit into
Expensify:mainfrom
twilight2294:patch-52

Conversation

@twilight2294

@twilight2294 twilight2294 commented Apr 9, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Don't show non-reimbursable reports in the Pay to-do queu

Fixed Issues

$ #87351
PROPOSAL: #87351 (comment)

Tests

same as QA

  • Verify that no errors appear in the JS console

Offline tests

Same as QA

QA Steps

  1. Create a reimbursable report and approve it
  2. Create a non-reimbursable report and approve it
  3. Go to /search and select Pay from the Todo section

Verify that the non-reimbursable report is not visible in the list

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
Screen.Recording.2026-04-09.at.12.55.38.PM.mov
Android: mWeb Chrome
Screen.Recording.2026-04-09.at.1.00.21.PM.mov
iOS: Native
Screen.Recording.2026-04-09.at.12.45.25.PM.mov
iOS: mWeb Safari
Screen.Recording.2026-04-09.at.12.46.07.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2026-04-09.at.12.12.38.PM.mov

@MelvinBot

Copy link
Copy Markdown
Contributor

PR Review

Change: Filters non-reimbursable-only reports out of the Pay to-do queue by adding a !hasOnlyNonReimbursableTransactions(report.reportID, reportTransactions) check in todos.ts:78.

Correctness

The logic is correct. hasOnlyNonReimbursableTransactions (ReportUtils.ts:2620) returns true only when every transaction in the report is non-reimbursable. Reports with a mix of reimbursable and non-reimbursable transactions will still appear in the Pay queue, which is the expected behavior.

The reportTransactions variable is already computed on line 55 and passed directly, so the function won't re-fetch transactions — no performance concern.

Failing Check

The test (job 8) failure is a flaky infrastructure issue — GnuTLS recv error during git checkout. Completely unrelated to this PR.

Suggestion

The existing tests in OnyxDerivedTest.tsx only create pay-eligible reports with reimbursable: true transactions. Consider adding a test case that creates a report with only non-reimbursable transactions and verifies it does not appear in reportsToPay. This would prevent regressions on this filter.

Verdict

The change is minimal, well-scoped, and uses an existing utility correctly. Looks good to merge once the flaky CI job passes. 👍

@twilight2294

Copy link
Copy Markdown
Contributor Author

@situchan working on recordings currently, will ping you once done

@twilight2294
twilight2294 marked this pull request as ready for review April 9, 2026 07:30
@twilight2294
twilight2294 requested review from a team as code owners April 9, 2026 07:30
@melvin-bot
melvin-bot Bot requested review from flaviadefaria and situchan April 9, 2026 07:30
@melvin-bot

melvin-bot Bot commented Apr 9, 2026

Copy link
Copy Markdown

@situchan 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
melvin-bot Bot removed request for a team April 9, 2026 07:30
@twilight2294

Copy link
Copy Markdown
Contributor Author

@situchan working on recordings currently, will ping you once done

@situchan recordings updated, PR is ready for your review

@situchan

situchan commented Apr 9, 2026

Copy link
Copy Markdown
Contributor

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
android.mov
Android: mWeb Chrome
mchrome.mov
iOS: HybridApp
ios.mov
iOS: mWeb Safari
msafari.mov
MacOS: Chrome / Safari
web.mov

@melvin-bot
melvin-bot Bot requested a review from rlinoz April 9, 2026 07:32
@situchan

situchan commented Apr 9, 2026

Copy link
Copy Markdown
Contributor

Rerunning hopefully fix job 8

@JmillsExpensify
JmillsExpensify requested review from JmillsExpensify and removed request for flaviadefaria April 9, 2026 07:35
@JmillsExpensify

Copy link
Copy Markdown
Contributor

Kicked off a quick adhoc

@github-actions

github-actions Bot commented Apr 9, 2026

Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

@JmillsExpensify

Copy link
Copy Markdown
Contributor

Ok, so this successfully resolved the issue on Home and Reports. That said, I'm still seeing a Pay to-do in the Inbox. We should remove it there too, for consistency.
CleanShot 2026-04-09 at 11 37 42@2x

@JmillsExpensify

Copy link
Copy Markdown
Contributor

Here's the equivalent in Reports.
CleanShot 2026-04-09 at 11 39 06@2x

@situchan

situchan commented Apr 9, 2026 •

Copy link
Copy Markdown
Contributor

Ok, so this successfully resolved the issue on Home and Reports. That said, I'm still seeing a Pay to-do in the Inbox. We should remove it there too, for consistency.

@JmillsExpensify We still show Pay button as primary action in report preview.
If we remove badge from LHN, they'll be inconsistent.
Is that fine?

Screenshot 2026-04-09 at 4 48 31 PM

@JmillsExpensify JmillsExpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok that's a really fair point. Ok, works for me! Approving.

@JmillsExpensify

Copy link
Copy Markdown
Contributor

cc @joekaufmanexpensify in case you want to take a look at this PR (and for visibility).

@joekaufmanexpensify

Copy link
Copy Markdown
Contributor

We still show Pay button as primary action in report preview.
If we remove badge from LHN, they'll be inconsistent.
Is that fine?

If an admin never pays a report, that means the report will be pinned to the LHN in perpetuity though, right? Many, if not most, of our customers won't pay entirely non-reimbursable reports. IMO, leaving this pay badge is setting up the LHN to be unusable for these admins. I checked OldDot, and we don't flag entirely non-reimbursable reports for payment in guided review. I don't think it would be inconsistent with that precedent to hide the badge here.

2026-04-09_08-25-33.mp4

@codecov

codecov Bot commented Apr 9, 2026 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/libs/actions/OnyxDerived/configs/todos.ts 100.00% <100.00%> (ø)
... and 55 files with indirect coverage changes

@rlinoz

rlinoz commented Apr 9, 2026

Copy link
Copy Markdown
Contributor

codewise this looks good.

Do we need a follow up based on @joekaufmanexpensify's comment? cc: @JmillsExpensify

@rlinoz
rlinoz merged commit 25e00cb into Expensify:main Apr 9, 2026
55 of 56 checks passed
@github-actions

github-actions Bot commented Apr 9, 2026

Copy link
Copy Markdown
Contributor

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

@joekaufmanexpensify

Copy link
Copy Markdown
Contributor

My 2c is people are still going to write in about this if we do not. But we could also wait and see if that happens before changing it further.

@OSBotify

OSBotify commented Apr 9, 2026

Copy link
Copy Markdown
Contributor

✋ 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 OSBotify mentioned this pull request Apr 10, 2026
87 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/rlinoz in version: 9.3.58-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site changes are required for this PR.

The existing help articles already describe the Pay to-do as surfacing reports ready for reimbursement:

  • Pay-Expenses.md — Covers paying workspace and personal expenses (all reimbursement flows)
  • Reimbursement-Payment-Methods.md — Describes reimbursement methods for approved reports
  • Using-Search-on-the-Reports-Page.md — Defines Pay as "Reports ready for reimbursement"

This PR filters non-reimbursable reports out of the Pay queue, which aligns the product with what the docs already say. No article references non-reimbursable reports appearing in Pay, so no updates are needed.

@JmillsExpensify

Copy link
Copy Markdown
Contributor

We still show Pay button as primary action in report preview.
If we remove badge from LHN, they'll be inconsistent.
Is that fine?

If an admin never pays a report, that means the report will be pinned to the LHN in perpetuity though, right? Many, if not most, of our customers won't pay entirely non-reimbursable reports. IMO, leaving this pay badge is setting up the LHN to be unusable for these admins. I checked OldDot, and we don't flag entirely non-reimbursable reports for payment in guided review. I don't think it would be inconsistent with that precedent to hide the badge here.

2026-04-09_08-25-33.mp4

I don't feel strongly on this one. @joekaufmanexpensify can you create a follow-up issue since this PR is merged?

@joekaufmanexpensify

Copy link
Copy Markdown
Contributor

Done!

Copy link
Copy Markdown
Contributor

Thanks

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.3.58-9 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 failure ❌

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.3.58-9 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants