@rango-dev/queue-manager-rango-preset 0.1.10-next.98 → 0.1.11-next.2

package/dist/queue-manager-rango-preset.cjs.development.js

@@ -2,31 +2,19 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+
+var rangoTypes = require('rango-types');
 var walletsShared = require('@rango-dev/wallets-shared');
+var BigNumber = _interopDefault(require('bignumber.js'));
 var walletsCore = require('@rango-dev/wallets-core');
 var rangoSdk = require('rango-sdk');
 var queueManagerCore = require('@rango-dev/queue-manager-core');
-var rangoTypes = require('rango-types');
 var Sentry = require('@sentry/browser');
 var queueManagerReact = require('@rango-dev/queue-manager-react');
 var react = require('react');
 var uuid = require('uuid');
 
-var SwapActionTypes;
-(function (SwapActionTypes) {
-  SwapActionTypes["START"] = "START";
-  SwapActionTypes["SCHEDULE_NEXT_STEP"] = "SCHEDULE_NEXT_STEP";
-  SwapActionTypes["CREATE_TRANSACTION"] = "CREATE_TRANSACTION";
-  SwapActionTypes["EXECUTE_TRANSACTION"] = "EXECUTE_TRANSACTION";
-  SwapActionTypes["CHECK_TRANSACTION_STATUS"] = "CHECK_TRANSACTION_STATUS";
-})(SwapActionTypes || (SwapActionTypes = {}));
-var BlockReason;
-(function (BlockReason) {
-  BlockReason["WAIT_FOR_CONNECT_WALLET"] = "waiting_for_connecting_wallet";
-  BlockReason["WAIT_FOR_NETWORK_CHANGE"] = "waiting_for_network_change";
-  BlockReason["DEPENDS_ON_OTHER_QUEUES"] = "depends_on_other_queues";
-})(BlockReason || (BlockReason = {}));
-
 function _regeneratorRuntime() {
   _regeneratorRuntime = function () {
     return exports;
@@ -452,46 +440,6 @@ function _assertThisInitialized(self) {
   return self;
 }
 
-var RANGO_DAPP_API_KEY = process.env.REACT_APP_API_KEY;
-var RANGO_DAPP_API_BASE_URL = process.env.REACT_APP_API_BASE_URL;
-var ERROR_MESSAGE_WAIT_FOR_WALLET = 'Waiting for connecting wallet';
-var ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION_WRONG_WALLET = function ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION_WRONG_WALLET(type, address) {
-  return "Please change your " + (type || 'wallet') + " account to " + (address || 'proper address');
-};
-var ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION = function ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION(type) {
-  return "Please connect to " + (type || 'your wallet') + " by using bellow button or top right button on page.";
-};
-var ERROR_MESSAGE_WAIT_FOR_CHANGE_NETWORK = function ERROR_MESSAGE_WAIT_FOR_CHANGE_NETWORK(network) {
-  return "Please change your network to " + network + ".";
-};
-
-var APIErrorCode;
-(function (APIErrorCode) {
-  APIErrorCode["TX_FAIL"] = "TX_FAIL";
-  APIErrorCode["FETCH_TX_FAILED"] = "FETCH_TX_FAILED";
-  APIErrorCode["USER_REJECT"] = "USER_REJECT";
-  APIErrorCode["CALL_WALLET_FAILED"] = "CALL_WALLET_FAILED";
-  APIErrorCode["SEND_TX_FAILED"] = "SEND_TX_FAILED";
-  APIErrorCode["CALL_OR_SEND_FAILED"] = "CALL_OR_SEND_FAILED";
-  APIErrorCode["USER_CANCEL"] = "USER_CANCEL";
-  APIErrorCode["CLIENT_UNEXPECTED_BEHAVIOUR"] = "CLIENT_UNEXPECTED_BEHAVIOUR";
-})(APIErrorCode || (APIErrorCode = {}));
-var ApiMethodName;
-(function (ApiMethodName) {
-  ApiMethodName["RequestingSwapTransaction"] = "Requesting Swap Transaction";
-  ApiMethodName["CreatingSwap"] = "Creating Swap";
-  ApiMethodName["CheckingTransactionStatus"] = "Checking transaction status";
-  ApiMethodName["CreateTransaction"] = "Create Transaction";
-  ApiMethodName["CheckApproval"] = "Check TX Approval";
-  ApiMethodName["GettingSwapDetail"] = "Getting Swap Detail";
-  ApiMethodName["GettingUserLimits"] = "Getting user limits";
-})(ApiMethodName || (ApiMethodName = {}));
-var TransactionName;
-(function (TransactionName) {
-  TransactionName["GenericTransaction"] = "transaction";
-  TransactionName["SendingOneInchTransaction"] = "1inch transaction";
-  TransactionName["Approval"] = "approve transaction";
-})(TransactionName || (TransactionName = {}));
 var ERROR_ASSERTION_FAILED = 'Assertion failed (Unexpected behaviour)';
 var ERROR_CREATE_TRANSACTION = 'Create transaction failed in Rango Server';
 var ERROR_INPUT_WALLET_NOT_FOUND = 'Input wallet not found';
@@ -500,12 +448,17 @@ var PrettyError = /*#__PURE__*/function (_Error) {
   function PrettyError(code, m, root, detail) {
     var _this;
     _this = _Error.call(this, m) || this;
+    _this._isPrettyError = true;
     Object.setPrototypeOf(_assertThisInitialized(_this), PrettyError.prototype);
+    PrettyError.prototype._isPrettyError = true;
     _this.code = code;
     _this.detail = detail;
     _this.root = root;
     return _this;
   }
+  PrettyError.isPrettyError = function isPrettyError(obj) {
+    return obj instanceof PrettyError || Object.prototype.hasOwnProperty('_isPrettyError');
+  };
   var _proto = PrettyError.prototype;
   _proto.getErrorDetail = function getErrorDetail() {
     var rawMessage = typeof this.root === 'object' && this.root && this.root.error ? this.root.error : JSON.stringify(this.root);
@@ -517,33 +470,30 @@ var PrettyError = /*#__PURE__*/function (_Error) {
     };
   };
   PrettyError.AssertionFailed = function AssertionFailed(m) {
-    return new PrettyError(APIErrorCode.CLIENT_UNEXPECTED_BEHAVIOUR, ERROR_ASSERTION_FAILED, m);
+    return new PrettyError('CLIENT_UNEXPECTED_BEHAVIOUR', ERROR_ASSERTION_FAILED, m);
   };
   PrettyError.BadStatusCode = function BadStatusCode(message, statusCode) {
-    return new PrettyError(APIErrorCode.TX_FAIL, message, null, "status code = " + statusCode);
+    return new PrettyError('TX_FAIL', message, null, "status code = " + statusCode);
   };
   PrettyError.CreateTransaction = function CreateTransaction(detail) {
-    return new PrettyError(APIErrorCode.FETCH_TX_FAILED, ERROR_CREATE_TRANSACTION, null, detail);
+    return new PrettyError('FETCH_TX_FAILED', ERROR_CREATE_TRANSACTION, null, detail);
   };
   PrettyError.WalletMissing = function WalletMissing() {
-    return new PrettyError(APIErrorCode.CLIENT_UNEXPECTED_BEHAVIOUR, ERROR_INPUT_WALLET_NOT_FOUND, null, 'Server requested for a blockchain or address not selected by user');
+    return new PrettyError('CLIENT_UNEXPECTED_BEHAVIOUR', ERROR_INPUT_WALLET_NOT_FOUND, null, 'Server requested for a blockchain or address not selected by user');
   };
   PrettyError.BlockchainMissing = function BlockchainMissing() {
-    return new PrettyError(APIErrorCode.CLIENT_UNEXPECTED_BEHAVIOUR, ERROR_INPUT_WALLET_NOT_FOUND, null, 'Server requested for a blockchain or address not selected by user');
+    return new PrettyError('CLIENT_UNEXPECTED_BEHAVIOUR', ERROR_INPUT_WALLET_NOT_FOUND, null, 'Server requested for a blockchain or address not selected by user');
   };
   return PrettyError;
 }( /*#__PURE__*/_wrapNativeSuper(Error));
-function isAPIErrorCode(value) {
-  return Object.values(APIErrorCode).includes(value);
-}
 function mapAppErrorCodesToAPIErrorCode(errorCode) {
-  var defaultErrorCode = APIErrorCode.CLIENT_UNEXPECTED_BEHAVIOUR;
+  var defaultErrorCode = 'CLIENT_UNEXPECTED_BEHAVIOUR';
   try {
     if (!errorCode) return defaultErrorCode;
-    if (isAPIErrorCode(errorCode)) return errorCode;
+    if (rangoTypes.isAPIErrorCode(errorCode)) return errorCode;
     if (rangoTypes.isSignerErrorCode(errorCode)) {
       var _t;
-      var t = (_t = {}, _t[rangoTypes.SignerErrorCode.REJECTED_BY_USER] = APIErrorCode.USER_REJECT, _t[rangoTypes.SignerErrorCode.SIGN_TX_ERROR] = APIErrorCode.CALL_WALLET_FAILED, _t[rangoTypes.SignerErrorCode.SEND_TX_ERROR] = APIErrorCode.SEND_TX_FAILED, _t[rangoTypes.SignerErrorCode.NOT_IMPLEMENTED] = defaultErrorCode, _t[rangoTypes.SignerErrorCode.OPERATION_UNSUPPORTED] = defaultErrorCode, _t[rangoTypes.SignerErrorCode.UNEXPECTED_BEHAVIOUR] = defaultErrorCode, _t);
+      var t = (_t = {}, _t[rangoTypes.SignerErrorCode.REJECTED_BY_USER] = 'USER_REJECT', _t[rangoTypes.SignerErrorCode.SIGN_TX_ERROR] = 'CALL_WALLET_FAILED', _t[rangoTypes.SignerErrorCode.SEND_TX_ERROR] = 'SEND_TX_FAILED', _t[rangoTypes.SignerErrorCode.NOT_IMPLEMENTED] = defaultErrorCode, _t[rangoTypes.SignerErrorCode.OPERATION_UNSUPPORTED] = defaultErrorCode, _t[rangoTypes.SignerErrorCode.UNEXPECTED_BEHAVIOUR] = defaultErrorCode, _t);
       return t[errorCode];
     }
     return defaultErrorCode;
@@ -551,21 +501,74 @@ function mapAppErrorCodesToAPIErrorCode(errorCode) {
     return defaultErrorCode;
   }
 }
+var prettifyErrorMessage = function prettifyErrorMessage(obj) {
+  if (!obj) return {
+    extraMessage: '',
+    extraMessageErrorCode: null
+  };
+  if (PrettyError.isPrettyError(obj)) return obj.getErrorDetail();
+  if (rangoTypes.SignerError.isSignerError(obj)) {
+    var t = obj.getErrorDetail();
+    return {
+      extraMessage: t.message,
+      extraMessageDetail: t.detail,
+      extraMessageErrorCode: t.code
+    };
+  }
+  if (obj instanceof Error) return {
+    extraMessage: obj.toString(),
+    extraMessageErrorCode: null
+  };
+  if (typeof obj !== 'string') return {
+    extraMessage: JSON.stringify(obj),
+    extraMessageErrorCode: null
+  };
+  return {
+    extraMessage: obj,
+    extraMessageErrorCode: null
+  };
+};
+
+var numberToString = function numberToString(number, minDecimals, maxDecimals) {
+  if (minDecimals === void 0) {
+    minDecimals = null;
+  }
+  if (maxDecimals === void 0) {
+    maxDecimals = null;
+  }
+  if (number === null) return '';
+  if (number === '') return '';
+  var n = new BigNumber(number);
+  var roundingMode = 1;
+  var maxI = 1000;
+  for (var i = 0; i < 60; i++) {
+    if (new BigNumber(n.toFixed(i, roundingMode)).eq(n)) {
+      maxI = i;
+      break;
+    }
+  }
+  if (n.gte(10000)) return n.toFormat(0, roundingMode);
+  if (n.gte(1000)) return n.toFormat(Math.min(maxI, Math.min(maxDecimals || 100, Math.max(minDecimals || 0, 1))), roundingMode);
+  if (n.gte(100)) return n.toFormat(Math.min(maxI, Math.min(maxDecimals || 100, Math.max(minDecimals || 0, 1))), roundingMode);
+  if (n.gte(1)) return n.toFormat(Math.min(maxI, Math.min(maxDecimals || 100, Math.max(minDecimals || 0, 2))), roundingMode);
+  if (n.gte(0.01)) return n.toFormat(Math.min(maxI, Math.min(maxDecimals || 100, Math.max(minDecimals || 0, 4))), roundingMode);
+  for (var _i = minDecimals || 4; _i < 17; _i++) if (n.gte(Math.pow(10, -_i))) return n.toFormat(Math.min(maxI, Math.min(maxDecimals || 100, Math.max(minDecimals || 0, _i))), roundingMode);
+  if (n.isEqualTo(0)) return '0';
+  return n.toFormat(Math.min(maxI, Math.min(maxDecimals || 100, Math.max(minDecimals || 0, 8))), roundingMode);
+};
 
-var PendingSwapNetworkStatus;
 (function (PendingSwapNetworkStatus) {
   PendingSwapNetworkStatus["WaitingForConnectingWallet"] = "waitingForConnectingWallet";
   PendingSwapNetworkStatus["WaitingForQueue"] = "waitingForQueue";
   PendingSwapNetworkStatus["WaitingForNetworkChange"] = "waitingForNetworkChange";
   PendingSwapNetworkStatus["NetworkChanged"] = "networkChanged";
-})(PendingSwapNetworkStatus || (PendingSwapNetworkStatus = {}));
-var MessageSeverity;
+})(exports.PendingSwapNetworkStatus || (exports.PendingSwapNetworkStatus = {}));
 (function (MessageSeverity) {
   MessageSeverity["error"] = "error";
   MessageSeverity["warning"] = "warning";
   MessageSeverity["info"] = "info";
   MessageSeverity["success"] = "success";
-})(MessageSeverity || (MessageSeverity = {}));
+})(exports.MessageSeverity || (exports.MessageSeverity = {}));
 var getCurrentBlockchainOfOrNull = function getCurrentBlockchainOfOrNull(swap, step) {
   try {
     return getCurrentBlockchainOf(swap, step);
@@ -603,48 +606,22 @@ var getStarknetApproveUrl = function getStarknetApproveUrl(tx) {
 var getTronApproveUrl = function getTronApproveUrl(tx) {
   return 'https://tronscan.org/#/transaction/{txHash}'.replace('{txHash}', tx.toLowerCase());
 };
-var prettifyErrorMessage = function prettifyErrorMessage(obj) {
-  if (!obj) return {
-    extraMessage: '',
-    extraMessageErrorCode: null
-  };
-  if (obj instanceof PrettyError) return obj.getErrorDetail();
-  if (obj instanceof rangoTypes.SignerError) {
-    var t = obj.getErrorDetail();
-    return {
-      extraMessage: t.message,
-      extraMessageDetail: t.detail,
-      extraMessageErrorCode: t.code
-    };
-  }
-  if (obj instanceof Error) return {
-    extraMessage: obj.toString(),
-    extraMessageErrorCode: null
-  };
-  if (typeof obj !== 'string') return {
-    extraMessage: JSON.stringify(obj),
-    extraMessageErrorCode: null
-  };
-  return {
-    extraMessage: obj,
-    extraMessageErrorCode: null
-  };
-};
 function getNextStep(swap, currentStep) {
   return swap.steps.find(function (step) {
     return step.status !== 'failed' && step.status !== 'success' && step.id !== currentStep.id;
   }) || null;
 }
-// TODO:  we have samething in `helpers`, for fixing circular dependency, we copied and should be removed eventually.
+/**
+ * Returns the wallet address, based on the current step of `PendingSwap`.
+ */
 var getCurrentAddressOf = function getCurrentAddressOf(swap, step) {
-  var _step$evmTransaction2, _step$evmApprovalTran2, _step$cosmosTransacti2, _step$solanaTransacti2, _step$transferTransac2, _step$transferTransac3;
-  var result = swap.wallets[((_step$evmTransaction2 = step.evmTransaction) == null ? void 0 : _step$evmTransaction2.blockChain) || ''] || swap.wallets[((_step$evmApprovalTran2 = step.evmApprovalTransaction) == null ? void 0 : _step$evmApprovalTran2.blockChain) || ''] || swap.wallets[((_step$cosmosTransacti2 = step.cosmosTransaction) == null ? void 0 : _step$cosmosTransacti2.blockChain) || ''] || swap.wallets[((_step$solanaTransacti2 = step.solanaTransaction) == null ? void 0 : _step$solanaTransacti2.blockChain) || ''] || ((_step$transferTransac2 = step.transferTransaction) != null && _step$transferTransac2.fromWalletAddress ? {
+  var _step$evmTransaction2, _step$evmApprovalTran2, _step$tronTransaction2, _step$tronApprovalTra2, _step$starknetTransac2, _step$starknetApprova2, _step$cosmosTransacti2, _step$solanaTransacti2, _step$transferTransac2, _step$transferTransac3;
+  var result = swap.wallets[((_step$evmTransaction2 = step.evmTransaction) == null ? void 0 : _step$evmTransaction2.blockChain) || ''] || swap.wallets[((_step$evmApprovalTran2 = step.evmApprovalTransaction) == null ? void 0 : _step$evmApprovalTran2.blockChain) || ''] || swap.wallets[((_step$tronTransaction2 = step.tronTransaction) == null ? void 0 : _step$tronTransaction2.blockChain) || ''] || swap.wallets[((_step$tronApprovalTra2 = step.tronApprovalTransaction) == null ? void 0 : _step$tronApprovalTra2.blockChain) || ''] || swap.wallets[((_step$starknetTransac2 = step.starknetTransaction) == null ? void 0 : _step$starknetTransac2.blockChain) || ''] || swap.wallets[((_step$starknetApprova2 = step.starknetApprovalTransaction) == null ? void 0 : _step$starknetApprova2.blockChain) || ''] || swap.wallets[((_step$cosmosTransacti2 = step.cosmosTransaction) == null ? void 0 : _step$cosmosTransacti2.blockChain) || ''] || swap.wallets[((_step$solanaTransacti2 = step.solanaTransaction) == null ? void 0 : _step$solanaTransacti2.blockChain) || ''] || ((_step$transferTransac2 = step.transferTransaction) != null && _step$transferTransac2.fromWalletAddress ? {
     address: (_step$transferTransac3 = step.transferTransaction) == null ? void 0 : _step$transferTransac3.fromWalletAddress
   } : null) || null;
   if (result == null) throw PrettyError.WalletMissing();
   return result.address;
 };
-// TODO:  we have samething in `helpers`, for fixing circular dependency, we copied and should be removed eventually.
 function getRelatedWallet(swap, currentStep) {
   var walletAddress = getCurrentAddressOf(swap, currentStep);
   var walletKV = Object.keys(swap.wallets).map(function (k) {
@@ -669,6 +646,130 @@ function getRelatedWalletOrNull(swap, currentStep) {
     return null;
   }
 }
+var getUsdPrice = function getUsdPrice(blockchain, symbol, address, allTokens) {
+  var token = allTokens == null ? void 0 : allTokens.find(function (t) {
+    var _t$symbol;
+    return t.blockchain === blockchain && ((_t$symbol = t.symbol) == null ? void 0 : _t$symbol.toUpperCase()) === (symbol == null ? void 0 : symbol.toUpperCase()) && t.address === address;
+  });
+  return (token == null ? void 0 : token.usdPrice) || null;
+};
+function getUsdFeeOfStep(step, allTokens) {
+  var totalFeeInUsd = new BigNumber(0);
+  for (var i = 0; i < step.fee.length; i++) {
+    var fee = step.fee[i];
+    if (fee.expenseType === 'DECREASE_FROM_OUTPUT') continue;
+    var unitPrice = getUsdPrice(fee.asset.blockchain, fee.asset.symbol, fee.asset.address, allTokens);
+    totalFeeInUsd = totalFeeInUsd.plus(new BigNumber(fee.amount).multipliedBy(unitPrice || 0));
+  }
+  return totalFeeInUsd;
+}
+function calculatePendingSwap(inputAmount, bestRoute, wallets, settings, validateBalanceOrFee, meta) {
+  var _bestRoute$result, _bestRoute$result$swa;
+  var simulationResult = bestRoute.result;
+  if (!simulationResult) throw Error('Simulation result should not be null');
+  return {
+    creationTime: new Date().getTime().toString(),
+    finishTime: null,
+    requestId: bestRoute.requestId || '',
+    inputAmount: inputAmount,
+    wallets: wallets,
+    status: 'running',
+    isPaused: false,
+    extraMessage: null,
+    extraMessageSeverity: null,
+    extraMessageDetail: null,
+    extraMessageErrorCode: null,
+    networkStatusExtraMessage: null,
+    networkStatusExtraMessageDetail: null,
+    lastNotificationTime: null,
+    settings: settings,
+    simulationResult: simulationResult,
+    validateBalanceOrFee: validateBalanceOrFee,
+    steps: ((_bestRoute$result = bestRoute.result) == null ? void 0 : (_bestRoute$result$swa = _bestRoute$result.swaps) == null ? void 0 : _bestRoute$result$swa.map(function (swap, index) {
+      return {
+        id: index + 1,
+        // from
+        fromBlockchain: swap.from.blockchain,
+        fromBlockchainLogo: swap.from.blockchainLogo,
+        fromLogo: swap.from.logo,
+        fromSymbol: swap.from.symbol,
+        fromSymbolAddress: swap.from.address,
+        fromDecimals: swap.from.decimals,
+        fromAmountPrecision: swap.fromAmountPrecision,
+        fromAmountMinValue: swap.fromAmountMinValue,
+        fromAmountMaxValue: swap.fromAmountMaxValue,
+        fromAmountRestrictionType: swap.fromAmountRestrictionType,
+        // to
+        toBlockchain: swap.to.blockchain,
+        toBlockchainLogo: swap.to.blockchainLogo,
+        toSymbol: swap.to.symbol,
+        toSymbolAddress: swap.to.address,
+        toDecimals: swap.to.decimals,
+        toLogo: swap.to.logo,
+        // swapper
+        swapperId: swap.swapperId,
+        swapperLogo: swap.swapperLogo,
+        swapperType: swap.swapperType,
+        // output, fee, timing
+        expectedOutputAmountHumanReadable: swap.toAmount,
+        outputAmount: '',
+        feeInUsd: meta ? numberToString(getUsdFeeOfStep(swap, meta == null ? void 0 : meta.tokens), null, 8) : null,
+        estimatedTimeInSeconds: swap.estimatedTimeInSeconds || null,
+        // status, tracking
+        status: 'created',
+        networkStatus: null,
+        startTransactionTime: new Date().getTime(),
+        externalTransactionId: null,
+        executedTransactionId: null,
+        executedTransactionTime: null,
+        explorerUrl: null,
+        diagnosisUrl: null,
+        trackingCode: null,
+        internalSteps: null,
+        // transactions
+        evmTransaction: null,
+        evmApprovalTransaction: null,
+        starknetTransaction: null,
+        starknetApprovalTransaction: null,
+        tronTransaction: null,
+        tronApprovalTransaction: null,
+        cosmosTransaction: null,
+        solanaTransaction: null,
+        transferTransaction: null,
+        // front fields
+        hasAlreadyProceededToSign: false
+      };
+    })) || []
+  };
+}
+
+var SwapActionTypes;
+(function (SwapActionTypes) {
+  SwapActionTypes["START"] = "START";
+  SwapActionTypes["SCHEDULE_NEXT_STEP"] = "SCHEDULE_NEXT_STEP";
+  SwapActionTypes["CREATE_TRANSACTION"] = "CREATE_TRANSACTION";
+  SwapActionTypes["EXECUTE_TRANSACTION"] = "EXECUTE_TRANSACTION";
+  SwapActionTypes["CHECK_TRANSACTION_STATUS"] = "CHECK_TRANSACTION_STATUS";
+})(SwapActionTypes || (SwapActionTypes = {}));
+var BlockReason;
+(function (BlockReason) {
+  BlockReason["WAIT_FOR_CONNECT_WALLET"] = "waiting_for_connecting_wallet";
+  BlockReason["WAIT_FOR_NETWORK_CHANGE"] = "waiting_for_network_change";
+  BlockReason["DEPENDS_ON_OTHER_QUEUES"] = "depends_on_other_queues";
+})(BlockReason || (BlockReason = {}));
+
+var RANGO_DAPP_API_KEY = process.env.REACT_APP_API_KEY;
+var RANGO_DAPP_API_BASE_URL = process.env.REACT_APP_API_BASE_URL;
+var ERROR_MESSAGE_WAIT_FOR_WALLET = 'Waiting for connecting wallet';
+var ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION_WRONG_WALLET = function ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION_WRONG_WALLET(type, address) {
+  return "Please change your " + (type || 'wallet') + " account to " + (address || 'proper address');
+};
+var ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION = function ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION(type) {
+  return "Please connect to " + (type || 'your wallet') + " by using bellow button or top right button on page.";
+};
+var ERROR_MESSAGE_WAIT_FOR_CHANGE_NETWORK = function ERROR_MESSAGE_WAIT_FOR_CHANGE_NETWORK(network) {
+  return "Please change your network to " + network + ".";
+};
 
 function logRPCError(error, swap, currentStep, walletType) {
   try {
@@ -713,12 +814,23 @@ function claimQueue() {
   };
 }
 /**
- *
+ * Sample inputs are:
+ *  - "metamask-ETH"
+ *  - "metamask-BSC-BSC:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+ *  - "token-pocket-BSC-BSC:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
  * Returns "wallet and network" separately, even if the wallet is dashed inside.
  *
  */
 function splitWalletNetwork(input) {
-  return input == null ? void 0 : input.split(/-(?=[^-]*$)/);
+  var removedAddressInput = (input == null ? void 0 : input.split(':')[0]) || '';
+  var splittedInput = removedAddressInput.split('-');
+  var network = splittedInput[splittedInput.length - 1];
+  var walletNetwork = splittedInput.slice(0, -1);
+  if (walletNetwork[walletNetwork.length - 1] === network) {
+    walletNetwork.pop();
+  }
+  var wallet = walletNetwork.join('-');
+  return [wallet, network];
 }
 /**
  *
@@ -751,24 +863,26 @@ function updateSwapStatus(_ref) {
   if (!!nextStatus) swap.status = nextStatus;
   swap.hasAlreadyProceededToSign = hasAlreadyProceededToSign;
   if (!!nextStatus && ['failed', 'success'].includes(nextStatus)) swap.finishTime = new Date().getTime().toString();
-  if (!!message) swap.extraMessage = message;
-  if (!!details) swap.extraMessageDetail = details;
+  if (!!message || !!details) {
+    swap.extraMessage = message || '';
+    swap.extraMessageDetail = details || '';
+  }
   if (!!nextStepStatus && ['failed'].includes(nextStepStatus)) {
     var _getRelatedWalletOrNu;
     //if user cancel the swap, we should pass relevant reason to the server.
     var errorReason = details && details.includes('Warning') ? 'Swap canceled by user.' : details;
     var walletType = (_getRelatedWalletOrNu = getRelatedWalletOrNull(swap, currentStep)) == null ? void 0 : _getRelatedWalletOrNu.walletType;
-    swap.extraMessageSeverity = MessageSeverity.error;
+    swap.extraMessageSeverity = exports.MessageSeverity.error;
     httpService.reportFailure({
       requestId: swap.requestId,
       step: (currentStep == null ? void 0 : currentStep.id) || 1,
-      eventType: mapAppErrorCodesToAPIErrorCode(hasAlreadyProceededToSign ? APIErrorCode.TX_FAIL : errorCode),
+      eventType: mapAppErrorCodesToAPIErrorCode(errorCode),
       reason: errorReason || '',
       data: walletType ? {
         wallet: walletType
       } : undefined
     }).then()["catch"]();
-  } else if (!!nextStepStatus && ['running'].includes(nextStepStatus)) swap.extraMessageSeverity = MessageSeverity.info;else if (!!nextStepStatus && ['success', 'approved'].includes(nextStepStatus)) swap.extraMessageSeverity = MessageSeverity.success;else if (nextStepStatus && ['waitingForApproval'].includes(nextStepStatus)) swap.extraMessageSeverity = MessageSeverity.warning;
+  } else if (!!nextStepStatus && ['running'].includes(nextStepStatus)) swap.extraMessageSeverity = exports.MessageSeverity.info;else if (!!nextStepStatus && ['success', 'approved'].includes(nextStepStatus)) swap.extraMessageSeverity = exports.MessageSeverity.success;else if (nextStepStatus && ['waitingForApproval'].includes(nextStepStatus)) swap.extraMessageSeverity = exports.MessageSeverity.warning;
   if (nextStepStatus === 'running' && currentStep) currentStep.startTransactionTime = new Date().getTime();
   setStorage(_extends({}, getStorage(), {
     swapDetails: swap
@@ -778,18 +892,32 @@ function updateSwapStatus(_ref) {
     step: currentStep
   };
 }
-function setStepTransactionIds(_ref2, txId, eventType, notifier) {
+function setStepTransactionIds(_ref2, txId, notifier, eventType, approveUrl) {
   var getStorage = _ref2.getStorage,
     setStorage = _ref2.setStorage;
   var swap = getStorage().swapDetails;
   swap.hasAlreadyProceededToSign = null;
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   var currentStep = getCurrentStep(swap);
-  currentStep.executedTransactionId = txId || currentStep.executedTransactionId;
+  currentStep.executedTransactionId = txId;
+  currentStep.executedTransactionTime = new Date().getTime().toString();
+  if (!!approveUrl) currentStep.explorerUrl = [].concat(currentStep.explorerUrl || [], [{
+    url: approveUrl,
+    description: "approve"
+  }]);
+  if (eventType === 'check_tx_status') {
+    swap.extraMessage = 'Checking transaction status ...';
+    swap.extraMessageDetail = '';
+    swap.extraMessageSeverity = exports.MessageSeverity.info;
+  } else if (eventType === 'check_approve_tx_status') {
+    swap.extraMessage = 'Checking approve transaction status ...';
+    swap.extraMessageDetail = '';
+    swap.extraMessageSeverity = exports.MessageSeverity.info;
+  }
   setStorage(_extends({}, getStorage(), {
     swapDetails: swap
   }));
-  notifier({
+  if (!!eventType) notifier({
     eventType: eventType,
     swap: swap,
     step: currentStep
@@ -816,11 +944,11 @@ function markRunningSwapAsWaitingForConnectingWallet(_ref3, reason, reasonDetail
   if (!currentStep) return;
   var currentTime = new Date();
   swap.lastNotificationTime = currentTime.getTime().toString();
-  var isAlreadyMarked = currentStep.networkStatus === PendingSwapNetworkStatus.WaitingForConnectingWallet && swap.networkStatusExtraMessage === reason && swap.networkStatusExtraMessageDetail === reasonDetail;
+  var isAlreadyMarked = currentStep.networkStatus === exports.PendingSwapNetworkStatus.WaitingForConnectingWallet && swap.networkStatusExtraMessage === reason && swap.networkStatusExtraMessageDetail === reasonDetail;
   if (isAlreadyMarked) {
     return;
   }
-  currentStep.networkStatus = PendingSwapNetworkStatus.WaitingForConnectingWallet;
+  currentStep.networkStatus = exports.PendingSwapNetworkStatus.WaitingForConnectingWallet;
   swap.networkStatusExtraMessage = reason;
   swap.networkStatusExtraMessageDetail = reasonDetail;
   setStorage(_extends({}, getStorage(), {
@@ -847,7 +975,7 @@ function markRunningSwapAsSwitchingNetwork(_ref4) {
   var reasonDetail = "Please change your " + type + " wallet network to " + fromBlockchain + ". " + metamaskMessage;
   var currentTime = new Date();
   swap.lastNotificationTime = currentTime.getTime().toString();
-  currentStep.networkStatus = PendingSwapNetworkStatus.WaitingForNetworkChange;
+  currentStep.networkStatus = exports.PendingSwapNetworkStatus.WaitingForNetworkChange;
   swap.networkStatusExtraMessage = reason;
   swap.networkStatusExtraMessageDetail = reasonDetail;
   setStorage(_extends({}, getStorage(), {
@@ -864,13 +992,19 @@ function markRunningSwapAsSwitchingNetwork(_ref4) {
  */
 function markRunningSwapAsDependsOnOtherQueues(_ref5) {
   var getStorage = _ref5.getStorage,
-    setStorage = _ref5.setStorage;
+    setStorage = _ref5.setStorage,
+    notifier = _ref5.notifier;
   var swap = getStorage().swapDetails;
   var currentStep = getCurrentStep(swap);
   if (!currentStep) return;
   swap.networkStatusExtraMessage = '';
   swap.networkStatusExtraMessageDetail = '';
-  currentStep.networkStatus = PendingSwapNetworkStatus.WaitingForQueue;
+  currentStep.networkStatus = exports.PendingSwapNetworkStatus.WaitingForQueue;
+  notifier({
+    eventType: 'waiting_for_queue',
+    swap: swap,
+    step: currentStep
+  });
   setStorage(_extends({}, getStorage(), {
     swapDetails: swap
   }));
@@ -1002,9 +1136,6 @@ function _getChainId() {
 function isNetworkMatchedForTransaction(_x2, _x3, _x4, _x5, _x6) {
   return _isNetworkMatchedForTransaction.apply(this, arguments);
 }
-/**
- * Returns the wallet address, based on the current step of `PendingSwap`.
- */
 function _isNetworkMatchedForTransaction() {
   _isNetworkMatchedForTransaction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(swap, step, wallet, meta, providers) {
     var fromBlockChain, sourceWallet, provider, chainId, blockChain;
@@ -1012,112 +1143,85 @@ function _isNetworkMatchedForTransaction() {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           if (!isWalletNull(wallet)) {
-            _context2.next = 3;
+            _context2.next = 2;
             break;
           }
-          console.warn('wallet object is null');
           return _context2.abrupt("return", false);
-        case 3:
+        case 2:
           fromBlockChain = getCurrentBlockchainOfOrNull(swap, step);
           if (fromBlockChain) {
-            _context2.next = 6;
+            _context2.next = 5;
             break;
           }
           return _context2.abrupt("return", false);
-        case 6:
+        case 5:
           if (!meta.evmBasedChains.find(function (evmBlochain) {
             return evmBlochain.name === fromBlockChain;
           })) {
-            _context2.next = 30;
+            _context2.next = 29;
             break;
           }
-          _context2.prev = 7;
+          _context2.prev = 6;
           sourceWallet = swap.wallets[fromBlockChain];
           if (!sourceWallet) {
-            _context2.next = 24;
+            _context2.next = 23;
             break;
           }
           if (![walletsShared.WalletType.META_MASK, walletsShared.WalletType.BINANCE_CHAIN, walletsShared.WalletType.XDEFI, walletsShared.WalletType.WALLET_CONNECT, walletsShared.WalletType.TRUST_WALLET, walletsShared.WalletType.COIN98, walletsShared.WalletType.EXODUS, walletsShared.WalletType.OKX, walletsShared.WalletType.COINBASE, walletsShared.WalletType.TOKEN_POCKET, walletsShared.WalletType.MATH, walletsShared.WalletType.SAFEPAL, walletsShared.WalletType.COSMOSTATION, walletsShared.WalletType.CLOVER, walletsShared.WalletType.BRAVE, walletsShared.WalletType.FRONTIER, walletsShared.WalletType.KUCOIN].includes(sourceWallet.walletType)) {
-            _context2.next = 23;
+            _context2.next = 22;
             break;
           }
           provider = getEvmProvider(providers, sourceWallet.walletType);
-          _context2.next = 14;
+          _context2.next = 13;
           return getChainId(provider);
-        case 14:
+        case 13:
           chainId = _context2.sent;
           if (!chainId) {
-            _context2.next = 21;
+            _context2.next = 20;
             break;
           }
-          blockChain = walletsShared.getBlockChainNameFromId(chainId, Object.entries(meta.blockchains).map(function (_ref7) {
-            var blockchainMeta = _ref7[1];
+          blockChain = walletsShared.getBlockChainNameFromId(chainId, Object.entries(meta.blockchains).map(function (_ref6) {
+            var blockchainMeta = _ref6[1];
             return blockchainMeta;
           }));
           if (!(blockChain && blockChain.toLowerCase() === fromBlockChain.toLowerCase())) {
-            _context2.next = 19;
+            _context2.next = 18;
             break;
           }
           return _context2.abrupt("return", true);
-        case 19:
+        case 18:
           if (!(blockChain && blockChain.toLowerCase() !== fromBlockChain.toLowerCase())) {
-            _context2.next = 21;
+            _context2.next = 20;
             break;
           }
           return _context2.abrupt("return", false);
-        case 21:
-          _context2.next = 24;
+        case 20:
+          _context2.next = 23;
           break;
-        case 23:
+        case 22:
           return _context2.abrupt("return", true);
-        case 24:
-          _context2.next = 29;
+        case 23:
+          _context2.next = 28;
           break;
-        case 26:
-          _context2.prev = 26;
-          _context2.t0 = _context2["catch"](7);
+        case 25:
+          _context2.prev = 25;
+          _context2.t0 = _context2["catch"](6);
           console.log(_context2.t0);
-        case 29:
+        case 28:
           return _context2.abrupt("return", false);
-        case 30:
+        case 29:
           return _context2.abrupt("return", true);
-        case 31:
+        case 30:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[7, 26]]);
+    }, _callee2, null, [[6, 25]]);
   }));
   return _isNetworkMatchedForTransaction.apply(this, arguments);
 }
-var getCurrentAddressOf$1 = function getCurrentAddressOf(swap, step) {
-  var _step$evmTransaction, _step$evmApprovalTran, _step$tronTransaction, _step$tronApprovalTra, _step$starknetTransac, _step$starknetApprova, _step$cosmosTransacti, _step$solanaTransacti, _step$transferTransac, _step$transferTransac2;
-  var result = swap.wallets[((_step$evmTransaction = step.evmTransaction) == null ? void 0 : _step$evmTransaction.blockChain) || ''] || swap.wallets[((_step$evmApprovalTran = step.evmApprovalTransaction) == null ? void 0 : _step$evmApprovalTran.blockChain) || ''] || swap.wallets[((_step$tronTransaction = step.tronTransaction) == null ? void 0 : _step$tronTransaction.blockChain) || ''] || swap.wallets[((_step$tronApprovalTra = step.tronApprovalTransaction) == null ? void 0 : _step$tronApprovalTra.blockChain) || ''] || swap.wallets[((_step$starknetTransac = step.starknetTransaction) == null ? void 0 : _step$starknetTransac.blockChain) || ''] || swap.wallets[((_step$starknetApprova = step.starknetApprovalTransaction) == null ? void 0 : _step$starknetApprova.blockChain) || ''] || swap.wallets[((_step$cosmosTransacti = step.cosmosTransaction) == null ? void 0 : _step$cosmosTransacti.blockChain) || ''] || swap.wallets[((_step$solanaTransacti = step.solanaTransaction) == null ? void 0 : _step$solanaTransacti.blockChain) || ''] || ((_step$transferTransac = step.transferTransaction) != null && _step$transferTransac.fromWalletAddress ? {
-    address: (_step$transferTransac2 = step.transferTransaction) == null ? void 0 : _step$transferTransac2.fromWalletAddress
-  } : null) || null;
-  if (result == null) throw PrettyError.WalletMissing();
-  return result.address;
-};
-// Todo: Is it same with `getRequiredWallet`?
-function getRelatedWallet$1(swap, currentStep) {
-  var walletAddress = getCurrentAddressOf$1(swap, currentStep);
-  var walletKV = Object.keys(swap.wallets).map(function (k) {
-    return {
-      k: k,
-      v: swap.wallets[k]
-    };
-  }).find(function (_ref6) {
-    var v = _ref6.v;
-    return v.address === walletAddress;
-  }) || null;
-  var blockchain = (walletKV == null ? void 0 : walletKV.k) || null;
-  var wallet = (walletKV == null ? void 0 : walletKV.v) || null;
-  var walletType = wallet == null ? void 0 : wallet.walletType;
-  if (walletType === walletsShared.WalletType.UNKNOWN || wallet === null) throw PrettyError.AssertionFailed("Wallet for source " + blockchain + " not passed: walletType: " + walletType);
-  return wallet;
-}
 var isTxAlreadyCreated = function isTxAlreadyCreated(swap, step) {
-  var _step$evmTransaction2, _step$evmApprovalTran2, _step$tronTransaction2, _step$tronApprovalTra2, _step$starknetTransac2, _step$starknetApprova2, _step$cosmosTransacti2, _step$solanaTransacti2, _step$transferTransac3;
-  var result = swap.wallets[((_step$evmTransaction2 = step.evmTransaction) == null ? void 0 : _step$evmTransaction2.blockChain) || ''] || swap.wallets[((_step$evmApprovalTran2 = step.evmApprovalTransaction) == null ? void 0 : _step$evmApprovalTran2.blockChain) || ''] || swap.wallets[((_step$tronTransaction2 = step.tronTransaction) == null ? void 0 : _step$tronTransaction2.blockChain) || ''] || swap.wallets[((_step$tronApprovalTra2 = step.tronApprovalTransaction) == null ? void 0 : _step$tronApprovalTra2.blockChain) || ''] || swap.wallets[((_step$starknetTransac2 = step.starknetTransaction) == null ? void 0 : _step$starknetTransac2.blockChain) || ''] || swap.wallets[((_step$starknetApprova2 = step.starknetApprovalTransaction) == null ? void 0 : _step$starknetApprova2.blockChain) || ''] || swap.wallets[((_step$cosmosTransacti2 = step.cosmosTransaction) == null ? void 0 : _step$cosmosTransacti2.blockChain) || ''] || swap.wallets[((_step$solanaTransacti2 = step.solanaTransaction) == null ? void 0 : _step$solanaTransacti2.blockChain) || ''] || ((_step$transferTransac3 = step.transferTransaction) == null ? void 0 : _step$transferTransac3.fromWalletAddress) || null;
+  var _step$evmTransaction, _step$evmApprovalTran, _step$tronTransaction, _step$tronApprovalTra, _step$starknetTransac, _step$starknetApprova, _step$cosmosTransacti, _step$solanaTransacti, _step$transferTransac;
+  var result = swap.wallets[((_step$evmTransaction = step.evmTransaction) == null ? void 0 : _step$evmTransaction.blockChain) || ''] || swap.wallets[((_step$evmApprovalTran = step.evmApprovalTransaction) == null ? void 0 : _step$evmApprovalTran.blockChain) || ''] || swap.wallets[((_step$tronTransaction = step.tronTransaction) == null ? void 0 : _step$tronTransaction.blockChain) || ''] || swap.wallets[((_step$tronApprovalTra = step.tronApprovalTransaction) == null ? void 0 : _step$tronApprovalTra.blockChain) || ''] || swap.wallets[((_step$starknetTransac = step.starknetTransaction) == null ? void 0 : _step$starknetTransac.blockChain) || ''] || swap.wallets[((_step$starknetApprova = step.starknetApprovalTransaction) == null ? void 0 : _step$starknetApprova.blockChain) || ''] || swap.wallets[((_step$cosmosTransacti = step.cosmosTransaction) == null ? void 0 : _step$cosmosTransacti.blockChain) || ''] || swap.wallets[((_step$solanaTransacti = step.solanaTransaction) == null ? void 0 : _step$solanaTransacti.blockChain) || ''] || ((_step$transferTransac = step.transferTransaction) == null ? void 0 : _step$transferTransac.fromWalletAddress) || null;
   return result !== null;
 };
 function resetNetworkStatus(actions) {
@@ -1159,7 +1263,7 @@ function updateNetworkStatus(actions, data) {
 }
 /**
  * Event handler for blocked tasks.
- * If a transcation execution is manually blocked (like for parallel or waiting for walle),
+ * If a transcation execution is manually blocked (like for parallel or waiting for wallet),
  * This function will be called by queue manager using `queue definition`.
  *
  * It checks if the required wallet is connected, unblock the queue to be run.
@@ -1168,11 +1272,14 @@ function onBlockForConnectWallet(event, meta) {
   var context = meta.context,
     queue = meta.queue;
   var swap = queue.getStorage().swapDetails;
-  if (!isRequiredWalletConnected(swap, context.state)) {
+  var _isRequiredWalletConn = isRequiredWalletConnected(swap, context.state),
+    ok = _isRequiredWalletConn.ok,
+    reason = _isRequiredWalletConn.reason;
+  if (!ok) {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     var currentStep = getCurrentStep(swap);
     context.notifier({
-      eventType: 'waiting_for_connecting_wallet',
+      eventType: reason === 'account_miss_match' ? 'waiting_for_change_wallet_account' : 'waiting_for_connecting_wallet',
       swap: swap,
       step: currentStep
     });
@@ -1224,7 +1331,7 @@ function onBlockForChangeNetwork(_event, meta) {
 }
 /**
  * Event handler for blocked tasks. (Parallel mode)
- * If a transcation execution is manually blocked (like for parallel or waiting for walle),
+ * If a transcation execution flow is manually blocked (like for parallel or waiting for walle),
  * This function will be called by queue manager using `queue definition`.
  *
  * It checks the blocked tasks, if there is no active `claimed` queue, try to give it to the best candidate.
@@ -1233,7 +1340,8 @@ function onDependsOnOtherQueues(_event, meta) {
   var getBlockedTasks = meta.getBlockedTasks,
     forceExecute = meta.forceExecute,
     queue = meta.queue,
-    manager = meta.manager;
+    manager = meta.manager,
+    context = meta.context;
   var _claimQueue = claimQueue(),
     setClaimer = _claimQueue.setClaimer,
     claimedBy = _claimQueue.claimedBy,
@@ -1247,12 +1355,14 @@ function onDependsOnOtherQueues(_event, meta) {
   }
   var claimerId = claimedBy();
   var isClaimedByAnyQueue = !!claimerId;
+  if (claimerId === queue.id) return;
   // Check if any queue `claimed` before, if yes, we don't should do anything.
   if (isClaimedByAnyQueue) {
     // We need to keep the latest swap messages
     markRunningSwapAsDependsOnOtherQueues({
       getStorage: queue.getStorage.bind(queue),
-      setStorage: queue.setStorage.bind(queue)
+      setStorage: queue.setStorage.bind(queue),
+      notifier: context.notifier
     });
     return;
   }
@@ -1277,7 +1387,7 @@ function onDependsOnOtherQueues(_event, meta) {
     resetClaimedBy: function resetClaimedBy() {
       reset();
       // TODO: Use key generator
-      retryOn(type + "-" + network + "-" + address, manager);
+      retryOn(type + "-" + network + ":" + address, context.notifier, manager);
     }
   });
 }
@@ -1286,16 +1396,28 @@ function isRequiredWalletConnected(swap, getState) {
     type = _getRequiredWallet4.type,
     address = _getRequiredWallet4.address;
   if (!type || !address) {
-    return false;
+    return {
+      ok: false,
+      reason: 'not_connected'
+    };
   }
   var walletState = getState(type);
-  var accounts = walletState.accounts;
+  var accounts = walletState.accounts,
+    connected = walletState.connected;
   var connectedAccounts = accounts || [];
-  return connectedAccounts.some(function (account) {
+  if (!connected) return {
+    ok: false,
+    reason: 'not_connected'
+  };
+  var matched = connectedAccounts.some(function (account) {
     var _readAccountAddress = walletsCore.readAccountAddress(account),
       accountAddress = _readAccountAddress.address;
     return address === accountAddress;
   });
+  return {
+    ok: matched,
+    reason: 'account_miss_match'
+  };
 }
 function singTransaction(actions) {
   var getStorage = actions.getStorage,
@@ -1319,10 +1441,11 @@ function singTransaction(actions) {
     tronApprovalTransaction = currentStep.tronApprovalTransaction,
     starknetTransaction = currentStep.starknetTransaction,
     starknetApprovalTransaction = currentStep.starknetApprovalTransaction;
-  var sourceWallet = getRelatedWallet$1(swap, currentStep);
-  var walletAddress = getCurrentAddressOf$1(swap, currentStep);
+  var sourceWallet = getRelatedWallet(swap, currentStep);
+  var walletAddress = getCurrentAddressOf(swap, currentStep);
   var walletSigners = getSigners(sourceWallet.walletType);
   var onFinish = function onFinish() {
+    // TODO resetClaimedBy is undefined here
     if (actions.context.resetClaimedBy) {
       actions.context.resetClaimedBy();
     }
@@ -1340,27 +1463,18 @@ function singTransaction(actions) {
       details: 'Waiting for approve transaction to be mined and confirmed successfully'
     });
     notifier(_extends({
-      eventType: 'confirm_contract'
+      eventType: 'confirm_approve_contract'
     }, updateResult));
     // Execute transaction
     walletSigners.getSigner(rangoSdk.TransactionType.EVM).signAndSendTx(evmApprovalTransaction, walletAddress, null).then(function (hash) {
-      console.debug('transaction of approval minted successfully', hash);
       var approveUrl = getEvmApproveUrl(hash, getCurrentBlockchainOf(swap, currentStep), meta.evmBasedChains);
-      currentStep.explorerUrl = [].concat(currentStep.explorerUrl || [], [{
-        url: approveUrl,
-        description: "approve"
-      }]);
-      // `currentStep` has been mutated, let's update storage.
-      setStorage(_extends({}, getStorage(), {
-        swapDetails: swap
-      }));
+      setStepTransactionIds(actions, hash, notifier, 'check_approve_tx_status', approveUrl);
       schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
       next();
       onFinish();
     }, function (error) {
       var _error$root, _error$root2, _error$root3;
       if (swap.status === 'failed') return;
-      console.debug('error in approving', error);
       var _prettifyErrorMessage = prettifyErrorMessage(error),
         extraMessage = _prettifyErrorMessage.extraMessage,
         extraMessageDetail = _prettifyErrorMessage.extraMessageDetail,
@@ -1395,27 +1509,18 @@ function singTransaction(actions) {
       details: 'Waiting for approve transaction to be mined and confirmed successfully'
     });
     notifier(_extends({
-      eventType: 'confirm_contract'
+      eventType: 'confirm_approve_contract'
     }, _updateResult));
     // Execute transaction
     walletSigners.getSigner(rangoSdk.TransactionType.TRON).signAndSendTx(tronApprovalTransaction, walletAddress, null).then(function (hash) {
-      console.debug('transaction of approval minted successfully', hash);
       var approveUrl = getTronApproveUrl(hash);
-      currentStep.explorerUrl = [].concat(currentStep.explorerUrl || [], [{
-        url: approveUrl,
-        description: "approve"
-      }]);
-      // `currentStep` has been mutated, let's update storage.
-      setStorage(_extends({}, getStorage(), {
-        swapDetails: swap
-      }));
+      setStepTransactionIds(actions, hash, notifier, 'check_approve_tx_status', approveUrl);
       schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
       next();
       onFinish();
     }, function (error) {
       var _error$root4, _error$root5, _error$root6;
       if (swap.status === 'failed') return;
-      console.debug('error in approving', error);
       var _prettifyErrorMessage2 = prettifyErrorMessage(error),
         extraMessage = _prettifyErrorMessage2.extraMessage,
         extraMessageDetail = _prettifyErrorMessage2.extraMessageDetail,
@@ -1450,27 +1555,18 @@ function singTransaction(actions) {
       details: 'Waiting for approve transaction to be mined and confirmed successfully'
     });
     notifier(_extends({
-      eventType: 'confirm_contract'
+      eventType: 'confirm_approve_contract'
     }, _updateResult2));
     // Execute transaction
     walletSigners.getSigner(rangoSdk.TransactionType.STARKNET).signAndSendTx(starknetApprovalTransaction, walletAddress, null).then(function (hash) {
-      console.debug('transaction of approval minted successfully', hash);
       var approveUrl = getStarknetApproveUrl(hash);
-      currentStep.explorerUrl = [].concat(currentStep.explorerUrl || [], [{
-        url: approveUrl,
-        description: "approve"
-      }]);
-      // `currentStep` has been mutated, let's update storage.
-      setStorage(_extends({}, getStorage(), {
-        swapDetails: swap
-      }));
+      setStepTransactionIds(actions, hash, notifier, 'check_approve_tx_status', approveUrl);
       schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
       next();
       onFinish();
     }, function (error) {
       var _error$root7, _error$root8, _error$root9;
       if (swap.status === 'failed') return;
-      console.debug('error in approving', error);
       var _prettifyErrorMessage3 = prettifyErrorMessage(error),
         extraMessage = _prettifyErrorMessage3.extraMessage,
         extraMessageDetail = _prettifyErrorMessage3.extraMessageDetail,
@@ -1496,17 +1592,20 @@ function singTransaction(actions) {
     return;
   }
   var hasAlreadyProceededToSign = typeof swap.hasAlreadyProceededToSign === 'boolean';
+  var nextStepStatusBasedOnHasAlreadyProceededToSign = hasAlreadyProceededToSign ? 'failed' : 'running';
+  var errorCodeBasedOnHasAlreadyProceededToSign = hasAlreadyProceededToSign ? 'TX_EXPIRED' : null;
   var executeMessage = hasAlreadyProceededToSign ? 'Transaction is expired. Please try again' : 'executing transaction';
   var executeDetails = "" + (sourceWallet.walletType === walletsShared.WalletType.WALLET_CONNECT ? 'Check your mobile phone' : '');
   if (!!transferTransaction) {
     var _updateResult3 = updateSwapStatus({
       getStorage: getStorage,
       setStorage: setStorage,
-      nextStepStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
-      nextStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
+      nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
+      nextStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
       message: executeMessage,
       details: executeDetails,
-      hasAlreadyProceededToSign: hasAlreadyProceededToSign
+      hasAlreadyProceededToSign: hasAlreadyProceededToSign,
+      errorCode: errorCodeBasedOnHasAlreadyProceededToSign
     });
     var notification = getSwapNotitfication('confirm_transfer', _updateResult3);
     notifier(notification);
@@ -1515,7 +1614,7 @@ function singTransaction(actions) {
       onFinish();
     } else {
       walletSigners.getSigner(rangoSdk.TransactionType.TRANSFER).signAndSendTx(transferTransaction, walletAddress, null).then(function (txId) {
-        setStepTransactionIds(actions, txId, 'transfer_confirmed', notifier);
+        setStepTransactionIds(actions, txId, notifier, 'check_tx_status');
         schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
         next();
         onFinish();
@@ -1545,11 +1644,12 @@ function singTransaction(actions) {
     var _updateResult4 = updateSwapStatus({
       getStorage: getStorage,
       setStorage: setStorage,
-      nextStepStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
-      nextStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
+      nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
+      nextStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
       message: executeMessage,
       details: executeDetails,
-      hasAlreadyProceededToSign: hasAlreadyProceededToSign
+      hasAlreadyProceededToSign: hasAlreadyProceededToSign,
+      errorCode: errorCodeBasedOnHasAlreadyProceededToSign
     });
     var _notification = getSwapNotitfication('calling_smart_contract', _updateResult4);
     notifier(_notification);
@@ -1558,7 +1658,7 @@ function singTransaction(actions) {
       onFinish();
     } else {
       walletSigners.getSigner(rangoSdk.TransactionType.EVM).signAndSendTx(evmTransaction, walletAddress, null).then(function (id) {
-        setStepTransactionIds(actions, id, 'smart_contract_called', notifier);
+        setStepTransactionIds(actions, id, notifier, 'check_tx_status');
         schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
         next();
         onFinish();
@@ -1592,11 +1692,12 @@ function singTransaction(actions) {
     var _updateResult5 = updateSwapStatus({
       getStorage: getStorage,
       setStorage: setStorage,
-      nextStepStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
-      nextStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
+      nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
+      nextStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
       message: executeMessage,
       details: executeDetails,
-      hasAlreadyProceededToSign: hasAlreadyProceededToSign
+      hasAlreadyProceededToSign: hasAlreadyProceededToSign,
+      errorCode: errorCodeBasedOnHasAlreadyProceededToSign
     });
     var _notification2 = getSwapNotitfication('calling_smart_contract', _updateResult5);
     notifier(_notification2);
@@ -1631,7 +1732,7 @@ function singTransaction(actions) {
       walletSigners.getSigner(rangoSdk.TransactionType.COSMOS).signAndSendTx(cosmosTransaction, walletAddress, null).then(
       // todo
       function (id) {
-        setStepTransactionIds(actions, id, 'smart_contract_called', notifier);
+        setStepTransactionIds(actions, id, notifier, 'check_tx_status');
         schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
         next();
         onFinish();
@@ -1661,11 +1762,12 @@ function singTransaction(actions) {
     var _updateResult7 = updateSwapStatus({
       getStorage: getStorage,
       setStorage: setStorage,
-      nextStepStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
-      nextStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
+      nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
+      nextStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
       message: executeMessage,
       details: executeDetails,
-      hasAlreadyProceededToSign: hasAlreadyProceededToSign
+      hasAlreadyProceededToSign: hasAlreadyProceededToSign,
+      errorCode: errorCodeBasedOnHasAlreadyProceededToSign
     });
     var _notification3 = getSwapNotitfication('calling_smart_contract', _updateResult7);
     notifier(_notification3);
@@ -1675,7 +1777,7 @@ function singTransaction(actions) {
     } else {
       var tx = solanaTransaction;
       walletSigners.getSigner(rangoSdk.TransactionType.SOLANA).signAndSendTx(tx, walletAddress, null).then(function (txId) {
-        setStepTransactionIds(actions, txId, 'smart_contract_called', notifier);
+        setStepTransactionIds(actions, txId, notifier, 'check_tx_status');
         schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
         next();
         onFinish();
@@ -1705,11 +1807,12 @@ function singTransaction(actions) {
     var _updateResult8 = updateSwapStatus({
       getStorage: getStorage,
       setStorage: setStorage,
-      nextStepStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
-      nextStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
+      nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
+      nextStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
       message: executeMessage,
       details: executeDetails,
-      hasAlreadyProceededToSign: hasAlreadyProceededToSign
+      hasAlreadyProceededToSign: hasAlreadyProceededToSign,
+      errorCode: errorCodeBasedOnHasAlreadyProceededToSign
     });
     var _notification4 = getSwapNotitfication('calling_smart_contract', _updateResult8);
     notifier(_notification4);
@@ -1718,7 +1821,7 @@ function singTransaction(actions) {
       onFinish();
     } else {
       walletSigners.getSigner(rangoSdk.TransactionType.TRON).signAndSendTx(tronTransaction, walletAddress, null).then(function (id) {
-        setStepTransactionIds(actions, id, 'smart_contract_called', notifier);
+        setStepTransactionIds(actions, id, notifier, 'check_tx_status');
         schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
         next();
         onFinish();
@@ -1752,11 +1855,12 @@ function singTransaction(actions) {
     var _updateResult9 = updateSwapStatus({
       getStorage: getStorage,
       setStorage: setStorage,
-      nextStepStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
-      nextStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
+      nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
+      nextStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
       message: executeMessage,
       details: executeDetails,
-      hasAlreadyProceededToSign: hasAlreadyProceededToSign
+      hasAlreadyProceededToSign: hasAlreadyProceededToSign,
+      errorCode: errorCodeBasedOnHasAlreadyProceededToSign
     });
     var _notification5 = getSwapNotitfication('calling_smart_contract', _updateResult9);
     notifier(_notification5);
@@ -1765,7 +1869,7 @@ function singTransaction(actions) {
       onFinish();
     } else {
       walletSigners.getSigner(rangoSdk.TransactionType.STARKNET).signAndSendTx(starknetTransaction, walletAddress, null).then(function (id) {
-        setStepTransactionIds(actions, id, 'smart_contract_called', notifier);
+        setStepTransactionIds(actions, id, notifier, 'check_tx_status');
         schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
         next();
         onFinish();
@@ -1819,7 +1923,9 @@ function checkWaitingForConnectWalletChange(params) {
         var hasWaitingForConnect = Object.keys(q.list.state.tasks).some(function (taskId) {
           var _task$blockedFor;
           var task = q.list.state.tasks[taskId];
-          return task.status === queueManagerCore.Status.BLOCKED && [BlockReason.WAIT_FOR_CONNECT_WALLET].includes((_task$blockedFor = task.blockedFor) == null ? void 0 : _task$blockedFor.reason);
+          return task.status === queueManagerCore.Status.BLOCKED &&
+          // TODO double check later
+          [BlockReason.WAIT_FOR_CONNECT_WALLET].includes((_task$blockedFor = task.blockedFor) == null ? void 0 : _task$blockedFor.reason);
         });
         if (currentStepRequiredWallet === wallet && hasWaitingForConnect && getCurrentBlockchainOfOrNull(swap, currentStep) != network) {
           var queueInstance = q.list;
@@ -1833,10 +1939,17 @@ function checkWaitingForConnectWalletChange(params) {
             },
             silent: true
           });
-          markRunningSwapAsSwitchingNetwork({
+          var result = markRunningSwapAsSwitchingNetwork({
             getStorage: queueInstance.getStorage.bind(queueInstance),
             setStorage: queueInstance.setStorage.bind(queueInstance)
           });
+          if (result) {
+            params == null ? void 0 : params.notifier({
+              eventType: 'waiting_for_network_change',
+              swap: result.swap,
+              step: result.step
+            });
+          }
         }
       }
     }
@@ -1867,6 +1980,49 @@ function checkWaitingForNetworkChange(manager) {
     }
   });
 }
+/**
+ * Get list of all running swaps
+ *
+ * @param manager
+ * @returns list of pending swaps
+ */
+function getRunningSwaps(manager) {
+  var queues = (manager == null ? void 0 : manager.getAll()) || new Map();
+  var result = [];
+  queues.forEach(function (q) {
+    // retry only on affected queues
+    var queueStorage = q.list.getStorage();
+    var swap = queueStorage == null ? void 0 : queueStorage.swapDetails;
+    if (!swap || swap.status !== 'running') return;
+    result.push(swap);
+  });
+  return result;
+}
+/**
+ *
+ * Trying to reset notifications for pending swaps to correct message on page load.
+ * We could remove this after supporting auto connect for wallets.
+ *
+ * @param swaps
+ * @param notifier
+ * @returns
+ */
+function resetRunningSwapNotifsOnPageLoad(runningSwaps, notifier) {
+  runningSwaps.forEach(function (swap) {
+    var currentStep = getCurrentStep(swap);
+    var eventType;
+    if ((currentStep == null ? void 0 : currentStep.networkStatus) === exports.PendingSwapNetworkStatus.WaitingForQueue) eventType = 'waiting_for_queue';else if ((swap == null ? void 0 : swap.status) === 'running') {
+      eventType = 'waiting_for_connecting_wallet';
+    }
+    if (!!eventType && !!notifier) {
+      notifier({
+        eventType: eventType,
+        swap: swap,
+        step: currentStep
+      });
+    }
+  });
+}
 /**
  *
  * Try to run blocked tasks by wallet and network name.
@@ -1878,7 +2034,7 @@ function checkWaitingForNetworkChange(manager) {
  * @param manager
  * @returns
  */
-function retryOn(wallet_network, manager, options) {
+function retryOn(wallet_network, notifier, manager, options) {
   var _finalQueueToBeRun;
   if (options === void 0) {
     options = {
@@ -1911,7 +2067,6 @@ function retryOn(wallet_network, manager, options) {
       }
     }
   });
-  // const isWaitingForConnectWallet = (status: Status) =>
   var finalQueueToBeRun = undefined;
   if (walletAndNetworkMatched.length > 0) {
     finalQueueToBeRun = walletAndNetworkMatched[0];
@@ -1920,7 +2075,8 @@ function retryOn(wallet_network, manager, options) {
         var currentQueue = walletAndNetworkMatched[i];
         markRunningSwapAsDependsOnOtherQueues({
           getStorage: currentQueue.getStorage.bind(currentQueue),
-          setStorage: currentQueue.setStorage.bind(currentQueue)
+          setStorage: currentQueue.setStorage.bind(currentQueue),
+          notifier: notifier
         });
       }
     }
@@ -1986,7 +2142,7 @@ function cancelSwap(swap) {
   });
 }
 
-var INTERVAL_FOR_CHECK = 2000;
+var INTERVAL_FOR_CHECK = 3000;
 /**
  * Subscribe to status of swap transaction by checking from server periodically.
  * After getting the status, notify the user and schedule `SCHEDULE_NEXT_STEP`.
@@ -2033,7 +2189,7 @@ function _checkTransactionStatus() {
           outputAmount = ((_status = status) == null ? void 0 : _status.outputAmount) || (!!currentStep.outputAmount ? currentStep.outputAmount : null);
           prevOutputAmount = currentStep.outputAmount;
           swap.extraMessage = ((_status2 = status) == null ? void 0 : _status2.extraMessage) || swap.extraMessage;
-          swap.extraMessageSeverity = MessageSeverity.info;
+          swap.extraMessageSeverity = exports.MessageSeverity.info;
           swap.extraMessageDetail = '';
           currentStep.status = ((_status3 = status) == null ? void 0 : _status3.status) || currentStep.status;
           currentStep.diagnosisUrl = ((_status4 = status) == null ? void 0 : _status4.diagnosisUrl) || currentStep.diagnosisUrl || null;
@@ -2044,6 +2200,7 @@ function _checkTransactionStatus() {
           if (!!newTransaction) {
             currentStep.status = 'created';
             currentStep.executedTransactionId = null;
+            currentStep.executedTransactionTime = null;
             currentStep.transferTransaction = null;
             currentStep.cosmosTransaction = null;
             currentStep.evmTransaction = null;
@@ -2071,11 +2228,22 @@ function _checkTransactionStatus() {
             eventType: 'step_completed_with_output',
             swap: swap,
             step: currentStep
-          });
+          });else if (prevOutputAmount === null && outputAmount === null) {
+            // it is needed to set notification after reloading the page
+            context.notifier({
+              eventType: 'check_tx_status',
+              swap: swap,
+              step: currentStep
+            });
+          }
           if (currentStep.status === 'success') {
             nextStep = getNextStep(swap, currentStep);
             swap.extraMessageDetail = '';
             swap.extraMessage = !!nextStep ? "starting next step: " + nextStep.swapperId + ": " + nextStep.fromBlockchain + " -> " + nextStep.toBlockchain : '';
+          } else if (currentStep.status === 'failed') {
+            swap.extraMessage = 'Transaction failed in blockchain';
+            swap.extraMessageSeverity = exports.MessageSeverity.error;
+            swap.extraMessageDetail = '';
           }
           // Sync data with storage
           setStorage(_extends({}, getStorage(), {
@@ -2115,38 +2283,70 @@ function checkApprovalStatus(_x2) {
  */
 function _checkApprovalStatus() {
   _checkApprovalStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
-    var getStorage, setStorage, next, schedule, retry, context, swap, currentStep, isApproved, response;
+    var getStorage, setStorage, next, schedule, retry, failed, context, swap, currentStep, isApproved, response, updateResult;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          getStorage = _ref2.getStorage, setStorage = _ref2.setStorage, next = _ref2.next, schedule = _ref2.schedule, retry = _ref2.retry, context = _ref2.context;
-          swap = getStorage().swapDetails; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          getStorage = _ref2.getStorage, setStorage = _ref2.setStorage, next = _ref2.next, schedule = _ref2.schedule, retry = _ref2.retry, failed = _ref2.failed, context = _ref2.context;
+          swap = getStorage().swapDetails; // double check it after fixing parallel
+          // const onFinish = () => {
+          //   // TODO resetClaimedBy is undefined here
+          //   if (context.resetClaimedBy) {
+          //     context.resetClaimedBy();
+          //   }
+          // };
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           currentStep = getCurrentStep(swap);
           isApproved = false;
           _context2.prev = 4;
           _context2.next = 7;
-          return httpService.checkApproval(swap.requestId);
+          return httpService.checkApproval(swap.requestId, currentStep.executedTransactionId || '');
         case 7:
           response = _context2.sent;
           isApproved = response.isApproved;
+          if (!isApproved && response.txStatus === 'failed') {
+            // approve transaction failed on
+            // we should fail the whole swap
+            updateResult = updateSwapStatus({
+              getStorage: getStorage,
+              setStorage: setStorage,
+              nextStatus: 'failed',
+              nextStepStatus: 'failed',
+              errorCode: 'SEND_TX_FAILED',
+              message: 'Approve transaction failed',
+              details: 'Smart contract approval failed in blockchain.'
+            });
+            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({
+              eventType: 'check_approve_tx_status',
+              swap: swap,
+              step: currentStep
+            });
+          }
           _context2.next = 15;
           break;
-        case 11:
-          _context2.prev = 11;
+        case 12:
+          _context2.prev = 12;
           _context2.t0 = _context2["catch"](4);
-          console.error('Failed to check getApprovedAmount', _context2.t0);
           isApproved = false;
         case 15:
           if (!isApproved) {
-            _context2.next = 30;
+            _context2.next = 31;
             break;
           }
           currentStep.status = 'approved';
           swap.extraMessage = "Spending " + currentStep.fromSymbol + " approved successfully.";
           swap.extraMessageDetail = null;
-          swap.extraMessageSeverity = MessageSeverity.success;
+          swap.extraMessageSeverity = exports.MessageSeverity.success;
           currentStep.evmApprovalTransaction = null;
           currentStep.executedTransactionId = null;
+          currentStep.executedTransactionTime = null;
           currentStep.starknetApprovalTransaction = null;
           currentStep.tronApprovalTransaction = null;
           setStorage(_extends({}, getStorage(), {
@@ -2159,18 +2359,18 @@ function _checkApprovalStatus() {
           });
           schedule(SwapActionTypes.SCHEDULE_NEXT_STEP);
           next();
-          _context2.next = 33;
+          _context2.next = 34;
           break;
-        case 30:
-          _context2.next = 32;
+        case 31:
+          _context2.next = 33;
           return delay(2000);
-        case 32:
-          retry();
         case 33:
+          retry();
+        case 34:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[4, 11]]);
+    }, _callee2, null, [[4, 12]]);
   }));
   return _checkApprovalStatus.apply(this, arguments);
 }
@@ -2289,7 +2489,7 @@ function _createTransaction() {
             nextStepStatus: 'failed',
             message: extraMessage,
             details: extraMessageDetail,
-            errorCode: APIErrorCode.FETCH_TX_FAILED
+            errorCode: 'FETCH_TX_FAILED'
           });
           context.notifier(_extends({
             eventType: 'task_failed'
@@ -2336,7 +2536,7 @@ function _executeTransaction() {
           currentStep = getCurrentStep(swap); // Resetting network status, so we will set it again during the running of this task.
           resetNetworkStatus(actions);
           /* Make sure wallet is connected and also the connected wallet is matched with tx by checking address. */
-          isWrongAddress = !isRequiredWalletConnected(swap, context.state);
+          isWrongAddress = !isRequiredWalletConnected(swap, context.state).ok;
           if (!isWrongAddress) {
             _context.next = 15;
             break;
@@ -2361,13 +2561,13 @@ function _executeTransaction() {
           We only run one request at a time (In parallel mode).
           */
           needsToBlockQueue = isNeedBlockQueueForParallel(currentStep);
-          if (!(needsToBlockQueue && !isClaimed && context.claimedBy)) {
+          if (!(needsToBlockQueue && !isClaimed)) {
             _context.next = 20;
             break;
           }
           _blockedFor = {
             reason: BlockReason.DEPENDS_ON_OTHER_QUEUES,
-            description: 'Waiting for other running tasks to be finished',
+            description: 'Waiting for other swaps to complete',
             details: {}
           };
           requestBlock(_blockedFor);
@@ -2394,7 +2594,7 @@ function _executeTransaction() {
           updateNetworkStatus(actions, {
             message: '',
             details: 'Wallet network changed successfully',
-            status: PendingSwapNetworkStatus.NetworkChanged
+            status: exports.PendingSwapNetworkStatus.NetworkChanged
           });
         case 32:
           // All the conditions are met. We can safely send the tx to wallet for sign.
@@ -2431,6 +2631,7 @@ function scheduleNextStep(_ref) {
       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();
@@ -2466,6 +2667,29 @@ function start(_ref) {
   next();
 }
 
+var _actions;
+/**
+ *
+ * The idea behind this queue is to be able dynamically add some steps.
+ * After running a swap, it can be blocked (like on waiting for switch netwrok)
+ *  or waits for something happend (like checking status of a transaction from server)
+ *
+ */
+var swapQueueDef = {
+  name: 'swap',
+  actions: (_actions = {}, _actions[SwapActionTypes.START] = start, _actions[SwapActionTypes.SCHEDULE_NEXT_STEP] = scheduleNextStep, _actions[SwapActionTypes.CREATE_TRANSACTION] = createTransaction, _actions[SwapActionTypes.EXECUTE_TRANSACTION] = executeTransaction, _actions[SwapActionTypes.CHECK_TRANSACTION_STATUS] = checkStatus, _actions),
+  run: [SwapActionTypes.START],
+  whenTaskBlocked: function whenTaskBlocked(event, meta) {
+    if (event.reason.reason === BlockReason.WAIT_FOR_CONNECT_WALLET) {
+      onBlockForConnectWallet(event, meta);
+    } else if (event.reason.reason === BlockReason.WAIT_FOR_NETWORK_CHANGE) {
+      onBlockForChangeNetwork(event, meta);
+    } else if (event.reason.reason === BlockReason.DEPENDS_ON_OTHER_QUEUES) {
+      onDependsOnOtherQueues(event, meta);
+    }
+  }
+};
+
 var MIGRATED_KEY = 'migratedToQueueManager';
 /**
  *
@@ -2657,9 +2881,10 @@ function useQueueManager(params) {
       checkWaitingForConnectWalletChange({
         evmChains: params.evmChains,
         wallet_network: params.lastConnectedWallet,
-        manager: manager
+        manager: manager,
+        notifier: params.notifier
       });
-      retryOn(params.lastConnectedWallet, manager);
+      retryOn(params.lastConnectedWallet, params.notifier, manager);
     }
   }, [params.lastConnectedWallet]);
   react.useEffect(function () {
@@ -2674,34 +2899,20 @@ function useQueueManager(params) {
   }, [params.disconnectedWallet]);
 }
 
-var _actions;
-/**
- *
- * The idea behind this queue is to be able dynamically add some steps.
- * After running a swap, it can be blocked (like on waiting for switch netwrok)
- *  or waits for something happend (like checking status of a transaction from server)
- *
- */
-var swapQueueDef = {
-  name: 'swap',
-  actions: (_actions = {}, _actions[SwapActionTypes.START] = start, _actions[SwapActionTypes.SCHEDULE_NEXT_STEP] = scheduleNextStep, _actions[SwapActionTypes.CREATE_TRANSACTION] = createTransaction, _actions[SwapActionTypes.EXECUTE_TRANSACTION] = executeTransaction, _actions[SwapActionTypes.CHECK_TRANSACTION_STATUS] = checkStatus, _actions),
-  run: [SwapActionTypes.START],
-  whenTaskBlocked: function whenTaskBlocked(event, meta) {
-    if (event.reason.reason === BlockReason.WAIT_FOR_CONNECT_WALLET) {
-      onBlockForConnectWallet(event, meta);
-    } else if (event.reason.reason === BlockReason.WAIT_FOR_NETWORK_CHANGE) {
-      onBlockForChangeNetwork(event, meta);
-    } else if (event.reason.reason === BlockReason.DEPENDS_ON_OTHER_QUEUES) {
-      onDependsOnOtherQueues(event, meta);
-    }
-  }
-};
-
+exports.PrettyError = PrettyError;
+exports.calculatePendingSwap = calculatePendingSwap;
 exports.cancelSwap = cancelSwap;
 exports.checkWaitingForNetworkChange = checkWaitingForNetworkChange;
+exports.getCurrentBlockchainOfOrNull = getCurrentBlockchainOfOrNull;
 exports.getCurrentStep = getCurrentStep;
 exports.getEvmProvider = getEvmProvider;
-exports.getRelatedWallet = getRelatedWallet$1;
+exports.getRelatedWallet = getRelatedWallet;
+exports.getRelatedWalletOrNull = getRelatedWalletOrNull;
+exports.getRequiredWallet = getRequiredWallet;
+exports.getRunningSwaps = getRunningSwaps;
+exports.prettifyErrorMessage = prettifyErrorMessage;
+exports.resetRunningSwapNotifsOnPageLoad = resetRunningSwapNotifsOnPageLoad;
+exports.splitWalletNetwork = splitWalletNetwork;
 exports.swapQueueDef = swapQueueDef;
 exports.updateSwapStatus = updateSwapStatus;
 exports.useMigration = useMigration;