Merge pull request #2116 from JoinColony/fix/task-finalize-persistent

Finalize both Tasks and Persistent Tasks

Author: rdig

src/modules/dashboard/components/ProgramReview/ProgramReviewItem.tsx

@@ -127,6 +127,7 @@ const ProgramReviewItem = ({
           payouts,
           skillId,
           workerAddress: worker.profile.walletAddress,
+          persistent: true,
         });
       }
       await acceptLevelTaskSubmission();

src/modules/dashboard/sagas/task.ts

@@ -81,6 +81,7 @@ function* taskFinalize({
     domainId,
     skillId,
     payouts,
+    persistent = false,
   },
   meta,
 }: Action<ActionTypes.TASK_FINALIZE>) {
@@ -116,21 +117,23 @@ function* taskFinalize({
       payload: { hash: txHash },
     } = yield takeFrom(txChannel, ActionTypes.TRANSACTION_HASH_RECEIVED);
 
-    /*
-     * @NOTE Put the task in a pending state
-     */
-    yield apolloClient.mutate<
-      SetTaskPendingMutation,
-      SetTaskPendingMutationVariables
-    >({
-      mutation: SetTaskPendingDocument,
-      variables: {
-        input: {
-          id: draftId,
-          txHash,
+    if (!persistent) {
+      /*
+       * @NOTE Put the task in a pending state
+       */
+      yield apolloClient.mutate<
+        SetTaskPendingMutation,
+        SetTaskPendingMutationVariables
+      >({
+        mutation: SetTaskPendingDocument,
+        variables: {
+          input: {
+            id: draftId,
+            txHash,
+          },
         },
-      },
-    });
+      });
+    }
 
     yield takeFrom(txChannel, ActionTypes.TRANSACTION_RECEIPT_RECEIVED);
 

src/redux/types/actions/task.ts

@@ -67,6 +67,7 @@ export type TaskActionTypes =
         domainId: number;
         skillId: number;
         payouts: Payouts;
+        persistent: boolean;
       }
     >
   | TaskErrorActionType<ActionTypes.TASK_FINALIZE_ERROR>