Flatten `SCREENS.RIGHT_MODAL.SEARCH_REPORT` by WojtekBoman · Pull Request #77809 · Expensify/App

WojtekBoman · 2025-12-16T19:58:56Z

Explanation of Change

This PR simplifies the strucutre of the Report screen displayed in RHP by flattening the structure.

Previously this screen was nested in ModalStackNavigator but due to the fact this screen can be displayed in Wide RHP, other screens can't be added to the same modal stack.

To avoid unnecessary nesting, this screen has been moved higher in the navigation structure, simplifying it.

After flattening the structure, secondary overlays are no longer needed in ModalStackNavigator so WideRHPOverlayWrapper was created to take over this responsibility.

Fixed Issues

$ #71821

This PR includes fixes for these regressions appeared after merging #75886
#77594
#77587
PROPOSAL:

Tests

Verify that no errors appear in the JS console

Verify if the Wide RHP is displayed correctly.

Without a receipt

Open reports tab
Select expenses
Open expense without a receipt
See if it renders properly (aspect ratio, borders, positioning)

With a distance receipt

Open reports tab
Select expenses
Open expense with a distance receipt
See if it renders properly (aspect ratio, borders, positioning)

With an e-receipt receipt

Open reports tab
Select expenses
Open expense with an e-receipt
See if it renders properly (aspect ratio, borders, positioning)

With a pdf receipt

Open reports tab
Select expenses
Open expense with a pdf receipt
See if it renders properly (aspect ratio, borders, positioning)

With a photo receipt

Open reports tab
Select expenses
Open expense with a photo receipt
See if it renders properly (aspect ratio, borders, positioning)

Offline tests

QA Steps

// 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

Android: mWeb Chrome

iOS: Native

Screen.Recording.2025-12-17.at.12.11.12.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2025-12-17.at.11.51.32.mov

codecov · 2025-12-16T20:07:05Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/SCREENS.ts	`100.00% <ø> (ø)`
src/components/MoneyRequestHeader.tsx	`0.00% <ø> (ø)`
src/components/ParentNavigationSubtitle.tsx	`65.38% <ø> (ø)`
src/components/ScreenWrapper/index.tsx	`94.73% <ø> (ø)`
src/components/ScrollOffsetContextProvider.tsx	`46.15% <100.00%> (ø)`
...ts/PlaybackContext/playbackContextReportIDUtils.ts	`50.00% <100.00%> (ø)`
...onents/WideRHPContextProvider/WIDE_RIGHT_MODALS.ts	`100.00% <100.00%> (ø)`
...components/WideRHPContextProvider/index.native.tsx	`100.00% <100.00%> (ø)`
...eRHPContextProvider/useShowWideRHPVersion/index.ts	`0.00% <ø> (ø)`
...c/components/WideRHPOverlayWrapper/index.native.ts	`100.00% <100.00%> (ø)`
... and 21 more
... and 62 files with indirect coverage changes

collectioneur · 2025-12-17T11:03:07Z

src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx

 const singleRHPWidth = variables.sideBarWidth;
 const getWideRHPWidth = (windowWidth: number) => variables.sideBarWidth + calculateReceiptPaneRHPWidth(windowWidth);

