Skip to content

[CP Staging] Revert "Navigate to last accessed report after dismissing migrated user welcome modal" #91934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grgia merged 1 commit into from
May 28, 2026
+2 −10
Merged

[CP Staging] Revert "Navigate to last accessed report after dismissing migrated user welcome modal" #91934

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 2 additions & 10 deletions src/components/MigratedUserWelcomeModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import React, {useMemo} from 'react';
import {View} from 'react-native';
import useArchivedReportsIdSet from '@hooks/useArchivedReportsIdSet';
import useIsPaidPolicyAdmin from '@hooks/useIsPaidPolicyAdmin';
import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import usePermissions from '@hooks/usePermissions';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useStyleUtils from '@hooks/useStyleUtils';
import useThemeStyles from '@hooks/useThemeStyles';
Expand All @@ -13,9 +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 shouldOpenOnAdminRoom from '@libs/Navigation/helpers/shouldOpenOnAdminRoom';
import Navigation from '@libs/Navigation/Navigation';
import {findLastAccessedReport} from '@libs/ReportUtils';
import {buildCannedSearchQuery} from '@libs/SearchQueryUtils';
import variables from '@styles/variables';
import CONST from '@src/CONST';
import ROUTES from '@src/ROUTES';
Expand All @@ -30,8 +27,6 @@ function MigratedUserWelcomeModal() {
const styles = useThemeStyles();
const StyleUtils = useStyleUtils();
const {shouldUseNarrowLayout} = useResponsiveLayout();
const {isBetaEnabled} = usePermissions();
const archivedReportsIdSet = useArchivedReportsIdSet();
const isReduceMotionEnabled = Accessibility.useReducedMotion();
const illustrations = useMemoizedLazyIllustrations(['ChatBubbles', 'ConciergeBot', 'PlanetWithMobileApp', 'MagnifyingGlassReceipt']);
const isCurrentUserPolicyAdmin = useIsPaidPolicyAdmin();
Expand Down Expand Up @@ -66,10 +61,7 @@ function MigratedUserWelcomeModal() {
const onClose = () => {
Log.hmmm('[MigratedUserWelcomeModal] onClose called, dismissing product training');
dismissProductTraining(CONST.MIGRATED_USER_WELCOME_MODAL);
const lastAccessedReportID = findLastAccessedReport(!isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS), shouldOpenOnAdminRoom(), undefined, archivedReportsIdSet)?.reportID;
if (lastAccessedReportID) {
Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(lastAccessedReportID));
}
Navigation.navigate(ROUTES.SEARCH_ROOT.getRoute({query: buildCannedSearchQuery({type: CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT})}));
};

const featureListContent = (
Expand Down
Loading