Merge pull request #2760 from JoinColony/fix/2739-tx-loading-order

Fix pending order of `stakeMotion` transactions
JoinColony · Jul 24, 2024 · 72cd960 · 72cd960
2 parents f4b4e6d + 732bc82
commit 72cd960
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/src/redux/sagas/motions/stakeMotion.ts b/src/redux/sagas/motions/stakeMotion.ts
@@ -170,6 +170,20 @@ function* stakeMotion({
       yield takeFrom(annotateStaking.channel, ActionTypes.TRANSACTION_CREATED);
     }
 
+    if (activateTokens) {
+      yield put(transactionPending(approve.id));
+
+      yield initiateTransaction({ id: approve.id });
+
+      yield waitForTxResult(approve.channel);
+
+      yield put(transactionPending(deposit.id));
+
+      yield initiateTransaction({ id: deposit.id });
+
+      yield waitForTxResult(deposit.channel);
+    }
+
     yield put(transactionPending(approveStake.id));
 
     const { domainId, rootHash } = yield call(
@@ -185,16 +199,6 @@ function* stakeMotion({
       ]),
     );
 
-    if (activateTokens) {
-      yield initiateTransaction({ id: approve.id });
-
-      yield waitForTxResult(approve.channel);
-
-      yield initiateTransaction({ id: deposit.id });
-
-      yield waitForTxResult(deposit.channel);
-    }
-
     yield initiateTransaction({ id: approveStake.id });
 
     yield waitForTxResult(approveStake.channel);