remove unnecessary params and navigation

cleanup the code

Author: war-in

modules/hybrid-app/src/index.native.ts

@@ -1,6 +1,3 @@
-import {Linking} from 'react-native';
-import type { Route } from '@src/ROUTES';
-import {handleHybridUrlNavigation} from '@src/HybridAppHandler';
 import ReactNativeHybridApp from './NativeReactNativeHybridApp';
 import type HybridAppModuleType from './types';
 
@@ -25,8 +22,4 @@ const HybridAppModule: HybridAppModuleType = {
     },
 };
 
-Linking.addEventListener('url', (state) => {
-    handleHybridUrlNavigation(state.url as Route);
-});
-
 export default HybridAppModule;

src/App.tsx

@@ -44,6 +44,7 @@ import OnyxUpdateManager from './libs/actions/OnyxUpdateManager';
 import {ReportAttachmentsProvider} from './pages/home/report/ReportAttachmentsContext';
 import type {Route} from './ROUTES';
 import './setup/backgroundTask';
+import './setup/hybridApp';
 import {SplashScreenStateContextProvider} from './SplashScreenStateContext';
 
 /**
@@ -114,12 +115,7 @@ function App({url, hybridAppSettings}: AppProps) {
                         >
                             <CustomStatusBarAndBackground />
                             <ErrorBoundary errorMessage="NewExpensify crash caught by error boundary">
-                                {CONFIG.IS_HYBRID_APP && (
-                                    <HybridAppHandler
-                                        url={url}
-                                        hybridAppSettings={hybridAppSettings}
-                                    />
-                                )}
+                                <HybridAppHandler hybridAppSettings={hybridAppSettings} />
                                 <ColorSchemeWrapper>
                                     <Expensify />
                                 </ColorSchemeWrapper>

src/HybridAppHandler.tsx

@@ -1,44 +1,19 @@
-import {findFocusedRoute} from '@react-navigation/native';
 import {useContext, useState} from 'react';
 import type {AppProps} from './App';
+import CONFIG from './CONFIG';
 import CONST from './CONST';
 import {signInAfterTransitionFromOldDot} from './libs/actions/Session';
-import Navigation, {navigationRef} from './libs/Navigation/Navigation';
-import type {Route} from './ROUTES';
-import ROUTES from './ROUTES';
-import SCREENS from './SCREENS';
 import SplashScreenStateContext from './SplashScreenStateContext';
 
-let isInitialNavigationHandled = false;
-
-function handleHybridUrlNavigation(url: Route) {
-    isInitialNavigationHandled = true;
-    const parsedUrl = Navigation.parseHybridAppUrl(url);
-
-    Navigation.isNavigationReady().then(() => {
-        if (parsedUrl.startsWith(`/${ROUTES.SHARE_ROOT}`)) {
-            const focusRoute = findFocusedRoute(navigationRef.getRootState());
-            if (focusRoute?.name === SCREENS.SHARE.SHARE_DETAILS || focusRoute?.name === SCREENS.SHARE.SUBMIT_DETAILS) {
-                Navigation.goBack(ROUTES.SHARE_ROOT);
-                return;
-            }
-        }
-        Navigation.navigate(parsedUrl);
-    });
-}
-
-function HybridAppHandler({url, hybridAppSettings}: AppProps) {
+function HybridAppHandler({hybridAppSettings}: AppProps) {
     const [signInHandled, setSignInHandled] = useState(false);
     const {setSplashScreenState} = useContext(SplashScreenStateContext);
 
-    if (!url || !hybridAppSettings || signInHandled) {
+    if (!CONFIG.IS_HYBRID_APP || !hybridAppSettings || signInHandled) {
         return null;
     }
 
     signInAfterTransitionFromOldDot(hybridAppSettings).then(() => {
-        if (!isInitialNavigationHandled) {
-            handleHybridUrlNavigation(url);
-        }
         setSplashScreenState(CONST.BOOT_SPLASH_STATE.READY_TO_BE_HIDDEN);
         setSignInHandled(true);
     });
@@ -49,4 +24,3 @@ function HybridAppHandler({url, hybridAppSettings}: AppProps) {
 HybridAppHandler.displayName = 'HybridAppHandler';
 
 export default HybridAppHandler;
-export {handleHybridUrlNavigation}

src/setup/hybridApp/index.native.ts

@@ -0,0 +1,28 @@
+import {findFocusedRoute} from '@react-navigation/native';
+import {Linking} from 'react-native';
+import Navigation, {navigationRef} from '@navigation/Navigation';
+import CONFIG from '@src/CONFIG';
+import type {Route} from '@src/ROUTES';
+import ROUTES from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
+
+if (CONFIG.IS_HYBRID_APP) {
+    Linking.addEventListener('url', (state) => {
+        handleHybridUrlNavigation(state.url as Route);
+    });
+}
+
+function handleHybridUrlNavigation(url: Route) {
+    const parsedUrl = Navigation.parseHybridAppUrl(url);
+
+    Navigation.isNavigationReady().then(() => {
+        if (parsedUrl.startsWith(`/${ROUTES.SHARE_ROOT}`)) {
+            const focusRoute = findFocusedRoute(navigationRef.getRootState());
+            if (focusRoute?.name === SCREENS.SHARE.SHARE_DETAILS || focusRoute?.name === SCREENS.SHARE.SUBMIT_DETAILS) {
+                Navigation.goBack(ROUTES.SHARE_ROOT);
+                return;
+            }
+        }
+        Navigation.navigate(parsedUrl);
+    });
+}

src/setup/hybridApp/index.ts

@@ -0,0 +1,2 @@
+// This file is intentionally empty as Hybrid App is a native mobile platforms feature
+// See `index.native.ts` for the native implementation.