diff --git a/src/components/MigratedUserWelcomeModal.tsx b/src/components/MigratedUserWelcomeModal.tsx index 11b0ab1e1b36..b5e4e1b33a18 100644 --- a/src/components/MigratedUserWelcomeModal.tsx +++ b/src/components/MigratedUserWelcomeModal.tsx @@ -11,11 +11,8 @@ import {openExternalLink} from '@libs/actions/Link'; import {dismissProductTraining} from '@libs/actions/Welcome'; import convertToLTR from '@libs/convertToLTR'; import Log from '@libs/Log'; -import Navigation from '@libs/Navigation/Navigation'; -import {buildCannedSearchQuery} from '@libs/SearchQueryUtils'; import variables from '@styles/variables'; import CONST from '@src/CONST'; -import ROUTES from '@src/ROUTES'; import type {FeatureListItem} from './FeatureList'; import FeatureTrainingModal from './FeatureTrainingModal'; import Icon from './Icon'; @@ -61,7 +58,6 @@ function MigratedUserWelcomeModal() { const onClose = () => { Log.hmmm('[MigratedUserWelcomeModal] onClose called, dismissing product training'); dismissProductTraining(CONST.MIGRATED_USER_WELCOME_MODAL); - Navigation.navigate(ROUTES.SEARCH_ROOT.getRoute({query: buildCannedSearchQuery({type: CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT})})); }; const featureListContent = ( diff --git a/src/libs/Navigation/guards/MigratedUserWelcomeModalGuard.ts b/src/libs/Navigation/guards/MigratedUserWelcomeModalGuard.ts index 18e23a71b5c6..38fb868504ce 100644 --- a/src/libs/Navigation/guards/MigratedUserWelcomeModalGuard.ts +++ b/src/libs/Navigation/guards/MigratedUserWelcomeModalGuard.ts @@ -4,20 +4,17 @@ import {tryNewDotOnyxSelector} from '@selectors/Onboarding'; import Onyx from 'react-native-onyx'; import type {OnyxEntry} from 'react-native-onyx'; import Log from '@libs/Log'; -import Navigation from '@libs/Navigation/Navigation'; import isProductTrainingElementDismissed from '@libs/TooltipUtils'; import CONST from '@src/CONST'; import NAVIGATORS from '@src/NAVIGATORS'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; import SCREENS from '@src/SCREENS'; -import type {DismissedProductTraining, Session} from '@src/types/onyx'; +import type {DismissedProductTraining} from '@src/types/onyx'; import type {GuardResult, NavigationGuard} from './types'; let hasBeenAddedToNudgeMigration = false; let dismissedProductTraining: OnyxEntry; -let session: OnyxEntry; -let isLoadingApp = true; let hasRedirectedToMigratedUserModal = false; @@ -25,43 +22,11 @@ function resetSessionFlag() { hasRedirectedToMigratedUserModal = false; } -/** - * Proactively navigate to the migrated user welcome modal when all conditions are met, - * without waiting for a user-initiated navigation action. - */ -function navigateToMigratedUserWelcomeModalIfReady() { - if ( - !session?.authToken || - isLoadingApp || - hasRedirectedToMigratedUserModal || - !hasBeenAddedToNudgeMigration || - isProductTrainingElementDismissed('migratedUserWelcomeModal', dismissedProductTraining) - ) { - return; - } - - Log.info('[MigratedUserWelcomeModalGuard] Proactively navigating to migrated user welcome modal'); - hasRedirectedToMigratedUserModal = true; - Navigation.navigate(ROUTES.MIGRATED_USER_WELCOME_MODAL.getRoute()); -} - -/** - * Called by guards/index.ts when session or loading app state changes. - * Reuses the shared Onyx subscriptions from guards/index.ts to avoid duplicate connections - * that cause extra renders in performance tests. - */ -function onSessionOrLoadingAppChanged(sessionValue: OnyxEntry, isLoadingAppValue: boolean) { - session = sessionValue; - isLoadingApp = isLoadingAppValue; - navigateToMigratedUserWelcomeModalIfReady(); -} - Onyx.connectWithoutView({ key: ONYXKEYS.NVP_TRY_NEW_DOT, callback: (value) => { const result = value ? tryNewDotOnyxSelector(value) : undefined; hasBeenAddedToNudgeMigration = result?.hasBeenAddedToNudgeMigration ?? false; - navigateToMigratedUserWelcomeModalIfReady(); }, }); @@ -133,4 +98,4 @@ const MigratedUserWelcomeModalGuard: NavigationGuard = { }; export default MigratedUserWelcomeModalGuard; -export {resetSessionFlag, onSessionOrLoadingAppChanged}; +export {resetSessionFlag}; diff --git a/src/libs/Navigation/guards/index.ts b/src/libs/Navigation/guards/index.ts index 22ac29cb2d5d..33851c2907cc 100644 --- a/src/libs/Navigation/guards/index.ts +++ b/src/libs/Navigation/guards/index.ts @@ -4,7 +4,7 @@ import type {OnyxEntry} from 'react-native-onyx'; import getCurrentUrl from '@libs/Navigation/currentUrl'; import ONYXKEYS from '@src/ONYXKEYS'; import type {Session} from '@src/types/onyx'; -import MigratedUserWelcomeModalGuard, {onSessionOrLoadingAppChanged} from './MigratedUserWelcomeModalGuard'; +import MigratedUserWelcomeModalGuard from './MigratedUserWelcomeModalGuard'; import OnboardingGuard from './OnboardingGuard'; import type {GuardContext, GuardResult, NavigationGuard} from './types'; @@ -19,7 +19,6 @@ Onyx.connectWithoutView({ key: ONYXKEYS.SESSION, callback: (value) => { session = value; - onSessionOrLoadingAppChanged(session, isLoadingApp); }, }); @@ -27,7 +26,6 @@ Onyx.connectWithoutView({ key: ONYXKEYS.IS_LOADING_APP, callback: (value) => { isLoadingApp = value ?? true; - onSessionOrLoadingAppChanged(session, isLoadingApp); }, });