improve splash screen hiding logic

Author: war-in

src/Expensify.tsx

@@ -117,10 +117,21 @@ function Expensify() {
     const isAuthenticated = useIsAuthenticated();
     const autoAuthState = useMemo(() => session?.autoAuthState ?? '', [session]);
 
-    const shouldInit = isNavigationReady && hasAttemptedToOpenPublicRoom && !!preferredLocale;
+    const isSplashReadyToBeHidden = splashScreenState === CONST.BOOT_SPLASH_STATE.READY_TO_BE_HIDDEN;
     const isSplashVisible = splashScreenState === CONST.BOOT_SPLASH_STATE.VISIBLE;
-    const isHybridAppReady = splashScreenState === CONST.BOOT_SPLASH_STATE.READY_TO_BE_HIDDEN && (isAuthenticated || !!hybridApp?.useNewDotSignInPage);
-    const shouldHideSplash = shouldInit && (CONFIG.IS_HYBRID_APP ? isHybridAppReady : isSplashVisible);
+
+    const shouldInit = isNavigationReady && hasAttemptedToOpenPublicRoom && !!preferredLocale;
+    const shouldHideSplash = (isSplashReadyToBeHidden || isSplashVisible) && shouldInit && !hybridApp?.loggedOutFromOldDot;
+
+    // This effect is closing OldDot sign out modal based on splash screen state
+    useEffect(() => {
+        if (!isSplashReadyToBeHidden || !shouldInit || !hybridApp?.loggedOutFromOldDot) {
+            return;
+        }
+
+        setSplashScreenState(CONST.BOOT_SPLASH_STATE.HIDDEN);
+        HybridAppModule.clearOldDotAfterSignOut();
+    }, [hybridApp?.loggedOutFromOldDot, isSplashReadyToBeHidden, setSplashScreenState, shouldInit, splashScreenState]);
 
     const initializeClient = () => {
         if (!Visibility.isVisible()) {

src/HybridAppHandler.tsx

@@ -29,13 +29,11 @@ function HybridAppHandler() {
             }
 
             const parsedHybridAppSettings = parseHybridAppSettings(hybridAppSettings);
-
             setupNewDotAfterTransitionFromOldDot(parsedHybridAppSettings, tryNewDot).then(() => {
-                if (parsedHybridAppSettings.hybridApp?.loggedOutFromOldDot) {
-                    setSplashScreenState(CONST.BOOT_SPLASH_STATE.HIDDEN);
-                } else if (splashScreenState === CONST.BOOT_SPLASH_STATE.VISIBLE) {
-                    setSplashScreenState(CONST.BOOT_SPLASH_STATE.READY_TO_BE_HIDDEN);
+                if (splashScreenState !== CONST.BOOT_SPLASH_STATE.VISIBLE) {
+                    return;
                 }
+                setSplashScreenState(CONST.BOOT_SPLASH_STATE.READY_TO_BE_HIDDEN);
             });
         });
     }, [isLoading, setSplashScreenState, splashScreenState, tryNewDot]);

src/pages/signin/SignInPage.tsx

@@ -1,4 +1,3 @@
-import HybridAppModule from '@expensify/react-native-hybrid-app';
 import {Str} from 'expensify-common';
 import React, {forwardRef, useEffect, useImperativeHandle, useRef, useState} from 'react';
 import type {ForwardedRef} from 'react';
@@ -22,7 +21,6 @@ import Performance from '@libs/Performance';
 import Visibility from '@libs/Visibility';
 import {setLocale} from '@userActions/App';
 import {clearSignInData} from '@userActions/Session';
-import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -185,7 +183,6 @@ function SignInPage({shouldEnableMaxHeight = true}: SignInPageInnerProps, ref: F
     // We need to show "Another login page is opened" message if the page isn't active and visible
     // eslint-disable-next-line rulesdir/no-negated-variables
     const shouldShowAnotherLoginPageOpenedMessage = Visibility.isVisible() && !isClientTheLeader;
-    const [hybridApp] = useOnyx(ONYXKEYS.HYBRID_APP, {canBeMissing: true});
 
     useEffect(() => Performance.measureTTI(), []);
 
@@ -306,15 +303,6 @@ function SignInPage({shouldEnableMaxHeight = true}: SignInPageInnerProps, ref: F
         navigateBack,
     }));
 
-    // This effect is closing OldDot sign out modal when SignInPage appears
-    // It can't be performed in any other place because there would be an empty screen for a while
-    useEffect(() => {
-        if (!CONFIG.IS_HYBRID_APP || !hybridApp?.loggedOutFromOldDot) {
-            return;
-        }
-        HybridAppModule.clearOldDotAfterSignOut();
-    }, [hybridApp?.loggedOutFromOldDot]);
-
     return (
         // Bottom SafeAreaView is removed so that login screen svg displays correctly on mobile.
         // The SVG should flow under the Home Indicator on iOS.