Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/components/MigratedUserWelcomeModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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 = (
Expand Down
39 changes: 2 additions & 37 deletions src/libs/Navigation/guards/MigratedUserWelcomeModalGuard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,64 +4,29 @@ 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<DismissedProductTraining>;
let session: OnyxEntry<Session>;
let isLoadingApp = true;

let hasRedirectedToMigratedUserModal = false;

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<Session>, 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();
},
});

Expand Down Expand Up @@ -133,4 +98,4 @@ const MigratedUserWelcomeModalGuard: NavigationGuard = {
};

export default MigratedUserWelcomeModalGuard;
export {resetSessionFlag, onSessionOrLoadingAppChanged};
export {resetSessionFlag};
4 changes: 1 addition & 3 deletions src/libs/Navigation/guards/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -19,15 +19,13 @@ Onyx.connectWithoutView({
key: ONYXKEYS.SESSION,
callback: (value) => {
session = value;
onSessionOrLoadingAppChanged(session, isLoadingApp);
},
});

Onyx.connectWithoutView({
key: ONYXKEYS.IS_LOADING_APP,
callback: (value) => {
isLoadingApp = value ?? true;
onSessionOrLoadingAppChanged(session, isLoadingApp);
},
});

Expand Down
Loading