@rango-dev/queue-manager-rango-preset 0.1.13-next.2 → 0.1.14

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

@@ -498,7 +498,7 @@ var PrettyError = /*#__PURE__*/function (_Error) {
     return _this;
   }
   PrettyError.isPrettyError = function isPrettyError(obj) {
-    return obj instanceof PrettyError || Object.prototype.hasOwnProperty('_isPrettyError');
+    return obj instanceof PrettyError || Object.prototype.hasOwnProperty.call(obj, '_isPrettyError');
   };
   var _proto = PrettyError.prototype;
   _proto.getErrorDetail = function getErrorDetail() {
@@ -1131,25 +1131,30 @@ function _getChainId() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          _context.next = 2;
+          _context.prev = 0;
+          _context.next = 3;
           return provider.request({
             method: 'eth_chainId'
           });
-        case 2:
+        case 3:
           _context.t0 = _context.sent;
           if (_context.t0) {
-            _context.next = 5;
+            _context.next = 6;
             break;
           }
           _context.t0 = provider == null ? void 0 : provider.chainId;
-        case 5:
+        case 6:
           chainId = _context.t0;
           return _context.abrupt("return", chainId);
-        case 7:
+        case 10:
+          _context.prev = 10;
+          _context.t1 = _context["catch"](0);
+          return _context.abrupt("return", provider == null ? void 0 : provider.chainId);
+        case 13:
         case "end":
           return _context.stop();
       }
-    }, _callee);
+    }, _callee, null, [[0, 10]]);
   }));
   return _getChainId.apply(this, arguments);
 }
@@ -1437,7 +1442,7 @@ function isRequiredWalletConnected(swap, getState) {
   var matched = connectedAccounts.some(function (account) {
     var _readAccountAddress = readAccountAddress(account),
       accountAddress = _readAccountAddress.address;
-    return address === accountAddress;
+    return address.toLocaleLowerCase() === accountAddress.toLocaleLowerCase();
   });
   return {
     ok: matched,
@@ -1517,7 +1522,7 @@ function singTransaction(actions) {
         errorCode: extraMessageErrorCode
       });
       notifier(_extends({
-        eventType: 'contract_rejected'
+        eventType: extraMessageErrorCode === 'REJECTED_BY_USER' ? 'contract_rejected' : 'smart_contract_call_failed'
       }, updateResult));
       failed();
       onFinish();
@@ -1563,7 +1568,7 @@ function singTransaction(actions) {
         errorCode: extraMessageErrorCode
       });
       notifier(_extends({
-        eventType: 'contract_rejected'
+        eventType: extraMessageErrorCode === 'REJECTED_BY_USER' ? 'contract_rejected' : 'smart_contract_call_failed'
       }, updateResult));
       failed();
       onFinish();
@@ -1609,7 +1614,7 @@ function singTransaction(actions) {
         errorCode: extraMessageErrorCode
       });
       notifier(_extends({
-        eventType: 'contract_rejected'
+        eventType: extraMessageErrorCode === 'REJECTED_BY_USER' ? 'contract_rejected' : 'smart_contract_call_failed'
       }, updateResult));
       failed();
       onFinish();
@@ -1659,7 +1664,7 @@ function singTransaction(actions) {
           errorCode: extraMessageErrorCode
         });
         notifier(_extends({
-          eventType: 'transfer_rejected'
+          eventType: extraMessageErrorCode === 'REJECTED_BY_USER' ? 'transfer_rejected' : 'transfer_failed'
         }, updateResult));
         failed();
         onFinish();
@@ -1707,7 +1712,7 @@ function singTransaction(actions) {
           errorCode: extraMessageErrorCode
         });
         notifier(_extends({
-          eventType: 'smart_contract_call_failed'
+          eventType: extraMessageErrorCode === 'REJECTED_BY_USER' ? 'contract_rejected' : 'smart_contract_call_failed'
         }, updateResult));
         failed();
         onFinish();
