fix: land new account on initially opened room by KJ21-ENG · Pull Request #92834 · Expensify/App

KJ21-ENG · 2026-06-05T21:54:19Z

Explanation of Change

This PR fixes issue #85242: when a signed-out user opens a report URL like /r/<reportID>, signs in/signs up with a new account, and completes onboarding, the app should land on the initially opened report. Current main lands on Home instead.

The accepted proposal identified the first destructive step in RootStackRouter: when OnboardingGuard returns a REDIRECT to onboarding, handleNavigationGuards resets the whole root stack using the adapted onboarding state. That adapted state has Home as the base route, so the report route that was revealed after dismissing SignIn is replaced by [Home, OnboardingModalNavigator].

While validating the fix locally, frontend logging showed additional Home navigations across the sign-in and onboarding-completion paths that could still overwrite the restored report after the router preserved it, for example:

SignInModal dismisses the SignIn RHP and then navigates to Home.
The Track-Expenses-With-Concierge RHP onboarding variant also navigates to Home.

So the final fix is intentionally narrow:

For onboarding modal REDIRECTs, preserve the current fullscreen report route under OnboardingModalNavigator instead of replacing it with Home.
Drop dismissible modal routes, such as SignIn RHP, before choosing the fullscreen base. This avoids the prior Web - Onboarding - Two Expensify logos appear on the modal #86258 regression where SignIn RHP and OnboardingModal were both kept and rendered two Expensify logos.
Fall back to the original adapted redirect state when no fullscreen route survives. This keeps the Home baseline needed for non-report routes like /concierge.
Keep Home navigation for normal/non-report flows, but skip it when the currently revealed fullscreen route is already a report. This avoids the prior #90303 regression caused by removing Home navigation globally.
Scope the redirect idempotency guard to onboarding/modal redirects only. This keeps the loop protection for duplicate onboarding modal redirects while allowing completed-user redirects to Home to reset nested TabNavigator state when the current tab is not Home.
Add a focused unit test for the router REDIRECT behavior, historical regression cases, and the completed-user Home redirect from a nested report state.

Fixed Issues

$ #85242
PROPOSAL: #85242 (comment)

Tests

Manual recordings have been added below.

Original issue #85242**:**

Log out of NewDot.
Open https://staging.new.expensify.com/r/7075912447943023.
Click Sign in and sign up with a new account.
Select an onboarding option and complete the flow.
Verify the app lands on the initially opened report, not Home.
- Note: with onboarding choices that open Concierge (e.g. Track expenses for my business), the report is still restored but Concierge (the side panel/chat) opens on top of it. This is expected.
- Note: with the Manage my team's expenses onboarding choice, the app redirects to the workspace #admins room instead of the report. This is expected.

Regression #86258**:**

Log out of NewDot.
Open https://staging.new.expensify.com/r/7075912447943023.
Sign up with a new account and proceed to the onboarding modal.
Verify only one Expensify logo/onboarding modal is visible and no SignIn RHP is stacked under it.

Regression #90303:

