Merge branch 'implement-hybrid-version-of-get-initial-url' into fix-reload-on-new-sign-in-page

war-in · war-in · commit b196416f71fd · 2025-07-08T16:23:53.000+02:00
# Conflicts:
#	modules/hybrid-app/android/src/main/java/com/expensify/reactnativehybridapp/ReactNativeHybridApp.kt
#	modules/hybrid-app/ios/ReactNativeHybridApp.mm
#	modules/hybrid-app/src/NativeReactNativeHybridApp.ts
#	modules/hybrid-app/src/index.native.ts
#	modules/hybrid-app/src/index.ts
#	modules/hybrid-app/src/types.ts
#	src/App.tsx
diff --git a/modules/hybrid-app/android/src/main/java/com/expensify/reactnativehybridapp/ReactNativeHybridApp.kt b/modules/hybrid-app/android/src/main/java/com/expensify/reactnativehybridapp/ReactNativeHybridApp.kt
@@ -38,6 +38,11 @@ class ReactNativeHybridApp(reactContext: ReactApplicationContext) :
     Log.d(NAME, "`sendAuthToken` should never be called in standalone `New Expensify` app")
   }
 
+  override fun getInitialURL(promise: Promise) {
+    Log.d(NAME, "`getInitialURL` should never be called in standalone `New Expensify` app")
+    promise.reject("NOT_IMPLEMENTED", "getInitialURL is not implemented in standalone New Expensify app")
+  }
+
   override fun signInToOldDot(
     autoGeneratedLogin: String,
     autoGeneratedPassword: String,
@@ -57,7 +62,7 @@ class ReactNativeHybridApp(reactContext: ReactApplicationContext) :
   }
 
   override fun getHybridAppSettings(promise: Promise) {
-    Log.d(NAME, "`getHybridAppSettings` should never be called in standalone `New Expensify` app") 
+    Log.d(NAME, "`getHybridAppSettings` should never be called in standalone `New Expensify` app")
     promise.reject("NOT_IMPLEMENTED", "getHybridAppSettings is not implemented in standalone New Expensify app")
   }
 }
diff --git a/modules/hybrid-app/ios/ReactNativeHybridApp.mm b/modules/hybrid-app/ios/ReactNativeHybridApp.mm
@@ -27,6 +27,12 @@ - (void)sendAuthToken:(NSString *)authToken {
     NSLog(@"[ReactNativeHybridApp] `sendAuthToken` should never be called in standalone `New Expensify` app");
 }
 
+- (void)getInitialURL:(RCTPromiseResolveBlock)resolve
+                      reject:(RCTPromiseRejectBlock)reject {
+    NSLog(@"[ReactNativeHybridApp] `getInitialURL` should never be called in standalone `New Expensify` app");
+    reject(@"NOT_IMPLEMENTED", @"This method is not available in standalone New Expensify app", nil);
+}
+
 - (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");
 }
