[No QA] Add tests for SearchMoneyRequestReportPage dismiss-on-removal logic by TMisiukiewicz · Pull Request #89247 · Expensify/App

TMisiukiewicz · 2026-04-30T06:20:50Z

Explanation of Change

Follow-up to #89150 per @mountiny's review request (#89150 (review)).

Extracts the removal-detection effect from SearchMoneyRequestReportPage into a dedicated hook useDismissOnReportRemoval so it can be unit-tested in isolation. The hook fetches report data internally via useOnyx — no behavioral change, same logic and route-change guard as before.

Adds 7 unit test cases covering:

Dismisses when a focused money request report is removed
Does not dismiss on first render even if report data is missing
Does not dismiss when screen is unfocused
Does not dismiss when previous report was not a money request report
Regression for Fix modal dismiss on report route change in SearchMoneyRequestReportPage #89150: does not dismiss when route changes to a report whose data hasn't loaded yet
Reviewer scenario: arrow navigation A→B→A with the previous report's status mutating mid-navigation — modal must never dismiss
Does not dismiss when report is updated but still present

Fixed Issues

$ #89177
PROPOSAL:

Tests

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

melvin-bot · 2026-04-30T06:24:19Z

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

codecov · 2026-04-30T06:29:16Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/hooks/useDismissOnMoneyRequestReportRemoval.ts	`100.00% <100.00%> (ø)`
src/pages/Search/SearchMoneyRequestReportPage.tsx	`0.00% <0.00%> (ø)`
... and 8 files with indirect coverage changes

mountiny · 2026-04-30T07:21:48Z

@abzokhattab can you please add a checklist?

abzokhattab · 2026-04-30T07:22:54Z

Yes let me check the pr

Copilot

Pull request overview

