Tighten idempotency check to focused route only

Check state.routes[state.index] instead of .some() so the guard only
ALLOWs when OnboardingModalNavigator is actually focused, not merely
present in the stack. Adds a test for the unfocused edge case.

Made-with: Cursor

Author: mountiny

src/libs/Navigation/guards/OnboardingGuard.ts

@@ -198,11 +198,11 @@ const OnboardingGuard: NavigationGuard = {
             return {type: 'ALLOW'};
         }
 
-        // If the OnboardingModalNavigator is already in the navigation state, the user is already
+        // If the OnboardingModalNavigator is the currently focused route, the user is already
         // on the onboarding flow. Redirecting again would produce a redundant state reset that
         // triggers further actions, creating an infinite navigation loop (APP-7FR).
-        const isAlreadyOnOnboarding = state.routes.some((route) => route.name === NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR);
-        if (isAlreadyOnOnboarding) {
+        const isOnboardingFocused = state.routes[state.index]?.name === NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR;
+        if (isOnboardingFocused) {
             return {type: 'ALLOW'};
         }
 

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

@@ -449,6 +449,37 @@ describe('OnboardingGuard', () => {
             expect(result.route).toContain('onboarding');
         });
 
+        it('should still redirect when onboarding is in routes but not focused', async () => {
+            // Given a user who needs onboarding, and a state where OnboardingModalNavigator
+            // exists in routes but HOME is focused (index: 0)
+            const stateWithOnboardingNotFocused: NavigationState = {
+                key: 'root',
+                index: 0,
+                routeNames: [SCREENS.HOME, NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR],
+                routes: [
+                    {key: 'home', name: SCREENS.HOME},
+                    {key: 'onboarding-modal', name: NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR},
+                ],
+                stale: false,
+                type: 'stack',
+            };
+
+            await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {
+                hasCompletedGuidedSetupFlow: false,
+            });
+            await Onyx.merge(ONYXKEYS.ACCOUNT, {
+                isFromPublicDomain: true,
+            });
+            await waitForBatchedUpdates();
+
+            // When the guard evaluates while onboarding is NOT focused
+            const result = OnboardingGuard.evaluate(stateWithOnboardingNotFocused, mockAction, authenticatedContext) as {type: 'REDIRECT'; route: string};
+
+            // Then the guard should still redirect because the user isn't actively on onboarding
+            expect(result.type).toBe('REDIRECT');
+            expect(result.route).toContain('onboarding');
+        });
+
         it('should still BLOCK RESET to non-onboarding even when on onboarding', async () => {
             // Given a user on onboarding who has not completed it
             await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {