[Due for payment 2026-02-27] Sign up - After non workspace Track users sign up, they see the bottom up Test Drive

[izarutskaya]

If you haven’t already, check out our contributing guidelines for onboarding and email contributors@expensify.com to request to join our Slack channel!

---

Version Number: 9.3.17-7
Reproducible in staging?: Yes
Reproducible in production?: Yes
If this was caught during regression testing, add the test name, ID and link from BrowserStack:
Email or phone of affected tester (no customers):
Logs: https://stackoverflow.com/c/expensify/questions/4856
Expensify/Expensify Issue URL:
Issue reported by: @danielrvidal
Slack conversation (hyperlinked to channel name): #expensify_convert

Action Performed:

1. Go to https://staging.new.expensify.com/
2. Sign up with new account
3. Choose Track and budget expenses and finish the flow

Expected Result:

When non workspace Track users sign up, they shouldn't see at the bottom up Test Drive

Actual Result:

After non workspace Track users sign up, they see the bottom up Test Drive

Workaround:

Remove the bottom up test drive as it doesn’t really make sense.

Platforms:

Select the officially supported platforms where the issue was reproduced:

• Android: App
• Android: mWeb Chrome
• iOS: App
• iOS: mWeb Safari
• iOS: mWeb Chrome
• Windows: Chrome
• MacOS: Chrome / Safari

Screenshots/Videos

Recording.3630.mp4

View all open jobs on GitHub

Issue Owner

Current Issue Owner: @laurenreidexpensify

[melvin-bot]

Triggered auto assignment to Contributor-plus team member for initial proposal review - @brunovjk (External)

[melvin-bot]

Triggered auto assignment to @laurenreidexpensify (Bug), see https://stackoverflow.com/c/expensify/questions/14418 for more details. Please add this bug to a GH project, as outlined in the SO.

[melvin-bot]

Unable to auto-create job on Upwork. The BZ team member should create it manually for this issue.

[izarutskaya]

cc @dylanexpensify for visibility

[github-actions]

⚠️ @mukhrr Your proposal is a duplicate of an already existing proposal and has been automatically withdrawn to prevent spam. Please review the existing proposals before submitting a new one.

[nyomanjyotisa]

🚨 Edited by proposal-police: This proposal was edited at 2026-02-12 12:29:35 UTC.

Proposal

Please re-state the problem that we are trying to solve in this issue.

Sign up - After non workspace Track users sign up, they see the bottom up Test Drive

What is the root cause of that problem?

For users who choose “Track and budget expenses” (PERSONAL_SPEND) and skip workspace creation, onboarding ends from BaseOnboardingWorkspaceOptional with no onboardingPolicyID. In navigateAfterOnboarding, the Test Drive modal is only skipped when onboardingPolicyID && !onboardingAdminsChatReportID. For PERSONAL_SPEND users who skipped, that condition is false, so the code always navigates to the Test Drive modal.

App/src/libs/navigateAfterOnboarding.ts

Lines 73 to 84 in 75478c5

	// In this case, we have joined an accessible policy. We would have an onboarding policy, but not an admins chat report.
	// We should skip the Test Drive modal in this case since we already have a policy to join.
	if (onboardingPolicyID && !onboardingAdminsChatReportID) {
	return;
	}
	// We're using Navigation.isNavigationReady here because without it, on iOS,
	// Navigation.dismissModal runs after Navigation.navigate(ROUTES.TEST_DRIVE_MODAL_ROOT.route)
	// And dismisses the modal before it even shows
	Navigation.isNavigationReady().then(() => {
	Navigation.navigate(ROUTES.TEST_DRIVE_MODAL_ROOT.route);

BaseOnboardingWorkspaceOptional also passes shouldSkipTestDriveModal: !!onboardingPolicyID && !onboardingAdminsChatReportID to completeOnboarding, so for PERSONAL_SPEND with no workspace we never skip the Test Drive modal in navigation or in onboarding state.

App/src/pages/OnboardingWorkspaceOptional/BaseOnboardingWorkspaceOptional.tsx

Lines 89 to 103 in 75478c5

	onboardingPolicyID,
	shouldSkipTestDriveModal: !!onboardingPolicyID && !onboardingAdminsChatReportID,
	});
	setOnboardingAdminsChatReportID();
	setOnboardingPolicyID();
	navigateAfterOnboardingWithMicrotaskQueue(
	isSmallScreenWidth,
	isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS),
	conciergeChatReportID,
	archivedReportsIdSet,
	onboardingPolicyID,
	mergedAccountConciergeReportID,
	false,

What changes do you think we should make in order to solve the problem?

Add an optional parameter engagementChoice to navigateAfterOnboarding and navigateAfterOnboardingWithMicrotaskQueue. If engagementChoice === CONST.ONBOARDING_CHOICES.PERSONAL_SPEND, return before navigating to the Test Drive modal.

    if (engagementChoice === CONST.ONBOARDING_CHOICES.PERSONAL_SPEND) {
        return;
    }

App/src/libs/navigateAfterOnboarding.ts

Line 79 in 75478c5

Then in navigateAfterOnboardingWithMicrotaskQueue, pass engagementChoice through to navigateAfterOnboarding.

