Create Navigation guards with OnboardingGuard & TestDriveModalGuard by TMisiukiewicz · Pull Request #81689 · Expensify/App

TMisiukiewicz · 2026-02-06T14:45:55Z

Explanation of Change

Fixed Issues

$ #79974
$ #81453
PROPOSAL:

Tests

Create fresh account
Verify you are navigated to onboarding
Go through entire onboarding
Verify the test drive modal appears

Create fresh account
Verify you are navigated to onboarding
Close the app
Web: Open https://dev.new.expensify.com:8082/workspaces
iOS: run xcrun simctl openurl booted "new-expensify://workspaces" in terminal
Android: run adb shell am start -W -a android.intent.action.VIEW -d "new-expensify://workspaces"
Verify you are redirected to the onboarding

Create fresh account
Verify you are navigated to onboarding
Do the first step of the onboarding
Close the app
Web: Open https://dev.new.expensify.com:8082/workspaces
iOS: run xcrun simctl openurl booted "new-expensify://workspaces" in terminal
Android: run adb shell am start -W -a android.intent.action.VIEW -d "new-expensify://workspaces"
Verify you are redirected to the last visited onboarding step

Create fresh account
Verify you are navigated to onboarding
Do the first step of the onboarding
Close the app
Web: Open https://dev.new.expensify.com:8082/onboarding/purpose
iOS: run xcrun simctl openurl booted "new-expensify://onboarding/purpose" in terminal
Android: run adb shell am start -W -a android.intent.action.VIEW -d "new-expensify://onboarding/purpose"
Verify you are redirected to the personal details step

Create fresh account
Verify you are navigated to onboarding
Go through entire onboarding
In the console:

Onyx.set("nvp_tryNewDot", {classicRedirect: {dismissed: false}, nudgeMigration: {timestamp: 
"2025-12-10 01:35:12", cohort: "test"}});

Reopen the app
Verify you are navigated to "Welcome to New Expensify" modal

Create a fresh account
Complete the entire onboarding flow (name, email, purpose, etc.)
Verify the test drive modal appears automatically
Close it
Verify it did not reappear

Create a fresh account
Complete the entire onboarding flow
Wait for test drive modal to appear
Dismiss the modal (click "Skip" or close button)
Navigate to different tabs (Workspaces, Settings, etc.)
Verify the modal does NOT reappear

Create a fresh account
Complete onboarding and dismiss the test drive modal
Manually navigate to /onboarding/workspaces by:
- Web: Type URL in address bar
- iOS: xcrun simctl openurl booted "newexpensify://workspaces"
- Android: adb shell am start -a android.intent.action.VIEW -d "newexpensify://workspaces"
Verify you're redirected to Test drive modal
Close it
Verify the modal does not reappear

Verify that no errors appear in the JS console

Offline tests

n/a

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."
Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

iOS: Native

ios.mov

iOS: mWeb Safari

ios.web.mov

MacOS: Chrome / Safari

web.mov

…8-navigation-guards" This reverts commit 91364fa, reversing changes made to 95e9d09.

codecov · 2026-02-06T14:56: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/hooks/useOnboardingFlow.ts	`87.50% <100.00%> (+0.40%)`	⬆️
src/libs/Navigation/NavigationRoot.tsx	`76.92% <ø> (-0.86%)`	⬇️
src/libs/Navigation/guards/OnboardingGuard.ts	`100.00% <100.00%> (ø)`
src/libs/Navigation/guards/index.ts	`100.00% <100.00%> (ø)`
src/libs/actions/Link.ts	`22.70% <100.00%> (-0.62%)`	⬇️
src/libs/actions/Welcome/index.ts	`40.67% <ø> (-1.75%)`	⬇️
src/libs/navigateAfterOnboarding.ts	`70.37% <100.00%> (+1.40%)`	⬆️
.../pages/OnboardingPurpose/BaseOnboardingPurpose.tsx	`2.85% <ø> (ø)`
src/Expensify.tsx	`84.10% <50.00%> (-0.25%)`	⬇️
src/libs/Navigation/guards/TestDriveModalGuard.ts	`96.42% <96.42%> (ø)`
... and 1 more
... and 13 files with indirect coverage changes

melvin-bot · 2026-02-09T13:19:14Z

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

melvin-bot · 2026-02-09T13:19:21Z

@QichenZhu @mountiny One of you needs to 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]

TMisiukiewicz · 2026-02-09T13:19:48Z

@eh2077 You might be interested in reviewing this once again since you already have some context from the 1st PR

TMisiukiewicz · 2026-02-09T13:31:52Z

