Mobile search-router is a RHP on native by jmusial · Pull Request #77380 · Expensify/App

jmusial · 2025-12-11T14:15:00Z

Explanation of Change

This PR rewrites SearchRouterModal to use navigation RHP instead of modal for android and ios native.

Fixed Issues

$ #53493

PROPOSAL:

Tests

Perform tests for each of the pages

Inbox page (/home)
One of the Settings pages (ex. /settings/profile)
Workspaces page (/workspaces)
Report (/r/:reportID)
Search report page (/search/r/:reportID)

Tests:

Basic navigation 1

Click SearchButton -> Search router modal opens
Close it using back button (if applicable) -> Should navigate to initial screen (or close keyboard first)

Basic navigation 2

Click SearchButton -> Search router modal opens
Close it using back search modal header back arrow -> Should navigate to initial screen

Advanced navigation 1

Click SearchButton -> Search router modal opens
Click one of the recent searches -> Should navigate to Search with recent search
Press back -> navigates back to search router modal (change from current behaviour - it goes straight to 5 on web)
Press back again -> navigates back to initial page

Advanced navigation 2

Click SearchButton -> Search router modal opens
Type in search phrase and press proposed result
Press back -> navigates back to search router modal (change from current behaviour - it goes straight to 5 on web)
Press back again -> navigates back to initial page

Offline tests

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

0080.android.native.mov

Android: mWeb Chrome

See: MacOS: Chrome / Safari

iOS: Native

0080.ios.native.mov

iOS: mWeb Safari

See: MacOS: Chrome / Safari

MacOS: Chrome / Safari

This PR does not change web implementation. Attaching small screen from chrome desktop as a sanity check & reference point.

On large screens the modal remains a POPOVER.

0080.chrome.desktop.mov

codecov · 2025-12-11T14:23:39Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/ROUTES.ts	`12.60% <ø> (ø)`
src/SCREENS.ts	`100.00% <ø> (ø)`
...onents/Search/SearchRouter/SearchRouterContext.tsx	`53.57% <ø> (ø)`
...ch/SearchRouter/SearchRouterModal/index.native.tsx	`100.00% <100.00%> (ø)`
...ts/Search/SearchRouter/SearchRouterModal/index.tsx	`0.00% <ø> (ø)`
src/libs/Navigation/linkingConfig/config.ts	`75.00% <ø> (ø)`
...gation/AppNavigator/ModalStackNavigators/index.tsx	`8.33% <50.00%> (+0.12%)`	⬆️
...on/AppNavigator/Navigators/RightModalNavigator.tsx	`4.87% <0.00%> (-0.07%)`	⬇️
...rch/SearchRouter/SearchRouterPage/index.native.tsx	`0.00% <0.00%> (ø)`
...nts/Search/SearchRouter/SearchRouterPage/index.tsx	`0.00% <0.00%> (ø)`
... and 2 more
... and 21 files with indirect coverage changes

mhawryluk · 2025-12-12T09:53:25Z

+/**
+ * On native devices SearchRouter is served from SearchRouterPage, on web from SearchRouterModal.
+ */ function SearchRouterModal() {


Suggested change

/**

* On native devices SearchRouter is served from SearchRouterPage, on web from SearchRouterModal.

*/ function SearchRouterModal() {

/**

* On native devices SearchRouter is served from SearchRouterPage, on web from SearchRouterModal.

*/

function SearchRouterModal() {

melvin-bot · 2025-12-15T12:22:36Z

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

mountiny · 2025-12-16T19:22:35Z

@parasharrajat can you test here

JmillsExpensify

All looks good, though product review isn't required for this one

mountiny · 2025-12-19T13:16:17Z

@parasharrajat can you please make sure to review this one or ask to reassign? thanks!

parasharrajat · 2025-12-19T13:25:56Z

yes, I will check it today.

jmusial · 2025-12-22T11:41:29Z

@parasharrajat any updates ?

parasharrajat · 2025-12-22T17:06:25Z

+    return null;
+}
+
+SearchRouterModal.displayName = 'SearchRouterModal';


Remove all displayName where it is same as component name.

parasharrajat · 2025-12-22T17:07:33Z

 });

