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

package/dist/queue-manager-rango-preset.esm.js

@@ -1185,7 +1185,7 @@ function onBlockForChangeNetwork(_event, meta) {
     queue = meta.queue;
   var swap = queue.getStorage().swapDetails;
   var currentStep = getCurrentStep(swap);
-  if (!currentStep) return;
+  if (!currentStep || swap.status !== 'running') return;
   var result = markRunningSwapAsSwitchingNetwork({
     getStorage: queue.getStorage.bind(queue),
     setStorage: queue.setStorage.bind(queue)
@@ -1775,7 +1775,7 @@ function checkWaitingForConnectWalletChange(params) {
   manager == null ? void 0 : manager.getAll().forEach(function (q) {
     var queueStorage = q.list.getStorage();
     var swap = queueStorage == null ? void 0 : queueStorage.swapDetails;
-    if (swap) {
+    if (swap && swap.status === 'running') {
       var currentStep = getCurrentStep(swap);
       if (currentStep) {
         var _queueStorage$swapDet;
@@ -1786,10 +1786,8 @@ function checkWaitingForConnectWalletChange(params) {
           return task.status === Status.BLOCKED && [BlockReason.WAIT_FOR_CONNECT_WALLET].includes((_task$blockedFor = task.blockedFor) == null ? void 0 : _task$blockedFor.reason);
         });
         if (currentStepRequiredWallet === wallet && hasWaitingForConnect) {
-          var _queueInstance$getSto;
           var queueInstance = q.list;
-          var _swap = (_queueInstance$getSto = queueInstance.getStorage()) == null ? void 0 : _queueInstance$getSto.swapDetails;
-          var _getRequiredWallet5 = getRequiredWallet(_swap),
+          var _getRequiredWallet5 = getRequiredWallet(swap),
             type = _getRequiredWallet5.type;
           var description = ERROR_MESSAGE_WAIT_FOR_CHANGE_NETWORK(type);
           q.list.block({
@@ -1818,16 +1816,18 @@ function checkWaitingForNetworkChange(manager) {
     if (hasWaitingForNetwork) {
       var _q$list$getStorage;
       var swap = (_q$list$getStorage = q.list.getStorage()) == null ? void 0 : _q$list$getStorage.swapDetails;
-      var _getRequiredWallet6 = getRequiredWallet(swap),
-        type = _getRequiredWallet6.type;
-      var 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: description
-        }
-      });
+      if (swap.status === 'running') {
+        var _getRequiredWallet6 = getRequiredWallet(swap),
+          type = _getRequiredWallet6.type;
+        var 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: description
+          }
+        });
+      }
     }
   });
 }
@@ -1862,7 +1862,7 @@ function retryOn(wallet_network, manager, options) {
     if (q.status === Status.BLOCKED) {
       var queueStorage = q.list.getStorage();
       var swap = queueStorage == null ? void 0 : queueStorage.swapDetails;
-      if (swap) {
+      if (swap && swap.status === 'running') {
         var currentStep = getCurrentStep(swap);
         if (currentStep) {
           var _queueStorage$swapDet2, _queueStorage$swapDet3;
@@ -2486,7 +2486,7 @@ function _migration() {
               var _tasks;
               var taskId = v4();
               var convertedSwap = {
-                id: v4(),
+                id: swap.requestId,
                 createdAt: Number(swap.creationTime),
                 name: 'swap',
                 status: Status.RUNNING,
@@ -2514,7 +2514,7 @@ function _migration() {
                */
               var status = swap.status === 'success' ? Status.SUCCESS : Status.FAILED;
               var _convertedSwap = {
-                id: v4(),
+                id: swap.requestId,
                 createdAt: Number(swap.creationTime),
                 name: 'swap',
                 status: status,