not sure why lint fails, it finished with 0 errors

github-actions · 2026-02-09T13:42:33Z

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

eh2077 · 2026-02-09T14:54:23Z

I'll look into it tmr

TMisiukiewicz · 2026-02-11T09:29:05Z

@eh2077 I was able to reproduce and provided a fix that should prevent this issue in the future, could you please take a look? 🙏

eh2077

works well!

Screen.Recording.2026-02-11.at.6.19.09.PM.mov

Screen.Recording.2026-02-11.at.6.32.33.PM.mov

github-actions · 2026-02-12T09:39:01Z

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

github-actions · 2026-02-12T09:42:14Z

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

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

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-02-12T09:45:31Z

✋ 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-02-12T15:48:34Z

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

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

vincdargento · 2026-02-12T19:28:09Z

@TMisiukiewicz It's the last test ok?

Create a fresh account

Complete onboarding and dismiss the test drive modal

Manually navigate to /onboarding/workspaces by:

Web: Type URL in address bar

iOS: xcrun simctl openurl booted "newexpensify://workspaces"

Android: adb shell am start -a android.intent.action.VIEW -d "newexpensify://workspaces"

Verify you're redirected to Test drive modal

Close it

Verify the modal does not reappear

Navigating to /onboarding/workspaces after completing the onboarding and dismissing the test drive modal it's leading to Not here page, but I feel this is expected, I just want to confirm

test.seven.faile.mp4

TMisiukiewicz · 2026-02-13T08:08:58Z

Hello @vincdargento ! I'm sorry, there is a mistake in the test plan 🙏 The correct version:

Create a fresh account
Complete onboarding and DO NOT dismiss the test drive modal
Manually navigate to /workspaces by:

Web: Type URL in address bar
iOS: xcrun simctl openurl booted "newexpensify://workspaces"
Android: adb shell am start -a android.intent.action.VIEW -d "newexpensify://workspaces"

Verify you're redirected to Test drive modal
Close it
Verify the modal does not reappear

Thank you for reporting this! 🙏

IuliiaHerets · 2026-02-13T09:06:47Z

@TMisiukiewicz QA team got this error:

Starting: Intent { act=android.intent.action.VIEW dat=new-expensify://workspaces/... } Error: Activity not started, unable to resolve Intent { act=android.intent.action.VIEW dat=new-expensify://workspaces/... flg=0x10000000 }

when run the step

run adb shell am start -W -a android.intent.action.VIEW -d "new-expensify://workspaces"

Can we skip this test? or any workaround to make it work?

bandicam.2026-02-13.15-09-44-447.mp4

TMisiukiewicz · 2026-02-13T09:09:16Z

@IuliiaHerets not sure how to fix that, I think it's safe to skip this test

OSBotify · 2026-02-13T18:49:16Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.18-8 🚀

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

mkhutornyi · 2026-03-24T21:46:29Z

+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        const isInvitedOrGroupMember = (!CONFIG.IS_HYBRID_APP && (hasNonPersonalPolicy || wasInvitedToNewDot)) ?? false;
+
+        const shouldSkipOnboarding = context.isLoading || isTransitioning || isOnboardingCompleted || isMigratedUser || isSingleEntry || needsExplanationModal || isInvitedOrGroupMember;


The onboarding guard added in this PR caused critical bug in onboarding flow.
Infinite loop, which leads to crash

More details: #83212 (comment)

bernhardoj · 2026-04-08T08:50:05Z

        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
+    } else {
+        // Navigate to home to trigger guard evaluation
+        Navigation.navigate(ROUTES.HOME);


@TMisiukiewicz Looks like we don't have the test drive modal guard anymore, do we still need it?

After completing the onboarding, this always navigate the user to HOME instead of staying where they were.

if this was here only to satisfy the test drive modal then it should be safe to remove 👍

TMisiukiewicz added 2 commits February 5, 2026 10:29

Revert "Merge pull request Expensify#81455 from Expensify/revert-7989…

ecc115f

…8-navigation-guards" This reverts commit 91364fa, reversing changes made to 95e9d09.

add test drive modal

76bcfae

melvin-bot Bot assigned TMisiukiewicz Feb 6, 2026

TMisiukiewicz mentioned this pull request Feb 6, 2026

[$500] Centralize navigation redirects with guard system #79974

Closed

TMisiukiewicz added 2 commits February 9, 2026 13:01

update testdrivemodal guard

1e5ea0e

fix CI

3556916

TMisiukiewicz force-pushed the navigation-guards-v2 branch from ed28b28 to 3556916 Compare February 9, 2026 12:37

TMisiukiewicz marked this pull request as ready for review February 9, 2026 13:19

TMisiukiewicz requested review from a team as code owners February 9, 2026 13:19

melvin-bot Bot requested review from JmillsExpensify and brunovjk and removed request for a team February 9, 2026 13:19

melvin-bot Bot requested review from a team, QichenZhu and mountiny and removed request for a team February 9, 2026 13:19

github-actions Bot reviewed Feb 9, 2026

View reviewed changes

Comment thread src/libs/Navigation/guards/OnboardingGuard.ts

mountiny requested review from eh2077 and removed request for QichenZhu and brunovjk February 9, 2026 13:39

This comment has been minimized.

Sign in to view

TMisiukiewicz added 2 commits February 11, 2026 09:07

Merge branch 'main' into navigation-guards-v2

9250f54

fix navigation freeze when test drive modal appears

ab5d7e9

eh2077 approved these changes Feb 11, 2026

View reviewed changes

Merge remote-tracking branch 'origin/main' into navigation-guards-v2

f5f2bfc

mountiny previously approved these changes Feb 11, 2026

View reviewed changes

Merge remote-tracking branch 'origin/main' into navigation-guards-v2

a03077e

TMisiukiewicz dismissed mountiny’s stale review via a03077e February 12, 2026 08:50

mountiny approved these changes Feb 12, 2026

View reviewed changes

mountiny merged commit f065af6 into Expensify:main Feb 12, 2026
30 checks passed

OSBotify mentioned this pull request Feb 12, 2026

Deploy Checklist: New Expensify 2026-02-12 #82262

Closed

lakchote mentioned this pull request Feb 13, 2026

Revert "Create Navigation guards with OnboardingGuard & TestDriveModalGuard" #82396

Closed

OSBotify mentioned this pull request Feb 13, 2026

Android - Navigation - App stuck on logo after log out and close App then open any conversation link #82413

Closed

7 tasks

melvin-bot Bot mentioned this pull request Feb 13, 2026

[Due for payment 2026-02-20] Android - Onboarding - Test drive modal appears twice, tab is not responsive #81453

Closed

7 tasks

shubham1206agra mentioned this pull request Feb 21, 2026

[Due for payment 2026-04-30] [$250] mWeb/Safari - Public room-Onboarding flow not appear when sign in from reply thread of public room #83092

Open

7 tasks

nkdengineer mentioned this pull request Mar 7, 2026

[$250] Onboarding modal not show when the invited member who not complete onboarding login #84436

Open

7 tasks

OSBotify mentioned this pull request Mar 20, 2026

mWeb - Onboarding - App freezes when create new account #85895

Closed

7 tasks

MelvinBot mentioned this pull request Mar 24, 2026

[Due for payment 2026-03-19] [$250] App crashes with infinite OnboardingGuard redirect loop #83212

Closed

7 tasks

mkhutornyi reviewed Mar 24, 2026

View reviewed changes

bernhardoj reviewed Apr 8, 2026

View reviewed changes

Krishna2323 mentioned this pull request Apr 15, 2026

Fix infinite onboarding navigation loop crash on iOS #88014

Merged

52 tasks

Conversation

TMisiukiewicz commented Feb 6, 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!

codecov Bot commented Feb 6, 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 Feb 9, 2026

Uh oh!

melvin-bot Bot commented Feb 9, 2026

Uh oh!

TMisiukiewicz commented Feb 9, 2026

Uh oh!

Uh oh!

TMisiukiewicz commented Feb 9, 2026

Uh oh!

github-actions Bot commented Feb 9, 2026

Uh oh!

This comment has been minimized.

eh2077 commented Feb 9, 2026

Uh oh!

TMisiukiewicz commented Feb 11, 2026

Uh oh!

eh2077 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Feb 12, 2026

Uh oh!

github-actions Bot commented Feb 12, 2026

Uh oh!

OSBotify commented Feb 12, 2026

Uh oh!

OSBotify commented Feb 12, 2026

Uh oh!

vincdargento commented Feb 12, 2026

Uh oh!

TMisiukiewicz commented Feb 13, 2026

Uh oh!

IuliiaHerets commented Feb 13, 2026

Uh oh!

TMisiukiewicz commented Feb 13, 2026

Uh oh!

OSBotify commented Feb 13, 2026

Uh oh!

mkhutornyi Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

bernhardoj Apr 8, 2026

Choose a reason for hiding this comment

Uh oh!

TMisiukiewicz Apr 8, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

TMisiukiewicz commented Feb 6, 2026 •

edited

Loading

codecov Bot commented Feb 6, 2026 •

edited by github-actions Bot

Loading