+const SearchRouterModalStackNavigator = createModalStackNavigator({
+    [SCREENS.ENABLE_PAYMENTS_ROOT]: () => require<ReactComponentModule>('../../../../components/Search/SearchRouter/SearchRouterPage').default,


wrong screen.

parasharrajat · 2025-12-22T17:08:21Z

can use toggleSearch/index.native.ts convention for all changes here?

parasharrajat · 2025-12-22T17:10:36Z

Search has backend error https://expensify.slack.com/archives/C049HHMV9SM/p1766421823508669. Can't test this ATM.

parasharrajat · 2025-12-26T11:44:03Z

NOTE: Slide to close does not work anymore on the search page.

parasharrajat · 2025-12-27T07:36:32Z

Overall looks good and work as mentioned in test steps. There are some pending comments above.

parasharrajat · 2026-01-05T18:37:05Z

Bumping @jmusial if you are back to work.

jmusial · 2026-01-07T16:40:35Z

@parasharrajat back today, will take a look later in the evening

update toggleSearch directory pattern

parasharrajat · 2026-01-08T12:53:00Z

this one too. the file path needs to be changed as well.

jmusial · 2026-01-08T12:54:29Z

NOTE: Slide to close does not work anymore on the search page.

Looking into this now, looks fine on android, checking ios

EDIT:

@parasharrajat works for me here, do you have set of repro steps for the scenario it didn't work for you ?

Screen.Recording.2026-01-08.at.14.27.20.mov

parasharrajat · 2026-01-08T16:32:03Z

@jmusial I see. May be I wasn't trying the gesture properly.

parasharrajat · 2026-01-08T16:36:21Z

@mountiny Can you please trigger adHoc build?

github-actions · 2026-01-08T18:13:59Z

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

github-actions · 2026-01-08T18:59:39Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-036e65fc1ba519346b5ed5758bdc5eebf39b9970/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-204ccee7da1419b005dabebe9c70787b994cb265/index.html

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

👀 View the workflow run that generated this build 👀

jmusial · 2026-01-09T09:39:38Z

@jmusial I see. May be I wasn't trying the gesture properly.

Yeah, it's tricky exp on IOS, you need to start the gesture really far left for it to work

parasharrajat · 2026-01-11T15:54:26Z

Screenshots

🔲 iOS / native

ScreenRecording_01-11-2026.23-40-58_1.mov

🔲 iOS / Safari

12.01.2026_00.01.00_REC.mp4

🔲 MacOS / Chrome

11.01.2026_23.59.19_REC.mp4

🔲 Android / Chrome

12.01.2026_00.10.42_REC.mp4

🔲 Android / native

12.01.2026_00.06.17_REC.mp4

parasharrajat

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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- 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 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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.js 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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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.
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.

🎀 👀 🎀 C+ reviewed

mountiny

Thanks, lets be on a look out for any regressions and blockers please

OSBotify · 2026-01-12T16:28:35Z

✋ 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 · 2026-01-13T03:38:35Z

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

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

OSBotify · 2026-01-14T02:54:54Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.3.0-8 🚀

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

POC: Mobile search-router is a RHP

c7307b8

melvin-bot Bot assigned jmusial Dec 11, 2025

jmusial added 2 commits December 12, 2025 10:22

refactor

ca53cc6

update navigator

0a213e7

jmusial changed the title ~~POC: Mobile search-router is a RHP~~ POC: Mobile search-router is a RHP on native Dec 12, 2025

jmusial added 3 commits December 12, 2025 10:30

Merge branch 'main' into feat/migrate-search-router-to-navigation

d59150a

prettier

c96faaf

fix typecheck

2264277

mhawryluk reviewed Dec 12, 2025

View reviewed changes

jmusial added 3 commits December 12, 2025 11:00

fix code style

bfca1b4

Merge branch 'main' into feat/migrate-search-router-to-navigation

ccb2f0a

make sure search router address cannot be navigated to manually

be1c751

jmusial changed the title ~~POC: Mobile search-router is a RHP on native~~ Mobile search-router is a RHP on native Dec 15, 2025

jmusial marked this pull request as ready for review December 15, 2025 12:22

jmusial requested review from a team as code owners December 15, 2025 12:22

melvin-bot Bot requested review from JmillsExpensify and parasharrajat and removed request for a team December 15, 2025 12:22

melvin-bot Bot removed the request for review from a team December 15, 2025 12:22

jmusial mentioned this pull request Dec 15, 2025

Replace modal screens with modals from @react-navigation #53493

Open

Merge branch 'main' into feat/migrate-search-router-to-navigation

f2d1c7c

JmillsExpensify reviewed Dec 18, 2025

View reviewed changes

jmusial added 2 commits December 19, 2025 16:21

Merge branch 'main' into feat/migrate-search-router-to-navigation

090b724

Merge branch 'main' into feat/migrate-search-router-to-navigation

f5839e7

parasharrajat suggested changes Dec 22, 2025

View reviewed changes

jmusial added 2 commits January 8, 2026 13:10

Merge branch 'main' into feat/migrate-search-router-to-navigation

cda1421

remove redundant displayName"

ff3d440

update toggleSearch directory pattern

parasharrajat reviewed Jan 8, 2026

View reviewed changes

move files to folders and change screen key

b2a16ac

jmusial requested a review from parasharrajat January 8, 2026 14:12

parasharrajat approved these changes Jan 11, 2026

View reviewed changes

melvin-bot Bot requested a review from mountiny January 11, 2026 18:42

mountiny approved these changes Jan 12, 2026

View reviewed changes

mountiny merged commit c440741 into Expensify:main Jan 12, 2026
31 checks passed

OSBotify mentioned this pull request Jan 13, 2026

Deploy Checklist: New Expensify 2026-01-13 #79402

Closed

91 tasks

mitarachim mentioned this pull request Jan 13, 2026

[Due for payment 2026-02-04] [Due for payment 2026-01-21] Android and iOS - Search - Missing Search in chat option #79409

Closed

7 tasks

mountiny mentioned this pull request Jan 13, 2026

[CP Staging] Revert "Mobile search-router is a RHP on native" #79444

Merged

Conversation

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

Uh oh!

Explanation of Change

Fixed Issues

Tests

Basic navigation 1

Basic navigation 2

Advanced navigation 1

Advanced navigation 2

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented Dec 11, 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!

mhawryluk Dec 12, 2025

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Dec 15, 2025

Uh oh!

mountiny commented Dec 16, 2025

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny commented Dec 19, 2025

Uh oh!

parasharrajat commented Dec 19, 2025

Uh oh!

jmusial commented Dec 22, 2025

Uh oh!

parasharrajat Dec 22, 2025

Choose a reason for hiding this comment

Uh oh!

parasharrajat Dec 22, 2025

Choose a reason for hiding this comment

Uh oh!

parasharrajat Dec 22, 2025

Choose a reason for hiding this comment

Uh oh!

parasharrajat commented Dec 22, 2025

Uh oh!

parasharrajat commented Dec 26, 2025

Uh oh!

parasharrajat commented Dec 27, 2025

Uh oh!

parasharrajat commented Jan 5, 2026

Uh oh!

jmusial commented Jan 7, 2026

Uh oh!

parasharrajat Jan 8, 2026 • 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!

jmusial commented Jan 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

parasharrajat commented Jan 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

parasharrajat commented Jan 8, 2026

Uh oh!

github-actions Bot commented Jan 8, 2026

Uh oh!

github-actions Bot commented Jan 8, 2026

Uh oh!

jmusial commented Jan 9, 2026

Uh oh!

parasharrajat commented Jan 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Screenshots

🔲 iOS / native

🔲 iOS / Safari

🔲 MacOS / Chrome

🔲 Android / Chrome

🔲 Android / native

jmusial commented Dec 11, 2025 •

edited

Loading

codecov Bot commented Dec 11, 2025 •

edited by github-actions Bot

Loading

parasharrajat Jan 8, 2026 •

edited

Loading

jmusial commented Jan 8, 2026 •

edited

Loading

parasharrajat commented Jan 8, 2026 •

edited

Loading

parasharrajat commented Jan 11, 2026 •

edited

Loading