Fix cross-Domain Search Router navigation by nabi-ebrahimi · Pull Request #100150 · Expensify/App

nabi-ebrahimi · 2026-09-02T11:21:43Z

Explanation of Change

When navigating from a page in Domain A to a Search Router destination in Domain B, React Navigation reused the existing Domain split navigator. The destination page changed, but the persistent Domain sidebar retained Domain A's account ID.

This PR updates the persistent Domain sidebar with the destination Domain ID before navigating. The behavior is scoped to cross-Domain navigation on wide layouts. Same-Domain and narrow-layout navigation continue using the existing flow.

Fixed Issues

$ #100112
PROPOSAL: N/A - follow-up for #98753

Tests

Navigate between two Domains

Precondition: The account is an administrator of at least two Domains.

Open Domain A and select Domain members.
Open Search Router using CMD/CTRL + K.
Search for SAML.
Select the SAML result belonging to Domain B.
Verify Domain B's SAML page opens.
Verify the Domain sidebar and page title show Domain B.
Repeat the flow from Domain B back to Domain A.

Expected: The selected page, sidebar, and title all belong to the destination Domain.

Verify that no errors appear in the JS console

Offline tests

Same as the Tests.

QA Steps

Same as the Tests.

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

iOS: mWeb Safari

MacOS: Chrome / Safari

fix.mov

melvin-bot · 2026-09-02T11:26:31Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 71bf540fb7

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

nabi-ebrahimi · 2026-09-02T12:08:19Z

@marufsharifi thanks for the review. I’ve addressed the valid comments and verified the cross-Domain navigation and Back behavior. Could you please review again?

marufsharifi · 2026-09-02T12:16:07Z

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 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 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)
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)
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately
- 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
- 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 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.
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

N/A

Android: mWeb Chrome

N/A

iOS: HybridApp

N/A

iOS: mWeb Safari

N/A

MacOS: Chrome / Safari

issue.fix.demo.mov

marufsharifi · 2026-09-02T14:13:42Z

+    if (!navigationRef.isReady()) {
+        return undefined;
+    }


!navigationRef.isReady() early return

Every test stubs isReady.mockReturnValue(true), so the not-ready guard is never taken.

Add a test "navigates directly when navigationRef is not ready": isReady.mockReturnValue(false), call with shouldUseNarrowLayout = false. Assert Navigation.setParams is not called, Navigation.navigate is called with the target route, and getRootState is never read.

codecov · 2026-09-03T06:23:29Z

Codecov Report

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

Files with missing lines	Coverage Δ
...s/Search/SearchRouter/useNavigationSuggestions.tsx	`92.92% <100.00%> (+0.07%)`	⬆️
...on/helpers/navigateToDomainRouteWithSidebarSync.ts	`96.29% <96.29%> (ø)`
... and 7 files with indirect coverage changes

marufsharifi

LGTM

carlosmiceli · 2026-09-03T09:30:52Z

@nabi-ebrahimi conflicts now 🙇

nabi-ebrahimi · 2026-09-03T10:18:29Z

@nabi-ebrahimi conflicts now 🙇

@carlosmiceli, Resolved, thanks

carlosmiceli · 2026-09-03T10:43:17Z

@trjExpensify all yours 🫡

trjExpensify

LGTM. 👍

marufsharifi · 2026-09-04T07:43:14Z

@carlosmiceli, I think this is ready to be merged. Thanks!

github-actions · 2026-09-04T09:22:58Z

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

OSBotify · 2026-09-04T09:25:54Z

✋ 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-09-04T09:26:50Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-6bf19d6-1c13481-ede698d26d774d5b43680dac00667730b94e8279/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-6bf19d6-1c13481-ca9834eb2028ad74772a17a64f9edbcb8cea0f0f/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-09-07T11:04:16Z

🚀 Deployed to staging by https://github.com/carlosmiceli in version: 9.4.73-0 🚀

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

MelvinBot · 2026-09-07T11:07:18Z

🤖 No help site changes required — I did not create a docs PR.

Why: This PR is an internal navigation-state fix. It adds navigateToDomainRouteWithSidebarSync.ts so the persistent Domain sidebar's domainAccountID is synced before a cross-Domain Search Router navigation. There is no new feature, no new setting, no renamed tab or button, and no user-facing copy change.

It restores the behavior the help site already documents. Nothing in docs/articles describes the buggy state, so there is nothing to correct.

What I checked

