fix: navigate to Concierge chat after login from Concierge deep link on web by x-dev90 · Pull Request #96387 · Expensify/App

x-dev90 · 2026-07-17T11:38:06Z

Explanation of Change

Preserve the /concierge deep-link intent when a logged-out user signs up with a new account, then consume that intent after onboarding before falling back to Home.

This keeps the existing pre-onboarding deep-link guard intact, avoids reopening stale non-Concierge deep links, and routes the user to the Concierge report when available. If the Concierge report ID is not ready yet, it navigates to ROUTES.CONCIERGE so ConciergePage can resolve the chat.

Fixed Issues

$ #95365
PROPOSAL: #95365 (comment)

Tests

Case 1: Original Flow

Log out of the app
Open /concierge directly in the browser
Sign up with a brand-new account
Complete onboarding
Verify the Concierge chat opens

Additional Cases

Log out of the app
Open /concierge directly in the browser
Start signup but do not complete onboarding
In the same tab, navigate to /
Sign up normally from /
Complete onboarding
Verify the app lands on Home and does not open Concierge

Log out of the app
Open /
Sign up with a brand-new account
Complete onboarding
Verify the app follows the normal onboarding destination and does not open Concierge from stale state

Log out of the app
Open /concierge/
Sign up with a brand-new account
Complete onboarding
Verify the Concierge chat opens

Log out of the app
Open /concierge?test=1
Sign up with a brand-new account
Complete onboarding
Verify the Concierge chat opens

Log out of the app
Open /concierge#test
Sign up with a brand-new account
Complete onboarding
Verify the Concierge chat opens

Verify that no errors appear in the JS console

Offline tests

Same as tests.

QA Steps

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

Screen_Recording_20260717_182305_Chrome.mp4

iOS: Native

iOS: mWeb Safari

Screen.Recording.2026-07-17.at.6.33.33.PM.mp4

MacOS: Chrome / Safari

Screen.Recording.2026-07-17.at.5.56.41.PM.mp4

codecov · 2026-07-17T12:33:29Z

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/DeepLinkHandler.tsx	`86.79% <100.00%> (+0.25%)`	⬆️
src/libs/actions/Link.ts	`52.82% <100.00%> (+0.15%)`	⬆️
src/libs/actions/SignInRedirect.ts	`74.07% <100.00%> (+0.48%)`	⬆️
src/libs/actions/Report/index.ts	`71.47% <50.00%> (-0.12%)`	⬇️
src/libs/navigateAfterOnboarding.ts	`92.10% <96.55%> (+4.10%)`	⬆️
src/hooks/useAutoCreateSubmitWorkspace.ts	`86.95% <50.00%> (-7.79%)`	⬇️
src/hooks/useAutoCreateTrackWorkspace.ts	`82.92% <60.00%> (-3.56%)`	⬇️
.../OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx	`95.06% <50.00%> (-2.35%)`	⬇️
src/hooks/useCompleteOnboarding.ts	`0.00% <0.00%> (ø)`
src/libs/PendingConciergeDeepLink.ts	`94.44% <94.44%> (ø)`
... and 3 more
... and 9 files with indirect coverage changes

melvin-bot · 2026-07-17T13:58:50Z

@brunovjk 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: f870138760

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

x-dev90 · 2026-07-18T18:33:35Z

Hi @brunovjk, I tested one additional edge case and would like to confirm the expected behavior.

Steps:

Log out.
Open /concierge.
Before completing signup/onboarding, open /.
Complete signup/onboarding.

I also tested this on main, and the app still navigates to Concierge after onboarding. So this behavior does not seem to be introduced by this PR.

My understanding is that the app currently preserves the original /concierge signup deep-link intent through onboarding, and visiting / before onboarding completes does not cancel it.

Could you please confirm how we should handle this? Should this PR keep the current main behavior and only fix the reported Concierge onboarding issue, or should we also update the behavior so opening / explicitly cancels the pending Concierge intent?

Tested on main:

Screencast.From.2026-07-18.22-40-19.mp4

x-dev90 · 2026-07-18T20:01:53Z

Hi @brunovjk, just following up on this PR.

I addressed the AI feedback by persisting the pending Concierge deep-link intent in sessionStorage, so it can survive a tab reload during signup/onboarding and still be cleared through the existing consume/sign-out paths.

Could you please review the latest changes when you have a chance?

brunovjk · 2026-07-20T17:35:55Z

