diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 5c4dfe5d95aa..ce16f59e211b 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -6366,6 +6366,19 @@ function navigateBackOnDeleteTransaction(backRoute: Route | undefined, isFromRHP const rootState = navigationRef.current?.getRootState(); const lastFullScreenRoute = rootState?.routes.findLast((route) => isFullScreenName(route.name)); if (lastFullScreenRoute?.name === NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR) { + const searchFullScreenRoutes = rootState?.routes.findLast((route) => route.name === NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR); + const lastRoute = searchFullScreenRoutes?.state?.routes?.at(-1); + if (lastRoute?.name === SCREENS.SEARCH.MONEY_REQUEST_REPORT) { + const lastRouteParams = lastRoute?.params; + const newBackRoute = lastRouteParams && 'backTo' in lastRouteParams ? lastRouteParams?.backTo : undefined; + if (isFromRHP) { + Navigation.dismissModal(); + } + Navigation.isNavigationReady().then(() => { + Navigation.goBack(newBackRoute as Route); + }); + return; + } Navigation.dismissModal(); return; }