From 95d60be42befa1d2bbb7ef0f0ee449f028e87030 Mon Sep 17 00:00:00 2001 From: daledah Date: Tue, 27 Aug 2024 13:59:11 +0700 Subject: [PATCH 1/2] fix: remove transaction after navigate --- src/libs/actions/IOU.ts | 1 + src/pages/ReportDetailsPage.tsx | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index f935b813cebd..a6799d797bc7 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -8042,5 +8042,6 @@ export { updateMoneyRequestTaxAmount, updateMoneyRequestTaxRate, mergeDuplicates, + prepareToCleanUpMoneyRequest }; export type {GPSPoint as GpsPoint, IOURequestType}; diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index de93ed7a3ced..e32959a8335d 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -697,7 +697,8 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD if (ReportActionsUtils.isTrackExpenseAction(requestParentReportAction)) { navigateBackToAfterDelete.current = IOU.deleteTrackExpense(moneyRequestReport?.reportID ?? '', iouTransactionID, requestParentReportAction, isSingleTransactionView); } else { - navigateBackToAfterDelete.current = IOU.deleteMoneyRequest(iouTransactionID, requestParentReportAction, isSingleTransactionView); + const {urlToNavigateBack} = IOU.prepareToCleanUpMoneyRequest(iouTransactionID, requestParentReportAction, true); + navigateBackToAfterDelete.current = urlToNavigateBack; } isTransactionDeleted.current = true; @@ -805,6 +806,9 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD Navigation.dismissModal(); } else { ReportUtils.navigateBackAfterDeleteTransaction(navigateBackToAfterDelete.current, true); + setTimeout(() => { + IOU.deleteMoneyRequest(iouTransactionID, requestParentReportAction, isSingleTransactionView); + }, CONST.ANIMATED_TRANSITION); } }} prompt={caseID === CASES.DEFAULT ? translate('task.deleteConfirmation') : translate('iou.deleteConfirmation')} From 995ed4a6e7833fb90e298231919b00aebfca3599 Mon Sep 17 00:00:00 2001 From: daledah Date: Tue, 27 Aug 2024 15:15:10 +0700 Subject: [PATCH 2/2] fix: lint checks --- src/libs/actions/IOU.ts | 2 +- src/pages/ReportDetailsPage.tsx | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index a6799d797bc7..bf5755bd2c1e 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -8042,6 +8042,6 @@ export { updateMoneyRequestTaxAmount, updateMoneyRequestTaxRate, mergeDuplicates, - prepareToCleanUpMoneyRequest + prepareToCleanUpMoneyRequest, }; export type {GPSPoint as GpsPoint, IOURequestType}; diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index e32959a8335d..4e49ed10acb4 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -806,6 +806,9 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD Navigation.dismissModal(); } else { ReportUtils.navigateBackAfterDeleteTransaction(navigateBackToAfterDelete.current, true); + if (!requestParentReportAction) { + return; + } setTimeout(() => { IOU.deleteMoneyRequest(iouTransactionID, requestParentReportAction, isSingleTransactionView); }, CONST.ANIMATED_TRANSITION);