Extracts the “dismiss modal when the currently-focused money request report disappears” logic from SearchMoneyRequestReportPage into a dedicated hook so the behavior can be unit-tested and regressions (e.g. #89150 / #89177) are prevented.

Changes:

Added useDismissOnReportRemoval hook to encapsulate the removal-detection + route-change guard logic.
Updated SearchMoneyRequestReportPage to use the new hook instead of the inline effect.
Added a new unit test suite with 7 cases covering deletion/removal, focus conditions, route changes, and a regression/navigation scenario.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File	Description
tests/unit/hooks/useDismissOnReportRemoval.test.ts	Adds unit tests covering modal-dismiss behavior and route-change regressions.
src/pages/Search/SearchMoneyRequestReportPage.tsx	Replaces inline “dismiss on report removal” effect with the extracted hook.
src/hooks/useDismissOnReportRemoval.ts	Introduces a new hook implementing the dismissal/removal detection logic.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-30T07:26:18Z

+function useDismissOnReportRemoval(reportIDFromRoute: string | undefined) {
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportIDFromRoute}`);
+    const prevReport = usePrevious(report);


The hook name useDismissOnReportRemoval is generic, but the implementation only dismisses for money request reports (isMoneyRequestReport(prevReport)). To avoid accidental reuse with incorrect expectations, consider renaming it to reflect the money-request constraint (or making the behavior configurable via a predicate/flag).

abzokhattab · 2026-04-30T08:31:40Z

@MelvinBot review

MelvinBot · 2026-04-30T08:35:09Z

PR Review

Clean extraction — the hook logic is correct and the 7 test cases are well-chosen, especially the regression scenarios for arrow navigation.

Issues

1. Duplicate Onyx subscription (minor)

The hook subscribes to ONYXKEYS.COLLECTION.REPORT at useDismissOnReportRemoval.ts:16, and SearchMoneyRequestReportPage already subscribes to the same key at SearchMoneyRequestReportPage.tsx:77. I see TMisiukiewicz addressed this in the existing review thread — the "hooks own their data" rationale is reasonable for testability, and the perf cost of a second Onyx subscription to the same key is negligible. No action needed here.

2. Hook name could be more specific (nit)

useDismissOnReportRemoval reads as generic, but the implementation only dismisses for money request reports (via isMoneyRequestReport). Something like useDismissOnMoneyRequestReportRemoval would prevent misuse. Not blocking.

Looks good

First-render guard, route-change guard, and focus check are all in the correct order
prevReportIDFromRoute is correctly re-added at SearchMoneyRequestReportPage.tsx:188 for the separate openReport effect — no logic lost
Test coverage is solid: happy path, first render, unfocused, non-money-request type, route change race, status mutation mid-navigation, and update-without-removal

abzokhattab · 2026-04-30T09:18:17Z

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: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

TMisiukiewicz · 2026-04-30T10:16:37Z

left comments & updated hook name

abzokhattab

LGTM

mountiny · 2026-05-01T06:22:28Z

Conflicts

…uest-report-tests # Conflicts: # Mobile-Expensify

TMisiukiewicz · 2026-05-04T06:54:47Z

resolved ✅

mountiny

Thank you!

github-actions · 2026-05-04T12:54:51Z

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

OSBotify · 2026-05-04T12:57:46Z

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

github-actions · 2026-05-04T13:04:27Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-290ed93-34a8d39-542fc1eaec6496aba20f8c36fa6d87872738087b/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-290ed93-34a8d39-ed261a1f48bd2e4ba6467e46b1d3de5f22f14b98/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-05-04T13:28:32Z

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

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

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

This PR is a pure internal code refactoring — it extracts a dismiss-on-removal effect into a dedicated hook (useDismissOnMoneyRequestReportRemoval) and adds unit tests. There are no user-facing changes (no new features, no UI changes, no changed behavior, no modified settings or labels).

No help site documentation changes are required.

Extract useDismissOnReportRemoval hook and add tests

49947ce

melvin-bot Bot assigned TMisiukiewicz Apr 30, 2026

TMisiukiewicz changed the title ~~Add tests for SearchMoneyRequestReportPage dismiss-on-removal logic~~ [No QA] Add tests for SearchMoneyRequestReportPage dismiss-on-removal logic Apr 30, 2026

TMisiukiewicz marked this pull request as ready for review April 30, 2026 06:24

TMisiukiewicz requested review from a team as code owners April 30, 2026 06:24

melvin-bot Bot requested review from abzokhattab and heyjennahay and removed request for a team and abzokhattab April 30, 2026 06:24

github-actions Bot reviewed Apr 30, 2026

View reviewed changes

Comment thread src/hooks/useDismissOnMoneyRequestReportRemoval.ts

mountiny requested review from abzokhattab, Copilot and mountiny April 30, 2026 07:21

Copilot started reviewing on behalf of mountiny April 30, 2026 07:21 View session

Copilot AI reviewed Apr 30, 2026

View reviewed changes

Rename hook to useDismissOnMoneyRequestReportRemoval

9e40aec

abzokhattab approved these changes Apr 30, 2026

View reviewed changes

Merge remote-tracking branch 'origin/main' into test/search-money-req…

dc35174

…uest-report-tests # Conflicts: # Mobile-Expensify

mountiny approved these changes May 4, 2026

View reviewed changes

mountiny merged commit 290ed93 into Expensify:main May 4, 2026
34 checks passed

OSBotify mentioned this pull request May 4, 2026

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

Open

75 tasks

Conversation

TMisiukiewicz commented Apr 30, 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 Apr 30, 2026

Uh oh!

Uh oh!

codecov Bot commented Apr 30, 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!

mountiny commented Apr 30, 2026

Uh oh!

abzokhattab commented Apr 30, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Copilot AI Apr 30, 2026

Choose a reason for hiding this comment

Uh oh!

abzokhattab commented Apr 30, 2026

Uh oh!

MelvinBot commented Apr 30, 2026

PR Review

Issues

Looks good

Uh oh!

abzokhattab 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!

TMisiukiewicz commented Apr 30, 2026

Uh oh!

abzokhattab left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny commented May 1, 2026

Uh oh!

TMisiukiewicz commented May 4, 2026

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented May 4, 2026

Uh oh!

OSBotify commented May 4, 2026

Uh oh!

github-actions Bot commented May 4, 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!

6 participants

TMisiukiewicz commented Apr 30, 2026 •

edited

Loading

codecov Bot commented Apr 30, 2026 •

edited by github-actions Bot

Loading

abzokhattab commented Apr 30, 2026 •

edited

Loading