Log out of NewDot and force close the app.
Open https://staging.new.expensify.com/concierge from an external app (Notes/browser).
Sign up with a new account and complete onboarding.
- Note: the Concierge chat may open on top of the onboarding modal mid-flow. This is a pre-existing issue on main ([Due for payment 2026-08-25] [$250] Web - User not navigate to the Concierge chat after login new account from Concierge deep link #95365 / [Exploratory] Web - Onboarding - Onboarding modal dismisses after navigate to Concierge link #95367), not caused by this PR; tap back to continue onboarding.
If the Concierge chat is open after onboarding, tap back from it and verify the app returns to Home and does not freeze.

Offline tests

Not applicable. This change affects sign-in/onboarding navigation and requires online authentication/onboarding APIs.

QA Steps

Same as Tests.

PR Author Checklist

Screenshots/Videos

Android: Native

ezyZip.15.mp4

Android: mWeb Chrome

ezyZip.14.mp4

iOS: Native

N/A

iOS: mWeb Safari

ezyZip.16.mp4

MacOS: Chrome / Safari

ezyZip.17.mp4

codecov · 2026-06-05T21:59:35Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/components/SidePanel/RHPVariantTest/index.ts	`51.51% <100.00%> (+51.51%)`	⬆️
...ateRootStackNavigator/GetStateForActionHandlers.ts	`65.84% <ø> (ø)`
...igator/createRootStackNavigator/RootStackRouter.ts	`85.71% <100.00%> (+13.40%)`	⬆️
src/libs/navigateAfterOnboarding.ts	`87.50% <100.00%> (ø)`
src/pages/signin/SignInModal.tsx	`0.00% <0.00%> (ø)`
... and 7 files with indirect coverage changes

melvin-bot · 2026-06-07T12:12:04Z

@bernhardoj 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 · 2026-06-07T12:12:09Z

@marcochavezf 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: 1201f47709

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

KJ21-ENG · 2026-06-08T11:28:05Z

@FitseTLT kind ping here. Thanks!

JmillsExpensify

I don't quite get how this particular state happens, though the sign-in on the RHP seems fine to me.

KJ21-ENG · 2026-06-08T21:19:39Z

@JmillsExpensify Yes, agreed that SignIn on the RHP itself is fine. The issue is the transient navigation state created by opening /r/<reportID> while logged out on large screen.

From the frontend debug logs, right when SignInModal dismisses and OnboardingGuard redirects, the root stack was:

[
"TabNavigator/ReportsSplitNavigator/Report",
"RightModalNavigator"
]

So the report route is already the fullscreen base and SignIn is the RHP on top. The bug was that the onboarding REDIRECT reset replaced that base with Home. This PR preserves that existing fullscreen report base under OnboardingModalNavigator, while dropping dismissible modal routes like the SignIn RHP so we do not reintroduce the two-logo regression.

@FitseTLT Do you agree with this as well?

FitseTLT · 2026-06-08T21:26:24Z

@JmillsExpensify This case is when you sign in while on a public room.

JmillsExpensify

Ah, thanks. LGTM then.

FitseTLT · 2026-07-13T20:32:45Z

FYI :- Failing Jest and TypeScript tests / checks are unrelated to this PR. Thanks!

I think it is fixed on main now

FitseTLT · 2026-07-13T20:59:15Z

After finishing onboarding if you select manage teams it will redirect to admin room which is expected but should be stated in test steps. And regarding the onboarding cases that open concierge page there are cases other than track choice so you should generalize the comment on that in the OP.

FitseTLT · 2026-07-13T21:24:50Z

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

2026-07-14.00-22-15.mp4

Android: mWeb Chrome

2026-07-13.23-51-42.mp4

iOS: HybridApp

iOS: mWeb Safari

2026-07-13.23-55-34.mp4

MacOS: Chrome / Safari

2026-07-13.23-46-45.mp4

FitseTLT · 2026-07-13T21:41:04Z

@KJ21-ENG for the case of concierge link the concierge page opens on top of the onboarding modal which is unwanted.

2026-07-14.00-33-14.mp4

KJ21-ENG · 2026-07-14T18:50:55Z

@KJ21-ENG for the case of concierge link the concierge page opens on top of the onboarding modal which is unwanted.

2026-07-14.00-33-14.mp4

@FitseTLT I didn't got this 🤔

FitseTLT · 2026-07-14T18:52:14Z

I am talking about the step of #90303

KJ21-ENG · 2026-07-14T20:50:05Z

Hmm, Isn't it unrelated to this PR ? Like its pre-existing on main. Am I missing something 👀

FitseTLT · 2026-07-14T20:51:19Z

Hmm, Isn't it unrelated to this PR ? Like its pre-existing on main. Am I missing something 👀

What's the behavior on main? can u give me a vid of that?

KJ21-ENG · 2026-07-15T19:06:33Z

@FitseTLT

1784142168556102-compressed.mp4

FitseTLT

LGTM

FitseTLT · 2026-07-15T21:39:45Z

cc @marcochavezf

marcochavezf · 2026-07-16T19:08:28Z

Conflicts 😢

…sed-onboarding-deeplink-fix # Conflicts: # tests/unit/navigateAfterOnboardingTest.ts

…version artifact)