@@ -41,7 +47,7 @@ - (void)clearOldDotAfterSignOut {
 
 - (void)getHybridAppSettings:(RCTPromiseResolveBlock)resolve
                       reject:(RCTPromiseRejectBlock)reject {
-    NSLog(@"[ReactNativeHybridApp] `getHybridAppSettings` should never be called in standalone `New Expensify` app");                
+    NSLog(@"[ReactNativeHybridApp] `getHybridAppSettings` should never be called in standalone `New Expensify` app");
     reject(@"NOT_IMPLEMENTED", @"This method is not available in standalone New Expensify app", nil);
 }
 
diff --git a/modules/hybrid-app/src/NativeReactNativeHybridApp.ts b/modules/hybrid-app/src/NativeReactNativeHybridApp.ts
@@ -9,6 +9,7 @@ export interface Spec extends TurboModule {
     completeOnboarding: (status: boolean) => void;
     switchAccount: (newDotCurrentAccountEmail: string, authToken: string, policyID: string, accountID: string) => void;
     sendAuthToken: (authToken: string) => void;
+    getInitialURL(): Promise<string | null>;
     signInToOldDot: (autoGeneratedLogin: string, autoGeneratedPassword: string, authToken: string, email: string, policyID: string) => void;
     signOutFromOldDot: () => void;
     clearOldDotAfterSignOut: () => void;
diff --git a/modules/hybrid-app/src/index.native.ts b/modules/hybrid-app/src/index.native.ts
@@ -20,6 +20,9 @@ const HybridAppModule: HybridAppModuleType = {
     sendAuthToken({authToken}) {
         ReactNativeHybridApp.sendAuthToken(authToken);
     },
+    getInitialURL() {
+        return ReactNativeHybridApp.getInitialURL();
+    },
     signInToOldDot({autoGeneratedLogin, autoGeneratedPassword, authToken, email, policyID}) {
         ReactNativeHybridApp.signInToOldDot(autoGeneratedLogin, autoGeneratedPassword, authToken, email, policyID);
     },
diff --git a/modules/hybrid-app/src/index.ts b/modules/hybrid-app/src/index.ts
@@ -24,6 +24,13 @@ const HybridAppModule: HybridAppModuleType = {
         // eslint-disable-next-line no-console
         console.warn('HybridAppModule: `sendAuthToken` should never be called on web');
     },
+    getInitialURL() {
+        // eslint-disable-next-line no-console
+        console.warn('HybridAppModule: `getInitialURL` should never be called on web');
+        return new Promise((resolve) => {
+            resolve(null);
+        });
+    },
     signInToOldDot() {
         // eslint-disable-next-line no-console
         console.warn('HybridAppModule: `signInToOldDot` should never be called on web');
diff --git a/modules/hybrid-app/src/types.ts b/modules/hybrid-app/src/types.ts
@@ -5,6 +5,7 @@ type HybridAppModuleType = {
     completeOnboarding: (args: {status: boolean}) => void;
     switchAccount: (args: {newDotCurrentAccountEmail: string; authToken: string; policyID: string; accountID: string}) => void;
     sendAuthToken: (args: {authToken: string}) => void;
+    getInitialURL(): Promise<string | null>;
     signInToOldDot: (args: {autoGeneratedLogin: string; autoGeneratedPassword: string; authToken: string; email: string; policyID: string}) => void;
     signOutFromOldDot: () => void;
     clearOldDotAfterSignOut: () => void;
diff --git a/src/App.tsx b/src/App.tsx
@@ -43,7 +43,6 @@ 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';
 import './setup/hybridApp';
 import {SplashScreenStateContextProvider} from './SplashScreenStateContext';
@@ -53,8 +52,6 @@ import {SplashScreenStateContextProvider} from './SplashScreenStateContext';
  * These will always be `undefined` in "pure" NewDot builds.
  */
 type AppProps = {
-    /** The URL specifying the initial navigation destination when the app opens */
-    url?: Route;
 };
 
 LogBox.ignoreLogs([
@@ -70,15 +67,15 @@ 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({}: AppProps) {
     useDefaultDragAndDrop();
     OnyxUpdateManager();
 
     return (
         <StrictModeWrapper>
             <SplashScreenStateContextProvider>
-                <InitialURLContextProvider url={url}>
-                    <HybridAppHandler />
+                <InitialURLContextProvider>
+                    <HybridAppHandler/>
                     <GestureHandlerRootView style={fill}>
                         <SafeAreaProvider
                             initialMetrics={{
diff --git a/src/Expensify.tsx b/src/Expensify.tsx
@@ -104,7 +104,7 @@ function Expensify() {
 
     useDebugShortcut();
 
-    const [initialUrl, setInitialUrl] = useState<string | null>(null);
+    const [initialUrl, setInitialUrl] = useState<Route | null>(null);
 
     useEffect(() => {
         if (isCheckingPublicRoom) {
@@ -209,18 +209,14 @@ function Expensify() {
             // We use custom deeplink handler in setup/hybridApp
             if (CONFIG.IS_HYBRID_APP) {
                 Report.doneCheckingPublicRoom();
-                return;
             }
-            setInitialUrl(url);
+
+            setInitialUrl(url as Route);
             Report.openReportFromDeepLink(url ?? '');
         });
 
         // Open chat report from a deep link (only mobile native)
         Linking.addEventListener('url', (state) => {
-            // We use custom deeplink handler in setup/hybridApp
-            if (CONFIG.IS_HYBRID_APP) {
-                return;
-            }
             Report.openReportFromDeepLink(state.url);
         });
 
diff --git a/src/components/InitialURLContextProvider.tsx b/src/components/InitialURLContextProvider.tsx
@@ -5,13 +5,13 @@ import type {AppProps} from '@src/App';
 import type {Route} from '@src/ROUTES';
 
 type InitialUrlContextType = {
-    initialURL: Route | undefined;
-    setInitialURL: React.Dispatch<React.SetStateAction<Route | undefined>>;
+    initialURL: Route | null;
+    setInitialURL: React.Dispatch<React.SetStateAction<Route | null>>;
 };
 
 /** Initial url that will be opened when NewDot is embedded into Hybrid App. */
 const InitialURLContext = createContext<InitialUrlContextType>({
-    initialURL: undefined,
+    initialURL: null,
     setInitialURL: () => {},
 });
 
@@ -20,18 +20,17 @@ type InitialURLContextProviderProps = AppProps & {
     children: ReactNode;
 };
 
-function InitialURLContextProvider({children, url}: InitialURLContextProviderProps) {
-    const [initialURL, setInitialURL] = useState<Route | undefined>();
+function InitialURLContextProvider({children}: InitialURLContextProviderProps) {
+    const [initialURL, setInitialURL] = useState<Route | null>(null);
 
     useEffect(() => {
-        if (url) {
-            setInitialURL(url);
-            return;
-        }
         Linking.getInitialURL().then((initURL) => {
+            if (!initURL) {
+                return;
+            }
             setInitialURL(initURL as Route);
         });
-    }, [url]);
+    }, []);
 
     const initialUrlContext = useMemo(
         () => ({
diff --git a/src/libs/Navigation/Navigation.ts b/src/libs/Navigation/Navigation.ts
@@ -10,12 +10,11 @@ import type {Writable} from 'type-fest';
 import getIsNarrowLayout from '@libs/getIsNarrowLayout';
 import Log from '@libs/Log';
 import {shallowCompare} from '@libs/ObjectUtils';
-import {generateReportID} from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {HybridAppRoute, Route} from '@src/ROUTES';
-import ROUTES, {HYBRID_APP_ROUTES} from '@src/ROUTES';
+import type {Route} from '@src/ROUTES';
+import ROUTES from '@src/ROUTES';
 import SCREENS, {PROTECTED_SCREENS} from '@src/SCREENS';
 import type {Account} from '@src/types/onyx';
 import getInitialSplitNavigatorState from './AppNavigator/createSplitNavigator/getInitialSplitNavigatorState';
@@ -116,23 +115,6 @@ const getTopmostReportActionId = (state = navigationRef.getState()) => getTopmos
  */
 const closeRHPFlow = (ref = navigationRef) => originalCloseRHPFlow(ref);
 
-/**
- * Function that generates dynamic urls from paths passed from OldDot.
- */
-function parseHybridAppUrl(url: HybridAppRoute | Route): Route {
-    switch (url) {
-        case HYBRID_APP_ROUTES.MONEY_REQUEST_CREATE_TAB_MANUAL:
-            return ROUTES.MONEY_REQUEST_CREATE_TAB_MANUAL.getRoute(CONST.IOU.ACTION.CREATE, CONST.IOU.TYPE.SUBMIT, CONST.IOU.OPTIMISTIC_TRANSACTION_ID, generateReportID());
-        case HYBRID_APP_ROUTES.MONEY_REQUEST_CREATE_TAB_DISTANCE:
-            return ROUTES.MONEY_REQUEST_CREATE_TAB_DISTANCE.getRoute(CONST.IOU.ACTION.CREATE, CONST.IOU.TYPE.SUBMIT, CONST.IOU.OPTIMISTIC_TRANSACTION_ID, generateReportID());
-        case HYBRID_APP_ROUTES.MONEY_REQUEST_CREATE:
-        case HYBRID_APP_ROUTES.MONEY_REQUEST_CREATE_TAB_SCAN:
-            return ROUTES.MONEY_REQUEST_CREATE_TAB_SCAN.getRoute(CONST.IOU.ACTION.CREATE, CONST.IOU.TYPE.SUBMIT, CONST.IOU.OPTIMISTIC_TRANSACTION_ID, generateReportID());
-        default:
-            return url;
-    }
-}
-
 /**
  * Returns the current active route.
  */
@@ -662,7 +644,6 @@ export default {
     getRouteNameFromStateEvent,
     getTopmostReportActionId,
     waitForProtectedRoutes,
-    parseHybridAppUrl,
     resetToHome,
     goBackToHome,
     closeRHPFlow,
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
@@ -1184,9 +1184,8 @@ function handleExitToNavigation(exitTo: Route | HybridAppRoute) {
     InteractionManager.runAfterInteractions(() => {
         waitForUserSignIn().then(() => {
             Navigation.waitForProtectedRoutes().then(() => {
-                const url = CONFIG.IS_HYBRID_APP ? Navigation.parseHybridAppUrl(exitTo) : (exitTo as Route);
                 Navigation.goBack();
-                Navigation.navigate(url);
+                Navigation.navigate(exitTo as Route);
             });
         });
     });
diff --git a/src/setup/hybridApp/index.native.ts b/src/setup/hybridApp/index.native.ts
@@ -1,12 +1,43 @@
+import HybridAppModule from '@expensify/react-native-hybrid-app';
 import {Linking} from 'react-native';
-import Navigation from '@navigation/Navigation';
-import {openReportFromDeepLink} from '@userActions/Report';
+import {generateReportID} from '@libs/ReportUtils';
 import CONFIG from '@src/CONFIG';
-import type {Route} from '@src/ROUTES';
+import CONST from '@src/CONST';
+import type {HybridAppRoute, Route} from '@src/ROUTES';
+import ROUTES, {HYBRID_APP_ROUTES} from '@src/ROUTES';
+
+// In HybridApp, URLs might come from OldDot in an unsupported format, so we transform them into a format that is supported by NewDot.
+function parseHybridAppUrl(url: HybridAppRoute | Route): Route {
+    switch (url) {
+        case HYBRID_APP_ROUTES.MONEY_REQUEST_CREATE_TAB_MANUAL:
+            return ROUTES.MONEY_REQUEST_CREATE_TAB_MANUAL.getRoute(CONST.IOU.ACTION.CREATE, CONST.IOU.TYPE.SUBMIT, CONST.IOU.OPTIMISTIC_TRANSACTION_ID, generateReportID());
+        case HYBRID_APP_ROUTES.MONEY_REQUEST_CREATE_TAB_DISTANCE:
+            return ROUTES.MONEY_REQUEST_CREATE_TAB_DISTANCE.getRoute(CONST.IOU.ACTION.CREATE, CONST.IOU.TYPE.SUBMIT, CONST.IOU.OPTIMISTIC_TRANSACTION_ID, generateReportID());
+        case HYBRID_APP_ROUTES.MONEY_REQUEST_CREATE:
+        case HYBRID_APP_ROUTES.MONEY_REQUEST_CREATE_TAB_SCAN:
+            return ROUTES.MONEY_REQUEST_CREATE_TAB_SCAN.getRoute(CONST.IOU.ACTION.CREATE, CONST.IOU.TYPE.SUBMIT, CONST.IOU.OPTIMISTIC_TRANSACTION_ID, generateReportID());
+        default:
+            return url;
+    }
+}
 
 if (CONFIG.IS_HYBRID_APP) {
-    Linking.addEventListener('url', (state) => {
-        const parsedUrl = Navigation.parseHybridAppUrl(state.url as Route);
-        openReportFromDeepLink(parsedUrl);
-    });
+    // On HybridApp we need to shadow official implementation of Linking.getInitialURL on NewDot side with our custom implementation.
+    // Main benefit from this approach is that our deeplink-related code can be implemented the same way for both standalone NewDot and HybridApp.
+    // It's not possible to use the official implementation from the Linking module because the way OldDot handles deeplinks is significantly different from a standard React Native app.
+    Linking.getInitialURL = () => HybridAppModule.getInitialURL().then((url) => parseHybridAppUrl(url as HybridAppRoute | Route));
+
+    // eslint-disable-next-line @typescript-eslint/unbound-method
+    const originalAddEventListener = Linking.addEventListener;
+
+    // We wrap the original addEventListener to parse the URL before passing it to the handler.
+    // This simplifies usage of the Linking module all over the app.
+    Linking.addEventListener = (type: 'url', handler: (event: {url: string}) => void) => {
+        const handlerWithParsedHybridAppUrl = (event: {url: string}) => {
+            const transformedUrl = parseHybridAppUrl(event.url as HybridAppRoute | Route);
+            handler({url: transformedUrl});
+        };
+
+        return originalAddEventListener.call(Linking, type, handlerWithParsedHybridAppUrl);
+    };
 }

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,11 @@ class ReactNativeHybridApp(reactContext: ReactApplicationContext) :`
`38`	`38`	Log.d(NAME, "`sendAuthToken` should never be called in standalone `New Expensify` app")
`39`	`39`	`}`
`40`	`40`
	`41`	`+ override fun getInitialURL(promise: Promise) {`
	`42`	+ Log.d(NAME, "`getInitialURL` should never be called in standalone `New Expensify` app")
	`43`	`+ promise.reject("NOT_IMPLEMENTED", "getInitialURL is not implemented in standalone New Expensify app")`
	`44`	`+ }`
	`45`	`+`
`41`	`46`	`override fun signInToOldDot(`
`42`	`47`	`autoGeneratedLogin: String,`
`43`	`48`	`autoGeneratedPassword: String,`
`@@ -57,7 +62,7 @@ class ReactNativeHybridApp(reactContext: ReactApplicationContext) :`
`57`	`62`	`}`
`58`	`63`
`59`	`64`	`override fun getHybridAppSettings(promise: Promise) {`
`60`		- Log.d(NAME, "`getHybridAppSettings` should never be called in standalone `New Expensify` app")
	`65`	+ Log.d(NAME, "`getHybridAppSettings` should never be called in standalone `New Expensify` app")
`61`	`66`	`promise.reject("NOT_IMPLEMENTED", "getHybridAppSettings is not implemented in standalone New Expensify app")`
`62`	`67`	`}`
`63`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,12 @@ - (void)sendAuthToken:(NSString *)authToken {`
`27`	`27`	NSLog(@"[ReactNativeHybridApp] `sendAuthToken` should never be called in standalone `New Expensify` app");
`28`	`28`	`}`
`29`	`29`
	`30`	`+- (void)getInitialURL:(RCTPromiseResolveBlock)resolve`
	`31`	`+ reject:(RCTPromiseRejectBlock)reject {`
	`32`	+ NSLog(@"[ReactNativeHybridApp] `getInitialURL` should never be called in standalone `New Expensify` app");
	`33`	`+ reject(@"NOT_IMPLEMENTED", @"This method is not available in standalone New Expensify app", nil);`
	`34`	`+}`
	`35`	`+`
`30`	`36`	`- (void)signInToOldDot:(NSString )autoGeneratedLogin autoGeneratedPassword:(NSString )autoGeneratedPassword authToken:(NSString )authToken email:(NSString )email policyID:(NSString *)policyID {`
`31`	`37`	NSLog(@"[ReactNativeHybridApp] `signInToOldDot` should never be called in standalone `New Expensify` app");
`32`	`38`	`}`
`@@ -41,7 +47,7 @@ - (void)clearOldDotAfterSignOut {`
`41`	`47`
`42`	`48`	`- (void)getHybridAppSettings:(RCTPromiseResolveBlock)resolve`
`43`	`49`	`reject:(RCTPromiseRejectBlock)reject {`
`44`		- NSLog(@"[ReactNativeHybridApp] `getHybridAppSettings` should never be called in standalone `New Expensify` app");
	`50`	+ NSLog(@"[ReactNativeHybridApp] `getHybridAppSettings` should never be called in standalone `New Expensify` app");
`45`	`51`	`reject(@"NOT_IMPLEMENTED", @"This method is not available in standalone New Expensify app", nil);`
`46`	`52`	`}`
`47`	`53`