Reviewed the full diff: 1 new helper, 1 call-site change in useNavigationSuggestions.tsx, plus 2 test files. No src/languages/* changes, so no copy to mirror.
Searched App/docs/articles for search router, domain sidebar, switch between domains, and cross-domain — zero matches. The help site does not document Search Router as a path to Domain settings.
Read every Domain article in docs/articles/new-expensify/domains/ and docs/articles/expensify-classic/domains/. They all route readers through Workspaces > Domains tab > [domain name] > [setting] — a menu path this PR does not touch.

Unrelated pre-existing issue I noticed (not caused by this PR, no PR opened for it): Set-Up-SAML-SSO.md opens with "Go to Domains > [Domain Name] > SAML" but every numbered step below says "Workspaces > [domain name] > SAML", and its "Claim and Verify a Domain" link points at /new-expensify/workspaces/Claim-and-Verify-a-Domain while that article lives under /new-expensify/domains/. Happy to fix both in a separate PR if you want.

@nabi-ebrahimi, there is no linked help site PR because no help site updates are required for this change. Please confirm you agree with that call — if you think an article does need updating, reply with which one and I'll open the draft PR.

OSBotify · 2026-09-08T19:03:47Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.4.73-3 🚀

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

Bundle Size Analysis (Sentry):

Android

Fix cross-Domain Search Router navigation

71bf540

melvin-bot Bot assigned nabi-ebrahimi Sep 2, 2026

nabi-ebrahimi marked this pull request as ready for review September 2, 2026 11:26

nabi-ebrahimi requested review from a team as code owners September 2, 2026 11:26

melvin-bot Bot requested review from marufsharifi and removed request for a team September 2, 2026 11:26

melvin-bot Bot requested review from JmillsExpensify and removed request for a team September 2, 2026 11:26

github-actions Bot reviewed Sep 2, 2026

View reviewed changes

Comment thread src/libs/Navigation/helpers/navigateToDomainRouteWithSidebarSync.ts

nabi-ebrahimi mentioned this pull request Sep 2, 2026

[Due for payment 2026-09-15] Domains - Destination domain does not open from search router when on another domain page #100112

Closed

7 tasks

Document cross-Domain navigation helper

0773ded

chatgpt-codex-connector Bot reviewed Sep 2, 2026

View reviewed changes

Comment thread src/libs/Navigation/helpers/navigateToDomainRouteWithSidebarSync.ts

marufsharifi suggested changes Sep 2, 2026

View reviewed changes

nabi-ebrahimi added 2 commits September 2, 2026 16:24

Test Domain navigation with production state structure

d853d83

Harden Domain sidebar navigation coverage

c41042e

Merge branch 'main' into fix/100112-cross-domain-search-navigation

648eade

marufsharifi suggested changes Sep 2, 2026

View reviewed changes

nabi-ebrahimi added 6 commits September 2, 2026 18:52

Expand Domain sidebar synchronization coverage

9ee3789

Align Domain sidebar sync with shared navigation mapping

0b5dee7

Improve Domain sidebar navigation readability

826f8f1

Verify navigation state is skipped when unavailable

1b68aef

Fix Domain navigation test lint

a637a6a

Merge branch 'main' into fix/100112-cross-domain-search-navigation

c7b1c7a

marufsharifi approved these changes Sep 3, 2026

View reviewed changes

melvin-bot Bot requested a review from carlosmiceli September 3, 2026 06:27

carlosmiceli previously approved these changes Sep 3, 2026

View reviewed changes

Merge branch 'main' into fix/100112-cross-domain-search-navigation

7404893

nabi-ebrahimi dismissed carlosmiceli’s stale review via 7404893 September 3, 2026 10:11

carlosmiceli approved these changes Sep 3, 2026

View reviewed changes

carlosmiceli requested a review from trjExpensify September 3, 2026 10:42

trjExpensify approved these changes Sep 3, 2026

View reviewed changes

carlosmiceli merged commit 6bf19d6 into Expensify:main Sep 4, 2026
36 of 37 checks passed

OSBotify mentioned this pull request Sep 7, 2026

Deploy Checklist: New Expensify 2026-09-07 #100479

Closed

Conversation

nabi-ebrahimi commented Sep 2, 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 Sep 2, 2026

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nabi-ebrahimi commented Sep 2, 2026

Uh oh!

marufsharifi commented Sep 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

marufsharifi Sep 2, 2026

Choose a reason for hiding this comment

Uh oh!

nabi-ebrahimi Sep 2, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

codecov Bot commented Sep 3, 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!

marufsharifi left a comment

Choose a reason for hiding this comment

Uh oh!

carlosmiceli commented Sep 3, 2026

Uh oh!

nabi-ebrahimi commented Sep 3, 2026

Uh oh!

carlosmiceli commented Sep 3, 2026

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

marufsharifi commented Sep 4, 2026

Uh oh!

Uh oh!

github-actions Bot commented Sep 4, 2026

Uh oh!

OSBotify commented Sep 4, 2026

Uh oh!

github-actions Bot commented Sep 4, 2026

Uh oh!

OSBotify commented Sep 7, 2026

Uh oh!

MelvinBot commented Sep 7, 2026

Uh oh!

OSBotify commented Sep 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

nabi-ebrahimi commented Sep 2, 2026 •

edited

Loading

marufsharifi commented Sep 2, 2026 •

edited

Loading

codecov Bot commented Sep 3, 2026 •

edited by github-actions Bot

Loading