[HybridApp] Do not use query params in AppProp URL

src/App.tsx

@@ -41,9 +41,12 @@ import {ReportAttachmentsProvider} from './pages/home/report/ReportAttachmentsCo
 import type {Route} from './ROUTES';
 import {SplashScreenStateContextProvider} from './SplashScreenStateContext';
 
+/**
+ * URL and settings passed to our top-level React Native component by HybridApp. Will always be undefined in "pure" NewDot builds.
+ */
 type AppProps = {
-    /** URL passed to our top-level React Native component by HybridApp. Will always be undefined in "pure" NewDot builds. */
     url?: Route;
+    hybridAppSettings?: string;
 };
 
 LogBox.ignoreLogs([
@@ -59,15 +62,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}: AppProps) {
     useDefaultDragAndDrop();
     OnyxUpdateManager();
     HybridApp.init();
 
     return (
         <StrictModeWrapper>
             <SplashScreenStateContextProvider>
-                <InitialURLContextProvider url={url}>
+                <InitialURLContextProvider
+                    url={url}
+                    hybridAppSettings={hybridAppSettings}
+                >
                     <GestureHandlerRootView style={fill}>
                         <ComposeProviders
                             components={[

src/Expensify.tsx

@@ -117,12 +117,12 @@ function Expensify() {
     const isAuthenticated = useMemo(() => !!(session?.authToken ?? null), [session]);
     const autoAuthState = useMemo(() => session?.autoAuthState ?? '', [session]);
 
-    const shouldInit = !!NativeModules.HybridAppModule
+    const shouldInit = NativeModules.HybridAppModule
         ? !hybridApp?.loggedOutFromOldDot && isNavigationReady && hasAttemptedToOpenPublicRoom
         : isNavigationReady && hasAttemptedToOpenPublicRoom;
     const shouldHideSplash =
         shouldInit &&
-        (!!NativeModules.HybridAppModule
+        (NativeModules.HybridAppModule
             ? splashScreenState === CONST.BOOT_SPLASH_STATE.READY_TO_BE_HIDDEN && (isAuthenticated || !!hybridApp?.useNewDotSignInPage)
             : splashScreenState === CONST.BOOT_SPLASH_STATE.VISIBLE);
 

src/ONYXKEYS.ts

@@ -449,9 +449,6 @@ 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',
 
@@ -1026,7 +1023,6 @@ 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.SHOULD_SHOW_SAVED_SEARCH_RENAME_TOOLTIP]: boolean;
     [ONYXKEYS.NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES]: Record<string, string>;

src/components/InitialURLContextProvider.tsx

@@ -18,20 +18,21 @@ const InitialURLContext = createContext<InitialUrlContextType>({
 });
 
 type InitialURLContextProviderProps = {
-    /** URL passed to our top-level React Native component by HybridApp. Will always be undefined in "pure" NewDot builds. */
     url?: Route;
 
+    hybridAppSettings?: string;
+
     /** Children passed to the context provider */
     children: ReactNode;
 };
 
-function InitialURLContextProvider({children, url}: InitialURLContextProviderProps) {
-    const [initialURL, setInitialURL] = useState<Route | undefined>();
+function InitialURLContextProvider({children, url, hybridAppSettings}: InitialURLContextProviderProps) {
+    const [initialURL, setInitialURL] = useState<Route | undefined>(url);
     const {setSplashScreenState} = useSplashScreenStateContext();
 
     useEffect(() => {
-        if (url) {
-            signInAfterTransitionFromOldDot(url).then((route) => {
+        if (url && hybridAppSettings) {
+            signInAfterTransitionFromOldDot(url, hybridAppSettings).then((route) => {
                 setInitialURL(route);
                 setSplashScreenState(CONST.BOOT_SPLASH_STATE.READY_TO_BE_HIDDEN);
             });
@@ -40,7 +41,7 @@ function InitialURLContextProvider({children, url}: InitialURLContextProviderPro
         Linking.getInitialURL().then((initURL) => {
             setInitialURL(initURL as Route);
         });
-    }, [setSplashScreenState, url]);
+    }, [hybridAppSettings, setSplashScreenState, url]);
 
     const initialUrlContext = useMemo(
         () => ({

src/hooks/useOnboardingFlow.ts

@@ -21,7 +21,7 @@ function useOnboardingFlowRouter() {
         selector: hasCompletedHybridAppOnboardingFlowSelector,
     });
 
-    const [isSingleNewDotEntry, isSingleNewDotEntryMetadata] = useOnyx(ONYXKEYS.IS_SINGLE_NEW_DOT_ENTRY);
+    const [isSingleNewDotEntry, isSingleNewDotEntryMetadata] = useOnyx(ONYXKEYS.HYBRID_APP, {selector: (data) => data?.isSingleNewDotEntry});
 
     useEffect(() => {
         if (isLoadingOnyxValue(isOnboardingCompletedMetadata)) {

src/libs/TripReservationUtils.ts

@@ -44,9 +44,9 @@ Onyx.connect({
 
 let isSingleNewDotEntry: boolean | undefined;
 Onyx.connect({
-    key: ONYXKEYS.IS_SINGLE_NEW_DOT_ENTRY,
+    key: ONYXKEYS.HYBRID_APP,
     callback: (val) => {
-        isSingleNewDotEntry = val;
+        isSingleNewDotEntry = val?.isSingleNewDotEntry;
     },
 });
 

src/libs/actions/HybridApp.ts → src/libs/actions/HybridApp/index.ts

@@ -1,5 +1,10 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type HybridAppSettings from './types';
+
+function parseHybridAppSettings(hybridAppSettings: string): HybridAppSettings {
+    return JSON.parse(hybridAppSettings) as HybridAppSettings;
+}
 
 function setIsSigningIn(isSigningIn: boolean) {
     Onyx.merge(ONYXKEYS.HYBRID_APP, {isSigningIn});
@@ -29,4 +34,13 @@ function setLoggedOutFromOldDot(loggedOutFromOldDot: boolean) {
     Onyx.merge(ONYXKEYS.HYBRID_APP, {loggedOutFromOldDot});
 }
 
-export {setOldDotSignInError, setIsSigningIn, setReadyToShowAuthScreens, setReadyToSwitchToClassicExperience, setShouldResetSigningInLogic, setUseNewDotSignInPage, setLoggedOutFromOldDot};
+export {
+    parseHybridAppSettings,
+    setOldDotSignInError,
+    setIsSigningIn,
+    setReadyToShowAuthScreens,
+    setReadyToSwitchToClassicExperience,
+    setShouldResetSigningInLogic,
+    setUseNewDotSignInPage,
+    setLoggedOutFromOldDot,
+};

src/libs/actions/HybridApp/types.ts

@@ -0,0 +1,12 @@
+import type ONYXKEYS from '@src/ONYXKEYS';
+import type {TryNewDot} from '@src/types/onyx';
+import type HybridApp from '@src/types/onyx/HybridApp';
+
+type HybridAppSettings = {
+    initialOnyxValues: {
+        [ONYXKEYS.HYBRID_APP]: HybridApp;
+        [ONYXKEYS.NVP_TRYNEWDOT]?: TryNewDot;
+    };
+};
+
+export default HybridAppSettings;

src/libs/actions/Session/index.ts

@@ -43,7 +43,7 @@ import * as App from '@userActions/App';
 import {KEYS_TO_PRESERVE, openApp} from '@userActions/App';
 import {KEYS_TO_PRESERVE_DELEGATE_ACCESS} from '@userActions/Delegate';
 import * as Device from '@userActions/Device';
-import {setLoggedOutFromOldDot, setReadyToShowAuthScreens, setReadyToSwitchToClassicExperience, setUseNewDotSignInPage} from '@userActions/HybridApp';
+import {parseHybridAppSettings, setLoggedOutFromOldDot, setReadyToShowAuthScreens, setReadyToSwitchToClassicExperience, setUseNewDotSignInPage} from '@userActions/HybridApp';
 import * as PriorityMode from '@userActions/PriorityMode';
 import redirectToSignIn from '@userActions/SignInRedirect';
 import Timing from '@userActions/Timing';
@@ -481,19 +481,13 @@ function signUpUser() {
     API.write(WRITE_COMMANDS.SIGN_UP_USER, params, {optimisticData, successData, failureData});
 }
 
-function signInAfterTransitionFromOldDot(transitionURL: string) {
-    const [route, queryParams] = transitionURL.split('?');
-    const {useNewDotSignInPage, isSingleNewDotEntry, loggedOutFromOldDot, shouldRemoveDelegatedAccess} = queryParams
-        ? Object.fromEntries(
-              queryParams.split('&').map((param) => {
-                  const [key, value] = param.split('=');
-                  return [key, value];
-              }),
-          )
-        : {useNewDotSignInPage: undefined, isSingleNewDotEntry: undefined, loggedOutFromOldDot: undefined, shouldRemoveDelegatedAccess: undefined};
+function signInAfterTransitionFromOldDot(route: Route, hybridAppSettings: string) {
+    const parsedHybridAppSettings = parseHybridAppSettings(hybridAppSettings);
+    const {initialOnyxValues} = parsedHybridAppSettings;
+    const {hybridApp, ...newDotOnyxValues} = initialOnyxValues;
 
     const clearOnyxBeforeSignIn = () => {
-        if (useNewDotSignInPage !== 'true') {
+        if (!hybridApp.useNewDotSignInPage) {
             setReadyToShowAuthScreens(true);
             setReadyToSwitchToClassicExperience(true);
             return Promise.resolve();
@@ -503,7 +497,7 @@ function signInAfterTransitionFromOldDot(transitionURL: string) {
     };
 
     const initAppAfterTransition = () => {
-        if (useNewDotSignInPage === 'true') {
+        if (hybridApp.useNewDotSignInPage) {
             return Promise.resolve();
         }
 
@@ -512,27 +506,30 @@ function signInAfterTransitionFromOldDot(transitionURL: string) {
 
     return new Promise<Route>((resolve) => {
         clearOnyxBeforeSignIn()
+            .then(() => Onyx.merge(ONYXKEYS.HYBRID_APP, hybridApp))
+            .then(() => Onyx.multiSet(newDotOnyxValues))
             .then(() => {
-                if (!shouldRemoveDelegatedAccess) {
+                if (!hybridApp.shouldRemoveDelegatedAccess) {
                     return;
                 }
                 return Onyx.clear(KEYS_TO_PRESERVE_DELEGATE_ACCESS);
             })
             .then(() => {
-                setUseNewDotSignInPage(useNewDotSignInPage === 'true');
-                setLoggedOutFromOldDot(loggedOutFromOldDot === 'true');
+                // This data is mocked and should be returned by BeginSignUp/SignInUser API commands
+                setUseNewDotSignInPage(!!hybridApp.useNewDotSignInPage);
+                setLoggedOutFromOldDot(!!hybridApp.loggedOutFromOldDot);
                 const useOldDot = 'true';
-                const dismissed = useNewDotSignInPage === 'true' ? useOldDot : 'false';
-                Onyx.multiSet({
-                    [ONYXKEYS.NVP_TRYNEWDOT]: {classicRedirect: {dismissed}}, // This data is mocked and should be returned by BeginSignUp/SignInUser API commands
+                const dismissed = hybridApp.useNewDotSignInPage ? useOldDot : 'false';
+                return Onyx.multiSet({
+                    [ONYXKEYS.NVP_TRYNEWDOT]: {classicRedirect: {dismissed}},
                 });
             })
             .then(initAppAfterTransition)
             .catch((error) => {
                 Log.hmmm('[HybridApp] Initialization of HybridApp has failed. Forcing transition', {error});
             })
             .finally(() => {
-                resolve(`${route}?singleNewDotEntry=${isSingleNewDotEntry}` as Route);
+                resolve(`${route}?singleNewDotEntry=${hybridApp.isSingleNewDotEntry}` as Route);
             });
     });
 }

src/types/onyx/HybridApp.ts

@@ -18,8 +18,14 @@ type HybridApp = {
     /** */
     shouldResetSigningInLogic?: boolean;
 
+    /** States whether we transitioned from OldDot to show only certain group of screens. It should be undefined on pure NewDot. */
+    isSingleNewDotEntry?: boolean;
+
     /** stores infromation if last log out was performed from OldDot */
     loggedOutFromOldDot?: boolean;
+
+    /** */
+    shouldRemoveDelegatedAccess?: boolean;
 };
 
 export default HybridApp;