Bring back new SignInPage

__mocks__/@ua/react-native-airship.ts

@@ -6,6 +6,13 @@ enum EventType {
     PushReceived = 'com.airship.push_received',
 }
 
+// eslint-disable-next-line no-restricted-syntax
+enum PermissionStatus {
+    Granted = 'granted',
+    Denied = 'denied',
+    NotDetermined = 'not_determined',
+}
+
 // eslint-disable-next-line @typescript-eslint/no-namespace
 namespace iOS {
     /**
@@ -71,4 +78,4 @@ const Airship: Partial<AirshipRoot> = {
 
 export default Airship;
 
-export {EventType, iOS};
+export {EventType, iOS, PermissionStatus};

modules/hybrid-app/android/src/main/java/com/expensify/reactnativehybridapp/ReactNativeHybridApp.kt

@@ -51,4 +51,22 @@ class ReactNativeHybridApp(reactContext: ReactApplicationContext) :
   override fun onURLListenerAdded() {
     Log.d(NAME, "`onURLListenerAdded` should never be called in standalone `New Expensify` app")
   }
+
+  override fun signInToOldDot(
+      autoGeneratedLogin: String,
+      autoGeneratedPassword: String,
+      authToken: String,
+      email: String,
+      policyID: String
+    ) {
+      Log.d(NAME, "`signInToOldDot` should never be called in standalone `New Expensify` app")
+    }
+
+    override fun signOutFromOldDot() {
+      Log.d(NAME, "`signOutFromOldDot` should never be called in standalone `New Expensify` app")
+    }
+
+    override fun clearOldDotAfterSignOut() {
+      Log.d(NAME, "`clearOldDotAfterSignOut` should never be called in standalone `New Expensify` app")
+    }
 }

modules/hybrid-app/ios/ReactNativeHybridApp.mm

@@ -43,6 +43,18 @@ - (void)onURLListenerAdded {
     NSLog(@"[ReactNativeHybridApp] `onURLListenerAdded` should never be called in standalone `New Expensify` app");
 }
 
+- (void)signInToOldDot:(NSString *)autoGeneratedLogin autoGeneratedPassword:(NSString *)autoGeneratedPassword authToken:(NSString *)authToken email:(NSString *)email policyID:(NSString *)policyID {
+    NSLog(@"[ReactNativeHybridApp] `signInToOldDot` should never be called in standalone `New Expensify` app");
+}
+
+- (void)signOutFromOldDot {
+    NSLog(@"[ReactNativeHybridApp] `signOutFromOldDot` should never be called in standalone `New Expensify` app");
+}
+
+- (void)clearOldDotAfterSignOut {
+    NSLog(@"[ReactNativeHybridApp] `clearOldDotAfterSignOut` should never be called in standalone `New Expensify` app");
+}
+
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params
 {

modules/hybrid-app/src/NativeReactNativeHybridApp.ts

@@ -12,6 +12,9 @@ export interface Spec extends TurboModule {
     getHybridAppSettings: () => Promise<string | null>;
     getInitialURL(): Promise<string | null>;
     onURLListenerAdded: () => void;
+    signInToOldDot: (autoGeneratedLogin: string, autoGeneratedPassword: string, authToken: string, email: string, policyID: string) => void;
+    signOutFromOldDot: () => void;
+    clearOldDotAfterSignOut: () => void;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('ReactNativeHybridApp');

modules/hybrid-app/src/index.native.ts

@@ -29,6 +29,15 @@ const HybridAppModule: HybridAppModuleType = {
     onURLListenerAdded() {
         ReactNativeHybridApp.onURLListenerAdded();
     },
+    signInToOldDot({autoGeneratedLogin, autoGeneratedPassword, authToken, email, policyID}) {
+        ReactNativeHybridApp.signInToOldDot(autoGeneratedLogin, autoGeneratedPassword, authToken, email, policyID);
+    },
+    signOutFromOldDot() {
+        ReactNativeHybridApp.signOutFromOldDot();
+    },
+    clearOldDotAfterSignOut() {
+        ReactNativeHybridApp.clearOldDotAfterSignOut();
+    },
 };
 
 export default HybridAppModule;

modules/hybrid-app/src/index.ts

@@ -38,6 +38,18 @@ const HybridAppModule: HybridAppModuleType = {
         // eslint-disable-next-line no-console
         console.warn('HybridAppModule: `onURLListenerAdded` should never be called on web');
     },
+    signInToOldDot() {
+        // eslint-disable-next-line no-console
+        console.warn('HybridAppModule: `signInToOldDot` should never be called on web');
+    },
+    signOutFromOldDot() {
+        // eslint-disable-next-line no-console
+        console.warn('HybridAppModule: `signOutFromOldDot` should never be called on web');
+    },
+    clearOldDotAfterSignOut() {
+        // eslint-disable-next-line no-console
+        console.warn('HybridAppModule: `clearOldDotAfterSignOut` should never be called on web');
+    },
 };
 
 export default HybridAppModule;

modules/hybrid-app/src/types.ts

@@ -8,6 +8,9 @@ type HybridAppModuleType = {
     getHybridAppSettings: () => Promise<string | null>;
     getInitialURL(): Promise<string | null>;
     onURLListenerAdded: () => void;
+    signInToOldDot: (args: {autoGeneratedLogin: string; autoGeneratedPassword: string; authToken: string; email: string; policyID: string}) => void;
+    signOutFromOldDot: () => void;
+    clearOldDotAfterSignOut: () => void;
 };
 
 export default HybridAppModuleType;

src/App.tsx

@@ -41,6 +41,7 @@ import {CurrentReportIDContextProvider} from './hooks/useCurrentReportID';
 import useDefaultDragAndDrop from './hooks/useDefaultDragAndDrop';
 import HybridAppHandler from './HybridAppHandler';
 import OnyxUpdateManager from './libs/actions/OnyxUpdateManager';
+import './libs/HybridApp';
 import {AttachmentModalContextProvider} from './pages/media/AttachmentModalScreen/AttachmentModalContext';
 import './setup/backgroundTask';
 import './setup/hybridApp';
@@ -69,47 +70,57 @@ function App() {
                 <InitialURLContextProvider>
                     <HybridAppHandler />
                     <GestureHandlerRootView style={fill}>
-                        <ComposeProviders
-                            components={[
-                                OnyxListItemProvider,
-                                ThemeProvider,
-                                ThemeStylesProvider,
-                                ThemeIllustrationsProvider,
-                                SafeAreaProvider,
-                                HTMLEngineProvider,
-                                PortalProvider,
-                                SafeArea,
-                                LocaleContextProvider,
-                                PopoverContextProvider,
-                                CurrentReportIDContextProvider,
-                                ScrollOffsetContextProvider,
-                                AttachmentModalContextProvider,
-                                PickerStateProvider,
-                                EnvironmentProvider,
-                                CustomStatusBarAndBackgroundContextProvider,
-                                ActiveElementRoleProvider,
-                                ActionSheetAwareScrollViewProvider,
-                                PlaybackContextProvider,
-                                FullScreenContextProvider,
-                                VolumeContextProvider,
-                                VideoPopoverMenuContextProvider,
-                                KeyboardProvider,
-                                KeyboardStateProvider,
-                                SearchRouterContextProvider,
-                                ProductTrainingContextProvider,
-                                InputBlurContextProvider,
-                                FullScreenBlockingViewContextProvider,
-                                FullScreenLoaderContextProvider,
-                            ]}
+                        {/* Initialize metrics early to ensure the UI renders even when NewDot is hidden.
+                            This is necessary for iOS HybridApp's SignInPage to appear correctly without the bootsplash.
+                            See: https://github.com/Expensify/App/pull/65178#issuecomment-3139026551
+                        */}
+                        <SafeAreaProvider
+                            initialMetrics={{
+                                insets: {top: 0, right: 0, bottom: 0, left: 0},
+                                frame: {x: 0, y: 0, width: 0, height: 0},
+                            }}
                         >