@x-dev90 It’s not very consistent, so I couldn't record a video, but it happens sometimes. If you access the deeplink with /concierge and—before entering the new acc—you go to / instead, causing a normal signup to open Concierge instead of Workspace settings page. I think this happens because / is a public route, so clearPendingConciergeDeepLink() isn’t called. Could you take a look and let me know what you think?

Also, If you enter using only the / deeplink, select "Something else" during onboarding, and complete the process, you are redirected to /concierge instead of Home:

Screen.Recording.2026-07-20.at.14.33.42.mov

x-dev90 · 2026-07-21T22:34:35Z

@x-dev90 It’s not very consistent, so I couldn't record a video, but it happens sometimes. If you access the deeplink with /concierge and—before entering the new acc—you go to / instead, causing a normal signup to open Concierge instead of Workspace settings page. I think this happens because / is a public route, so clearPendingConciergeDeepLink() isn’t called. Could you take a look and let me know what you think?

Also, If you enter using only the / deeplink, select "Something else" during onboarding, and complete the process, you are redirected to /concierge instead of Hom

Hi @brunovjk ,I updated the implementation to preserve the pending /concierge intent across page reloads using tab-scoped sessionStorage, while still allowing an explicit root/Home navigation to cancel that intent. I also handled generated root/Home startup events so they do not incorrectly override an existing pending Concierge intent.

I added focused unit coverage for the Concierge redirect, explicit root cancellation, direct root signup, and reload cases. I also adjusted the reload detection to avoid direct deprecated API access.

Could you please review again when you have a chance?

Thank you!

After Fix:

Screencast.From.2026-07-22.01-34-13.mp4

Screencast.From.2026-07-22.01-31-38.mp4

Screencast.From.2026-07-22.01-36-26.mp4

Screencast.From.2026-07-22.01-37-43.mp4

brunovjk · 2026-07-22T16:40:59Z

Thanks for the effort @x-dev90, but now it seems to be failing on the initial issue:

Screen.Recording.2026-07-22.at.13.38.18.mov

x-dev90 · 2026-07-25T11:57:08Z

Hi @brunovjk, could you please review this PR again when you have a chance?

After the previous approval, I found and addressed a few remaining edge cases. The earlier fix covered refreshing before signup after opening the deep link, but the latest updates also cover refreshes during and after signup while onboarding is still in progress.

The PR now preserves the original /concierge deep-link intent across those signup/onboarding refresh flows. It also makes the Submit workspace onboarding flow honor the same pending intent instead of incorrectly navigating to Workspace settings, #admins, or Home.

I also addressed the two-tab sync case: if /concierge is opened in one tab, but the user later opens / or another explicit internal route in another tab before completing onboarding, the stale Concierge intent is cancelled across tabs so both tabs stay aligned with the latest user intent.

I added focused unit coverage for these cases as well. Could you please take another look?

Before

Screencast.From.2026-07-25.15-57-36.mp4

Screencast.From.2026-07-25.16-04-16.mp4

vokoscreenNG-2026-07-25_01-00-50.mp4

After Fix:

Screencast.From.2026-07-25.16-18-52.mp4

Screencast.From.2026-07-25.15-12-55.mp4

Screencast.From.2026-07-25.16-20-49.mp4

x-dev90 · 2026-07-26T16:19:10Z

@x-dev90 please ping me when this is on me

Hi @cristipaval, thanks for waiting.

I’ve finished the additional testing and addressed the remaining edge cases, including refresh during onboarding, Submit workspace onboarding, and two-tab intent sync. This should be ready for you once @brunovjk re-reviews the latest changes.

x-dev90 · 2026-07-27T06:01:38Z

@brunovjk Gentle bump when you have a chance. Thanks!

brunovjk · 2026-07-27T12:57:47Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: a5eb8b0f94

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-07-27T13:02:46Z

