diff --git a/src/libs/actions/Link.ts b/src/libs/actions/Link.ts index 104fe4a9e2e9..ae51ec04f541 100644 --- a/src/libs/actions/Link.ts +++ b/src/libs/actions/Link.ts @@ -355,7 +355,7 @@ function openReportFromDeepLink( const lastAccessedReportID = findLastAccessedReport(false, shouldOpenOnAdminRoom(), undefined, reportID)?.reportID; if (lastAccessedReportID) { const lastAccessedReportRoute = ROUTES.REPORT_WITH_ID.getRoute(lastAccessedReportID); - Navigation.navigate(lastAccessedReportRoute); + Navigation.navigate(lastAccessedReportRoute, {forceReplace: Navigation.getTopmostReportId() === reportID}); return; } navigateToConciergeChat(false, () => true); @@ -378,7 +378,7 @@ function openReportFromDeepLink( // eslint-disable-next-line rulesdir/prefer-early-return callback: (report) => { // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing - if (report?.errorFields?.notFound || report?.reportID) { + if (report?.errorFields?.notFound || report?.reportID || (report === undefined && CONST.REGEX.NON_NUMERIC.test(reportID))) { Onyx.disconnect(reportConnection); navigateHandler(report); }