@@ -2186,12 +2191,12 @@ function checkTransactionStatus(_x) {
  */
 function _checkTransactionStatus() {
   _checkTransactionStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var _status, _status2, _status3, _status4, _status5, _status6, _status7, _status8, _status9, _status10;
-    var getStorage, setStorage, next, schedule, retry, context, swap, currentStep, txId, status, outputAmount, prevOutputAmount, newTransaction, nextStep;
+    var _status, _status2, _status3, _status4, _status5, _status6, _status7, _status9, _status10, _status11;
+    var getStorage, setStorage, next, schedule, retry, failed, context, swap, currentStep, txId, status, outputAmount, prevOutputAmount, newTransaction, nextStep, _status8;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          getStorage = _ref.getStorage, setStorage = _ref.setStorage, next = _ref.next, schedule = _ref.schedule, retry = _ref.retry, context = _ref.context;
+          getStorage = _ref.getStorage, setStorage = _ref.setStorage, next = _ref.next, schedule = _ref.schedule, retry = _ref.retry, failed = _ref.failed, context = _ref.context;
           swap = getStorage().swapDetails; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           currentStep = getCurrentStep(swap);
           txId = currentStep.executedTransactionId;
@@ -2279,26 +2284,36 @@ function _checkTransactionStatus() {
           } else if (currentStep.status === 'failed') {
             swap.extraMessage = 'Transaction failed in blockchain';
             swap.extraMessageSeverity = MessageSeverity.error;
-            swap.extraMessageDetail = '';
+            swap.extraMessageDetail = ((_status8 = status) == null ? void 0 : _status8.extraMessage) || '';
+            swap.status = 'failed';
+            swap.finishTime = new Date().getTime().toString();
           }
           // Sync data with storage
           setStorage(_extends({}, getStorage(), {
             swapDetails: swap
           }));
-          if (!(((_status8 = status) == null ? void 0 : _status8.status) === 'failed' || ((_status9 = status) == null ? void 0 : _status9.status) === 'success' || ((_status10 = status) == null ? void 0 : _status10.status) === 'running' && !!status.newTx)) {
-            _context.next = 39;
+          if (!(((_status9 = status) == null ? void 0 : _status9.status) === 'failed')) {
+            _context.next = 38;
+            break;
+          }
+          failed();
+          _context.next = 46;
+          break;
+        case 38:
+          if (!(((_status10 = status) == null ? void 0 : _status10.status) === 'success' || ((_status11 = status) == null ? void 0 : _status11.status) === 'running' && !!status.newTx)) {
+            _context.next = 43;
             break;
           }
           schedule(SwapActionTypes.SCHEDULE_NEXT_STEP);
           next();
-          _context.next = 42;
+          _context.next = 46;
           break;
-        case 39:
-          _context.next = 41;
+        case 43:
+          _context.next = 45;
           return delay(INTERVAL_FOR_CHECK);
-        case 41:
+        case 45:
           retry();
-        case 42:
+        case 46:
         case "end":
           return _context.stop();
       }
@@ -2319,7 +2334,7 @@ function checkApprovalStatus(_x2) {
  */
 function _checkApprovalStatus() {
   _checkApprovalStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
-    var getStorage, setStorage, next, schedule, retry, failed, context, swap, currentStep, isApproved, response, updateResult;
+    var getStorage, setStorage, next, schedule, retry, failed, context, swap, currentStep, isApproved, response, message, details, updateResult;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -2339,7 +2354,14 @@ function _checkApprovalStatus() {
           return _context2.abrupt("return");
         case 10:
           isApproved = response.isApproved;
-          if (!isApproved && response.txStatus === 'failed') {
+          if (!isApproved && (response.txStatus === 'failed' || response.txStatus === 'success')) {
+            if (response.txStatus === 'failed') {
+              message = 'Approve transaction failed';
+              details = 'Smart contract approval failed in blockchain.';
+            } else {
+              message = 'Not enough approval';
+              if (response.requiredApprovedAmount && response.currentApprovedAmount) details = "Required approval: " + response.requiredApprovedAmount + ", current approval: " + response.currentApprovedAmount;else details = "You still don't have enough approval for this swap.";
+            }
             // approve transaction failed on
             // we should fail the whole swap
             updateResult = updateSwapStatus({
@@ -2348,14 +2370,13 @@ function _checkApprovalStatus() {
               nextStatus: 'failed',
               nextStepStatus: 'failed',
               errorCode: 'SEND_TX_FAILED',
-              message: 'Approve transaction failed',
-              details: 'Smart contract approval failed in blockchain.'
+              message: message,
+              details: details
             });
             context.notifier(_extends({
               eventType: 'smart_contract_call_failed'
             }, updateResult));
             failed();
-            // onFinish();
           } else if (!isApproved) {
             // it is needed to set notification after reloading the page
             context.notifier({
@@ -2676,12 +2697,14 @@ function scheduleNextStep(_ref) {
     context = _ref.context;
   var swap = getStorage().swapDetails;
   var currentStep = getCurrentStep(swap);
-  if (!!currentStep) {
+  var isFailed = swap.steps.find(function (step) {
+    return step.status === 'failed';
+  });
+  if (!!currentStep && !isFailed) {
     if (isTxAlreadyCreated(swap, currentStep)) {
       schedule(SwapActionTypes.EXECUTE_TRANSACTION);
       return next();
     }
-    // TODO double check it after approval changes
     if (currentStep != null && currentStep.executedTransactionId) {
       schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
       return next();
@@ -2693,9 +2716,6 @@ function scheduleNextStep(_ref) {
     schedule(SwapActionTypes.CREATE_TRANSACTION);
     next();
   } else {
-    var isFailed = swap.steps.find(function (step) {
-      return step.status === 'failed';
-    });
     swap.status = isFailed ? 'failed' : 'success';
     swap.finishTime = new Date().getTime().toString();
     setStorage(_extends({}, getStorage(), {