+function SecondaryOverlay() {


Why do we need this function here if we already have SecondaryOverlay in WideRHPOverlayWrapper?

It has different positions as it's displayed below the focused screen and this one isn't pressable. We might consider using different names for the secondary overlay displayed in the wrapper

I think that's a good idea. Maybe add 'inner' and 'outer' to these component names?

collectioneur · 2025-12-17T11:05:26Z

src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx

-                )}
-                {shouldRenderTertiaryOverlay && !shouldUseNarrowLayout && (
+                {!shouldUseNarrowLayout && <SecondaryOverlay />}
+                {!shouldUseNarrowLayout && shouldRenderTertiaryOverlay && (


Why couldn't we use the TertiaryOverlay component here?

same as above

collectioneur · 2025-12-17T11:16:19Z

Could you please remove SCREENS.SEARCH.REPORT_RHP as it isn't used anymore?

collectioneur

The rest is LGTM

melvin-bot · 2025-12-17T12:06:19Z

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

ZhenjaHorbach · 2025-12-17T17:23:08Z

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

2025-12-18.09.53.08.mov

Android: mWeb Chrome

2025-12-18.09.53.08.mov

iOS: HybridApp

2025-12-18.09.38.34.mov

iOS: mWeb Safari

2025-12-18.09.42.30.mov

MacOS: Chrome / Safari

2025-12-18.09.12.53.mov

2025-12-18.09.24.31.mov

ZhenjaHorbach · 2025-12-18T08:57:03Z

Overall, the changes look good
All that's left is to fix the conflicts

WojtekBoman · 2025-12-18T11:14:44Z

@ZhenjaHorbach conflicts solved and I adjusted a bit useModalStackScreenOptions.tsx

ZhenjaHorbach · 2025-12-18T13:51:12Z

@WojtekBoman
I'm sorry
But we have conflicts again 😢

mountiny

Changes look good to me

ZhenjaHorbach · 2025-12-18T16:39:38Z

I found a visual glitch after changing expenses using the arrows
And we don't have this issue on staging

2025-12-18.17.38.42.mov

WojtekBoman · 2025-12-19T09:39:47Z

Screen.Recording.2025-12-19.at.10.39.17.mov

@ZhenjaHorbach Should be ok now!

mountiny

Changes since my last review look good, thanks for thorough testing @ZhenjaHorbach

mountiny · 2025-12-19T12:23:50Z

We are skipping the React complier action here as this PR touches many files and we cannot fix the react complience in them in scope of these changes

melvin-bot · 2025-12-19T12:24:05Z

@mountiny looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

mountiny · 2025-12-19T12:24:16Z

Explained above

OSBotify · 2025-12-19T12:35:15Z

✋ 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 · 2025-12-19T23:59:39Z

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

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

yuwenmemon · 2025-12-22T07:13:02Z

This caused #78239; however, reverting has a ton of conflicts.

OSBotify · 2025-12-23T00:33:03Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.2.85-7 🚀

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

melvin-bot bot assigned WojtekBoman Dec 16, 2025

WojtekBoman changed the title ~~Flatten SCREENS.RIGHT_MODAL.SEARCH_REPORT~~ Flatten SCREENS.RIGHT_MODAL.SEARCH_REPORT Dec 16, 2025

WojtekBoman force-pushed the wide-rhp-wrappers branch 6 times, most recently from f5dd6c0 to 62d4052 Compare December 17, 2025 10:58

collectioneur reviewed Dec 17, 2025

View reviewed changes

collectioneur approved these changes Dec 17, 2025

View reviewed changes

WojtekBoman marked this pull request as ready for review December 17, 2025 12:06

WojtekBoman requested review from a team as code owners December 17, 2025 12:06

melvin-bot bot requested review from ZhenjaHorbach and heyjennahay and removed request for a team December 17, 2025 12:06

WojtekBoman force-pushed the wide-rhp-wrappers branch 2 times, most recently from de821d2 to 7bddff6 Compare December 17, 2025 12:17

WojtekBoman force-pushed the wide-rhp-wrappers branch from bb51619 to 0e88d27 Compare December 17, 2025 18:39

WojtekBoman force-pushed the wide-rhp-wrappers branch from 0e88d27 to b85c712 Compare December 18, 2025 11:12

WojtekBoman added 4 commits December 18, 2025 15:08

Flatten SCREENS.RIGHT_MODAL.SEARCH_REPORT

55f9560

Fix issue Expensify#77587 - Web - Expense - + menu appears in the middle

a96e6de

Remove SCREENS.SEARCH.REPORT_RHP const

c9c5314

Move overlays to the wrapper file

59ebb1d

WojtekBoman force-pushed the wide-rhp-wrappers branch from b85c712 to 59ebb1d Compare December 18, 2025 14:23

mountiny previously approved these changes Dec 18, 2025

View reviewed changes

Fix animations when navigating between search reports

cb019f7

WojtekBoman dismissed mountiny’s stale review via cb019f7 December 19, 2025 09:28

ZhenjaHorbach approved these changes Dec 19, 2025

View reviewed changes

melvin-bot bot requested a review from mountiny December 19, 2025 11:08

mountiny approved these changes Dec 19, 2025

View reviewed changes

mountiny merged commit 3b940ba into Expensify:main Dec 19, 2025
31 of 32 checks passed

melvin-bot bot added the Emergency label Dec 19, 2025

mountiny removed the Emergency label Dec 19, 2025

OSBotify mentioned this pull request Dec 19, 2025

Deploy Checklist: New Expensify 2025-12-19 #78170

Closed

87 tasks

yuwenmemon mentioned this pull request Dec 22, 2025

[Due for payment 2025-12-31] Expense - Review duplicates RHP loads infinitely after deleting expense #78239

Closed

7 tasks

melvin-bot bot mentioned this pull request Dec 23, 2025

[Due for payment 2026-01-23] [CFI] Create super wide RHP modal to display expense reports when accessed via Reports page or report previews #71821

Closed

Conversation

WojtekBoman commented Dec 16, 2025 • 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 Dec 16, 2025 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

collectioneur Dec 17, 2025 • 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!

WojtekBoman Dec 17, 2025 • 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!

collectioneur Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

collectioneur Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

WojtekBoman Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

collectioneur commented Dec 17, 2025

Uh oh!

collectioneur left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Dec 17, 2025

Uh oh!

ZhenjaHorbach commented Dec 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ZhenjaHorbach commented Dec 18, 2025

Uh oh!

WojtekBoman commented Dec 18, 2025

Uh oh!

ZhenjaHorbach commented Dec 18, 2025

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

ZhenjaHorbach commented Dec 18, 2025

Uh oh!

WojtekBoman commented Dec 19, 2025

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny commented Dec 19, 2025

Uh oh!

Uh oh!

melvin-bot bot commented Dec 19, 2025

Uh oh!

mountiny commented Dec 19, 2025

Uh oh!

OSBotify commented Dec 19, 2025

Uh oh!

OSBotify commented Dec 19, 2025

Uh oh!

yuwenmemon commented Dec 22, 2025

Uh oh!

OSBotify commented Dec 23, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

WojtekBoman commented Dec 16, 2025 •

edited

Loading

codecov bot commented Dec 16, 2025 •

edited by github-actions bot

Loading

collectioneur Dec 17, 2025 •

edited

Loading

WojtekBoman Dec 17, 2025 •

edited

Loading

ZhenjaHorbach commented Dec 17, 2025 •

edited

Loading