Merge pull request #89303 from Expensify/arosiclair-onboarding-transition

Fix onboarding not showing after OD to ND transition

(cherry picked from commit 9eab883)

(cherry-picked to staging by arosiclair)

Author: luacmartins

src/hooks/useOnboardingFlow.ts

@@ -42,9 +42,9 @@ function useOnboardingFlowRouter() {
 
     const [isSingleNewDotEntry, isSingleNewDotEntryMetadata] = useOnyx(ONYXKEYS.HYBRID_APP, {selector: isSingleNewDotEntrySelector});
 
-    useEffect(() => {
-        const isOnboardingCompleted = hasCompletedGuidedSetupFlowSelector(onboardingValues);
+    const isOnboardingCompleted = hasCompletedGuidedSetupFlowSelector(onboardingValues);
 
+    useEffect(() => {
         // This should delay opening the onboarding modal so it does not interfere with the ongoing ReportScreen params changes
         // eslint-disable-next-line @typescript-eslint/no-deprecated
         const handle = InteractionManager.runAfterInteractions(() => {
@@ -65,11 +65,6 @@ function useOnboardingFlowRouter() {
                 return;
             }
 
-            if (currentUrl.endsWith('/r')) {
-                // Don't trigger onboarding if we are in the middle of a redirect to a report
-                return;
-            }
-
             if (CONFIG.IS_HYBRID_APP) {
                 // For single entries, such as using the Travel feature from OldDot, we don't want to show onboarding
                 if (isSingleNewDotEntry) {
@@ -133,6 +128,7 @@ function useOnboardingFlowRouter() {
         hasBeenAddedToNudgeMigration,
         hasNonPersonalPolicy,
         wasInvitedToNewDot,
+        isOnboardingCompleted,
     ]);
 
     return {