Fix: createStakedExpenditure saga stuck if enough active tokens

JoinColony · Oct 13, 2024 · 0e35c83 · 0e35c83
1 parent b2a06f7
commit 0e35c83
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/redux/sagas/expenditures/createStakedExpenditure.ts b/src/redux/sagas/expenditures/createStakedExpenditure.ts
@@ -109,7 +109,9 @@ function* createStakedExpenditure({
   yield createMulticallChannels();
 
   try {
-    if (stakeAmount.gt(activeBalance)) {
+    const needsActivatingTokens = stakeAmount.gt(activeBalance);
+
+    if (needsActivatingTokens) {
       const missingActiveTokens = stakeAmount.sub(activeBalance);
 
       yield createGroupTransaction({
@@ -198,13 +200,15 @@ function* createStakedExpenditure({
       });
     }
 
-    yield takeFrom(approve.channel, ActionTypes.TRANSACTION_CREATED);
-    yield initiateTransaction(approve.id);
-    yield waitForTxResult(approve.channel);
+    if (needsActivatingTokens) {
+      yield takeFrom(approve.channel, ActionTypes.TRANSACTION_CREATED);
+      yield initiateTransaction(approve.id);
+      yield waitForTxResult(approve.channel);
 
-    yield takeFrom(deposit.channel, ActionTypes.TRANSACTION_CREATED);
-    yield initiateTransaction(deposit.id);
-    yield waitForTxResult(deposit.channel);
+      yield takeFrom(deposit.channel, ActionTypes.TRANSACTION_CREATED);
+      yield initiateTransaction(deposit.id);
+      yield waitForTxResult(deposit.channel);
+    }
 
     yield takeFrom(approveStake.channel, ActionTypes.TRANSACTION_CREATED);
     yield initiateTransaction(approveStake.id);