KJ21-ENG · 2026-07-16T19:34:00Z

@marcochavezf Resolved

OSBotify · 2026-07-17T16:16:48Z

✋ 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-07-17T16:23:34Z

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

github-actions · 2026-07-17T16:29:17Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-00c24247e86-7ad9444-eaf8e6f25123fd959d8f1c2cd7f79c264a475062/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-00c2424-7ad9444-fc09cb0d631712b470f1176ace3793fcfa15443b/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-07-21T01:29:19Z

🚀 Deployed to staging by https://github.com/marcochavezf in version: 9.4.41-0 🚀

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

MelvinBot · 2026-07-21T01:31:21Z

🤖 Help site review: no changes required.

I reviewed the changes in this PR against the help site files under App/docs/articles and no updates are needed.

Why: This is an internal navigation/routing bug fix. It corrects which screen a user lands on after signing in/up from a report deep link (/r/<reportID>) and completing onboarding — the app should land on the initially opened report instead of Home. The diff is limited to navigation internals (RootStackRouter, GetStateForActionHandlers, navigateAfterOnboarding, SignInModal, RHPVariantTest) and unit tests.

There is no new or changed user-facing feature, setting, tab, label, or button, and no existing help article documents this deep-link landing behavior. The help site describes product features and how-to flows, not the internal routing that determines the post-sign-in destination — so there is nothing to add or correct. Because no changes are required, I have not created a draft docs PR.

@KJ21-ENG, please confirm you agree no help site updates are needed. If you believe a specific article should be updated, point me to it and I'll draft the changes.

OSBotify · 2026-07-22T06:10:25Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.4.41-4 🚀

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

Bundle Size Analysis (Sentry):

Android

melvin-bot Bot assigned KJ21-ENG Jun 5, 2026

KJ21-ENG mentioned this pull request Jun 5, 2026

[Due for payment 2026-08-06] [$250] After signing in with a new account, the home page appears instead of the room #85242

Closed

2 of 7 tasks

Fix onboarding deep link preservation

d2ff7e8

KJ21-ENG force-pushed the KJ21-ENG/85242-focused-onboarding-deeplink-fix branch from 1202a6a to d2ff7e8 Compare June 5, 2026 21:55

KJ21-ENG changed the title ~~[WIP] fix: preserve report deep links through onboarding~~ [WIP] fix: land new account on initially opened room Jun 5, 2026

KJ21-ENG changed the title ~~[WIP] fix: land new account on initially opened room~~ fix: land new account on initially opened room Jun 6, 2026

KJ21-ENG force-pushed the KJ21-ENG/85242-focused-onboarding-deeplink-fix branch 2 times, most recently from b85d0d6 to 169b7ec Compare June 6, 2026 09:26

Scope modal redirect idempotency guard

1201f47

KJ21-ENG force-pushed the KJ21-ENG/85242-focused-onboarding-deeplink-fix branch from 169b7ec to 1201f47 Compare June 6, 2026 09:40

KJ21-ENG marked this pull request as ready for review June 7, 2026 12:11

KJ21-ENG requested review from a team as code owners June 7, 2026 12:11

melvin-bot Bot requested review from JmillsExpensify and bernhardoj and removed request for a team June 7, 2026 12:12

melvin-bot Bot requested review from a team and marcochavezf and removed request for a team June 7, 2026 12:12

chatgpt-codex-connector Bot reviewed Jun 7, 2026

