@rango-dev/queue-manager-rango-preset 0.1.15-next.5 → 0.1.15-next.7

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

@@ -960,7 +960,7 @@ function updateSwapStatus(_ref) {
   var swap = getStorage().swapDetails;
   var currentStep = getCurrentStep(swap);
   if (!!nextStepStatus && !!currentStep) currentStep.status = nextStepStatus;
-  if (!!nextStatus) swap.status = nextStatus;
+  if (nextStatus) swap.status = nextStatus;
   swap.hasAlreadyProceededToSign = hasAlreadyProceededToSign;
   if (!!nextStatus && ['failed', 'success'].includes(nextStatus)) swap.finishTime = new Date().getTime().toString();
   if (!!message || !!details) {
@@ -1006,7 +1006,7 @@ function setStepTransactionIds(_ref2, txId, notifier, eventType, explorerUrl) {
   var currentStep = getCurrentStep(swap);
   currentStep.executedTransactionId = txId;
   currentStep.executedTransactionTime = new Date().getTime().toString();
-  if (!!(explorerUrl != null && explorerUrl.url)) currentStep.explorerUrl = [].concat(currentStep.explorerUrl || [], [{
+  if (explorerUrl != null && explorerUrl.url) currentStep.explorerUrl = [].concat(currentStep.explorerUrl || [], [{
     url: explorerUrl.url,
     description: explorerUrl.description || null
   }]);
@@ -1022,7 +1022,7 @@ function setStepTransactionIds(_ref2, txId, notifier, eventType, explorerUrl) {
   setStorage(_extends({}, getStorage(), {
     swapDetails: swap
   }));
-  if (!!eventType) notifier({
+  if (eventType) notifier({
     eventType: eventType,
     swap: swap,
     step: currentStep
@@ -1393,16 +1393,18 @@ function onBlockForChangeNetwork(_event, meta) {
     type = _getRequiredWallet2.type,
     network = _getRequiredWallet2.network;
   if (!!type && !!network) {
-    var _result = context.switchNetwork(type, network);
-    if (_result) {
-      _result.then(function () {
-        queue.unblock();
-      })["catch"](function (error) {
-        // ignore switch network errors
-        console.log({
-          error: error
+    if (context.canSwitchNetworkTo(type, network)) {
+      var _result = context.switchNetwork(type, network);
+      if (_result) {
+        _result.then(function () {
+          queue.unblock();
+        })["catch"](function (error) {
+          // ignore switch network errors
+          console.log({
+            error: error
+          });
         });
-      });
+      }
     }
   }
 }
@@ -1464,7 +1466,7 @@ function onDependsOnOtherQueues(_event, meta) {
     resetClaimedBy: function resetClaimedBy() {
       reset();
       // TODO: Use key generator
-      retryOn(type + "-" + network + ":" + address, context.notifier, manager);
+      retryOn(type + "-" + network + ":" + address, context.notifier, manager, context.canSwitchNetworkTo);
     }
   });
 }
@@ -1739,8 +1741,8 @@ function resetRunningSwapNotifsOnPageLoad(runningSwaps, notifier) {
  * @param manager
  * @returns
  */
-function retryOn(wallet_network, notifier, manager, options) {
-  var _finalQueueToBeRun;
+function retryOn(wallet_network, notifier, manager, canSwitchNetworkTo, options) {
+  var _finalQueueToBeRun, _finalQueueToBeRun2;
   if (options === void 0) {
     options = {
       fallbackToOnlyWallet: true
@@ -1788,7 +1790,7 @@ function retryOn(wallet_network, notifier, manager, options) {
   } else if (onlyWalletMatched.length > 0 && options.fallbackToOnlyWallet) {
     finalQueueToBeRun = onlyWalletMatched[0];
   }
-  (_finalQueueToBeRun = finalQueueToBeRun) == null ? void 0 : _finalQueueToBeRun.checkBlock();
+  if (!(canSwitchNetworkTo != null && canSwitchNetworkTo(wallet, network))) (_finalQueueToBeRun = finalQueueToBeRun) == null ? void 0 : _finalQueueToBeRun.unblock();else (_finalQueueToBeRun2 = finalQueueToBeRun) == null ? void 0 : _finalQueueToBeRun2.checkBlock();
 }
 /*
   For avoiding conflict by making too many requests to wallet, we need to make sure
@@ -1810,27 +1812,22 @@ function _throwOnOK() {
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          _context3.prev = 0;
-          _context3.next = 3;
+          _context3.next = 2;
           return rawResponse;
-        case 3:
+        case 2:
           responseBody = _context3.sent;
           if (!(!responseBody.ok || !responseBody.transaction)) {
-            _context3.next = 6;
+            _context3.next = 5;
             break;
           }
           throw PrettyError.CreateTransaction(responseBody.error || 'bad response from create tx endpoint');
-        case 6:
+        case 5:
           return _context3.abrupt("return", responseBody);
-        case 9:
-          _context3.prev = 9;
-          _context3.t0 = _context3["catch"](0);
-          throw _context3.t0;
-        case 12:
+        case 6:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[0, 9]]);
+    }, _callee3);
   }));
   return _throwOnOK.apply(this, arguments);
 }
@@ -2737,7 +2734,7 @@ function useQueueManager(params) {
         manager: manager,
         notifier: params.notifier
       });
-      retryOn(params.lastConnectedWallet, params.notifier, manager);
+      retryOn(params.lastConnectedWallet, params.notifier, manager, params.canSwitchNetworkTo);
     }
   }, [params.lastConnectedWallet]);
   useEffect(function () {