From 23764074293e8f2c00d9efaeeac0138df77321e2 Mon Sep 17 00:00:00 2001 From: Kevin Brian Bader Date: Thu, 9 Jan 2025 00:59:13 -0800 Subject: [PATCH] FIX: Task delete confirmation Cancel button navigates to parent report --- src/pages/ReportDetailsPage.tsx | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index 166b12b27751..f539aee3107a 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -875,22 +875,15 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta // Where to navigate back to after deleting the transaction and its report. const navigateToTargetUrl = useCallback(() => { - let urlToNavigateBack: string | undefined; - + // If transaction was not deleted (i.e. Cancel was clicked), do nothing + // which only dismiss the delete confirmation modal if (!isTransactionDeleted.current) { - if (caseID === CASES.DEFAULT) { - urlToNavigateBack = Task.getNavigationUrlOnTaskDelete(report); - if (urlToNavigateBack) { - Report.setDeleteTransactionNavigateBackUrl(urlToNavigateBack); - Navigation.goBack(urlToNavigateBack as Route); - } else { - Navigation.dismissModal(); - } - return; - } return; } + let urlToNavigateBack: string | undefined; + + // Only proceed with navigation logic if transaction was actually deleted if (!isEmptyObject(requestParentReportAction)) { const isTrackExpense = ReportActionsUtils.isTrackExpenseAction(requestParentReportAction); if (isTrackExpense) { @@ -906,7 +899,7 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta Report.setDeleteTransactionNavigateBackUrl(urlToNavigateBack); ReportUtils.navigateBackOnDeleteTransaction(urlToNavigateBack as Route, true); } - }, [caseID, iouTransactionID, moneyRequestReport?.reportID, report, requestParentReportAction, isSingleTransactionView, isTransactionDeleted]); + }, [report, iouTransactionID, requestParentReportAction, isSingleTransactionView, isTransactionDeleted, moneyRequestReport?.reportID]); const mentionReportContextValue = useMemo(() => ({currentReportID: report.reportID, exactlyMatch: true}), [report.reportID]);