Merge pull request #22746 from samh-nl/fix/issue-22060

fix: clear task pendingAction upon success
Expensify · Jul 13, 2023 · a5f6467 · a5f6467
2 parents 138a41c + 4f49a47
commit a5f6467
Showing 1 changed file with 35 additions and 3 deletions.
diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js
@@ -213,7 +213,17 @@ function completeTask(taskReportID, taskTitle) {
         },
     ];
 
-    const successData = [];
+    const successData = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${taskReportID}`,
+            value: {
+                [completedTaskReportAction.reportActionID]: {
+                    pendingAction: null,
+                },
+            },
+        },
+    ];
     const failureData = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -273,7 +283,17 @@ function reopenTask(taskReportID, taskTitle) {
         },
     ];
 
-    const successData = [];
+    const successData = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${taskReportID}`,
+            value: {
+                [reopenedTaskReportAction.reportActionID]: {
+                    pendingAction: null,
+                },
+            },
+        },
+    ];
     const failureData = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -613,6 +633,18 @@ function cancelTask(taskReportID, taskTitle, originalStateNum, originalStatusNum
         },
     ];
 
+    const successData = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${taskReportID}`,
+            value: {
+                [optimisticReportActionID]: {
+                    pendingAction: null,
+                },
+            },
+        },
+    ];
+
     const failureData = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -631,7 +663,7 @@ function cancelTask(taskReportID, taskTitle, originalStateNum, originalStatusNum
         },
     ];
 
-    API.write('CancelTask', {cancelledTaskReportActionID: optimisticReportActionID, taskReportID}, {optimisticData, failureData});
+    API.write('CancelTask', {cancelledTaskReportActionID: optimisticReportActionID, taskReportID}, {optimisticData, successData, failureData});
 }
 
 /**