Merge pull request #89071 from software-mansion-labs/kuba_nowakowski/bugfix/tab_navi_blockers

fix onboarding modal from OD and bac button flow

(cherry picked from commit 7c1f47e)

(cherry-picked to staging by luacmartins)

Author: luacmartins

src/hooks/useOnboardingFlow.ts

@@ -82,11 +82,11 @@ function useOnboardingFlowRouter() {
                 }
             }
 
-            // Skip onboarding for migrated users or users who were invited/have workspace policies
             const isMigratedUser = hasBeenAddedToNudgeMigration ?? false;
             // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
             const isInvitedOrGroupMember = (!CONFIG.IS_HYBRID_APP && (hasNonPersonalPolicy || wasInvitedToNewDot)) ?? false;
-            if (isMigratedUser || isInvitedOrGroupMember) {
+            // OD signup sets inviteType + creates a workspace, so invited/group members can still need NewDot onboarding.
+            if (isMigratedUser || (isInvitedOrGroupMember && isOnboardingCompleted)) {
                 return;
             }
 

src/libs/Navigation/AppNavigator/createRootStackNavigator/useCustomRootStackNavigatorState/index.ios.ts

@@ -6,6 +6,13 @@ import type {NavigationRoute, SplitNavigatorName} from '@libs/Navigation/types';
 import NAVIGATORS from '@src/NAVIGATORS';
 import ensureTabNavigatorRoutes from './ensureTabNavigatorRoutes';
 
+// TODO: deploy-blocker hotfix for #89006 — slicing tab state breaks rehydration on iOS swipe-back.
+// Skipping the slice until we exceed the threshold preserves the underlying TAB_NAVIGATOR's nested
+// state so the gesture restores it correctly. This is a temporary fix; the proper solution is to
+// rebuild the TAB_NAVIGATOR state from `preservedNavigatorStates` on rehydration so the magic
+// number can go away. We'll address this shortly — tracked in https://github.com/Expensify/App/issues/89179.
+const SKIP_SLICE_TAB_THRESHOLD = 4;
+
 // Swiping back on iOS does not work properly when the preloaded route has gestureEnabled set to false.
 // Therefore, on screens where swiping should work, preloadedRoutes will be an empty array during rendering to ensure swiping works properly.
 // Once this bug is fixed, this file should be deleted and index.android.ts renamed to index.native.ts.
@@ -35,12 +42,19 @@ function getShouldHidePreloadedRoutes(route?: NavigationRoute) {
 // This is an optimization to keep mounted only last few screens in the stack.
 // On native platforms, we store the last two routes to handle swiping back.
 export default function useCustomRootStackNavigatorState({state}: CustomStateHookProps) {
-    const lastSplitIndex = state.routes.findLastIndex((route) => isFullScreenName(route.name));
-    const indexToSlice = Math.max(0, lastSplitIndex - 1);
-    const slicedRoutes = state.routes.slice(indexToSlice, state.routes.length);
-    const routesToRender = ensureTabNavigatorRoutes(slicedRoutes, indexToSlice, state.routes);
+    const tabCount = state.routes.reduce((acc, route) => (route.name === NAVIGATORS.TAB_NAVIGATOR ? acc + 1 : acc), 0);
+
+    let stateToRender: typeof state;
+    if (tabCount <= SKIP_SLICE_TAB_THRESHOLD) {
+        stateToRender = state;
+    } else {
+        const lastSplitIndex = state.routes.findLastIndex((route) => isFullScreenName(route.name));
+        const indexToSlice = Math.max(0, lastSplitIndex - 1);
+        const slicedRoutes = state.routes.slice(indexToSlice, state.routes.length);
+        const routesToRender = ensureTabNavigatorRoutes(slicedRoutes, indexToSlice, state.routes);
+        stateToRender = {...state, routes: routesToRender, index: routesToRender.length - 1};
+    }
 
-    const stateToRender = {...state, routes: routesToRender, index: routesToRender.length - 1};
     if (getShouldHidePreloadedRoutes(stateToRender.routes.at(-1))) {
         return {...stateToRender, preloadedRoutes: []};
     }

src/libs/Navigation/Navigation.ts

@@ -483,6 +483,14 @@ function goUp(backToRoute: Route, options?: GoBackOptions) {
         return;
     }
 
+    // For TAB_NAVIGATOR targets, use POP_TO so the underlying tab's nested state is restored from the
+    // payload — plain pop can leave the active tab pointing at Home instead of the intended target.
+    // Issue: https://github.com/Expensify/App/issues/89006
+    if ((minimalAction.payload as {name?: string} | undefined)?.name === NAVIGATORS.TAB_NAVIGATOR) {
+        navigationRef.current.dispatch({...minimalAction, type: CONST.NAVIGATION.ACTION_TYPE.POP_TO, target: targetState.key});
+        return;
+    }
+
     navigationRef.current.dispatch({...StackActions.pop(distanceToPop), target: targetState.key});
 }
 

src/libs/Navigation/guards/OnboardingGuard.ts

@@ -184,15 +184,7 @@ const OnboardingGuard: NavigationGuard = {
         const isNavigatingWithReplace = isNavigatingToOnboardingFlowWithReplaceAction(action);
 
         const shouldSkipOnboarding =
-            skipOnboardingConfig ||
-            isLoading ||
-            isTransitioning ||
-            isOnboardingCompleted ||
-            isMigratedUser ||
-            isSingleEntry ||
-            needsExplanationModal ||
-            isInvitedOrGroupMember ||
-            isNavigatingWithReplace;
+            skipOnboardingConfig || isLoading || isTransitioning || isOnboardingCompleted || isMigratedUser || isSingleEntry || needsExplanationModal || isNavigatingWithReplace;
 
         if (shouldSkipOnboarding) {
             return {type: 'ALLOW'};

src/libs/Navigation/helpers/linkTo/index.ts

@@ -203,7 +203,9 @@ export default function linkTo(navigation: NavigationContainerRef<RootNavigatorP
     }
 
     // If we deep link to a RHP page, we want to make sure we have the correct full screen route under the overlay.
-    if (shouldCheckFullScreenRouteMatching(action)) {
+    // Skip when current top is already RHP — the underlying tab is already in place, and the extra dispatch
+    // would corrupt the navigation state. Issue: https://github.com/Expensify/App/issues/89006
+    if (shouldCheckFullScreenRouteMatching(action) && currentState.routes[currentState.index]?.name !== NAVIGATORS.RIGHT_MODAL_NAVIGATOR) {
         const newFocusedRoute = findFocusedRoute(stateFromPath);
         if (newFocusedRoute) {
             // getMatchingFullScreenRoute returns a TAB_NAVIGATOR wrapper; unwrap it to get the

tests/unit/Navigation/guards/OnboardingGuard.test.ts

@@ -362,6 +362,28 @@ describe('OnboardingGuard', () => {
             expect(result.type).toBe('REDIRECT');
             expect(result.route).toContain('onboarding');
         });
+
+        it('should redirect invited or group members when they have not completed onboarding', async () => {
+            // Given an invited user from OD signup who has not completed the NewDot guided setup
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+            });
+            await Onyx.merge(ONYXKEYS.NVP_INTRO_SELECTED, {
+                choice: CONST.INTRO_CHOICES.SUBMIT,
+            });
+            await Onyx.merge(ONYXKEYS.HAS_NON_PERSONAL_POLICY, true);
+            await Onyx.merge(ONYXKEYS.ACCOUNT, {
+                isFromPublicDomain: true,
+            });
+            await waitForBatchedUpdates();
+
+            // When the guard evaluates on a non-onboarding screen
+            const result = OnboardingGuard.evaluate(mockState, mockAction, authenticatedContext) as {type: 'REDIRECT'; route: string};
+
+            // Then redirect to onboarding
+            expect(result.type).toBe('REDIRECT');
+            expect(result.route).toContain('onboarding');
+        });
     });
 
     describe('infinite loop prevention (APP-7FR)', () => {