Skip to content

Fix RHP dismissal during report navigation with key-based wrapper#87773

Open
leshniak wants to merge 3 commits intoExpensify:mainfrom
callstack-internal:fix/rhp-closes-on-nav-arrows
Open

Fix RHP dismissal during report navigation with key-based wrapper#87773
leshniak wants to merge 3 commits intoExpensify:mainfrom
callstack-internal:fix/rhp-closes-on-nav-arrows

Conversation

@leshniak
Copy link
Copy Markdown
Contributor

@leshniak leshniak commented Apr 13, 2026 •
edited
Loading

Explanation of Change

Split SearchMoneyRequestReportPage into an outer wrapper that passes key={reportIDFromRoute} and an inner SearchMoneyRequestReportPageContent. Each arrow click remounts the inner component with a clean slate — all hooks and refs reset naturally without manual tracking.

The dismissal effect uses a mount-scoped hasEverHadReportRef — it starts false on each remount, so the transient undefined during Onyx hydration cannot trigger dismissal. Once the report loads, the ref becomes true. If the report is later deleted (becomes undefined), we dismiss — preserving the existing behavior. The isMoneyRequestReport check from the original code was dropped since this page only renders money request reports.

Also adds a hydration guard in shouldShowAccessErrorPage: when reportIDFromRoute is set but reportID hasn't resolved from Onyx yet and report actions haven't loaded, the error page is suppressed — showing the skeleton loader instead of "Hmm... it's not there". The guard is bounded by hasLoadedReportActionsForAccessError so genuinely non-existent reports still show the error once loading completes.

This also removes both usePrevious calls from the component, making it React Compiler compliant.

Fixed Issues

$ #87784
PROPOSAL:

Tests

  1. Navigate to Search → Reports (expense reports)
  2. Click on any expense report row to open it in the RHP
  3. Verify the RHP opens and shows the report content (not "Hmm... it's not there")
  4. Use the prev/next navigation arrows to navigate between reports
  5. Verify the RHP stays open and shows a skeleton loader briefly during transitions
  6. Verify no unexpected dismissal occurs during rapid arrow clicking
  • Verify that no errors appear in the JS console

Offline tests

  1. Open an expense report via search arrows while online
  2. Go offline
  3. Use prev/next arrows to navigate between cached reports
  4. Verify navigation works for reports already loaded in Onyx
  5. Verify no crash or unexpected dismissal occurs

QA Steps

Same as Tests above.

  • 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.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
bez.nazwy.mov
iOS: mWeb Safari
MacOS: Chrome / Safari
test.mp4

@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 13, 2026 •
edited by github-actions Bot
Loading

Codecov Report

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

Files with missing lines Coverage Δ
src/pages/Search/SearchMoneyRequestReportPage.tsx 0.00% <0.00%> (ø)
... and 7 files with indirect coverage changes

@leshniak leshniak force-pushed the fix/rhp-closes-on-nav-arrows branch 3 times, most recently from a0e8b65 to 06561b0 Compare April 15, 2026 16:40
@leshniak @claude
Fix RHP dismissal during report navigation with key-based wrapper
24c4ab4 
When navigating between expense reports using prev/next arrows, the RHP
would close because the dismissal effect detected report as undefined
during Onyx key transition and incorrectly triggered dismissModal.

Split SearchMoneyRequestReportPage into outer wrapper with
key={reportIDFromRoute} and inner content component. Each arrow click
remounts with clean state. A mount-scoped hasEverHadReportRef ensures
dismissal only fires after report has loaded then disappeared (deletion),
not during initial hydration gap. Hydration guard in shouldShowAccessErrorPage
suppresses the not-found page while Onyx resolves.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@aimane-chnaif
Copy link
Copy Markdown
Contributor

aimane-chnaif commented Apr 16, 2026

I was reviewing #88113 since I am assigned as reviewer.

Not found page briefly shows when report is deleted from another device. Can we fix that?

bug.mov

@leshniak leshniak force-pushed the fix/rhp-closes-on-nav-arrows branch from 06561b0 to 24c4ab4 Compare April 16, 2026 13:56
@leshniak leshniak changed the title Fix RHP closing unexpectedly when using prev/next navigation arrows Fix RHP dismissal during report navigation with key-based wrapper Apr 16, 2026
@leshniak leshniak mentioned this pull request Apr 17, 2026
Open
@leshniak
Copy link
Copy Markdown
Contributor Author

leshniak commented Apr 17, 2026

I was reviewing #88113 since I am assigned as reviewer.

Not found page briefly shows when report is deleted from another device. Can we fix that?

bug.mov

@aimane-chnaif I made a potential fix, but it's not tested yet - let's leave this PR as a draft until Monday.

@leshniak leshniak force-pushed the fix/rhp-closes-on-nav-arrows branch 2 times, most recently from c81343f to a7b6c92 Compare April 20, 2026 20:00
@leshniak leshniak force-pushed the fix/rhp-closes-on-nav-arrows branch from a7b6c92 to b51ad6c Compare April 20, 2026 20:28
@leshniak
Copy link
Copy Markdown
Contributor Author

leshniak commented Apr 20, 2026

@aimane-chnaif It's fixed.

@Julesssss Julesssss requested a review from aimane-chnaif April 20, 2026 23:39
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 20, 2026

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

@Julesssss
Copy link
Copy Markdown
Contributor

Julesssss commented Apr 20, 2026

@aimane-chnaif thanks for looking, I assigned you to the issue. Please re-review when you have a moment

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 21, 2026

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

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-b51ad6c-46742ee-9cfed14df2df86422312596f04ff96b867d5457a/index.html https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-b51ad6c-46742ee-d84a75fcb3cb33b633ba7622e6ecfb14033301b3/index.html
Android iOS
Web 🕸️
https://87773.pr-testing.expensify.com
Web

👀 View the workflow run that generated this build 👀

@leshniak leshniak marked this pull request as ready for review April 22, 2026 13:16
@leshniak leshniak requested review from a team as code owners April 22, 2026 13:16
@melvin-bot melvin-bot Bot requested review from Julesssss and trjExpensify and removed request for a team April 22, 2026 13:16
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented Apr 22, 2026

@Julesssss 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 the request for review from a team April 22, 2026 13:16
@trjExpensify
Copy link
Copy Markdown
Contributor

trjExpensify commented Apr 22, 2026

PR doesn’t need product input as a refactor PR. Unassigning and unsubscribing myself.

@trjExpensify trjExpensify removed their request for review April 22, 2026 14:46
@Julesssss
Copy link
Copy Markdown
Contributor

Julesssss commented Apr 22, 2026

Hi @aimane-chnaif, the feedback fix was resolved. I think that's the last thing to check

@aimane-chnaif
Copy link
Copy Markdown
Contributor

aimane-chnaif commented Apr 22, 2026

@leshniak please merge main as the branch is very behind

@leshniak
Copy link
Copy Markdown
Contributor Author

leshniak commented Apr 22, 2026

@aimane-chnaif merged

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

Reviewers

@aimane-chnaif aimane-chnaif Awaiting requested review from aimane-chnaif

@Julesssss Julesssss Awaiting requested review from Julesssss

At least 1 approving review is required to merge this pull request.

Assignees

@leshniak leshniak

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@leshniak @aimane-chnaif @Julesssss @trjExpensify