[CP-stag] Revert "Bring back new sign-in page"

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

@@ -6,13 +6,6 @@ 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 {
     /**
@@ -78,4 +71,4 @@ const Airship: Partial<AirshipRoot> = {
 
 export default Airship;
 
-export {EventType, iOS, PermissionStatus};
+export {EventType, iOS};

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

@@ -36,22 +36,4 @@ class ReactNativeHybridApp(reactContext: ReactApplicationContext) :
   override fun sendAuthToken(authToken: String?) {
     Log.d(NAME, "`sendAuthToken` 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

@@ -27,18 +27,6 @@ - (void)sendAuthToken:(NSString *)authToken {
     NSLog(@"[ReactNativeHybridApp] `sendAuthToken` 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

@@ -9,9 +9,6 @@ export interface Spec extends TurboModule {
     completeOnboarding: (status: boolean) => void;
     switchAccount: (newDotCurrentAccountEmail: string, authToken: string, policyID: string, accountID: string) => void;
     sendAuthToken: (authToken: string) => 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

@@ -20,15 +20,6 @@ const HybridAppModule: HybridAppModuleType = {
     sendAuthToken({authToken}) {
         ReactNativeHybridApp.sendAuthToken(authToken);
     },
-    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

@@ -24,18 +24,6 @@ const HybridAppModule: HybridAppModuleType = {
         // eslint-disable-next-line no-console
         console.warn('HybridAppModule: `sendAuthToken` 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

@@ -5,9 +5,6 @@ type HybridAppModuleType = {
     completeOnboarding: (args: {status: boolean}) => void;
     switchAccount: (args: {newDotCurrentAccountEmail: string; authToken: string; policyID: string; accountID: string}) => void;
     sendAuthToken: (args: {authToken: string}) => 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,7 +41,6 @@ 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 type {Route} from './ROUTES';
 import './setup/backgroundTask';
@@ -82,53 +81,47 @@ function App({url, hybridAppSettings}: AppProps) {
                 <InitialURLContextProvider url={url}>
                     <HybridAppHandler hybridAppSettings={hybridAppSettings} />
                     <GestureHandlerRootView style={fill}>
-                        <SafeAreaProvider
-                            initialMetrics={{
-                                insets: {top: 0, right: 0, bottom: 0, left: 0},
-                                frame: {x: 0, y: 0, width: 0, height: 0},
-                            }}
+                        <ComposeProviders
+                            components={[
+                                OnyxProvider,
+                                ThemeProvider,
+                                ThemeStylesProvider,
+                                ThemeIllustrationsProvider,
+                                SafeAreaProvider,
+                                PortalProvider,
+                                SafeArea,
+                                LocaleContextProvider,
+                                HTMLEngineProvider,
+                                PopoverContextProvider,
+                                CurrentReportIDContextProvider,
+                                ScrollOffsetContextProvider,
+                                AttachmentModalContextProvider,
+                                PickerStateProvider,
+                                EnvironmentProvider,
+                                CustomStatusBarAndBackgroundContextProvider,
+                                ActiveElementRoleProvider,
+                                ActionSheetAwareScrollViewProvider,
+                                PlaybackContextProvider,
+                                FullScreenContextProvider,
+                                VolumeContextProvider,
+                                VideoPopoverMenuContextProvider,
+                                KeyboardProvider,
+                                KeyboardStateProvider,
+                                SearchRouterContextProvider,
+                                ProductTrainingContextProvider,
+                                InputBlurContextProvider,
+                                FullScreenBlockingViewContextProvider,
+                                FullScreenLoaderContextProvider,
+                            ]}
                         >
-                            <ComposeProviders
-                                components={[
-                                    OnyxProvider,
-                                    ThemeProvider,
-                                    ThemeStylesProvider,
-                                    ThemeIllustrationsProvider,
-                                    PortalProvider,
-                                    SafeArea,
-                                    LocaleContextProvider,
-                                    HTMLEngineProvider,
-                                    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>
+                            <CustomStatusBarAndBackground />
+                            <ErrorBoundary errorMessage="NewExpensify crash caught by error boundary">
+                                <ColorSchemeWrapper>
+                                    <Expensify />
+                                </ColorSchemeWrapper>
+                            </ErrorBoundary>
+                            <NavigationBar />
+                        </ComposeProviders>
                     </GestureHandlerRootView>
                 </InitialURLContextProvider>
             </SplashScreenStateContextProvider>

src/CONFIG.ts

@@ -95,12 +95,7 @@ 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',
-        // cspell:disable-next-line
-        HYBRID_APP_WEB_CLIENT_ID: '1008697809946-5e095eqem3o6ugtpc2rjf7v880tcp28p.apps.googleusercontent.com',
-        // cspell:disable-next-line
-        HYBRID_APP_IOS_CLIENT_ID: '1008697809946-sh04nqq0hea396s1qdqqbj6ia649odb2.apps.googleusercontent.com',
     },
     GCP_GEOLOCATION_API_KEY: googleGeolocationAPIKey,
     FIREBASE_WEB_CONFIG: {

src/CONST/index.ts

@@ -6723,12 +6723,6 @@ const CONST = {
         HIDDEN: `hidden`,
     },
 
-    HYBRID_APP_SIGN_IN_STATE: {
-        NOT_STARTED: 'notStarted',
-        STARTED: 'started',
-        FINISHED: 'finished',
-    },
-
     CSV_IMPORT_COLUMNS: {
         EMAIL: 'email',
         NAME: 'name',

src/Expensify.tsx

@@ -99,7 +99,6 @@ function Expensify() {
     const [isSidebarLoaded] = useOnyx(ONYXKEYS.IS_SIDEBAR_LOADED, {canBeMissing: true});
     const [screenShareRequest] = useOnyx(ONYXKEYS.SCREEN_SHARE_REQUEST, {canBeMissing: true});
     const [lastVisitedPath] = useOnyx(ONYXKEYS.LAST_VISITED_PATH, {canBeMissing: true});
-    const [hybridApp] = useOnyx(ONYXKEYS.HYBRID_APP, {canBeMissing: true});
 
     useDebugShortcut();
 
@@ -115,12 +114,10 @@ function Expensify() {
     const isAuthenticated = useIsAuthenticated();
     const autoAuthState = useMemo(() => session?.autoAuthState ?? '', [session]);
 
-    const shouldInit = isNavigationReady && hasAttemptedToOpenPublicRoom && !!preferredLocale && (CONFIG.IS_HYBRID_APP ? !hybridApp?.loggedOutFromOldDot : true);
-    const shouldHideSplash =
-        shouldInit &&
-        (CONFIG.IS_HYBRID_APP
-            ? splashScreenState === CONST.BOOT_SPLASH_STATE.READY_TO_BE_HIDDEN && (isAuthenticated || !!hybridApp?.useNewDotSignInPage)
-            : splashScreenState === CONST.BOOT_SPLASH_STATE.VISIBLE);
+    const shouldInit = isNavigationReady && hasAttemptedToOpenPublicRoom && !!preferredLocale;
+    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 initializeClient = () => {
         if (!Visibility.isVisible()) {

src/HybridAppHandler.tsx

@@ -1,32 +1,20 @@
 import {useContext, useState} from 'react';
-import {useOnyx} from 'react-native-onyx';
 import type {AppProps} from './App';
 import CONFIG from './CONFIG';
 import CONST from './CONST';
-import {parseHybridAppSettings} from './libs/actions/HybridApp';
-import {setupNewDotAfterTransitionFromOldDot} from './libs/actions/Session';
-import ONYXKEYS from './ONYXKEYS';
+import {signInAfterTransitionFromOldDot} from './libs/actions/Session';
 import SplashScreenStateContext from './SplashScreenStateContext';
-import isLoadingOnyxValue from './types/utils/isLoadingOnyxValue';
 
 function HybridAppHandler({hybridAppSettings}: AppProps) {
     const [signInHandled, setSignInHandled] = useState(false);
-    const {splashScreenState, setSplashScreenState} = useContext(SplashScreenStateContext);
-    const [tryNewDot, tryNewDotMetadata] = useOnyx(ONYXKEYS.NVP_TRY_NEW_DOT, {canBeMissing: true});
+    const {setSplashScreenState} = useContext(SplashScreenStateContext);
 
-    const isLoading = isLoadingOnyxValue(tryNewDotMetadata);
-
-    if (!CONFIG.IS_HYBRID_APP || !hybridAppSettings || signInHandled || isLoading) {
+    if (!CONFIG.IS_HYBRID_APP || !hybridAppSettings || signInHandled) {
         return null;
     }
 
-    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);
-        }
+    signInAfterTransitionFromOldDot(hybridAppSettings).then(() => {
+        setSplashScreenState(CONST.BOOT_SPLASH_STATE.READY_TO_BE_HIDDEN);
         setSignInHandled(true);
     });
 

src/ONYXKEYS.ts

@@ -476,6 +476,9 @@ const ONYXKEYS = {
     /** Stores recently used currencies */
     RECENTLY_USED_CURRENCIES: 'nvp_recentlyUsedCurrencies',
 
+    /** States whether we transitioned from OldDot to show only certain group of screens. It should be undefined on pure NewDot. */
+    IS_SINGLE_NEW_DOT_ENTRY: 'isSingleNewDotEntry',
+
     /** Company cards custom names */
     NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES: 'nvp_expensify_ccCustomNames',
 
@@ -532,9 +535,6 @@ const ONYXKEYS = {
     /** Set this gets redirected from global reimbursements flow */
     IS_COMING_FROM_GLOBAL_REIMBURSEMENTS_FLOW: 'isComingFromGlobalReimbursementsFlow',
 
-    /** Stores HybridApp specific state required to interoperate with OldDot */
-    HYBRID_APP: 'hybridApp',
-
     /** Stores information for OpenUnreportedExpensesPage API call pagination */
     HAS_MORE_UNREPORTED_TRANSACTIONS_RESULTS: 'hasMoreUnreportedTransactionsResults',
 
@@ -1172,6 +1172,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.APPROVAL_WORKFLOW]: OnyxTypes.ApprovalWorkflowOnyx;
     [ONYXKEYS.IMPORTED_SPREADSHEET]: OnyxTypes.ImportedSpreadsheet;
     [ONYXKEYS.LAST_ROUTE]: string;
+    [ONYXKEYS.IS_SINGLE_NEW_DOT_ENTRY]: boolean | undefined;
     [ONYXKEYS.IS_USING_IMPORTED_STATE]: boolean;
     [ONYXKEYS.NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES]: Record<string, string>;
     [ONYXKEYS.CONCIERGE_REPORT_ID]: string;
@@ -1190,7 +1191,6 @@ type OnyxValuesMapping = {
     [ONYXKEYS.SCHEDULE_CALL_DRAFT]: OnyxTypes.ScheduleCallDraft;
     [ONYXKEYS.IS_FORCED_TO_CHANGE_CURRENCY]: boolean | undefined;
     [ONYXKEYS.IS_COMING_FROM_GLOBAL_REIMBURSEMENTS_FLOW]: boolean | undefined;
-    [ONYXKEYS.HYBRID_APP]: OnyxTypes.HybridApp;
     [ONYXKEYS.HAS_MORE_UNREPORTED_TRANSACTIONS_RESULTS]: boolean | undefined;
     [ONYXKEYS.IS_LOADING_UNREPORTED_TRANSACTIONS]: boolean | undefined;
     [ONYXKEYS.NVP_LAST_ECASH_IOS_LOGIN]: string;