diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx index 79c5d5df795e2..bb3c85beeda0b 100644 --- a/src/libs/Navigation/AppNavigator/AuthScreens.tsx +++ b/src/libs/Navigation/AppNavigator/AuthScreens.tsx @@ -2,9 +2,10 @@ import type {RouteProp} from '@react-navigation/native'; import {findFocusedRoute, useNavigation} from '@react-navigation/native'; import React, {memo, useEffect, useMemo, useRef, useState} from 'react'; import type {OnyxEntry} from 'react-native-onyx'; -import Onyx, {useOnyx, withOnyx} from 'react-native-onyx'; +import Onyx, {useOnyx} from 'react-native-onyx'; import ActiveWorkspaceContextProvider from '@components/ActiveWorkspaceProvider'; import ComposeProviders from '@components/ComposeProviders'; +import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator'; import OptionsListContextProvider from '@components/OptionListContextProvider'; import {SearchContextProvider} from '@components/Search/SearchContext'; import {useSearchRouterContext} from '@components/Search/SearchRouter/SearchRouterContext'; @@ -53,6 +54,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'; @@ -67,7 +69,7 @@ import RightModalNavigator from './Navigators/RightModalNavigator'; import WelcomeVideoModalNavigator from './Navigators/WelcomeVideoModalNavigator'; import useRootNavigatorScreenOptions from './useRootNavigatorScreenOptions'; -type AuthScreensProps = { +type AuthScreensContentProps = { /** Session of currently logged in user */ session: OnyxEntry; @@ -210,7 +212,29 @@ const modalScreenListenersWithCancelSearch = { }, }; -function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDAppliedToClient}: AuthScreensProps) { +// AuthScreens has been migrated to useOnyx. In the previous version, withOnyx waited until all the Onyx values are loaded and then rendered the component first time. +// To avoid breaking functionalities that rely on this logic, we keep the same behavior by waiting for the Onyx values to be loaded before rendering the component. +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 isLastOpenedPublicRoomIDLoading = isLoadingOnyxValue(lastOpenedPublicRoomIDStatus); + const isInitialLastUpdateIDAppliedToClientLoading = isLoadingOnyxValue(initialLastUpdateIDAppliedToClientStatus); + + if (isLastOpenedPublicRoomIDLoading || isInitialLastUpdateIDAppliedToClientLoading) { + return ; + } + + return ( + + ); +} + +function AuthScreensContent({session, lastOpenedPublicRoomID, initialLastUpdateIDAppliedToClient}: AuthScreensContentProps) { const theme = useTheme(); const {shouldUseNarrowLayout} = useResponsiveLayout(); const rootNavigatorScreenOptions = useRootNavigatorScreenOptions(); @@ -662,20 +686,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 0db3c5fb11f71..f50e61c63ac89 100644 --- a/src/libs/Navigation/linkingConfig/config.ts +++ b/src/libs/Navigation/linkingConfig/config.ts @@ -1563,7 +1563,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 226299c4ad411..a246f435f8c24 100644 --- a/src/libs/actions/App.ts +++ b/src/libs/actions/App.ts @@ -481,7 +481,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 ec145ce2a30dc..dc81842045a07 100644 --- a/src/libs/actions/Session/index.ts +++ b/src/libs/actions/Session/index.ts @@ -55,7 +55,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 Response from '@src/types/onyx/Response'; import type Session from '@src/types/onyx/Session'; @@ -843,19 +842,11 @@ function clearSignInData() { } /** - * Reset all current params of the Home route + * Reset navigation state after logout */ -function resetHomeRouteParams() { +function resetNavigationState() { 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); }); } @@ -875,7 +866,7 @@ function cleanupSession() { PersistedRequests.clear(); NetworkConnection.clearReconnectionCallbacks(); SessionUtils.resetDidUserLogInDuringSession(); - resetHomeRouteParams(); + resetNavigationState(); clearCache().then(() => { Log.info('Cleared all cache data', true, {}, true); });