@rango-dev/queue-manager-rango-preset 0.1.10-next.92 → 0.1.10-next.93

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/queue-manager-rango-preset",
-  "version": "0.1.10-next.92",
+  "version": "0.1.10-next.93",
   "license": "MIT",
   "module": "dist/queue-manager-rango-preset.esm.js",
   "main": "dist/index.js",

package/src/helpers.ts

@@ -675,7 +675,7 @@ export function onBlockForChangeNetwork(
   const swap = queue.getStorage().swapDetails as SwapStorage['swapDetails'];
   const currentStep = getCurrentStep(swap);
 
-  if (!currentStep) return;
+  if (!currentStep || swap.status !== 'running') return;
 
   const result = markRunningSwapAsSwitchingNetwork({
     getStorage: queue.getStorage.bind(queue),
@@ -1491,7 +1491,7 @@ export function checkWaitingForConnectWalletChange(params: {
   manager?.getAll().forEach((q) => {
     const queueStorage = q.list.getStorage() as SwapStorage | undefined;
     const swap = queueStorage?.swapDetails;
-    if (swap) {
+    if (swap && swap.status === 'running') {
       const currentStep = getCurrentStep(swap);
       if (currentStep) {
         const currentStepRequiredWallet =
@@ -1511,8 +1511,6 @@ export function checkWaitingForConnectWalletChange(params: {
 
         if (currentStepRequiredWallet === wallet && hasWaitingForConnect) {
           const queueInstance = q.list;
-          const swap = queueInstance.getStorage()
-            ?.swapDetails as SwapStorage['swapDetails'];
           const { type } = getRequiredWallet(swap);
           const description = ERROR_MESSAGE_WAIT_FOR_CHANGE_NETWORK(type);
 
@@ -1552,16 +1550,18 @@ export function checkWaitingForNetworkChange(manager?: Manager): void {
     if (hasWaitingForNetwork) {
       const swap = q.list.getStorage()
         ?.swapDetails as SwapStorage['swapDetails'];
-      const { type } = getRequiredWallet(swap);
-      const description = ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION(type);
-
-      // Change the block reason to waiting for connecting wallet
-      q.list.block({
-        reason: {
-          reason: BlockReason.WAIT_FOR_CONNECT_WALLET,
-          description,
-        },
-      });
+      if (swap.status === 'running') {
+        const { type } = getRequiredWallet(swap);
+        const description = ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION(type);
+
+        // Change the block reason to waiting for connecting wallet
+        q.list.block({
+          reason: {
+            reason: BlockReason.WAIT_FOR_CONNECT_WALLET,
+            description,
+          },
+        });
+      }
     }
   });
 }
@@ -1596,7 +1596,7 @@ export function retryOn(
       const queueStorage = q.list.getStorage() as SwapStorage | undefined;
       const swap = queueStorage?.swapDetails;
 
-      if (swap) {
+      if (swap && swap.status === 'running') {
         const currentStep = getCurrentStep(swap);
         if (currentStep) {
           if (