View reviewed changes

Comment thread src/pages/signin/SignInModal.tsx Resolved

Fix navigation guard redirect test types

8e5c8cb

JmillsExpensify reviewed Jun 8, 2026

View reviewed changes

JmillsExpensify previously approved these changes Jun 8, 2026

View reviewed changes

Merge branch 'main' into KJ21-ENG/85242-focused-onboarding-deeplink-fix

139315c

FitseTLT approved these changes Jul 15, 2026

View reviewed changes

KJ21-ENG added 2 commits July 17, 2026 00:49

Merge remote-tracking branch 'upstream/main' into KJ21-ENG/85242-focu…

90653e6

…sed-onboarding-deeplink-fix # Conflicts: # tests/unit/navigateAfterOnboardingTest.ts

Restore AuthScreensInitHandler.tsx to main version (undo local oxfmt …

2f81c04

…version artifact)

marcochavezf approved these changes Jul 17, 2026

View reviewed changes

marcochavezf merged commit 00c2424 into Expensify:main Jul 17, 2026
36 checks passed

shubham1206agra mentioned this pull request Jul 18, 2026

[$250] [Exploratory] Public room - Unable to open Public room after tap the "here" hyperlink on Concierge message #94783

Closed

2 of 7 tasks

OSBotify mentioned this pull request Jul 21, 2026

Deploy Checklist: New Expensify 2026-07-21 #96534

Closed

FitseTLT mentioned this pull request Aug 7, 2026

Create Navigation guards with OnboardingGuard & TestDriveModalGuard #81689

Merged

53 tasks done

MelvinBot mentioned this pull request Sep 9, 2026

[Due for payment 2026-10-01] Navigation - Tap on view from email opens the Home if any other tab is open before #100680

Closed

1 of 7 tasks

FitseTLT mentioned this pull request Oct 28, 2026

[$250] Native share - Android - No sharing flow/app freezes when share image signed out #101425

Open

1 of 7 tasks

Conversation

KJ21-ENG commented Jun 5, 2026 • edited by JmillsExpensify 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 Jun 5, 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!

melvin-bot Bot commented Jun 7, 2026

Uh oh!

melvin-bot Bot commented Jun 7, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

KJ21-ENG commented Jun 8, 2026

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

KJ21-ENG commented Jun 8, 2026

Uh oh!

FitseTLT commented Jun 8, 2026

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

FitseTLT commented Jul 13, 2026

Uh oh!

FitseTLT commented Jul 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

FitseTLT commented Jul 13, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

FitseTLT commented Jul 13, 2026

Uh oh!

KJ21-ENG commented Jul 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

FitseTLT commented Jul 14, 2026

Uh oh!

KJ21-ENG commented Jul 14, 2026

Uh oh!

FitseTLT commented Jul 14, 2026

Uh oh!

KJ21-ENG commented Jul 15, 2026

Uh oh!

FitseTLT left a comment

Choose a reason for hiding this comment

Uh oh!

FitseTLT commented Jul 15, 2026

Uh oh!

marcochavezf commented Jul 16, 2026

Uh oh!

KJ21-ENG commented Jul 16, 2026

Uh oh!

Uh oh!

OSBotify commented Jul 17, 2026

Uh oh!

github-actions Bot commented Jul 17, 2026

Uh oh!

github-actions Bot commented Jul 17, 2026

Uh oh!

OSBotify commented Jul 21, 2026

Uh oh!

MelvinBot commented Jul 21, 2026

Uh oh!

OSBotify commented Jul 22, 2026

Uh oh!

KJ21-ENG commented Jun 5, 2026 •

edited by JmillsExpensify

Loading

codecov Bot commented Jun 5, 2026 •

edited by github-actions Bot

Loading

FitseTLT commented Jul 13, 2026 •

edited

Loading

KJ21-ENG commented Jul 14, 2026 •

edited

Loading