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

# Conflicts:
#	src/Expensify.tsx
#	src/components/ScreenWrapper/index.tsx

Author: war-in

src/ROUTES.ts

@@ -2585,18 +2585,6 @@ const ROUTES = {
     TEST_TOOLS_MODAL: 'test-tools',
 } as const;
 
-/**
- * Proxy routes can be used to generate a correct url with dynamic values
- *
- * It will be used by HybridApp, that has no access to methods generating dynamic routes in NewDot
- */
-const HYBRID_APP_ROUTES = {
-    MONEY_REQUEST_CREATE: '/request/new/scan',
-    MONEY_REQUEST_CREATE_TAB_SCAN: '/submit/new/scan',
-    MONEY_REQUEST_CREATE_TAB_MANUAL: '/submit/new/manual',
-    MONEY_REQUEST_CREATE_TAB_DISTANCE: '/submit/new/distance',
-} as const;
-
 /**
  * Configuration for shared parameters that can be passed between routes.
  * These parameters are commonly used across multiple screens and are preserved
@@ -2610,7 +2598,7 @@ const SHARED_ROUTE_PARAMS: Partial<Record<Screen, string[]>> = {
     [SCREENS.WORKSPACE.INITIAL]: ['backTo'],
 } as const;
 
-export {HYBRID_APP_ROUTES, getUrlWithBackToParam, PUBLIC_SCREENS_ROUTES, SHARED_ROUTE_PARAMS};
+export {getUrlWithBackToParam, PUBLIC_SCREENS_ROUTES, SHARED_ROUTE_PARAMS};
 export default ROUTES;
 
 type AttachmentsRoute = typeof ROUTES.ATTACHMENTS.route;
@@ -2658,6 +2646,4 @@ type RoutesValidationError = 'Error: One or more routes defined within `ROUTES`
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 type RouteIsPlainString = AssertTypesNotEqual<string, Route, RoutesValidationError>;
 
-type HybridAppRoute = (typeof HYBRID_APP_ROUTES)[keyof typeof HYBRID_APP_ROUTES];
-
-export type {HybridAppRoute, Route};
+export type {Route};

src/components/ScreenWrapper/index.tsx

@@ -171,7 +171,7 @@ function ScreenWrapper(
     const {initialURL} = useContext(InitialURLContext);
     const [hybridApp] = useOnyx(ONYXKEYS.HYBRID_APP, {canBeMissing: true});
 
-    usePreventRemove((hybridApp?.isSingleNewDotEntry ?? false) && initialURL === Navigation.getActiveRouteWithoutParams(), () => {
+    usePreventRemove((hybridApp?.isSingleNewDotEntry ?? false) && !!initialURL?.endsWith(Navigation.getActiveRouteWithoutParams()), () => {
         if (!CONFIG.IS_HYBRID_APP) {
             return;
         }

src/libs/Navigation/types.ts

@@ -19,7 +19,7 @@ import type {AttachmentModalScreenParams} from '@pages/media/AttachmentModalScre
 import type CONST from '@src/CONST';
 import type {Country, IOUAction, IOUType} from '@src/CONST';
 import type NAVIGATORS from '@src/NAVIGATORS';
-import type {Route as ExpensifyRoute, HybridAppRoute, Route as Routes} from '@src/ROUTES';
+import type {Route as ExpensifyRoute, Route as Routes} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type EXIT_SURVEY_REASON_FORM_INPUT_IDS from '@src/types/form/ExitSurveyReasonForm';
 import type {CompanyCardFeed} from '@src/types/onyx';
@@ -1978,7 +1978,7 @@ type SharedScreensParamList = {
         shortLivedToken?: string;
         authTokenType?: ValueOf<typeof CONST.AUTH_TOKEN_TYPES>;
         // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
-        exitTo?: Routes | HybridAppRoute;
+        exitTo?: Routes;
         shouldForceLogin: string;
         domain?: Routes;
         delegatorEmail?: string;
@@ -1987,7 +1987,7 @@ type SharedScreensParamList = {
         accountID: string;
         validateCode: string;
         // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
-        exitTo?: Routes | HybridAppRoute;
+        exitTo?: Routes;
     };
 };
 

src/libs/actions/Report.ts

@@ -3429,6 +3429,10 @@ function openReportFromDeepLink(url: string) {
                                 return;
                             }
 
+                            if (isAuthenticated) {
+                                return;
+                            }
+
                             // Check if the report exists in the collection
                             const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
                             // If the report does not exist, navigate to the last accessed report or Concierge chat

src/libs/actions/Session/index.ts

@@ -57,7 +57,7 @@ import * as Welcome from '@userActions/Welcome';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {HybridAppRoute, Route} from '@src/ROUTES';
+import type {Route} from '@src/ROUTES';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 import type {TryNewDot} from '@src/types/onyx';
@@ -1182,18 +1182,18 @@ function waitForUserSignIn(): Promise<boolean> {
     });
 }
 
-function handleExitToNavigation(exitTo: Route | HybridAppRoute) {
+function handleExitToNavigation(exitTo: Route) {
     InteractionManager.runAfterInteractions(() => {
         waitForUserSignIn().then(() => {
             Navigation.waitForProtectedRoutes().then(() => {
                 Navigation.goBack();
-                Navigation.navigate(exitTo as Route);
+                Navigation.navigate(exitTo);
             });
         });
     });
 }
 
-function signInWithValidateCodeAndNavigate(accountID: number, validateCode: string, twoFactorAuthCode = '', exitTo?: Route | HybridAppRoute) {
+function signInWithValidateCodeAndNavigate(accountID: number, validateCode: string, twoFactorAuthCode = '', exitTo?: Route) {
     signInWithValidateCode(accountID, validateCode, twoFactorAuthCode);
     if (exitTo) {
         handleExitToNavigation(exitTo);

src/setup/hybridApp/index.native.ts

@@ -1,43 +1,10 @@
 import HybridAppModule from '@expensify/react-native-hybrid-app';
 import {Linking} from 'react-native';
-import {generateReportID} from '@libs/ReportUtils';
 import CONFIG from '@src/CONFIG';
-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) {
     // 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);
-    };
+    Linking.getInitialURL = () => HybridAppModule.getInitialURL();
 }