[HybridApp] Receive structured initialProperties (not as url) and improve url handling

src/App.tsx

@@ -43,10 +43,17 @@ import type {Route} from './ROUTES';
 import './setup/backgroundTask';
 import {SplashScreenStateContextProvider} from './SplashScreenStateContext';
 
-/** Values passed to our top-level React Native component by HybridApp. Will always be undefined in "pure" NewDot builds. */
+/**
+ * Properties passed to the top-level React Native component by HybridApp.
+ * These will always be `undefined` in "pure" NewDot builds.
+ */
 type AppProps = {
-    /** URL containing all necessary data to run React Native app (e.g. login data) */
+    /** The URL specifying the initial navigation destination when the app opens */
     url?: Route;
+    /** Serialized configuration data required to initialize the React Native app (e.g. authentication details) */
+    hybridAppSettings?: string;
+    /** A timestamp indicating when the initial properties were last updated, used to detect changes */
+    timestamp?: string;
 };
 
 LogBox.ignoreLogs([
@@ -62,14 +69,18 @@ const fill = {flex: 1};
 
 const StrictModeWrapper = CONFIG.USE_REACT_STRICT_MODE_IN_DEV ? React.StrictMode : ({children}: {children: React.ReactElement}) => children;
 
-function App({url}: AppProps) {
+function App({url, hybridAppSettings, timestamp}: AppProps) {
     useDefaultDragAndDrop();
     OnyxUpdateManager();
 
     return (
         <StrictModeWrapper>
             <SplashScreenStateContextProvider>
-                <InitialURLContextProvider url={url}>
+                <InitialURLContextProvider
+                    url={url}
+                    hybridAppSettings={hybridAppSettings}
+                    timestamp={timestamp}
+                >
                     <GestureHandlerRootView style={fill}>
                         <ComposeProviders
                             components={[
@@ -120,3 +131,5 @@ function App({url}: AppProps) {
 App.displayName = 'App';
 
 export default App;
+
+export type {AppProps};

src/CONST.ts

@@ -6600,10 +6600,6 @@ const CONST = {
         },
     },
 
-    HYBRID_APP: {
-        REORDERING_REACT_NATIVE_ACTIVITY_TO_FRONT: 'reorderingReactNativeActivityToFront',
-    },
-
     MIGRATED_USER_WELCOME_MODAL: 'migratedUserWelcomeModal',
 
     BASE_LIST_ITEM_TEST_ID: 'base-list-item-',

src/components/BookTravelButton.tsx

@@ -70,7 +70,7 @@ function BookTravelButton({text}: BookTravelButtonProps) {
 
                     // Close NewDot if it was opened only for Travel, as its purpose is now fulfilled.
                     Log.info('[HybridApp] Returning to OldDot after opening TravelDot');
-                    NativeModules.HybridAppModule.closeReactNativeApp(false, false);
+                    NativeModules.HybridAppModule.closeReactNativeApp({shouldSignOut: false, shouldSetNVP: false});
                     setRootStatusBarEnabled(false);
                 })
                 ?.catch(() => {

src/components/InitialURLContextProvider.tsx

@@ -1,12 +1,9 @@
 import React, {createContext, useEffect, useMemo, useState} from 'react';
 import type {ReactNode} from 'react';
 import {Linking} from 'react-native';
-import {useOnyx} from 'react-native-onyx';
-import type {ValueOf} from 'type-fest';
 import {signInAfterTransitionFromOldDot} from '@libs/actions/Session';
-import Navigation from '@navigation/Navigation';
+import {AppProps} from '@src/App';
 import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
 import {useSplashScreenStateContext} from '@src/SplashScreenStateContext';
 
@@ -21,46 +18,31 @@
     setInitialURL: () => {},
 });
 
-type InitialURLContextProviderProps = {
-    /** URL passed to our top-level React Native component by HybridApp. Will always be undefined in "pure" NewDot builds. */
-    url?: Route | ValueOf<typeof CONST.HYBRID_APP>;
-
+type InitialURLContextProviderProps = AppProps & {
     /** Children passed to the context provider */
     children: ReactNode;
 };
 
-function InitialURLContextProvider({children, url}: InitialURLContextProviderProps) {
+function InitialURLContextProvider({children, url, hybridAppSettings, timestamp}: InitialURLContextProviderProps) {
     const [initialURL, setInitialURL] = useState<Route | undefined>();
-    const [lastVisitedPath] = useOnyx(ONYXKEYS.LAST_VISITED_PATH);
     const {splashScreenState, setSplashScreenState} = useSplashScreenStateContext();
 
     useEffect(() => {
-        if (url !== CONST.HYBRID_APP.REORDERING_REACT_NATIVE_ACTIVITY_TO_FRONT) {
-            return;
-        }
-
-        if (splashScreenState !== CONST.BOOT_SPLASH_STATE.HIDDEN) {
-            setSplashScreenState(CONST.BOOT_SPLASH_STATE.READY_TO_BE_HIDDEN);
-            Navigation.navigate(lastVisitedPath as Route);
-        }
-    }, [lastVisitedPath, setSplashScreenState, splashScreenState, url]);
-
-    useEffect(() => {
-        if (url === CONST.HYBRID_APP.REORDERING_REACT_NATIVE_ACTIVITY_TO_FRONT) {
-            return;
-        }
-
-        if (url) {
-            signInAfterTransitionFromOldDot(url).then((route) => {
-                setInitialURL(route);
+        if (url && hybridAppSettings) {
+            setInitialURL(url);
+            signInAfterTransitionFromOldDot(hybridAppSettings).then(() => {
+                if (splashScreenState === CONST.BOOT_SPLASH_STATE.HIDDEN) {
+                    return;
+                }
                 setSplashScreenState(CONST.BOOT_SPLASH_STATE.READY_TO_BE_HIDDEN);
             });
             return;
         }
         Linking.getInitialURL().then((initURL) => {
             setInitialURL(initURL as Route);
         });
-    }, [setSplashScreenState, url]);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [url, hybridAppSettings, timestamp]);
 
     const initialUrlContext = useMemo(
         () => ({

src/components/ScreenWrapper.tsx

@@ -1,8 +1,9 @@
-import {UNSTABLE_usePreventRemove, useIsFocused, useNavigation, useRoute} from '@react-navigation/native';
+import {UNSTABLE_usePreventRemove, useIsFocused, useNavigation} from '@react-navigation/native';
 import type {ForwardedRef, ReactNode} from 'react';
 import React, {createContext, forwardRef, useContext, useEffect, useMemo, useRef, useState} from 'react';
 import type {StyleProp, ViewStyle} from 'react-native';
 import {Keyboard, NativeModules, PanResponder, View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
 import {PickerAvoidingView} from 'react-native-picker-select';
 import type {EdgeInsets} from 'react-native-safe-area-context';
 import useEnvironment from '@hooks/useEnvironment';
@@ -18,6 +19,7 @@ import type {AuthScreensParamList, RootStackParamList} from '@libs/Navigation/ty
 import addViewportResizeListener from '@libs/VisualViewport';
 import toggleTestToolsModal from '@userActions/TestTool';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import CustomDevMenu from './CustomDevMenu';
 import CustomStatusBarAndBackgroundContext from './CustomStatusBarAndBackground/CustomStatusBarAndBackgroundContext';
 import FocusTrapForScreens from './FocusTrap/FocusTrapForScreen';
@@ -154,6 +156,7 @@ function ScreenWrapper(
     // since Modals are drawn in separate native view hierarchy we should always add paddings
     const ignoreInsetsConsumption = !useContext(ModalContext).default;
     const {setRootStatusBarEnabled} = useContext(CustomStatusBarAndBackgroundContext);
+    const [isSingleNewDotEntry] = useOnyx(ONYXKEYS.IS_SINGLE_NEW_DOT_ENTRY);
 
     // We need to use isSmallScreenWidth instead of shouldUseNarrowLayout for a case where we want to show the offline indicator only on small screens
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
@@ -165,14 +168,10 @@ function ScreenWrapper(
     const maxHeight = shouldEnableMaxHeight ? windowHeight : undefined;
     const minHeight = shouldEnableMinHeight && !isSafari() ? initialHeight : undefined;
 
-    const route = useRoute();
-    const shouldReturnToOldDot = useMemo(() => {
-        return !!route?.params && 'singleNewDotEntry' in route.params && route.params.singleNewDotEntry === 'true';
-    }, [route?.params]);
     const {isBlurred, setIsBlurred} = useInputBlurContext();
 
-    UNSTABLE_usePreventRemove(shouldReturnToOldDot, () => {
-        NativeModules.HybridAppModule?.closeReactNativeApp(false, false);
+    UNSTABLE_usePreventRemove(isSingleNewDotEntry ?? false, () => {
+        NativeModules.HybridAppModule?.closeReactNativeApp({shouldSignOut: false, shouldSetNVP: false});
         setRootStatusBarEnabled(false);
     });
 

src/libs/actions/Delegate.ts

@@ -156,7 +156,14 @@ function connect(email: string) {
 
                     NetworkStore.setAuthToken(response?.restrictedToken ?? null);
                     confirmReadyToOpenApp();
-                    openApp().then(() => NativeModules.HybridAppModule?.switchAccount(email, restrictedToken, policyID, String(previousAccountID)));
+                    openApp().then(() =>
+                        NativeModules.HybridAppModule?.switchAccount({
+                            newDotCurrentAccountEmail: email,
+                            authToken: restrictedToken,
+                            policyID,
+                            accountID: String(previousAccountID),
+                        }),
+                    );
                 });
         })
         .catch((error) => {
@@ -238,7 +245,14 @@ function disconnect() {
                     NetworkStore.setAuthToken(response?.authToken ?? null);
 
                     confirmReadyToOpenApp();
-                    openApp().then(() => NativeModules.HybridAppModule?.switchAccount(requesterEmail, authToken, '', ''));
+                    openApp().then(() =>
+                        NativeModules.HybridAppModule?.switchAccount({
+                            newDotCurrentAccountEmail: requesterEmail,
+                            authToken,
+                            policyID: '',
+                            accountID: '',
+                        }),
+                    );
                 });
         })
         .catch((error) => {

src/libs/actions/Session/index.ts

@@ -231,7 +231,7 @@ function signOutAndRedirectToSignIn(shouldResetToHome?: boolean, shouldStashSess
     if (!isAnonymousUser()) {
         // In the HybridApp, we want the Old Dot to handle the sign out process
         if (NativeModules.HybridAppModule && killHybridApp) {
-            NativeModules.HybridAppModule.closeReactNativeApp(true, false);
+            NativeModules.HybridAppModule.closeReactNativeApp({shouldSignOut: true, shouldSetNVP: false});
             return;
         }
         // We'll only call signOut if we're not stashing the session and this is not a supportal session,
@@ -514,9 +514,22 @@ function getLastUpdateIDAppliedToClient(): Promise<number> {
     });
 }
 
-function signInAfterTransitionFromOldDot(transitionURL: string) {
-    const [route, queryParams] = transitionURL.split('?');
+type HybridAppSettings = {
+    email: string;
+    authToken: string;
+    accountID: number;
+    autoGeneratedLogin: string;
+    autoGeneratedPassword: string;
+    clearOnyxOnStart: boolean;
+    completedHybridAppOnboarding: boolean;
+    isSingleNewDotEntry: boolean;
+    primaryLogin: string;
+    encryptedAuthToken: string;
+    nudgeMigrationTimestamp?: string;
+    oldDotOriginalAccountEmail?: string;
+};
 
+function signInAfterTransitionFromOldDot(hybridAppSettings: string) {
     const {
         email,
         authToken,
@@ -530,75 +543,63 @@ function signInAfterTransitionFromOldDot(transitionURL: string) {
         isSingleNewDotEntry,
         primaryLogin,
         oldDotOriginalAccountEmail,
-    } = Object.fromEntries(
-        queryParams.split('&').map((param) => {
-            const [key, value] = param.split('=');
-            return [key, value];
-        }),
-    );
+    } = JSON.parse(hybridAppSettings) as HybridAppSettings;
 
     const clearOnyxForNewAccount = () => {
-        if (clearOnyxOnStart !== 'true') {
+        if (!clearOnyxOnStart) {
             return Promise.resolve();
         }
 
         return Onyx.clear(KEYS_TO_PRESERVE);
     };
 
-    const setSessionDataAndOpenApp = new Promise<Route>((resolve) => {
-        clearOnyxForNewAccount()
-            .then(() => {
-                // This section controls copilot changes
-                const currentUserEmail = getCurrentUserEmail();
-
-                // If ND and OD account are the same - do nothing
-                if (email === currentUserEmail) {
-                    return;
-                }
-
-                // If account was changed to original one on OD side - clear onyx
-                if (!oldDotOriginalAccountEmail) {
-                    return Onyx.clear(KEYS_TO_PRESERVE_DELEGATE_ACCESS);
-                }
-
-                // If we're already logged in - do nothing, data will be set in next step
-                if (currentUserEmail) {
-                    return;
-                }
-
-                // If we're not logged in - set stashed data
-                return Onyx.multiSet({
-                    [ONYXKEYS.STASHED_CREDENTIALS]: {autoGeneratedLogin, autoGeneratedPassword},
-                });
-            })
-            .then(() =>
-                Onyx.multiSet({
-                    [ONYXKEYS.SESSION]: {email, authToken, encryptedAuthToken: decodeURIComponent(encryptedAuthToken), accountID: Number(accountID)},
-                    [ONYXKEYS.CREDENTIALS]: {autoGeneratedLogin, autoGeneratedPassword},
-                    [ONYXKEYS.IS_SINGLE_NEW_DOT_ENTRY]: isSingleNewDotEntry === 'true',
-                    [ONYXKEYS.NVP_TRYNEWDOT]: {
-                        classicRedirect: {completedHybridAppOnboarding: completedHybridAppOnboarding === 'true'},
-                        nudgeMigration: nudgeMigrationTimestamp ? {timestamp: new Date(nudgeMigrationTimestamp)} : undefined,
-                    },
-                }).then(() => Onyx.merge(ONYXKEYS.ACCOUNT, {primaryLogin})),
-            )
-            .then(() => {
-                if (clearOnyxOnStart === 'true') {
-                    return openApp();
-                }
-                return getLastUpdateIDAppliedToClient().then((lastUpdateId) => {
-                    return reconnectApp(lastUpdateId);
-                });
-            })
-            .catch((error) => {
-                Log.hmmm('[HybridApp] Initialization of HybridApp has failed. Forcing transition', {error});
-            })
-            .finally(() => {
-                resolve(`${route}${isSingleNewDotEntry === 'true' ? '?singleNewDotEntry=true' : ''}` as Route);
-            });
-    });
+    return clearOnyxForNewAccount()
+        .then(() => {
+            // This section controls copilot changes
+            const currentUserEmail = getCurrentUserEmail();
+
+            // If ND and OD account are the same - do nothing
+            if (email === currentUserEmail) {
+                return;
+            }
 
-    return setSessionDataAndOpenApp;
+            // If account was changed to original one on OD side - clear onyx
+            if (!oldDotOriginalAccountEmail) {
+                return Onyx.clear(KEYS_TO_PRESERVE_DELEGATE_ACCESS);
+            }
+
+            // If we're already logged in - do nothing, data will be set in next step
+            if (currentUserEmail) {
+                return;
+            }
+
+            // If we're not logged in - set stashed data
+            return Onyx.multiSet({
+                [ONYXKEYS.STASHED_CREDENTIALS]: {autoGeneratedLogin, autoGeneratedPassword},
+            });
+        })
+        .then(() =>
+            Onyx.multiSet({
+                [ONYXKEYS.SESSION]: {email, authToken, encryptedAuthToken: decodeURIComponent(encryptedAuthToken), accountID: Number(accountID)},
+                [ONYXKEYS.CREDENTIALS]: {autoGeneratedLogin, autoGeneratedPassword},
+                [ONYXKEYS.IS_SINGLE_NEW_DOT_ENTRY]: isSingleNewDotEntry,
+                [ONYXKEYS.NVP_TRYNEWDOT]: {
+                    classicRedirect: {completedHybridAppOnboarding},
+                    nudgeMigration: nudgeMigrationTimestamp ? {timestamp: new Date(nudgeMigrationTimestamp)} : undefined,
+                },
+            }).then(() => Onyx.merge(ONYXKEYS.ACCOUNT, {primaryLogin})),
+        )
+        .then(() => {
+            if (clearOnyxOnStart) {
+                return openApp();
+            }
+            return getLastUpdateIDAppliedToClient().then((lastUpdateId) => {
+                return reconnectApp(lastUpdateId);
+            });
+        })
+        .catch((error) => {
+            Log.hmmm('[HybridApp] Initialization of HybridApp has failed. Forcing transition', {error});
+        });
 }
 
 /**

src/libs/actions/Welcome/index.ts

@@ -11,7 +11,7 @@
 import type Onboarding from '@src/types/onyx/Onboarding';
 import type TryNewDot from '@src/types/onyx/TryNewDot';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import * as OnboardingFlow from './OnboardingFlow';
 
 type OnboardingData = Onboarding | undefined;
 
@@ -145,7 +145,7 @@
 
         // No matter what the response is, we want to mark the onboarding as completed (user saw the explanation modal)
         Log.info(`[HybridApp] Onboarding status has changed. Propagating new value to OldDot`, true);
-        NativeModules.HybridAppModule.completeOnboarding(true);
+        NativeModules.HybridAppModule.completeOnboarding({status: true});
     });
 }
 

src/pages/ErrorPage/SessionExpiredPage.tsx

@@ -9,7 +9,7 @@
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import * as Session from '@userActions/Session';
 
 function SessionExpiredPage() {
     const styles = useThemeStyles();
@@ -37,7 +37,7 @@
                                     Navigation.goBack();
                                     return;
                                 }
-                                NativeModules.HybridAppModule.closeReactNativeApp(true, false);
+                                NativeModules.HybridAppModule.closeReactNativeApp({shouldSignOut: true, shouldSetNVP: false});
                             }}
                         >
                             {translate('deeplinkWrapper.signIn')}

src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx

@@ -107,7 +107,7 @@ function BaseOnboardingEmployees({shouldUseNativeStyles, route}: BaseOnboardingE
                         );
                     }
 
-                    NativeModules.HybridAppModule.closeReactNativeApp(false, true);
+                    NativeModules.HybridAppModule.closeReactNativeApp({shouldSignOut: false, shouldSetNVP: true});
                     setRootStatusBarEnabled(false);
                 }}
                 pressOnEnter