Fix: Filter ineligible reports in useOutstandingReports hook by abzokhattab · Pull Request #84832 · Expensify/App

abzokhattab · 2026-03-11T01:19:08Z

Explanation of Change

Adds ineligible report filtering logic to the useOutstandingReports hook. This ensures both consumers of the hook — the confirmation page (MoneyRequestConfirmationListFooter) and the report selection list (IOURequestEditReportCommon) — see filtered results. When all reports are ineligible, the confirmation page correctly disables the Report field instead of opening a blank page.

Fixed Issues

$ #70423

Tests

Create a workspace
Enable Instant submit, and disable approvals, and payments inside the workspace workflow
Create a reimbursable expense
Retract the report to reopen it as a draft report
Create a non-reimbursable expense
Retract the report to reopen it as a draft report
Go to Report -> submit
Select the reimbursable
Click More > move expenses
Ensure that the non-reimbursable expense (created in step 5) doesn't show up in the list.

Deploy blocker regression test:

Set submission frequency to Instantly, disable Approvals and Payments
Create two non-reimbursable expenses in two reports
Open both reports and retract them from More menu
Click + > Create expense > Manual
Enter amount > Next
On confirm page, verify that the Report field is disabled when all reports contain only non-reimbursable expenses

Offline tests

Same as tests

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-03-13.at.01.55.31.mov

Screen.Recording.2026-03-13.at.01.54.41.mov

Android: mWeb Chrome

Screen.Recording.2026-03-13.at.01.59.31.mov

Screen.Recording.2026-03-13.at.02.00.02.mov

iOS: Native

Screen.Recording.2026-03-13.at.01.55.31.mov

Screen.Recording.2026-03-13.at.01.54.41.mov

iOS: mWeb Safari

Screen.Recording.2026-03-13.at.01.59.31.mov

Screen.Recording.2026-03-13.at.02.00.02.mov

MacOS: Chrome / Safari

Screen.Recording.2026-03-13.at.01.46.58.mov

Screen.Recording.2026-03-13.at.01.50.43.mov