-                            <CustomStatusBarAndBackground />
-                            <ErrorBoundary errorMessage="NewExpensify crash caught by error boundary">
-                                <ColorSchemeWrapper>
-                                    <Expensify />
-                                </ColorSchemeWrapper>
-                            </ErrorBoundary>
-                            <NavigationBar />
-                        </ComposeProviders>
+                            <ComposeProviders
+                                components={[
+                                    OnyxListItemProvider,
+                                    ThemeProvider,
+                                    ThemeStylesProvider,
+                                    ThemeIllustrationsProvider,
+                                    HTMLEngineProvider,
+                                    PortalProvider,
+                                    SafeArea,
+                                    LocaleContextProvider,
+                                    PopoverContextProvider,
+                                    CurrentReportIDContextProvider,
+                                    ScrollOffsetContextProvider,
+                                    AttachmentModalContextProvider,
+                                    PickerStateProvider,
+                                    EnvironmentProvider,
+                                    CustomStatusBarAndBackgroundContextProvider,
+                                    ActiveElementRoleProvider,
+                                    ActionSheetAwareScrollViewProvider,
+                                    PlaybackContextProvider,
+                                    FullScreenContextProvider,
+                                    VolumeContextProvider,
+                                    VideoPopoverMenuContextProvider,
+                                    KeyboardProvider,
+                                    KeyboardStateProvider,
+                                    SearchRouterContextProvider,
+                                    ProductTrainingContextProvider,
+                                    InputBlurContextProvider,
+                                    FullScreenBlockingViewContextProvider,
+                                    FullScreenLoaderContextProvider,
+                                ]}
+                            >
+                                <CustomStatusBarAndBackground />
+                                <ErrorBoundary errorMessage="NewExpensify crash caught by error boundary">
+                                    <ColorSchemeWrapper>
+                                        <Expensify />
+                                    </ColorSchemeWrapper>
+                                </ErrorBoundary>
+                                <NavigationBar />
+                            </ComposeProviders>
+                        </SafeAreaProvider>
                     </GestureHandlerRootView>
                 </InitialURLContextProvider>
             </SplashScreenStateContextProvider>

