From 50a379f2cdd14c3bb6c15744d2606a7cc31a4a36 Mon Sep 17 00:00:00 2001 From: Wojciech Boman Date: Wed, 29 Jan 2025 16:55:12 +0100 Subject: [PATCH 1/3] Migrate AuthScreens to useOnyx --- .../Navigation/AppNavigator/AuthScreens.tsx | 89 +++++++++---------- src/libs/Navigation/linkingConfig/config.ts | 14 ++- src/libs/actions/App.ts | 2 +- src/libs/actions/Session/index.ts | 10 +-- 4 files changed, 58 insertions(+), 57 deletions(-) diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx index ec1c06b2bbaf..cd546ad0a8fe 100644 --- a/src/libs/Navigation/AppNavigator/AuthScreens.tsx +++ b/src/libs/Navigation/AppNavigator/AuthScreens.tsx @@ -3,7 +3,7 @@ import {findFocusedRoute, useNavigation} from '@react-navigation/native'; import React, {memo, useEffect, useMemo, useRef} from 'react'; import {NativeModules} from 'react-native'; import type {OnyxEntry} from 'react-native-onyx'; -import Onyx, {withOnyx} from 'react-native-onyx'; +import Onyx, {useOnyx} from 'react-native-onyx'; import ActiveGuidesEventListener from '@components/ActiveGuidesEventListener'; import ActiveWorkspaceContextProvider from '@components/ActiveWorkspaceProvider'; import ComposeProviders from '@components/ComposeProviders'; @@ -57,6 +57,7 @@ import SCREENS from '@src/SCREENS'; import type * as OnyxTypes from '@src/types/onyx'; import type {SelectedTimezone, Timezone} from '@src/types/onyx/PersonalDetails'; import {isEmptyObject} from '@src/types/utils/EmptyObject'; +import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue'; import type ReactComponentModule from '@src/types/utils/ReactComponentModule'; import createRootStackNavigator from './createRootStackNavigator'; import {reportsSplitsWithEnteringAnimation, workspaceSplitsWithoutEnteringAnimation} from './createRootStackNavigator/GetStateForActionHandlers'; @@ -70,17 +71,6 @@ import RightModalNavigator from './Navigators/RightModalNavigator'; import WelcomeVideoModalNavigator from './Navigators/WelcomeVideoModalNavigator'; import useRootNavigatorScreenOptions from './useRootNavigatorScreenOptions'; -type AuthScreensProps = { - /** Session of currently logged in user */ - session: OnyxEntry; - - /** The report ID of the last opened public room as anonymous user */ - lastOpenedPublicRoomID: OnyxEntry; - - /** The last Onyx update ID was applied to the client */ - initialLastUpdateIDAppliedToClient: OnyxEntry; -}; - const loadReportAttachments = () => require('../../../pages/home/report/ReportAttachments').default; const loadValidateLoginPage = () => require('../../../pages/ValidateLoginPage').default; const loadLogOutPreviousUserPage = () => require('../../../pages/LogOutPreviousUserPage').default; @@ -213,7 +203,10 @@ const modalScreenListenersWithCancelSearch = { }, }; -function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDAppliedToClient}: AuthScreensProps) { +function AuthScreens() { + const [session] = useOnyx(ONYXKEYS.SESSION); + const [lastOpenedPublicRoomID, lastOpenedPublicRoomIDStatus] = useOnyx(ONYXKEYS.LAST_OPENED_PUBLIC_ROOM_ID); + const [initialLastUpdateIDAppliedToClient, initialLastUpdateIDAppliedToClientStatus] = useOnyx(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT); const theme = useTheme(); const {shouldUseNarrowLayout} = useResponsiveLayout(); const rootNavigatorScreenOptions = useRootNavigatorScreenOptions(); @@ -222,6 +215,10 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie const modal = useRef({}); const {isOnboardingCompleted} = useOnboardingFlowRouter(); + const isLastOpenedPublicRoomIDLoading = isLoadingOnyxValue(lastOpenedPublicRoomIDStatus); + const isInitialLastUpdateIDAppliedToClientLoading = isLoadingOnyxValue(initialLastUpdateIDAppliedToClientStatus); + const isLastOpenedPublicRoomIDLoadedRef = useRef(false); + const isInitialLastUpdateIDAppliedToClientLoadedRef = useRef(false); const navigation = useNavigation(); useEffect(() => { @@ -244,6 +241,37 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie }; }, [theme]); + useEffect(() => { + if (isLastOpenedPublicRoomIDLoading || isLastOpenedPublicRoomIDLoadedRef.current) { + return; + } + + isLastOpenedPublicRoomIDLoadedRef.current = true; + if (lastOpenedPublicRoomID) { + // Re-open the last opened public room if the user logged in from a public room link + Report.openLastOpenedPublicRoom(lastOpenedPublicRoomID); + } + }, [isLastOpenedPublicRoomIDLoading, lastOpenedPublicRoomID]); + + useEffect(() => { + if (isInitialLastUpdateIDAppliedToClientLoading || isInitialLastUpdateIDAppliedToClientLoadedRef.current) { + return; + } + + isInitialLastUpdateIDAppliedToClientLoadedRef.current = true; + // In Hybrid App we decide to call one of those method when booting ND and we don't want to duplicate calls + if (!NativeModules.HybridAppModule) { + // If we are on this screen then we are "logged in", but the user might not have "just logged in". They could be reopening the app + // or returning from background. If so, we'll assume they have some app data already and we can call reconnectApp() instead of openApp(). + if (SessionUtils.didUserLogInDuringSession()) { + App.openApp(); + } else { + Log.info('[AuthScreens] Sending ReconnectApp'); + App.reconnectApp(initialLastUpdateIDAppliedToClient); + } + } + }, [initialLastUpdateIDAppliedToClient, isInitialLastUpdateIDAppliedToClientLoading]); + useEffect(() => { const shortcutsOverviewShortcutConfig = CONST.KEYBOARD_SHORTCUTS.SHORTCUTS; const searchShortcutConfig = CONST.KEYBOARD_SHORTCUTS.SEARCH; @@ -264,28 +292,12 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie PusherConnectionManager.init(); initializePusher(); - // In Hybrid App we decide to call one of those method when booting ND and we don't want to duplicate calls - if (!NativeModules.HybridAppModule) { - // If we are on this screen then we are "logged in", but the user might not have "just logged in". They could be reopening the app - // or returning from background. If so, we'll assume they have some app data already and we can call reconnectApp() instead of openApp(). - if (SessionUtils.didUserLogInDuringSession()) { - App.openApp(); - } else { - Log.info('[AuthScreens] Sending ReconnectApp'); - App.reconnectApp(initialLastUpdateIDAppliedToClient); - } - } - PriorityMode.autoSwitchToFocusMode(); App.setUpPoliciesAndNavigate(session); App.redirectThirdPartyDesktopSignIn(); - if (lastOpenedPublicRoomID) { - // Re-open the last opened public room if the user logged in from a public room link - Report.openLastOpenedPublicRoom(lastOpenedPublicRoomID); - } Download.clearDownloads(); const unsubscribeOnyxModal = onyxSubscribe({ @@ -636,20 +648,5 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie AuthScreens.displayName = 'AuthScreens'; -const AuthScreensMemoized = memo(AuthScreens, () => true); - -// Migration to useOnyx cause re-login if logout from deeplinked report in desktop app -// Further analysis required and more details can be seen here: -// https://github.com/Expensify/App/issues/50560 -// eslint-disable-next-line -export default withOnyx({ - session: { - key: ONYXKEYS.SESSION, - }, - lastOpenedPublicRoomID: { - key: ONYXKEYS.LAST_OPENED_PUBLIC_ROOM_ID, - }, - initialLastUpdateIDAppliedToClient: { - key: ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT, - }, -})(AuthScreensMemoized); +// This memo is needed because is one of the main components in the app and navigation root and is relevant for the app performance. +export default memo(AuthScreens); diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts index be4eb6418232..2161fa18337a 100644 --- a/src/libs/Navigation/linkingConfig/config.ts +++ b/src/libs/Navigation/linkingConfig/config.ts @@ -1518,7 +1518,19 @@ const config: LinkingOptions['config'] = { path: ROUTES.HOME, exact: true, }, - [SCREENS.REPORT]: ROUTES.REPORT_WITH_ID.route, + [SCREENS.REPORT]: { + path: ROUTES.REPORT_WITH_ID.route, + // If params are defined, but reportID is explicitly undefined, we will get the url /r/undefined. + // We want to avoid that situation, so we will return an empty string instead. + parse: { + // eslint-disable-next-line + reportID: (reportID: string | undefined) => reportID ?? '', + }, + stringify: { + // eslint-disable-next-line + reportID: (reportID: string | undefined) => reportID ?? '', + }, + }, }, }, diff --git a/src/libs/actions/App.ts b/src/libs/actions/App.ts index f5fa451c59a4..5ceb7af3364b 100644 --- a/src/libs/actions/App.ts +++ b/src/libs/actions/App.ts @@ -500,7 +500,7 @@ function setUpPoliciesAndNavigate(session: OnyxEntry) { if (!isLoggingInAsNewUser && exitTo) { Navigation.waitForProtectedRoutes() .then(() => { - Navigation.navigate(exitTo); + Navigation.navigate(exitTo, {forceReplace: true}); }) .then(endSignOnTransition); } else { diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts index 512019b6db6e..51d8d3415283 100644 --- a/src/libs/actions/Session/index.ts +++ b/src/libs/actions/Session/index.ts @@ -830,15 +830,7 @@ function clearSignInData() { */ function resetHomeRouteParams() { Navigation.isNavigationReady().then(() => { - const routes = navigationRef.current?.getState()?.routes; - const homeRoute = routes?.find((route) => route.name === SCREENS.HOME); - - const emptyParams: Record = {}; - Object.keys(homeRoute?.params ?? {}).forEach((paramKey) => { - emptyParams[paramKey] = undefined; - }); - - Navigation.setParams(emptyParams, homeRoute?.key ?? ''); + navigationRef.resetRoot(navigationRef.getRootState()); Onyx.set(ONYXKEYS.IS_CHECKING_PUBLIC_ROOM, false); }); } From 54f6a95712fd520ba65a545883880718549878f0 Mon Sep 17 00:00:00 2001 From: Wojciech Boman Date: Wed, 29 Jan 2025 17:10:38 +0100 Subject: [PATCH 2/3] Fix lint in Session/index.ts --- src/libs/actions/Session/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts index 51d8d3415283..91990c838d0d 100644 --- a/src/libs/actions/Session/index.ts +++ b/src/libs/actions/Session/index.ts @@ -54,7 +54,6 @@ import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type {HybridAppRoute, Route} from '@src/ROUTES'; import ROUTES from '@src/ROUTES'; -import SCREENS from '@src/SCREENS'; import type Credentials from '@src/types/onyx/Credentials'; import type Session from '@src/types/onyx/Session'; import type {AutoAuthState} from '@src/types/onyx/Session'; From 433d6864bc247141c135f09326cde11a6a038a5e Mon Sep 17 00:00:00 2001 From: Wojciech Boman Date: Fri, 31 Jan 2025 07:59:56 +0100 Subject: [PATCH 3/3] Rename resetHomeRouteParams function to resetNavigationState in Session/index --- src/libs/actions/Session/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts index 91990c838d0d..6156fdc92ed9 100644 --- a/src/libs/actions/Session/index.ts +++ b/src/libs/actions/Session/index.ts @@ -825,9 +825,9 @@ function clearSignInData() { } /** - * Reset all current params of the Home route + * Reset navigation state after logout */ -function resetHomeRouteParams() { +function resetNavigationState() { Navigation.isNavigationReady().then(() => { navigationRef.resetRoot(navigationRef.getRootState()); Onyx.set(ONYXKEYS.IS_CHECKING_PUBLIC_ROOM, false); @@ -849,7 +849,7 @@ function cleanupSession() { PersistedRequests.clear(); NetworkConnection.clearReconnectionCallbacks(); SessionUtils.resetDidUserLogInDuringSession(); - resetHomeRouteParams(); + resetNavigationState(); clearCache().then(() => { Log.info('Cleared all cache data', true, {}, true); });