Move the ineligible report filtering from IOURequestEditReportCommon into the useOutstandingReports hook so both the confirmation page and the report selection list see filtered results. This fixes the original bug (Expensify#70423) while avoiding the deploy blocker (Expensify#81608) that caused the previous fix to be reverted.

melvin-bot · 2026-03-13T01:02:53Z

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

abzokhattab · 2026-03-13T01:04:06Z

cc @mananjadhav

abzokhattab · 2026-03-13T01:04:47Z

@MelvinBot can u merge to main

MelvinBot · 2026-03-13T01:10:06Z

I'm not able to merge PRs — that's outside my capabilities. The PR's merge state is currently BLOCKED, which typically means it still needs required reviews or status checks to pass before it can be merged.

To merge this PR, you'll need to ensure all required checks pass and the necessary approvals are in place, then merge it manually or have a maintainer do so.

…le-report-filtering

Replace manual loops with eslint-disable comments by using toCollectionDataSet + Onyx.multiSet for batch merging test data. Also use createRandomTransaction for properly typed transaction objects.

joekaufmanexpensify

Good for product

…le-report-filtering

mananjadhav · 2026-03-18T04:12:03Z

I'll be able to take a look at this tomorrow.

abzokhattab · 2026-03-23T23:04:56Z

@mananjadhav kind reminder

grgia · 2026-03-26T11:22:47Z

@codex review

chatgpt-codex-connector · 2026-03-26T11:40:16Z

Codex Review: Something went wrong. Try again later by commenting “@codex review”.

Failed to set up container

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

grgia · 2026-04-07T10:50:28Z

@huult on review

huult · 2026-04-07T14:34:56Z

@grgia Do you need me to review this PR?

grgia · 2026-04-07T16:09:27Z

Ah I see @mananjadhav should be assigned

mallenexpensify · 2026-04-13T22:26:13Z

@mananjadhav what happened here? It's been almost a month?!?!

mananjadhav · 2026-04-13T22:31:31Z

I had reassigned all outstanding PRs that I couldn't check. I thought I reassigned this one too. @huult Are you available to review this as per the comment here? I can't get to this soon.

huult · 2026-04-13T23:41:11Z

I can take over as C+ thanks

huult · 2026-04-14T02:32:13Z

@grgia Based on this comment #84832 (comment), can I review this PR?

grgia · 2026-04-14T15:35:56Z

@huult yes, all good

huult · 2026-04-15T04:55:41Z

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

Screen.Recording.2026-04-15.at.23.03.44.mp4

Android: mWeb Chrome

Screen.Recording.2026-04-15.at.23.09.25.mp4

iOS: HybridApp

Screen.Recording.2026-04-15.at.23.13.56.mp4

iOS: mWeb Safari

Screen.Recording.2026-04-15.at.23.17.50.mp4

MacOS: Chrome / Safari

Screen.Recording.2026-04-15.at.22.53.31.mp4

huult · 2026-04-15T07:43:07Z

@abzokhattab Could you please sync with main?

abzokhattab · 2026-04-15T08:17:15Z

yes sure ...

just updated it

huult · 2026-04-15T08:31:21Z

Moves the ineligible report filtering logic from IOURequestEditReportCommon.tsx into the useOutstandingReports hook. This ensures both consumers of the hook — the confirmation page (MoneyRequestConfirmationListFooter) and the report selection list (IOURequestEditReportCommon) — see filtered results.

@abzokhattab This explains your changes in this PR. However, I didn’t see any changes in the IOURequestEditReportCommon ineligible report filtering logic. It looks like this PR is not moving the existing logic, but instead adding new logic for useOutstandingReports. If that's correct, could you please check and update the explanation of the changes?

abzokhattab · 2026-04-15T08:41:33Z

yes @huult the wording is not fully accurate, i changed it

grgia · 2026-04-15T13:47:53Z

Awaiting final C+ review

huult · 2026-04-15T15:23:24Z

@grgia I’m reviewing this PR. I need to trace the history to get context 😄 I think I can finish it today or tmr.

huult · 2026-04-15T15:44:08Z

@codex review

chatgpt-codex-connector · 2026-04-15T16:16:53Z

Codex Review: Didn't find any major issues. Already looking forward to the next diff.

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

huult

LGTM!

huult · 2026-04-17T06:39:38Z

@grgia all yours

github-actions · 2026-04-17T12:06:41Z

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

github-actions · 2026-04-17T12:11:27Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-cd59e40-2665fac-df6d350ab668c79327029f9c49b7d6bf902c82e7/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-cd59e40-2665fac-bd6b83fa6b5aac60ecf1f7f393e9b74645231c4d/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-17T12:15:02Z

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

melvin-bot bot assigned abzokhattab Mar 11, 2026

abzokhattab force-pushed the akhattab/fix-ineligible-report-filtering branch from da1de9d to 291e654 Compare March 11, 2026 01:47

abzokhattab force-pushed the akhattab/fix-ineligible-report-filtering branch from 291e654 to df2fba1 Compare March 11, 2026 01:48

abzokhattab marked this pull request as ready for review March 13, 2026 01:02

abzokhattab requested review from a team as code owners March 13, 2026 01:02

melvin-bot bot requested a review from huult March 13, 2026 01:02

melvin-bot bot requested review from joekaufmanexpensify and removed request for a team March 13, 2026 01:02

abzokhattab mentioned this pull request Mar 13, 2026

pending BZ checklist [Due for payment 2026-02-17] [Due for payment 2025-10-21] [$250] If an expense report is not eligible to have reports moved to it, don't show it in the list #70423

Open

16 tasks

github-actions bot reviewed Mar 13, 2026

View reviewed changes

Comment thread tests/unit/hooks/useOutstandingReports.test.ts Outdated

github-actions bot reviewed Mar 13, 2026

View reviewed changes

Comment thread tests/unit/hooks/useOutstandingReports.test.ts

abzokhattab added 2 commits March 13, 2026 02:15

Merge remote-tracking branch 'origin/main' into akhattab/fix-ineligib…

ede85d3

…le-report-filtering

Use toCollectionDataSet to avoid eslint-disable for no-await-in-loop

45fc3d5

Replace manual loops with eslint-disable comments by using toCollectionDataSet + Onyx.multiSet for batch merging test data. Also use createRandomTransaction for properly typed transaction objects.

joekaufmanexpensify approved these changes Mar 13, 2026

View reviewed changes

Merge remote-tracking branch 'origin/main' into akhattab/fix-ineligib…

26729d6

…le-report-filtering

grgia approved these changes Apr 2, 2026

View reviewed changes

grgia approved these changes Apr 7, 2026

View reviewed changes

grgia requested a review from mananjadhav April 7, 2026 16:09

grgia removed the request for review from mananjadhav April 14, 2026 15:36

Merge branch 'main' into akhattab/fix-ineligible-report-filtering

f40d89e

huult approved these changes Apr 15, 2026

View reviewed changes

melvin-bot bot requested a review from grgia April 15, 2026 16:22

grgia approved these changes Apr 17, 2026

View reviewed changes

grgia merged commit cd59e40 into Expensify:main Apr 17, 2026
35 of 36 checks passed

Conversation

abzokhattab commented Mar 11, 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!

melvin-bot bot commented Mar 13, 2026

Uh oh!

abzokhattab commented Mar 13, 2026

Uh oh!

abzokhattab commented Mar 13, 2026

Uh oh!

Uh oh!

Uh oh!

MelvinBot commented Mar 13, 2026

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

mananjadhav commented Mar 18, 2026

Uh oh!

abzokhattab commented Mar 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

grgia commented Mar 26, 2026

Uh oh!

chatgpt-codex-connector bot commented Mar 26, 2026

Uh oh!

grgia commented Apr 7, 2026

Uh oh!

huult commented Apr 7, 2026

Uh oh!

grgia commented Apr 7, 2026

Uh oh!

mallenexpensify commented Apr 13, 2026

Uh oh!

mananjadhav commented Apr 13, 2026

Uh oh!

huult commented Apr 13, 2026

Uh oh!

huult commented Apr 14, 2026

Uh oh!

grgia commented Apr 14, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

huult commented Apr 15, 2026

Uh oh!

abzokhattab commented Apr 15, 2026

Uh oh!

huult commented Apr 15, 2026

Uh oh!

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

Uh oh!

Uh oh!

grgia commented Apr 15, 2026

Uh oh!

huult commented Apr 15, 2026

Uh oh!

huult commented Apr 15, 2026

Uh oh!

chatgpt-codex-connector bot commented Apr 15, 2026

Uh oh!

huult left a comment

Choose a reason for hiding this comment

Uh oh!

huult commented Apr 17, 2026

Uh oh!

Uh oh!

github-actions bot commented Apr 17, 2026

Uh oh!

github-actions bot commented Apr 17, 2026

abzokhattab commented Mar 11, 2026 •

edited

Loading

abzokhattab commented Mar 23, 2026 •

edited

Loading

huult commented Apr 15, 2026 •

edited

Loading

abzokhattab commented Apr 15, 2026 •

edited

Loading