+    } else if (normalizedRoute === '/') {
+        // Root is an explicit normal signup intent, so it cancels Concierge unless it is a reload replay.
+        setPendingHomeDeepLinkForRoot();


Only store Home when replacing a pending Concierge intent

For an ordinary logged-out web load at /, openReportFromDeepLink() reaches this branch even when no Concierge intent exists, so it creates a pending Home flag. When onboarding finishes, navigateToPendingDeepLinkAfterOnboarding() consumes that flag and returns before the normal RHP variant, admin-room, or workspace navigation runs. Consequently, normal signups from the root URL are forced to Home instead of following their existing onboarding destination; the Home marker should only be created when it is actually canceling a pending Concierge intent.

Useful? React with 👍 / 👎.

Hi @brunovjk, thank you for taking the time to review this.

I tested the fresh / signup flow on main, without opening /concierge first. On main, opening /, signing up, and completing onboarding navigates to Concierge. I also added an extra fix in this PR so / -> signup/onboarding now lands on Home instead of Concierge.

This PR now fixes both related flows:

/concierge -> signup/onboarding preserves the Concierge intent.

/ -> signup/onboarding lands on Home instead of Concierge.

I also re-tested the other onboarding flows, and they continue to behave as expected.

Could you please confirm if this is the behavior we want to keep?

chatgpt-codex-connector · 2026-07-27T13:02:46Z

+    // Submit workspace onboarding bypasses navigateAfterOnboarding(), so honor the same pending deep-link intent here.
+    if (navigateToPendingDeepLinkAfterOnboarding(conciergeReportID)) {
+        return;


Avoid consuming onboarding intents from the Submit welcome modal

When an existing user signs in through /concierge, the normal deep-link handler opens Concierge but never consumes the new pending flag because no onboarding completion occurs. If that user then confirms the proactively shown SubmitPlanWelcomeModal, its shouldCompleteOnboarding=false path still reaches this check, consumes the stale flag, and returns before navigating to Workspace Categories or opening the side panel. Restrict this pending-intent handling to actual onboarding callers, or clear the intent after it has been fulfilled for an already-onboarded sign-in.

Useful? React with 👍 / 👎.

@brunovjk, thanks for checking this.

I tested the existing-user sign-in flow separately, but I could not reproduce the issue. Signing in through /concierge opens Concierge as expected, and confirming the SubmitPlanWelcomeModal still navigates to Workspace Categories with the side panel open.

Since the sign-in flow works separately from the signup/onboarding flow covered by this PR, I’m not seeing the stale pending intent issue described here. Could you please confirm if there are specific steps I should test?

brunovjk · 2026-07-27T13:28:03Z

@x-dev90 what do you think about the comments (P1 and P2) above? We also have some conflicts.Thanks.

x-dev90 · 2026-07-28T10:18:30Z

@brunovjk, could you please check this when you get a chance. thanks.

brunovjk · 2026-07-28T14:16:17Z

Great work, @x-dev90. However, the Home screen opens first, briefly, and then the concierge page opens a moment later.

Screen.Recording.2026-07-28.at.11.12.54.mov

Do you think we can fix this? Thanks.

x-dev90 · 2026-07-30T14:13:59Z

Great work, @x-dev90. However, the Home screen opens first, briefly, and then the concierge page opens a moment later.

Hi @brunovjk , I’ve addressed the feedback. Could you please review again?

brunovjk · 2026-07-30T21:29:37Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e2adfa85d5

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

x-dev90 · 2026-07-30T22:19:35Z

Hi @brunovjk, thank you for taking the time to review this!

I've added one final fix for the / signup flow. Although this flow wasn't mentioned in the original issue, it always shows Concierge after onboarding on the main branch. After the previous fix, it still briefly showed Concierge before navigating to the correct onboarding target page. With this change, it now navigates directly to the expected onboarding target page without showing Concierge first.

Test steps:

Open https://dev.new.expensify.com:8082/.
Sign up and complete onboarding.
Verify you're taken directly to the expected onboarding target page without briefly seeing Concierge.

Since this is closely related to the same post-onboarding routing behavior, I think it makes sense to keep it in this PR. Could you please take another look and let me know if this approach looks good?

fix: navigate to Concierge chat after login from deep link on web

c307c84

melvin-bot Bot assigned x-dev90 Jul 17, 2026

Fix missing pending Concierge deep link helper

f870138

x-dev90 marked this pull request as ready for review July 17, 2026 13:58

x-dev90 requested review from a team as code owners July 17, 2026 13:58

melvin-bot Bot requested review from brunovjk and flaviadefaria July 17, 2026 13:58

melvin-bot Bot removed request for a team July 17, 2026 13:58

github-actions Bot reviewed Jul 17, 2026

View reviewed changes

Comment thread src/libs/PendingConciergeDeepLink.ts

chatgpt-codex-connector Bot reviewed Jul 17, 2026

View reviewed changes

Comment thread src/libs/PendingConciergeDeepLink.ts

x-dev90 added 3 commits July 18, 2026 00:38

Merge branch 'main' into fix/web-concierge-deep-link-login-navigation

9f44d64

Add comment for pending Concierge intent helper

b972082

Merge branch 'main' into fix/web-concierge-deep-link-login-navigation

0ceaa6f

fix: persist pending Concierge deep link across reloads

e6df449

fix: use type import for pending Concierge reload test

91e65ec

x-dev90 added 4 commits July 21, 2026 11:00

Merge branch 'main' into fix/web-concierge-deep-link-login-navigation

537a2e3

Merge branch 'main' into fix/web-concierge-deep-link-login-navigation

eea9b8d

Fix Concierge onboarding deep link persistence and cancellation

3f4a0eb

Fix lint-safe Concierge deep link reload detection

74735c9

x-dev90 added 2 commits July 23, 2026 01:08

Merge branch 'main' into fix/web-concierge-deep-link-login-navigation

c2cf6b2

Fix Concierge deep-link intent through onboarding edge cases

71c10c7

Merge branch 'main' into fix/web-concierge-deep-link-login-navigation

b66c1b6

x-dev90 requested a review from brunovjk July 25, 2026 11:57

Merge branch 'main' into fix/web-concierge-deep-link-login-navigation

a5eb8b0

chatgpt-codex-connector Bot reviewed Jul 27, 2026

View reviewed changes

x-dev90 added 3 commits July 27, 2026 18:25

Merge branch 'main' into fix/web-concierge-deep-link-login-navigation

60d03b2

Fix onboarding navigation tests after merge updates

ee4b83b

Fix onboarding navigation test after merge updates

9dfe564

x-dev90 added 7 commits July 28, 2026 21:27

Merge branch 'main' into fix/web-concierge-deep-link-login-navigation

5198605

Merge branch 'main' into fix/web-concierge-deep-link-login-navigation

09f0907

Merge branch 'main' into fix/web-concierge-deep-link-login-navigation

10a4afe

Merge branch 'main' into fix/web-concierge-deep-link-login-navigation

39af2f4

Fix Concierge deep link before onboarding modal unmounts

c1d2933

Fix two-tab Concierge onboarding intent cancellation

2e8af74

Fix unsafe finally return in Track onboarding navigation

e2adfa8

chatgpt-codex-connector Bot reviewed Jul 30, 2026

View reviewed changes

Comment thread src/libs/navigateAfterOnboarding.ts

fix: prevent Concierge flash after root signup onboarding

033c831

x-dev90 added 4 commits July 31, 2026 03:08

fix: reset Escape dismiss state before onboarding deep-link navigation

6f7abdb

Merge branch 'main' into fix/web-concierge-deep-link-login-navigation

ba32e0f

fix: keep Concierge deep link focused through onboarding

4701899

fix: make Track onboarding cleanup lint-safe

2302dca

Uh oh!

Conversation

x-dev90 commented Jul 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Additional Cases

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented Jul 17, 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 Jul 17, 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!

x-dev90 commented Jul 18, 2026

Uh oh!

x-dev90 commented Jul 18, 2026

Uh oh!

brunovjk commented Jul 20, 2026

Uh oh!

x-dev90 commented Jul 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

brunovjk commented Jul 22, 2026

Uh oh!

x-dev90 commented Jul 25, 2026

Uh oh!

x-dev90 commented Jul 26, 2026

Uh oh!

x-dev90 commented Jul 27, 2026

Uh oh!

brunovjk commented Jul 27, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jul 27, 2026

Choose a reason for hiding this comment

Uh oh!

x-dev90 Jul 27, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Jul 27, 2026

Choose a reason for hiding this comment

Uh oh!

x-dev90 Jul 27, 2026

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Uh oh!

x-dev90 commented Jul 28, 2026

Uh oh!

brunovjk commented Jul 28, 2026

Uh oh!

x-dev90 commented Jul 30, 2026

Uh oh!

brunovjk commented Jul 30, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

x-dev90 commented Jul 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

x-dev90 commented Jul 17, 2026 •

edited

Loading

codecov Bot commented Jul 17, 2026 •

edited by github-actions Bot

Loading

x-dev90 commented Jul 21, 2026 •

edited

Loading

brunovjk commented Jul 27, 2026 •

edited

Loading

x-dev90 commented Jul 30, 2026 •

edited

Loading