Fix deeplinks don't work when signing in with a new account

Expensify · Sep 21, 2024 · fe4d0ac · fe4d0ac
1 parent 9160fa5
commit fe4d0ac
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
@@ -2673,13 +2673,7 @@ function openReportFromDeepLink(url: string) {
         Session.waitForUserSignIn().then(() => {
             const connection = Onyx.connect({
                 key: ONYXKEYS.NVP_ONBOARDING,
-                callback: (onboarding) => {
-                    if (onboarding) {
-                        // Once the onboarding data is available, we want to disconnect the connection
-                        // so it won't trigger the deeplink again every time the data is changed, for example, when relogin.
-                        Onyx.disconnect(connection);
-                    }
-
+                callback: () => {
                     Navigation.waitForProtectedRoutes().then(() => {
                         if (route && Session.isAnonymousUser() && !Session.canAnonymousUserAccessRoute(route)) {
                             Session.signOutAndRedirectToSignIn(true);
@@ -2696,7 +2690,15 @@ function openReportFromDeepLink(url: string) {
                         // We need skip deeplinking if the user hasn't completed the guided setup flow.
                         Welcome.isOnboardingFlowCompleted({
                             onNotCompleted: () => OnboardingFlow.startOnboardingFlow(),
-                            onCompleted: () => {
+                            onCompleted: (isOldDotAccount) => {
+                                // We want to disconnect the connection so it won't trigger the deeplink again
+                                // every time the data is changed, for example, when relogin.
+                                Onyx.disconnect(connection);
+
+                                if (isOldDotAccount) {
+                                    return;
+                                }
+
                                 const state = navigationRef.getRootState();
                                 const currentFocusedRoute = findFocusedRoute(state);
 

diff --git a/src/libs/actions/Welcome/index.ts b/src/libs/actions/Welcome/index.ts
@@ -21,7 +21,7 @@ let tryNewDotData: TryNewDot | undefined;
 let onboarding: OnboardingData;
 
 type HasCompletedOnboardingFlowProps = {
-    onCompleted?: () => void;
+    onCompleted?: (isOldDotAccount: boolean) => void;
     onNotCompleted?: () => void;
 };
 
@@ -52,14 +52,23 @@ function onServerDataReady(): Promise<void> {
 let isOnboardingInProgress = false;
 function isOnboardingFlowCompleted({onCompleted, onNotCompleted}: HasCompletedOnboardingFlowProps) {
     isOnboardingFlowStatusKnownPromise.then(() => {
-        if (Array.isArray(onboarding) || onboarding?.hasCompletedGuidedSetupFlow === undefined) {
+        // onboarding is an array for old accounts and accounts created from olddot
+        if (Array.isArray(onboarding)) {
+            onCompleted?.(true);
+            return;
+        }
+
+        if (onboarding?.hasCompletedGuidedSetupFlow === undefined) {
             return;
         }
 
         if (onboarding?.hasCompletedGuidedSetupFlow) {
             isOnboardingInProgress = false;
-            onCompleted?.();
-        } else if (!isOnboardingInProgress) {
+            onCompleted?.(false);
+            return;
+        }
+
+        if (!isOnboardingInProgress) {
             isOnboardingInProgress = true;
             onNotCompleted?.();
         }