update to use InitialUrlContext

Author: dmkt9

src/Expensify.tsx

@@ -5,6 +5,7 @@ import type {NativeEventSubscription} from 'react-native';
 import {AppState, Linking, Platform} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
+import {InitialURLContext} from '@components/InitialURLContextProvider';
 import ConfirmModal from './components/ConfirmModal';
 import DeeplinkWrapper from './components/DeeplinkWrapper';
 import EmojiPicker from './components/EmojiPicker/EmojiPicker';
@@ -105,7 +106,7 @@ function Expensify() {
     useDebugShortcut();
 
     const [initialUrl, setInitialUrl] = useState<Route | null>(null);
-
+    const {setIsAuthenticatedAtStartup} = useContext(InitialURLContext);
     useEffect(() => {
         if (isCheckingPublicRoom) {
             return;
@@ -201,6 +202,7 @@ function Expensify() {
 
         appStateChangeListener.current = AppState.addEventListener('change', initializeClient);
 
+        setIsAuthenticatedAtStartup(isAuthenticated);
         // If the app is opened from a deep link, get the reportID (if exists) from the deep link and navigate to the chat report
         Linking.getInitialURL().then((url) => {
             setInitialUrl(url as Route);

src/components/InitialURLContextProvider.tsx

@@ -1,18 +1,21 @@
 import React, {createContext, useEffect, useMemo, useState} from 'react';
 import type {ReactNode} from 'react';
 import {Linking} from 'react-native';
-import {hasAuthToken} from '@libs/actions/Session';
 import type {Route} from '@src/ROUTES';
 
 type InitialUrlContextType = {
     initialURL: Route | null;
     setInitialURL: React.Dispatch<React.SetStateAction<Route | null>>;
+    isAuthenticatedAtStartup: boolean;
+    setIsAuthenticatedAtStartup: React.Dispatch<React.SetStateAction<boolean>>;
 };
 
 /** Initial url that will be opened when NewDot is embedded into Hybrid App. */
 const InitialURLContext = createContext<InitialUrlContextType>({
     initialURL: null,
     setInitialURL: () => {},
+    isAuthenticatedAtStartup: false,
+    setIsAuthenticatedAtStartup: () => {},
 });
 
 type InitialURLContextProviderProps = {
@@ -22,7 +25,7 @@ type InitialURLContextProviderProps = {
 
 function InitialURLContextProvider({children}: InitialURLContextProviderProps) {
     const [initialURL, setInitialURL] = useState<Route | null>(null);
-    const [isAuthenticatedAtStartup, setIsAuthenticatedAtStartup] = useState<boolean>();
+    const [isAuthenticatedAtStartup, setIsAuthenticatedAtStartup] = useState<boolean>(false);
 
     useEffect(() => {
         Linking.getInitialURL().then((initURL) => {
@@ -33,16 +36,12 @@ function InitialURLContextProvider({children}: InitialURLContextProviderProps) {
         });
     }, []);
 
-    useEffect(() => {
-        const isAuthenticated = hasAuthToken();
-        setIsAuthenticatedAtStartup(isAuthenticated);
-    }, []);
-
     const initialUrlContext = useMemo(
         () => ({
             initialURL,
             setInitialURL,
             isAuthenticatedAtStartup,
+            setIsAuthenticatedAtStartup,
         }),
         [initialURL, isAuthenticatedAtStartup],
     );

src/libs/Navigation/AppNavigator/AuthScreens.tsx

@@ -244,7 +244,7 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
     const prevIsOnboardingLoading = usePrevious(isOnboardingLoading);
     const [shouldShowRequire2FAPage, setShouldShowRequire2FAPage] = useState(!!account?.needsTwoFactorAuthSetup && !account.requiresTwoFactorAuth);
     const navigation = useNavigation();
-    const {initialURL} = useContext(InitialURLContext);
+    const {initialURL, isAuthenticatedAtStartup, setIsAuthenticatedAtStartup} = useContext(InitialURLContext);
 
     // State to track whether the delegator's authentication is completed before displaying data
     const [isDelegatorFromOldDotIsReady, setIsDelegatorFromOldDotIsReady] = useState(false);
@@ -326,8 +326,10 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
                         });
                 } else {
                     const reportID = getReportIDFromLink(initialURL ?? null);
-                    if (reportID) {
+                    if (reportID && !isAuthenticatedAtStartup) {
                         Report.openReport(reportID);
+                        // Don't want to call `openReport` again when logging out and then logging in
+                        setIsAuthenticatedAtStartup(true);
                     }
                     App.openApp();
                 }

src/libs/actions/Report.ts

@@ -3440,11 +3440,6 @@ function openReportFromDeepLink(url: string) {
                                 return;
                             }
 
-                            // Navigation for signed users is handled by react-navigation.
-                            if (isAuthenticated) {
-                                return;
-                            }
-
                             const navigateHandler = (reportParam?: OnyxEntry<Report>) => {
                                 // Check if the report exists in the collection
                                 const report = reportParam ?? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];