fix: honor /concierge deep link through all onboarding exit paths

Author: x-dev90

src/hooks/useAutoCreateSubmitWorkspace.ts

@@ -122,7 +122,9 @@ function useAutoCreateSubmitWorkspace() {
                 policyIDForNavigation = existingSubmitPolicyID;
             }
 
-            navigateToSubmitWorkspaceAfterOnboardingWithMicrotaskQueue(policyIDForNavigation, shouldUseNarrowLayout);
+            // Pass conciergeReportID so the Submit workspace path can honor a pending
+            // /concierge deep-link intent the same way navigateAfterOnboarding does.
+            navigateToSubmitWorkspaceAfterOnboardingWithMicrotaskQueue(policyIDForNavigation, shouldUseNarrowLayout, conciergeReportID);
         },
         [
             currentUserEmail,
@@ -144,6 +146,7 @@ function useAutoCreateSubmitWorkspace() {
             hasActiveAdminPolicies,
             shouldUseNarrowLayout,
             conciergeChat,
+            conciergeReportID,
         ],
     );
 

src/hooks/useCompleteOnboarding.ts

@@ -129,6 +129,8 @@ function useCompleteOnboarding() {
                 waitForUpcomingTransition: true,
             });
 
+            // Pass rhpVariant directly — navigateAfterOnboardingWithMicrotaskQueue expects
+            // variantOverride as a plain OnboardingRHPVariant value, not a wrapper object.
             navigateAfterOnboardingWithMicrotaskQueue(
                 isSmallScreenWidth,
                 isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS),
@@ -137,9 +139,7 @@ function useCompleteOnboarding() {
                 policyID,
                 adminsChatReportID,
                 (session?.email ?? '').includes('+'),
-                {
-                    variantOverride: rhpVariant,
-                },
+                rhpVariant,
             );
         } catch (error) {
             Log.warn('[useCompleteOnboarding] Error completing onboarding', {error});

src/libs/navigateAfterOnboarding.ts

@@ -74,6 +74,13 @@ function navigateAfterOnboarding(
 ) {
     setDisableDismissOnEscape(false);
 
+    // Honor a pending /concierge deep-link intent before any other navigation decision.
+    // The user explicitly opened /concierge before signing up, so Concierge takes priority.
+    if (consumePendingConciergeDeepLink()) {
+        Navigation.navigate(conciergeReportID ? ROUTES.REPORT_WITH_ID.getRoute(conciergeReportID) : (ROUTES.CONCIERGE as Route));
+        return;
+    }
+
     // On mobile (small screen), Track workspace admins with the trackExpensesWithConcierge variant
     // should navigate directly to the Concierge DM (which contains onboarding tasks).
     // This check is outside shouldOpenRHPVariant because that function returns false on native
@@ -100,8 +107,6 @@ function navigateAfterOnboarding(
     );
     if (reportID) {
         Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
-    } else if (consumePendingConciergeDeepLink()) {
-        Navigation.navigate(conciergeReportID ? ROUTES.REPORT_WITH_ID.getRoute(conciergeReportID) : (ROUTES.CONCIERGE as Route));
     } else {
         // Navigate to home to trigger guard evaluation
         Navigation.navigate(ROUTES.HOME);
@@ -137,10 +142,16 @@ function navigateAfterOnboardingWithMicrotaskQueue(
  * After creating or joining a Submit workspace during onboarding,
  * navigate to Workspace > Categories with the side panel open so
  * the #admins room is visible in Concierge Anywhere.
+ * If the user arrived via a Concierge deep link, navigate to Concierge instead.
  */
-function navigateToSubmitWorkspaceAfterOnboarding(policyID?: string, shouldUseNarrowLayout = false) {
+function navigateToSubmitWorkspaceAfterOnboarding(policyID?: string, shouldUseNarrowLayout = false, conciergeReportID?: string) {
     setDisableDismissOnEscape(false);
 
+    if (consumePendingConciergeDeepLink()) {
+        Navigation.navigate(conciergeReportID ? ROUTES.REPORT_WITH_ID.getRoute(conciergeReportID) : (ROUTES.CONCIERGE as Route));
+        return;
+    }
+
     if (!policyID) {
         Navigation.navigate(ROUTES.HOME);
         return;
@@ -155,10 +166,10 @@ function navigateToSubmitWorkspaceAfterOnboarding(policyID?: string, shouldUseNa
     SidePanelActions.openSidePanel(!shouldUseNarrowLayout);
 }
 
-function navigateToSubmitWorkspaceAfterOnboardingWithMicrotaskQueue(policyID?: string, shouldUseNarrowLayout = false) {
+function navigateToSubmitWorkspaceAfterOnboardingWithMicrotaskQueue(policyID?: string, shouldUseNarrowLayout = false, conciergeReportID?: string) {
     Navigation.dismissModal();
     Navigation.setNavigationActionToMicrotaskQueue(() => {
-        navigateToSubmitWorkspaceAfterOnboarding(policyID, shouldUseNarrowLayout);
+        navigateToSubmitWorkspaceAfterOnboarding(policyID, shouldUseNarrowLayout, conciergeReportID);
     });
 }