simplify blocking logic

software-mansion-labs · Dec 6, 2024 · 84a8445 · 84a8445
1 parent 6f5d0c7
commit 84a8445
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 30 deletions.
diff --git a/src/libs/HybridApp.ts b/src/libs/HybridApp.ts
@@ -68,13 +68,7 @@ function handleChangeInHybridAppSignInFlow(hybridApp: OnyxEntry<HybridApp>, tryN
         return;
     }
 
-    if (
-        hybridApp?.newDotSignInState === CONST.HYBRID_APP_SIGN_IN_STATE.FINISHED &&
-        !hybridApp?.signedInOnOldDot &&
-        tryNewDot !== undefined &&
-        !!credentials?.autoGeneratedLogin &&
-        !!credentials?.autoGeneratedPassword
-    ) {
+    if (hybridApp?.newDotSignInState === CONST.HYBRID_APP_SIGN_IN_STATE.FINISHED && tryNewDot !== undefined && !!credentials?.autoGeneratedLogin && !!credentials?.autoGeneratedPassword) {
         Log.info(`[HybridApp] Performing sign-in${shouldUseOldApp(tryNewDot) ? '' : ' (in background)'} on OldDot side`);
         NativeModules.HybridAppModule.signInToOldDot(
             credentials.autoGeneratedLogin,
@@ -84,16 +78,14 @@ function handleChangeInHybridAppSignInFlow(hybridApp: OnyxEntry<HybridApp>, tryN
             getCurrentUserEmail() ?? '',
             activePolicyID ?? '',
         );
-        HybridAppActions.setSignedInOnOldDot(true);
-
-        if (shouldUseOldApp(tryNewDot)) {
-            HybridAppActions.setUseNewDotSignInPage(false).then(() => {
+        HybridAppActions.setUseNewDotSignInPage(false).then(() => {
+            if (shouldUseOldApp(tryNewDot)) {
                 NativeModules.HybridAppModule.closeReactNativeApp(false, false);
-            });
-        } else {
-            Log.info('[HybridApp] The user should see NewDot. There is no need to block the user on the `SignInPage` until the sign-in process is completed on the OldDot side.');
-            HybridAppActions.setReadyToShowAuthScreens(true);
-        }
+            } else {
+                Log.info('[HybridApp] The user should see NewDot. There is no need to block the user on the `SignInPage` until the sign-in process is completed on the OldDot side.');
+                HybridAppActions.setReadyToShowAuthScreens(true);
+            }
+        });
     }
 
     currentHybridApp = hybridApp;

diff --git a/src/libs/actions/HybridApp/index.ts b/src/libs/actions/HybridApp/index.ts
@@ -30,18 +30,13 @@ function setUseNewDotSignInPage(useNewDotSignInPage: boolean) {
     return Onyx.merge(ONYXKEYS.HYBRID_APP, {useNewDotSignInPage});
 }
 
-function setSignedInOnOldDot(signedInOnOldDot: boolean) {
-    Onyx.merge(ONYXKEYS.HYBRID_APP, {signedInOnOldDot});
-}
-
 /*
  * Starts HybridApp sign-in flow from the beginning.
  */
 function resetSignInFlow() {
     Onyx.merge(ONYXKEYS.HYBRID_APP, {
         readyToShowAuthScreens: false,
         newDotSignInState: CONST.HYBRID_APP_SIGN_IN_STATE.NOT_STARTED,
-        signedInOnOldDot: false,
     });
 }
 
@@ -54,7 +49,6 @@ function prepareHybridAppAfterTransitionToNewDot(hybridApp: HybridApp) {
             ...hybridApp,
             readyToShowAuthScreens: false,
             newDotSignInState: CONST.HYBRID_APP_SIGN_IN_STATE.NOT_STARTED,
-            signedInOnOldDot: false,
         });
     }
 
@@ -65,4 +59,4 @@ function prepareHybridAppAfterTransitionToNewDot(hybridApp: HybridApp) {
     });
 }
 
-export {parseHybridAppSettings, setReadyToShowAuthScreens, setNewDotSignInState, resetSignInFlow, prepareHybridAppAfterTransitionToNewDot, setUseNewDotSignInPage, setSignedInOnOldDot};
+export {parseHybridAppSettings, setReadyToShowAuthScreens, setNewDotSignInState, resetSignInFlow, prepareHybridAppAfterTransitionToNewDot, setUseNewDotSignInPage};
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
@@ -239,10 +239,8 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
                     ...(NativeModules.HybridAppModule
                         ? {
                               action: () => {
-                                  HybridAppActions.setUseNewDotSignInPage(false).then(() => {
-                                      NativeModules.HybridAppModule.closeReactNativeApp(false, true);
-                                      setInitialURL(undefined);
-                                  });
+                                  NativeModules.HybridAppModule.closeReactNativeApp(false, true);
+                                  setInitialURL(undefined);
                               },
                           }
                         : {

diff --git a/src/types/onyx/HybridApp.ts b/src/types/onyx/HybridApp.ts
@@ -20,9 +20,6 @@ type HybridApp = {
 
     /** Describes current stage of NewDot sign-in */
     newDotSignInState?: ValueOf<typeof CONST.HYBRID_APP_SIGN_IN_STATE>;
-
-    /** Tells if OldDot sign-in was performed */
-    signedInOnOldDot?: boolean;
 };
 
 export default HybridApp;