Merge pull request Expensify#46272 from dominictb/fix/45699-delete-task

fix: dismiss modal after deleting task
kmbcook · Aug 5, 2024 · aa3804e · aa3804e
2 parents 13beeac + f401f4f
commit aa3804e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
@@ -1056,7 +1056,7 @@ function deleteTask(report: OnyxEntry<OnyxTypes.Report>) {
     Report.notifyNewAction(report.reportID, currentUserAccountID);
 
     if (shouldDeleteTaskReport) {
-        Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(parentReport?.reportID ?? '-1'));
+        return ROUTES.REPORT_WITH_ID.getRoute(parentReport?.reportID ?? '-1');
     }
 }
 

diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
@@ -680,8 +680,7 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
         setIsDeleteModalVisible(false);
 
         if (caseID === CASES.DEFAULT) {
-            Task.deleteTask(report);
-            navigateBackToAfterDelete.current = undefined;
+            navigateBackToAfterDelete.current = Task.deleteTask(report);
             return;
         }
 
@@ -784,6 +783,13 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                     onModalHide={() => {
                         // We use isTransactionDeleted to know if the modal hides because the user deletes the transaction.
                         if (!isTransactionDeleted.current) {
+                            if (caseID === CASES.DEFAULT) {
+                                if (navigateBackToAfterDelete.current) {
+                                    Navigation.goBack(navigateBackToAfterDelete.current);
+                                } else {
+                                    Navigation.dismissModal();
+                                }
+                            }
                             return;
                         }