From b0ce0ebfb3311b9fdf9457ba103aa35f742fda53 Mon Sep 17 00:00:00 2001 From: truph01 Date: Tue, 16 Dec 2025 15:22:51 +0700 Subject: [PATCH 1/3] fix: navigation issue when deleting expense --- src/libs/ReportUtils.ts | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 5c4dfe5d95aa..7c420658ab33 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -6366,12 +6366,22 @@ 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; } - if (isFromRHP) { - Navigation.dismissModal(); - } Navigation.isNavigationReady().then(() => { Navigation.goBack(backRoute); }); From d879591dcdd88ffefb660d7b9003acf734ad4cf8 Mon Sep 17 00:00:00 2001 From: truph01 Date: Tue, 16 Dec 2025 16:10:34 +0700 Subject: [PATCH 2/3] fix: revert redundant change --- src/libs/ReportUtils.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 7c420658ab33..2fedc8dc7580 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -6382,6 +6382,9 @@ function navigateBackOnDeleteTransaction(backRoute: Route | undefined, isFromRHP Navigation.dismissModal(); return; } + if (isFromRHP) { + Navigation.dismissModal(); + } Navigation.isNavigationReady().then(() => { Navigation.goBack(backRoute); }); From 83562f038d14f9f1d8172e60938f2791c569d686 Mon Sep 17 00:00:00 2001 From: truph01 Date: Tue, 16 Dec 2025 16:21:03 +0700 Subject: [PATCH 3/3] fix: spellcheck --- src/libs/ReportUtils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index 2fedc8dc7580..ce16f59e211b 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -6370,12 +6370,12 @@ function navigateBackOnDeleteTransaction(backRoute: Route | undefined, isFromRHP 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; + const newBackRoute = lastRouteParams && 'backTo' in lastRouteParams ? lastRouteParams?.backTo : undefined; if (isFromRHP) { Navigation.dismissModal(); } Navigation.isNavigationReady().then(() => { - Navigation.goBack(newbackRoute as Route); + Navigation.goBack(newBackRoute as Route); }); return; }