Skip to content

Fix test drive modal appearing twice on Android #81465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Julesssss wants to merge 2 commits into from
Closed

Fix test drive modal appearing twice on Android #81465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3074619
Fix test drive modal appearing twice and tab unresponsiveness
Julesssss Feb 5, 2026
cbcdf15
Remove unnecessary comment
MelvinBot Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions src/hooks/useOnboardingFlow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,17 +78,21 @@ function useOnboardingFlowRouter() {
// Should be removed once Test Drive modal route has its own navigation guard
// Details: https://github.com/Expensify/App/pull/79898
if (hasCompletedGuidedSetupFlowSelector(onboardingValues) && onboardingValues?.testDriveModalDismissed === false) {
Navigation.setNavigationActionToMicrotaskQueue(() => {
Log.info('[Onboarding] User has not completed the guided setup flow, starting onboarding flow from test drive modal');
startOnboardingFlow({
onboardingInitialPath: ROUTES.TEST_DRIVE_MODAL_ROOT.route,
isUserFromPublicDomain: false,
hasAccessiblePolicies: false,
currentOnboardingCompanySize: undefined,
currentOnboardingPurposeSelected: undefined,
onboardingValues,
const navigationState = navigationRef.getRootState();
const lastRoute = navigationState.routes.at(-1);
if (lastRoute?.name !== NAVIGATORS.TEST_DRIVE_MODAL_NAVIGATOR) {
Navigation.setNavigationActionToMicrotaskQueue(() => {
Log.info('[Onboarding] User has not completed the guided setup flow, starting onboarding flow from test drive modal');
startOnboardingFlow({
onboardingInitialPath: ROUTES.TEST_DRIVE_MODAL_ROOT.route,
isUserFromPublicDomain: false,
hasAccessiblePolicies: false,
currentOnboardingCompanySize: undefined,
currentOnboardingPurposeSelected: undefined,
onboardingValues,
});
});
});
}
}
if (hasBeenAddedToNudgeMigration && !isProductTrainingElementDismissed('migratedUserWelcomeModal', dismissedProductTraining)) {
const navigationState = navigationRef.getRootState();
Expand Down
1 change: 1 addition & 0 deletions src/libs/Navigation/AppNavigator/AuthScreens.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,7 @@ function AuthScreens() {
name={NAVIGATORS.TEST_DRIVE_MODAL_NAVIGATOR}
options={rootNavigatorScreenOptions.basicModalNavigator}
component={TestDriveModalNavigator}
listeners={modalScreenListeners}
/>
<RootStack.Screen
name={NAVIGATORS.TEST_DRIVE_DEMO_NAVIGATOR}
Expand Down
Loading