Merge pull request #49839 from software-mansion-labs/fix/onboarding-d…

…eeplinking-v2 [CP Stag] Fix User not redirected to IOU report when logging in after deeplink
Expensify · Sep 27, 2024 · 2cdd7d5 · 2cdd7d5
2 parents 6aabedb + cb2a182
commit 2cdd7d5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 19 deletions.
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
@@ -2689,28 +2689,31 @@ function openReportFromDeepLink(url: string) {
                             return;
                         }
 
-                        // We need skip deeplinking if the user hasn't completed the guided setup flow.
-                        Welcome.isOnboardingFlowCompleted({
-                            onNotCompleted: () => OnboardingFlow.startOnboardingFlow(),
-                            onCompleted: () => {
-                                const state = navigationRef.getRootState();
-                                const currentFocusedRoute = findFocusedRoute(state);
+                        const handleDeeplinkNavigation = () => {
+                            const state = navigationRef.getRootState();
+                            const currentFocusedRoute = findFocusedRoute(state);
 
-                                if (isOnboardingFlowName(currentFocusedRoute?.name)) {
-                                    Welcome.setOnboardingErrorMessage(Localize.translateLocal('onboarding.purpose.errorBackButton'));
-                                    return;
-                                }
+                            if (isOnboardingFlowName(currentFocusedRoute?.name)) {
+                                Welcome.setOnboardingErrorMessage(Localize.translateLocal('onboarding.purpose.errorBackButton'));
+                                return;
+                            }
 
-                                if (shouldSkipDeepLinkNavigation(route)) {
-                                    return;
-                                }
+                            if (shouldSkipDeepLinkNavigation(route)) {
+                                return;
+                            }
 
-                                if (isAuthenticated) {
-                                    return;
-                                }
+                            if (isAuthenticated) {
+                                return;
+                            }
 
-                                Navigation.navigate(route as Route, CONST.NAVIGATION.ACTION_TYPE.PUSH);
-                            },
+                            Navigation.navigate(route as Route, CONST.NAVIGATION.ACTION_TYPE.PUSH);
+                        };
+
+                        // We need skip deeplinking if the user hasn't completed the guided setup flow.
+                        Welcome.isOnboardingFlowCompleted({
+                            onNotCompleted: OnboardingFlow.startOnboardingFlow,
+                            onCompleted: handleDeeplinkNavigation,
+                            onCanceled: handleDeeplinkNavigation,
                         });
                     });
                 },

diff --git a/src/libs/actions/Welcome/index.ts b/src/libs/actions/Welcome/index.ts
@@ -23,6 +23,7 @@ let onboarding: OnboardingData;
 type HasCompletedOnboardingFlowProps = {
     onCompleted?: () => void;
     onNotCompleted?: () => void;
+    onCanceled?: () => void;
 };
 
 type HasOpenedForTheFirstTimeFromHybridAppProps = {
@@ -50,9 +51,10 @@ function onServerDataReady(): Promise<void> {
 }
 
 let isOnboardingInProgress = false;
-function isOnboardingFlowCompleted({onCompleted, onNotCompleted}: HasCompletedOnboardingFlowProps) {
+function isOnboardingFlowCompleted({onCompleted, onNotCompleted, onCanceled}: HasCompletedOnboardingFlowProps) {
     isOnboardingFlowStatusKnownPromise.then(() => {
         if (Array.isArray(onboarding) || onboarding?.hasCompletedGuidedSetupFlow === undefined) {
+            onCanceled?.();
             return;
         }