src/CONFIG.ts

@@ -95,7 +95,18 @@ export default {
     GOOGLE_SIGN_IN: {
         // cspell:disable-next-line
         WEB_CLIENT_ID: '921154746561-gpsoaqgqfuqrfsjdf8l7vohfkfj7b9up.apps.googleusercontent.com',
+        // cspell:disable-next-line
         IOS_CLIENT_ID: '921154746561-s3uqn2oe4m85tufi6mqflbfbuajrm2i3.apps.googleusercontent.com',
+        HYBRID_APP: {
+            // cspell:disable-next-line
+            IOS_CLIENT_ID: '1008697809946-sh04nqq0hea396s1qdqqbj6ia649odb2.apps.googleusercontent.com',
+            WEB_CLIENT_ID: {
+                // cspell:disable-next-line
+                IOS: '1008697809946-5e095eqem3o6ugtpc2rjf7v880tcp28p.apps.googleusercontent.com',
+                // cspell:disable-next-line
+                ANDROID: '240677659774-86pov3adub93cv4b8uj13g7varolmk2l.apps.googleusercontent.com',
+            },
+        },
     },
     GCP_GEOLOCATION_API_KEY: googleGeolocationAPIKey,
     FIREBASE_WEB_CONFIG: {

src/Expensify.tsx

@@ -105,6 +105,7 @@ function Expensify() {
     const [currentOnboardingPurposeSelected] = useOnyx(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, {canBeMissing: true});
     const [currentOnboardingCompanySize] = useOnyx(ONYXKEYS.ONBOARDING_COMPANY_SIZE, {canBeMissing: true});
     const [onboardingInitialPath] = useOnyx(ONYXKEYS.ONBOARDING_LAST_VISITED_PATH, {canBeMissing: true});
+    const [hybridApp] = useOnyx(ONYXKEYS.HYBRID_APP, {canBeMissing: true});
 
     useDebugShortcut();
     usePriorityMode();
@@ -121,10 +122,22 @@ 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;
-    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()) {
             return;

src/HybridAppHandler.tsx

@@ -2,15 +2,22 @@ import HybridAppModule from '@expensify/react-native-hybrid-app';
 import {useContext, useEffect} from 'react';
 import CONFIG from './CONFIG';
 import CONST from './CONST';
-import {signInAfterTransitionFromOldDot} from './libs/actions/Session';
+import useOnyx from './hooks/useOnyx';
+import {parseHybridAppSettings} from './libs/actions/HybridApp';
+import {setupNewDotAfterTransitionFromOldDot} from './libs/actions/Session';
 import Log from './libs/Log';
+import ONYXKEYS from './ONYXKEYS';
 import SplashScreenStateContext from './SplashScreenStateContext';
+import isLoadingOnyxValue from './types/utils/isLoadingOnyxValue';
 
 function HybridAppHandler() {
-    const {setSplashScreenState} = useContext(SplashScreenStateContext);
+    const {splashScreenState, setSplashScreenState} = useContext(SplashScreenStateContext);
+    const [tryNewDot, tryNewDotMetadata] = useOnyx(ONYXKEYS.NVP_TRY_NEW_DOT, {canBeMissing: true});
+
+    const isLoading = isLoadingOnyxValue(tryNewDotMetadata);
 
     useEffect(() => {
-        if (!CONFIG.IS_HYBRID_APP) {
+        if (!CONFIG.IS_HYBRID_APP || isLoading) {
             return;
         }
 
@@ -21,11 +28,14 @@ function HybridAppHandler() {
                 return;
             }
 
-            signInAfterTransitionFromOldDot(hybridAppSettings).then(() => {
+            setupNewDotAfterTransitionFromOldDot(parseHybridAppSettings(hybridAppSettings), tryNewDot).then(() => {
+                if (splashScreenState !== CONST.BOOT_SPLASH_STATE.VISIBLE) {
+                    return;
+                }
                 setSplashScreenState(CONST.BOOT_SPLASH_STATE.READY_TO_BE_HIDDEN);
             });
         });
-    }, [setSplashScreenState]);
+    }, [isLoading, setSplashScreenState, splashScreenState, tryNewDot]);
 
     return null;
 }

src/components/ScreenWrapper/index.tsx

@@ -20,7 +20,7 @@ import NarrowPaneContext from '@libs/Navigation/AppNavigator/Navigators/NarrowPa
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackNavigationProp} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {ReportsSplitNavigatorParamList, RootNavigatorParamList} from '@libs/Navigation/types';
-import closeReactNativeApp from '@userActions/HybridApp';
+import {closeReactNativeApp} from '@userActions/HybridApp';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';

src/components/SignInButtons/GoogleSignIn/index.native.tsx

@@ -1,20 +1,32 @@
 import {GoogleSignin, statusCodes} from '@react-native-google-signin/google-signin';
 import React from 'react';
 import IconButton from '@components/SignInButtons/IconButton';
+import getPlatform from '@libs/getPlatform';
 import Log from '@libs/Log';
-import * as Session from '@userActions/Session';
+import {beginGoogleSignIn} from '@userActions/Session';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import type {GoogleSignInProps} from '.';
 import type GoogleError from './types';
 
+/**
+ * Helper function returning webClientId based on a platform used
+ */
+function getWebClientId() {
+    if (!CONFIG.IS_HYBRID_APP) {
+        return CONFIG.GOOGLE_SIGN_IN.WEB_CLIENT_ID;
+    }
+
+    return getPlatform() === CONST.PLATFORM.ANDROID ? CONFIG.GOOGLE_SIGN_IN.HYBRID_APP.WEB_CLIENT_ID.ANDROID : CONFIG.GOOGLE_SIGN_IN.HYBRID_APP.WEB_CLIENT_ID.IOS;
+}
+
 /**
  * Google Sign In method for iOS and android that returns identityToken.
  */
 function googleSignInRequest() {
     GoogleSignin.configure({
-        webClientId: CONFIG.GOOGLE_SIGN_IN.WEB_CLIENT_ID,
-        iosClientId: CONFIG.GOOGLE_SIGN_IN.IOS_CLIENT_ID,
+        webClientId: getWebClientId(),
+        iosClientId: CONFIG.IS_HYBRID_APP ? CONFIG.GOOGLE_SIGN_IN.HYBRID_APP.IOS_CLIENT_ID : CONFIG.GOOGLE_SIGN_IN.IOS_CLIENT_ID,
         offlineAccess: false,
     });
 
@@ -25,7 +37,7 @@ function googleSignInRequest() {
 
     GoogleSignin.signIn()
         .then((response) => response.idToken)
-        .then((token) => Session.beginGoogleSignIn(token))
+        .then((token) => beginGoogleSignIn(token))
         .catch((error: GoogleError | undefined) => {
             // Handle unexpected error shape
             if (error?.code === undefined) {