function navigateAfterOnboardingWithMicrotaskQueue(
    ...
    engagementChoice?: string,
) {
    Navigation.dismissModal();
    Navigation.setNavigationActionToMicrotaskQueue(() => {
        navigateAfterOnboarding(
            ...
            engagementChoice,
        );
    });
}

App/src/libs/navigateAfterOnboarding.ts

Lines 88 to 109 in 75478c5

	function navigateAfterOnboardingWithMicrotaskQueue(
	isSmallScreenWidth: boolean,
	canUseDefaultRooms: boolean | undefined,
	conciergeReportID: string,
	archivedReportsIdSet: ArchivedReportsIDSet,
	onboardingPolicyID?: string,
	onboardingAdminsChatReportID?: string,
	shouldPreventOpenAdminRoom = false,
	) {
	Navigation.dismissModal();
	Navigation.setNavigationActionToMicrotaskQueue(() => {
	navigateAfterOnboarding(
	isSmallScreenWidth,
	canUseDefaultRooms,
	conciergeReportID,
	archivedReportsIdSet,
	onboardingPolicyID,
	onboardingAdminsChatReportID,
	shouldPreventOpenAdminRoom,
	);
	});
	}

In BaseOnboardingWorkspaceOptional, when calling navigateAfterOnboardingWithMicrotaskQueue, pass onboardingPurposeSelected as the new engagementChoice argument.

        navigateAfterOnboardingWithMicrotaskQueue(
           ...
            onboardingPurposeSelected,
        );

App/src/pages/OnboardingWorkspaceOptional/BaseOnboardingWorkspaceOptional.tsx

Lines 96 to 104 in 75478c5

	navigateAfterOnboardingWithMicrotaskQueue(
	isSmallScreenWidth,
	isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS),
	conciergeChatReportID,
	archivedReportsIdSet,
	onboardingPolicyID,
	mergedAccountConciergeReportID,
	false,
	);

Then, when calling completeOnboardingReport, set shouldSkipTestDriveModal so PERSONAL_SPEND (non-workspace) also skips the Test Drive modal

            shouldSkipTestDriveModal: (!!onboardingPolicyID && !onboardingAdminsChatReportID) || onboardingPurposeSelected === CONST.ONBOARDING_CHOICES.PERSONAL_SPEND,

App/src/pages/OnboardingWorkspaceOptional/BaseOnboardingWorkspaceOptional.tsx

Line 90 in 75478c5

shouldSkipTestDriveModal: !!onboardingPolicyID && !onboardingAdminsChatReportID,

We could do the same thing on BaseOnboardingWorkspaceInvite.tsx to skip the Test Drive modal when Track users create a workspace

What alternative solutions did you explore? (Optional)

None

[ohrytskov]

Proposal

Please re-state the problem that we are trying to solve in this issue.

After signing up and choosing Track and budget expenses (non-workspace Track users), users see the bottom-up Test Drive modal. For this path, the Test Drive modal should not be shown.

What is the root cause of that problem?

The “skip workspace” finish step (src/pages/OnboardingWorkspaceOptional/BaseOnboardingWorkspaceOptional.tsx) always calls navigateAfterOnboardingWithMicrotaskQueue(...), and src/libs/navigateAfterOnboarding.ts always navigates to ROUTES.TEST_DRIVE_MODAL_ROOT unless the “joined accessible policy” guard (onboardingPolicyID && !onboardingAdminsChatReportID) is true.

For the Track/no-workspace flow (engagementChoice === CONST.ONBOARDING_CHOICES.PERSONAL_SPEND), onboardingPolicyID is not set, so we never hit the guard and we always navigate to the Test Drive modal.

What changes do you think we should make in order to solve the problem?

Keep the “should we show Test Drive?” decision in one place and use the existing shouldSkipTestDriveModal concept instead of hard-coding an onboarding choice inside navigation.

1. Skip Test Drive for this path at completion

   • In src/pages/OnboardingWorkspaceOptional/BaseOnboardingWorkspaceOptional.tsx, compute:
     • shouldSkipTestDriveModal = onboardingPurposeSelected === CONST.ONBOARDING_CHOICES.PERSONAL_SPEND
   • Pass that value into completeOnboardingReport({shouldSkipTestDriveModal: ...}) so testDriveModalDismissed is not set to false for Track/no-workspace users.

2. Gate navigation to Test Drive using the same flag

   • Extend navigateAfterOnboarding(...) and navigateAfterOnboardingWithMicrotaskQueue(...) in src/libs/navigateAfterOnboarding.ts with an optional argument (e.g., shouldSkipTestDriveModal?: boolean).
   • Before calling Navigation.navigate(ROUTES.TEST_DRIVE_MODAL_ROOT.route), add:
     • if (shouldSkipTestDriveModal) { return; }
   • From BaseOnboardingWorkspaceOptional, pass shouldSkipTestDriveModal into navigateAfterOnboardingWithMicrotaskQueue(...) as the new trailing argument.

This keeps behavior unchanged for other onboarding paths (argument omitted → modal behavior unchanged), and avoids baking “PERSONAL_SPEND” logic into the shared navigation helper.

What alternative solutions did you explore? (Optional)

[brunovjk]

We can go with @nyomanjyotisa's proposal. Thank you.

🎀 👀 🎀 C+ reviewed