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

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

@@ -637,21 +637,17 @@ var getCurrentBlockchainOf = function getCurrentBlockchainOf(swap, step) {
   // TODO: check why it returns string
   return blockchain;
 };
-var getEvmApproveUrl = function getEvmApproveUrl(tx, network, evmBasedBlockchains) {
-  var evmBlochain = evmBasedBlockchains.find(function (blockchain) {
-    return blockchain.name === network;
-  });
-  if (!evmBlochain) {
-    throw Error("unsupported network: " + network + " for getting approve url.");
-  }
-  if (evmBlochain.info.transactionUrl) return evmBlochain.info.transactionUrl.replace('{txHash}', tx.toLowerCase());
-  throw Error("Explorer url for " + network + " is not implemented");
+var getBlockchainMetaExplorerBaseUrl = function getBlockchainMetaExplorerBaseUrl(blockchainMeta) {
+  var _blockchainMeta$info;
+  if (rangoTypes.isCosmosBlockchain(blockchainMeta)) return (_blockchainMeta$info = blockchainMeta.info) == null ? void 0 : _blockchainMeta$info.explorerUrlToTx;else if (rangoTypes.isEvmBlockchain(blockchainMeta) || rangoTypes.isStarknetBlockchain(blockchainMeta) || rangoTypes.isTronBlockchain(blockchainMeta)) return blockchainMeta.info.transactionUrl;
+  return;
 };
-var getStarknetApproveUrl = function getStarknetApproveUrl(tx) {
-  return 'https://starkscan.co/tx/{txHash}'.replace('{txHash}', tx.toLowerCase());
-};
-var getTronApproveUrl = function getTronApproveUrl(tx) {
-  return 'https://tronscan.org/#/transaction/{txHash}'.replace('{txHash}', tx.toLowerCase());
+var getScannerUrl = function getScannerUrl(txHash, network, blockchainMetaMap) {
+  var blockchainMeta = blockchainMetaMap[network];
+  var baseUrl = getBlockchainMetaExplorerBaseUrl(blockchainMeta);
+  if (!baseUrl) return;
+  if (baseUrl.indexOf('/{txHash}') !== -1) return baseUrl.replace('{txHash}', txHash == null ? void 0 : txHash.toLowerCase());
+  return baseUrl + "/" + (txHash == null ? void 0 : txHash.toLowerCase());
 };
 function getNextStep(swap, currentStep) {
   return swap.steps.find(function (step) {
@@ -837,6 +833,23 @@ function claimQueue() {
     }
   };
 }
+/**
+ *
+ * We use module-level variable to keep track of
+ * map of transactions hash to the TransactionResponse
+ *
+ */
+var swapTransactionToResponseMap = {};
+function useTransactionsResponse() {
+  return {
+    getTransactionResponseByHash: function getTransactionResponseByHash(hash) {
+      return swapTransactionToResponseMap[hash];
+    },
+    setTransactionResponseByHash: function setTransactionResponseByHash(hash, response) {
+      swapTransactionToResponseMap[hash] = response;
+    }
+  };
+}
 /**
  * Sample inputs are:
  *  - "metamask-ETH"
@@ -867,6 +880,73 @@ var getCurrentStep = function getCurrentStep(swap) {
     return step.status !== 'failed' && step.status !== 'success';
   }) || null;
 };
+/**
+ *
+ * Returns current step transaction
+ *
+ */
+var getCurrentStepTx = function getCurrentStepTx(currentStep) {
+  var evmTransaction = currentStep.evmTransaction,
+    evmApprovalTransaction = currentStep.evmApprovalTransaction,
+    cosmosTransaction = currentStep.cosmosTransaction,
+    solanaTransaction = currentStep.solanaTransaction,
+    transferTransaction = currentStep.transferTransaction,
+    starknetApprovalTransaction = currentStep.starknetApprovalTransaction,
+    starknetTransaction = currentStep.starknetTransaction,
+    tronApprovalTransaction = currentStep.tronApprovalTransaction,
+    tronTransaction = currentStep.tronTransaction;
+  return evmTransaction || evmApprovalTransaction || cosmosTransaction || solanaTransaction || transferTransaction || starknetApprovalTransaction || starknetTransaction || tronApprovalTransaction || tronTransaction;
+};
+/**
+ *
+ * Set current step transaction
+ *
+ */
+var setCurrentStepTx = function setCurrentStepTx(currentStep, transaction) {
+  currentStep.transferTransaction = null;
+  currentStep.cosmosTransaction = null;
+  currentStep.evmTransaction = null;
+  currentStep.solanaTransaction = null;
+  currentStep.evmApprovalTransaction = null;
+  currentStep.starknetApprovalTransaction = null;
+  currentStep.starknetTransaction = null;
+  currentStep.tronApprovalTransaction = null;
+  currentStep.tronTransaction = null;
+  if (rangoSdk.isEvmTransaction(transaction)) {
+    if (transaction.isApprovalTx) currentStep.evmApprovalTransaction = transaction;else currentStep.evmTransaction = transaction;
+  } else if (rangoSdk.isCosmosTransaction(transaction)) {
+    currentStep.cosmosTransaction = transaction;
+  } else if (rangoSdk.isSolanaTransaction(transaction)) {
+    currentStep.solanaTransaction = transaction;
+  } else if (rangoSdk.isTransferTransaction(transaction)) {
+    currentStep.transferTransaction = transaction;
+  } else if (rangoSdk.isStarknetTransaction(transaction)) {
+    if (transaction.isApprovalTx) currentStep.starknetApprovalTransaction = transaction;else currentStep.starknetTransaction = transaction;
+  } else if (rangoSdk.isTronTransaction(transaction)) {
+    if (transaction.isApprovalTx) currentStep.tronApprovalTransaction = transaction;else currentStep.tronTransaction = transaction;
+  }
+  return currentStep;
+};
+/**
+ *
+ * Returns current step transaction type
+ *
+ */
+var getCurrentStepTxType = function getCurrentStepTxType(currentStep) {
+  var _getCurrentStepTx;
+  return (_getCurrentStepTx = getCurrentStepTx(currentStep)) == null ? void 0 : _getCurrentStepTx.type;
+};
+/**
+ *
+ * Returns a boolean indicating that current step is an approval tx or not.
+ *
+ */
+var isApprovalCurrentStepTx = function isApprovalCurrentStepTx(currentStep) {
+  var evmApprovalTransaction = currentStep.evmApprovalTransaction,
+    starknetApprovalTransaction = currentStep.starknetApprovalTransaction,
+    tronApprovalTransaction = currentStep.tronApprovalTransaction;
+  return !!(evmApprovalTransaction || starknetApprovalTransaction || tronApprovalTransaction);
+};
 /**
  * When we are doing a swap, there are some common fields that will be updated together.
  * This function helps us to update a swap status and also it will update some more fields like `extraMessageSeverity` based on the input.
@@ -916,7 +996,12 @@ function updateSwapStatus(_ref) {
     step: currentStep
   };
 }
-function setStepTransactionIds(_ref2, txId, notifier, eventType, approveUrl) {
+/**
+ *
+ * Set current step transaction hash, update pending swap status, and notify user if needed
+ *
+ */
+function setStepTransactionIds(_ref2, txId, notifier, eventType, explorerUrl) {
   var getStorage = _ref2.getStorage,
     setStorage = _ref2.setStorage;
   var swap = getStorage().swapDetails;
@@ -925,9 +1010,9 @@ function setStepTransactionIds(_ref2, txId, notifier, eventType, approveUrl) {
   var currentStep = getCurrentStep(swap);
   currentStep.executedTransactionId = txId;
   currentStep.executedTransactionTime = new Date().getTime().toString();
-  if (!!approveUrl) currentStep.explorerUrl = [].concat(currentStep.explorerUrl || [], [{
-    url: approveUrl,
-    description: "approve"
+  if (!!(explorerUrl != null && explorerUrl.url)) currentStep.explorerUrl = [].concat(currentStep.explorerUrl || [], [{
+    url: explorerUrl.url,
+    description: explorerUrl.description || null
   }]);
   if (eventType === 'check_tx_status') {
     swap.extraMessage = 'Checking transaction status ...';
@@ -947,15 +1032,6 @@ function setStepTransactionIds(_ref2, txId, notifier, eventType, approveUrl) {
     step: currentStep
   });
 }
-function getSwapNotitfication(eventType, updateResult) {
-  if (updateResult.swap.hasAlreadyProceededToSign) {
-    return _extends({
-      eventType: 'transaction_expired'
-    }, updateResult);
-  } else return _extends({
-    eventType: eventType
-  }, updateResult);
-}
 /**
  * If a swap needs a wallet to be connected,
  * By calling this function some related fields will be updated to show a correct message and state for notfiying the user.
@@ -1040,24 +1116,6 @@ function delay(ms) {
     return setTimeout(res, ms);
   });
 }
-var isEvmTransaction = function isEvmTransaction(tx) {
-  return tx.type === rangoSdk.TransactionType.EVM;
-};
-var isCosmosTransaction = function isCosmosTransaction(tx) {
-  return tx.type === rangoSdk.TransactionType.COSMOS;
-};
-var isSolanaTransaction = function isSolanaTransaction(tx) {
-  return tx.type === rangoSdk.TransactionType.SOLANA;
-};
-var isTrasnferTransaction = function isTrasnferTransaction(tx) {
-  return tx.type === rangoSdk.TransactionType.TRANSFER;
-};
-var isStarknetTransaction = function isStarknetTransaction(tx) {
-  return tx.type === rangoSdk.TransactionType.STARKNET;
-};
-var isTronTransaction = function isTronTransaction(tx) {
-  return tx.type === rangoSdk.TransactionType.TRON;
-};
 /**
  *
  * To execute a swap, we are keeping the user prefrences on what wallet they are going to use for a sepecific blockchain
@@ -1203,8 +1261,8 @@ function _isNetworkMatchedForTransaction() {
             _context2.next = 19;
             break;
           }
-          blockChain = walletsShared.getBlockChainNameFromId(chainId, Object.entries(meta.blockchains).map(function (_ref6) {
-            var blockchainMeta = _ref6[1];
+          blockChain = walletsShared.getBlockChainNameFromId(chainId, Object.entries(meta.blockchains).map(function (_ref7) {
+            var blockchainMeta = _ref7[1];
             return blockchainMeta;
           }));
           if (!(blockChain && blockChain.toLowerCase() === fromBlockChain.toLowerCase())) {
@@ -1443,6 +1501,8 @@ function isRequiredWalletConnected(swap, getState) {
   };
 }
 function singTransaction(actions) {
+  var _useTransactionsRespo = useTransactionsResponse(),
+    setTransactionResponseByHash = _useTransactionsRespo.setTransactionResponseByHash;
   var getStorage = actions.getStorage,
     setStorage = actions.setStorage,
     failed = actions.failed,
@@ -1456,451 +1516,99 @@ function singTransaction(actions) {
   var swap = getStorage().swapDetails;
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   var currentStep = getCurrentStep(swap);
-  var evmTransaction = currentStep.evmTransaction,
-    evmApprovalTransaction = currentStep.evmApprovalTransaction,
-    cosmosTransaction = currentStep.cosmosTransaction,
-    solanaTransaction = currentStep.solanaTransaction,
-    transferTransaction = currentStep.transferTransaction,
-    tronTransaction = currentStep.tronTransaction,
-    tronApprovalTransaction = currentStep.tronApprovalTransaction,
-    starknetTransaction = currentStep.starknetTransaction,
-    starknetApprovalTransaction = currentStep.starknetApprovalTransaction;
   var sourceWallet = getRelatedWallet(swap, currentStep);
+  var mobileWallet = isMobileWallet(sourceWallet == null ? void 0 : sourceWallet.walletType);
   var walletAddress = getCurrentAddressOf(swap, currentStep);
   var walletSigners = getSigners(sourceWallet.walletType);
-  var mobileWallet = isMobileWallet(sourceWallet.walletType);
+  var currentStepBlockchain = getCurrentBlockchainOf(swap, currentStep);
   var onFinish = function onFinish() {
     // TODO resetClaimedBy is undefined here
     if (actions.context.resetClaimedBy) {
       actions.context.resetClaimedBy();
     }
   };
-  if (!!evmApprovalTransaction) {
-    var spenderContract = evmApprovalTransaction == null ? void 0 : evmApprovalTransaction.to;
-    if (!spenderContract) throw PrettyError.AssertionFailed('contract address is null for checking approval');
-    // Update swap status
-    var message = "Waiting for approval of " + (currentStep == null ? void 0 : currentStep.fromSymbol) + " coin " + (mobileWallet ? 'on your mobile phone' : '');
+  var tx = getCurrentStepTx(currentStep);
+  var txType = tx == null ? void 0 : tx.type;
+  var isApproval = isApprovalCurrentStepTx(currentStep);
+  var isSmartContractCall = [rangoSdk.TransactionType.EVM, rangoSdk.TransactionType.STARKNET, rangoSdk.TransactionType.TRON].includes(txType);
+  var hasAlreadyProceededToSign = typeof swap.hasAlreadyProceededToSign === 'boolean';
+  var nextStatus, nextStepStatus, eventType, message, details;
+  if (isApproval) {
+    message = "Waiting for approval of " + (currentStep == null ? void 0 : currentStep.fromSymbol) + " coin " + (mobileWallet ? 'on your mobile phone!' : '');
+    details = 'Waiting for approve transaction to be mined and confirmed successfully';
+    nextStepStatus = 'waitingForApproval';
+    nextStatus = undefined;
+    eventType = 'confirm_approve_contract';
+  } else if (hasAlreadyProceededToSign) {
+    message = 'Transaction is expired. Please try again.';
+    nextStepStatus = 'failed';
+    nextStatus = 'failed';
+    details = '';
+    eventType = 'transaction_expired';
+  } else {
+    message = 'Executing transaction ...';
+    nextStepStatus = 'running';
+    nextStatus = 'running';
+    details = "" + (mobileWallet ? 'Check your mobile phone!' : '');
+    eventType = isSmartContractCall ? 'calling_smart_contract' : 'confirm_transfer';
+  }
+  var updateResult = updateSwapStatus({
+    getStorage: getStorage,
+    setStorage: setStorage,
+    nextStepStatus: nextStepStatus,
+    nextStatus: nextStatus,
+    message: message,
+    details: details,
+    hasAlreadyProceededToSign: isApproval ? undefined : hasAlreadyProceededToSign,
+    errorCode: hasAlreadyProceededToSign ? 'TX_EXPIRED' : undefined
+  });
+  notifier(_extends({
+    eventType: eventType
+  }, updateResult));
+  if (hasAlreadyProceededToSign) {
+    failed();
+    onFinish();
+    return;
+  }
+  var signer = walletSigners.getSigner(txType);
+  signer.signAndSendTx(tx, walletAddress, null).then(function (_ref6) {
+    var hash = _ref6.hash,
+      response = _ref6.response;
+    var explorerUrl = getScannerUrl(hash, currentStepBlockchain, meta.blockchains);
+    setStepTransactionIds(actions, hash, notifier, isApproval ? 'check_approve_tx_status' : 'check_tx_status', explorerUrl ? {
+      url: explorerUrl,
+      description: isApproval ? 'Approve' : 'Swap'
+    } : undefined);
+    // response used for evm transactions to get receipt and track replaced
+    response && setTransactionResponseByHash(hash, response);
+    schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
+    next();
+    onFinish();
+  }, function (error) {
+    var _error$root, _error$root2, _error$root3;
+    if (swap.status === 'failed') return;
+    var _prettifyErrorMessage = prettifyErrorMessage(error),
+      extraMessage = _prettifyErrorMessage.extraMessage,
+      extraMessageDetail = _prettifyErrorMessage.extraMessageDetail,
+      extraMessageErrorCode = _prettifyErrorMessage.extraMessageErrorCode;
+    // if it is an rpc error with details, send the log to sentry
+    if (error && error != null && error.root && error != null && (_error$root = error.root) != null && _error$root.message && error != null && (_error$root2 = error.root) != null && _error$root2.code && error != null && (_error$root3 = error.root) != null && _error$root3.reason) logRPCError(error.root, swap, currentStep, sourceWallet == null ? void 0 : sourceWallet.walletType);
     var updateResult = updateSwapStatus({
       getStorage: getStorage,
       setStorage: setStorage,
-      nextStepStatus: 'waitingForApproval',
-      message: message,
-      details: 'Waiting for approve transaction to be mined and confirmed successfully'
+      nextStatus: 'failed',
+      nextStepStatus: 'failed',
+      message: extraMessage,
+      details: extraMessageDetail,
+      errorCode: extraMessageErrorCode
     });
+    var eventType = extraMessageErrorCode === 'REJECTED_BY_USER' ? 'contract_rejected' : isSmartContractCall ? 'smart_contract_call_failed' : 'transfer_failed';
     notifier(_extends({
-      eventType: 'confirm_approve_contract'
+      eventType: eventType
     }, updateResult));
-    // Execute transaction
-    walletSigners.getSigner(rangoSdk.TransactionType.EVM).signAndSendTx(evmApprovalTransaction, walletAddress, null).then(function (hash) {
-      var approveUrl = getEvmApproveUrl(hash, getCurrentBlockchainOf(swap, currentStep), meta.evmBasedChains);
-      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;
-      var _prettifyErrorMessage = prettifyErrorMessage(error),
-        extraMessage = _prettifyErrorMessage.extraMessage,
-        extraMessageDetail = _prettifyErrorMessage.extraMessageDetail,
-        extraMessageErrorCode = _prettifyErrorMessage.extraMessageErrorCode;
-      if (error && error != null && error.root && error != null && (_error$root = error.root) != null && _error$root.message && error != null && (_error$root2 = error.root) != null && _error$root2.code && error != null && (_error$root3 = error.root) != null && _error$root3.reason) {
-        logRPCError(error.root, swap, currentStep, sourceWallet == null ? void 0 : sourceWallet.walletType);
-      }
-      var updateResult = updateSwapStatus({
-        getStorage: getStorage,
-        setStorage: setStorage,
-        nextStatus: 'failed',
-        nextStepStatus: 'failed',
-        message: extraMessage,
-        details: extraMessageDetail,
-        errorCode: extraMessageErrorCode
-      });
-      notifier(_extends({
-        eventType: extraMessageErrorCode === 'REJECTED_BY_USER' ? 'contract_rejected' : 'smart_contract_call_failed'
-      }, updateResult));
-      failed();
-      onFinish();
-    });
-    return;
-  } else if (!!tronApprovalTransaction) {
-    // Update swap status
-    var _message = "Waiting for approval of " + (currentStep == null ? void 0 : currentStep.fromSymbol) + " coin " + (mobileWallet ? 'on your mobile phone' : '');
-    var _updateResult = updateSwapStatus({
-      getStorage: getStorage,
-      setStorage: setStorage,
-      nextStepStatus: 'waitingForApproval',
-      message: _message,
-      details: 'Waiting for approve transaction to be mined and confirmed successfully'
-    });
-    notifier(_extends({
-      eventType: 'confirm_approve_contract'
-    }, _updateResult));
-    // Execute transaction
-    walletSigners.getSigner(rangoSdk.TransactionType.TRON).signAndSendTx(tronApprovalTransaction, walletAddress, null).then(function (hash) {
-      var approveUrl = getTronApproveUrl(hash);
-      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;
-      var _prettifyErrorMessage2 = prettifyErrorMessage(error),
-        extraMessage = _prettifyErrorMessage2.extraMessage,
-        extraMessageDetail = _prettifyErrorMessage2.extraMessageDetail,
-        extraMessageErrorCode = _prettifyErrorMessage2.extraMessageErrorCode;
-      if (error && error != null && error.root && error != null && (_error$root4 = error.root) != null && _error$root4.message && error != null && (_error$root5 = error.root) != null && _error$root5.code && error != null && (_error$root6 = error.root) != null && _error$root6.reason) {
-        logRPCError(error.root, swap, currentStep, sourceWallet == null ? void 0 : sourceWallet.walletType);
-      }
-      var updateResult = updateSwapStatus({
-        getStorage: getStorage,
-        setStorage: setStorage,
-        nextStatus: 'failed',
-        nextStepStatus: 'failed',
-        message: extraMessage,
-        details: extraMessageDetail,
-        errorCode: extraMessageErrorCode
-      });
-      notifier(_extends({
-        eventType: extraMessageErrorCode === 'REJECTED_BY_USER' ? 'contract_rejected' : 'smart_contract_call_failed'
-      }, updateResult));
-      failed();
-      onFinish();
-    });
-    return;
-  } else if (!!starknetApprovalTransaction) {
-    // Update swap status
-    var _message2 = "Waiting for approval of " + (currentStep == null ? void 0 : currentStep.fromSymbol) + " coin " + (mobileWallet ? 'on your mobile phone' : '');
-    var _updateResult2 = updateSwapStatus({
-      getStorage: getStorage,
-      setStorage: setStorage,
-      nextStepStatus: 'waitingForApproval',
-      message: _message2,
-      details: 'Waiting for approve transaction to be mined and confirmed successfully'
-    });
-    notifier(_extends({
-      eventType: 'confirm_approve_contract'
-    }, _updateResult2));
-    // Execute transaction
-    walletSigners.getSigner(rangoSdk.TransactionType.STARKNET).signAndSendTx(starknetApprovalTransaction, walletAddress, null).then(function (hash) {
-      var approveUrl = getStarknetApproveUrl(hash);
-      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;
-      var _prettifyErrorMessage3 = prettifyErrorMessage(error),
-        extraMessage = _prettifyErrorMessage3.extraMessage,
-        extraMessageDetail = _prettifyErrorMessage3.extraMessageDetail,
-        extraMessageErrorCode = _prettifyErrorMessage3.extraMessageErrorCode;
-      if (error && error != null && error.root && error != null && (_error$root7 = error.root) != null && _error$root7.message && error != null && (_error$root8 = error.root) != null && _error$root8.code && error != null && (_error$root9 = error.root) != null && _error$root9.reason) {
-        logRPCError(error.root, swap, currentStep, sourceWallet == null ? void 0 : sourceWallet.walletType);
-      }
-      var updateResult = updateSwapStatus({
-        getStorage: getStorage,
-        setStorage: setStorage,
-        nextStatus: 'failed',
-        nextStepStatus: 'failed',
-        message: extraMessage,
-        details: extraMessageDetail,
-        errorCode: extraMessageErrorCode
-      });
-      notifier(_extends({
-        eventType: extraMessageErrorCode === 'REJECTED_BY_USER' ? 'contract_rejected' : 'smart_contract_call_failed'
-      }, updateResult));
-      failed();
-      onFinish();
-    });
-    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 = mobileWallet ? 'Check your mobile phone' : '';
-  if (!!transferTransaction) {
-    var _updateResult3 = updateSwapStatus({
-      getStorage: getStorage,
-      setStorage: setStorage,
-      nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
-      nextStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
-      message: executeMessage,
-      details: executeDetails,
-      hasAlreadyProceededToSign: hasAlreadyProceededToSign,
-      errorCode: errorCodeBasedOnHasAlreadyProceededToSign
-    });
-    var notification = getSwapNotitfication('confirm_transfer', _updateResult3);
-    notifier(notification);
-    if (notification.eventType === 'transaction_expired') {
-      failed();
-      onFinish();
-    } else {
-      walletSigners.getSigner(rangoSdk.TransactionType.TRANSFER).signAndSendTx(transferTransaction, walletAddress, null).then(function (txId) {
-        setStepTransactionIds(actions, txId, notifier, 'check_tx_status');
-        schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
-        next();
-        onFinish();
-      }, function (error) {
-        if (swap.status === 'failed') return;
-        var _prettifyErrorMessage4 = prettifyErrorMessage(error),
-          extraMessage = _prettifyErrorMessage4.extraMessage,
-          extraMessageDetail = _prettifyErrorMessage4.extraMessageDetail,
-          extraMessageErrorCode = _prettifyErrorMessage4.extraMessageErrorCode;
-        var updateResult = updateSwapStatus({
-          getStorage: getStorage,
-          setStorage: setStorage,
-          nextStatus: 'failed',
-          nextStepStatus: 'failed',
-          message: extraMessage,
-          details: extraMessageDetail,
-          errorCode: extraMessageErrorCode
-        });
-        notifier(_extends({
-          eventType: extraMessageErrorCode === 'REJECTED_BY_USER' ? 'transfer_rejected' : 'transfer_failed'
-        }, updateResult));
-        failed();
-        onFinish();
-      });
-    }
-  } else if (!!evmTransaction) {
-    var _updateResult4 = updateSwapStatus({
-      getStorage: getStorage,
-      setStorage: setStorage,
-      nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
-      nextStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
-      message: executeMessage,
-      details: executeDetails,
-      hasAlreadyProceededToSign: hasAlreadyProceededToSign,
-      errorCode: errorCodeBasedOnHasAlreadyProceededToSign
-    });
-    var _notification = getSwapNotitfication('calling_smart_contract', _updateResult4);
-    notifier(_notification);
-    if (_notification.eventType === 'transaction_expired') {
-      failed();
-      onFinish();
-    } else {
-      walletSigners.getSigner(rangoSdk.TransactionType.EVM).signAndSendTx(evmTransaction, walletAddress, null).then(function (id) {
-        setStepTransactionIds(actions, id, notifier, 'check_tx_status');
-        schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
-        next();
-        onFinish();
-      }, function (error) {
-        var _error$root10, _error$root11, _error$root12;
-        if (swap.status === 'failed') return;
-        var _prettifyErrorMessage5 = prettifyErrorMessage(error),
-          extraMessage = _prettifyErrorMessage5.extraMessage,
-          extraMessageDetail = _prettifyErrorMessage5.extraMessageDetail,
-          extraMessageErrorCode = _prettifyErrorMessage5.extraMessageErrorCode;
-        if (error && error != null && error.root && error != null && (_error$root10 = error.root) != null && _error$root10.message && error != null && (_error$root11 = error.root) != null && _error$root11.code && error != null && (_error$root12 = error.root) != null && _error$root12.reason) {
-          logRPCError(error.root, swap, currentStep, sourceWallet == null ? void 0 : sourceWallet.walletType);
-        }
-        var updateResult = updateSwapStatus({
-          getStorage: getStorage,
-          setStorage: setStorage,
-          nextStatus: 'failed',
-          nextStepStatus: 'failed',
-          message: extraMessage,
-          details: extraMessageDetail,
-          errorCode: extraMessageErrorCode
-        });
-        notifier(_extends({
-          eventType: extraMessageErrorCode === 'REJECTED_BY_USER' ? 'contract_rejected' : 'smart_contract_call_failed'
-        }, updateResult));
-        failed();
-        onFinish();
-      });
-    }
-  } else if (!!cosmosTransaction) {
-    var _updateResult5 = updateSwapStatus({
-      getStorage: getStorage,
-      setStorage: setStorage,
-      nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
-      nextStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
-      message: executeMessage,
-      details: executeDetails,
-      hasAlreadyProceededToSign: hasAlreadyProceededToSign,
-      errorCode: errorCodeBasedOnHasAlreadyProceededToSign
-    });
-    var _notification2 = getSwapNotitfication('calling_smart_contract', _updateResult5);
-    notifier(_notification2);
-    if (_notification2.eventType === 'transaction_expired') {
-      failed();
-      onFinish();
-    } else {
-      walletSigners.getSigner(rangoSdk.TransactionType.COSMOS).signAndSendTx(cosmosTransaction, walletAddress, null).then(
-      // todo
-      function (id) {
-        setStepTransactionIds(actions, id, notifier, 'check_tx_status');
-        schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
-        next();
-        onFinish();
-      }, function (error) {
-        if (swap.status === 'failed') return;
-        var _prettifyErrorMessage6 = prettifyErrorMessage(error),
-          extraMessage = _prettifyErrorMessage6.extraMessage,
-          extraMessageDetail = _prettifyErrorMessage6.extraMessageDetail,
-          extraMessageErrorCode = _prettifyErrorMessage6.extraMessageErrorCode;
-        var updateResult = updateSwapStatus({
-          getStorage: getStorage,
-          setStorage: setStorage,
-          nextStatus: 'failed',
-          nextStepStatus: 'failed',
-          message: extraMessage,
-          details: extraMessageDetail,
-          errorCode: extraMessageErrorCode
-        });
-        notifier(_extends({
-          eventType: 'smart_contract_call_failed'
-        }, updateResult));
-        failed();
-        onFinish();
-      });
-    }
-  } else if (!!solanaTransaction) {
-    var _updateResult6 = updateSwapStatus({
-      getStorage: getStorage,
-      setStorage: setStorage,
-      nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
-      nextStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
-      message: executeMessage,
-      details: executeDetails,
-      hasAlreadyProceededToSign: hasAlreadyProceededToSign,
-      errorCode: errorCodeBasedOnHasAlreadyProceededToSign
-    });
-    var _notification3 = getSwapNotitfication('calling_smart_contract', _updateResult6);
-    notifier(_notification3);
-    if (_notification3.eventType === 'transaction_expired') {
-      failed();
-      onFinish();
-    } else {
-      var tx = solanaTransaction;
-      walletSigners.getSigner(rangoSdk.TransactionType.SOLANA).signAndSendTx(tx, walletAddress, null).then(function (txId) {
-        setStepTransactionIds(actions, txId, notifier, 'check_tx_status');
-        schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
-        next();
-        onFinish();
-      }, function (error) {
-        if (swap.status === 'failed') return;
-        var _prettifyErrorMessage7 = prettifyErrorMessage(error),
-          extraMessage = _prettifyErrorMessage7.extraMessage,
-          extraMessageDetail = _prettifyErrorMessage7.extraMessageDetail,
-          extraMessageErrorCode = _prettifyErrorMessage7.extraMessageErrorCode;
-        var updateResult = updateSwapStatus({
-          getStorage: getStorage,
-          setStorage: setStorage,
-          nextStatus: 'failed',
-          nextStepStatus: 'failed',
-          message: extraMessage,
-          details: extraMessageDetail,
-          errorCode: extraMessageErrorCode
-        });
-        notifier(_extends({
-          eventType: 'smart_contract_call_failed'
-        }, updateResult));
-        failed();
-        onFinish();
-      });
-    }
-  } else if (!!tronTransaction) {
-    var _updateResult7 = updateSwapStatus({
-      getStorage: getStorage,
-      setStorage: setStorage,
-      nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
-      nextStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
-      message: executeMessage,
-      details: executeDetails,
-      hasAlreadyProceededToSign: hasAlreadyProceededToSign,
-      errorCode: errorCodeBasedOnHasAlreadyProceededToSign
-    });
-    var _notification4 = getSwapNotitfication('calling_smart_contract', _updateResult7);
-    notifier(_notification4);
-    if (_notification4.eventType === 'transaction_expired') {
-      failed();
-      onFinish();
-    } else {
-      walletSigners.getSigner(rangoSdk.TransactionType.TRON).signAndSendTx(tronTransaction, walletAddress, null).then(function (id) {
-        setStepTransactionIds(actions, id, notifier, 'check_tx_status');
-        schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
-        next();
-        onFinish();
-      }, function (error) {
-        var _error$root13, _error$root14, _error$root15;
-        if (swap.status === 'failed') return;
-        var _prettifyErrorMessage8 = prettifyErrorMessage(error),
-          extraMessage = _prettifyErrorMessage8.extraMessage,
-          extraMessageDetail = _prettifyErrorMessage8.extraMessageDetail,
-          extraMessageErrorCode = _prettifyErrorMessage8.extraMessageErrorCode;
-        if (error && error != null && error.root && error != null && (_error$root13 = error.root) != null && _error$root13.message && error != null && (_error$root14 = error.root) != null && _error$root14.code && error != null && (_error$root15 = error.root) != null && _error$root15.reason) {
-          logRPCError(error.root, swap, currentStep, sourceWallet == null ? void 0 : sourceWallet.walletType);
-        }
-        var updateResult = updateSwapStatus({
-          getStorage: getStorage,
-          setStorage: setStorage,
-          nextStatus: 'failed',
-          nextStepStatus: 'failed',
-          message: extraMessage,
-          details: extraMessageDetail,
-          errorCode: extraMessageErrorCode
-        });
-        notifier(_extends({
-          eventType: 'smart_contract_call_failed'
-        }, updateResult));
-        failed();
-        onFinish();
-      });
-    }
-  } else if (!!starknetTransaction) {
-    var _updateResult8 = updateSwapStatus({
-      getStorage: getStorage,
-      setStorage: setStorage,
-      nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
-      nextStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
-      message: executeMessage,
-      details: executeDetails,
-      hasAlreadyProceededToSign: hasAlreadyProceededToSign,
-      errorCode: errorCodeBasedOnHasAlreadyProceededToSign
-    });
-    var _notification5 = getSwapNotitfication('calling_smart_contract', _updateResult8);
-    notifier(_notification5);
-    if (_notification5.eventType === 'transaction_expired') {
-      failed();
-      onFinish();
-    } else {
-      walletSigners.getSigner(rangoSdk.TransactionType.STARKNET).signAndSendTx(starknetTransaction, walletAddress, null).then(function (id) {
-        setStepTransactionIds(actions, id, notifier, 'check_tx_status');
-        schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
-        next();
-        onFinish();
-      }, function (error) {
-        var _error$root16, _error$root17, _error$root18;
-        if (swap.status === 'failed') return;
-        var _prettifyErrorMessage9 = prettifyErrorMessage(error),
-          extraMessage = _prettifyErrorMessage9.extraMessage,
-          extraMessageDetail = _prettifyErrorMessage9.extraMessageDetail,
-          extraMessageErrorCode = _prettifyErrorMessage9.extraMessageErrorCode;
-        if (error && error != null && error.root && error != null && (_error$root16 = error.root) != null && _error$root16.message && error != null && (_error$root17 = error.root) != null && _error$root17.code && error != null && (_error$root18 = error.root) != null && _error$root18.reason) {
-          logRPCError(error.root, swap, currentStep, sourceWallet == null ? void 0 : sourceWallet.walletType);
-        }
-        var updateResult = updateSwapStatus({
-          getStorage: getStorage,
-          setStorage: setStorage,
-          nextStatus: 'failed',
-          nextStepStatus: 'failed',
-          message: extraMessage,
-          details: extraMessageDetail,
-          errorCode: extraMessageErrorCode
-        });
-        notifier(_extends({
-          eventType: 'smart_contract_call_failed'
-        }, updateResult));
-        failed();
-        onFinish();
-      });
-    }
-  }
+    failed();
+    onFinish();
+  });
 }
 function checkWaitingForConnectWalletChange(params) {
   var wallet_network = params.wallet_network,
@@ -2148,7 +1856,7 @@ function cancelSwap(swap, manager) {
   return updateResult;
 }
 
-var INTERVAL_FOR_CHECK = 3000;
+var INTERVAL_FOR_CHECK = 5000;
 /**
  * Subscribe to status of swap transaction by checking from server periodically.
  * After getting the status, notify the user and schedule `SCHEDULE_NEXT_STEP`.
@@ -2163,42 +1871,110 @@ function checkTransactionStatus(_x) {
 function _checkTransactionStatus() {
   _checkTransactionStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
     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;
+    var getStorage, setStorage, next, schedule, retry, failed, context, swap, meta, currentStep, txId, getTxReceiptFailed, status, signer, _useTransactionsRespo, getTransactionResponseByHash, setTransactionResponseByHash, txType, sourceWallet, _signer, txResponse, _yield$signer$wait, updatedTxHash, updatedTxResponse, currentStepBlockchain, explorerUrl, _currentStep$explorer, _prettifyErrorMessage, extraMessage, extraMessageDetail, extraMessageErrorCode, updateResult, 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, failed = _ref.failed, context = _ref.context;
-          swap = getStorage().swapDetails; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          swap = getStorage().swapDetails;
+          meta = context.meta; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           currentStep = getCurrentStep(swap);
           txId = currentStep.executedTransactionId;
+          getTxReceiptFailed = false;
           status = null;
-          _context.prev = 5;
-          _context.next = 8;
+          signer = null;
+          _useTransactionsRespo = useTransactionsResponse(), getTransactionResponseByHash = _useTransactionsRespo.getTransactionResponseByHash, setTransactionResponseByHash = _useTransactionsRespo.setTransactionResponseByHash;
+          try {
+            txType = getCurrentStepTxType(currentStep);
+            sourceWallet = getRelatedWallet(swap, currentStep);
+            if (txType && sourceWallet) signer = context.getSigners(sourceWallet.walletType).getSigner(txType);
+          } catch (error) {
+            // wallet is not connected yet
+            // no need to do anything
+          }
+          _context.prev = 10;
+          if (!((_signer = signer) != null && _signer.wait)) {
+            _context.next = 19;
+            break;
+          }
+          txResponse = getTransactionResponseByHash(txId);
+          _context.next = 15;
+          return signer.wait(txId, txResponse);
+        case 15:
+          _yield$signer$wait = _context.sent;
+          updatedTxHash = _yield$signer$wait.hash;
+          updatedTxResponse = _yield$signer$wait.response;
+          if (updatedTxHash !== txId) {
+            currentStep.executedTransactionId = updatedTxHash || currentStep.executedTransactionId;
+            currentStepBlockchain = getCurrentBlockchainOf(swap, currentStep);
+            explorerUrl = getScannerUrl(currentStep.executedTransactionId, currentStepBlockchain, meta.blockchains);
+            if (explorerUrl) {
+              if (currentStep.explorerUrl && ((_currentStep$explorer = currentStep.explorerUrl) == null ? void 0 : _currentStep$explorer.length) >= 1) {
+                currentStep.explorerUrl[currentStep.explorerUrl.length - 1] = {
+                  url: explorerUrl,
+                  description: 'Replaced Swap'
+                };
+              }
+            }
+            txId = currentStep.executedTransactionId;
+            if (updatedTxHash && updatedTxResponse) setTransactionResponseByHash(updatedTxHash, updatedTxResponse);
+          }
+        case 19:
+          _context.next = 27;
+          break;
+        case 21:
+          _context.prev = 21;
+          _context.t0 = _context["catch"](10);
+          _prettifyErrorMessage = prettifyErrorMessage(_context.t0), extraMessage = _prettifyErrorMessage.extraMessage, extraMessageDetail = _prettifyErrorMessage.extraMessageDetail, extraMessageErrorCode = _prettifyErrorMessage.extraMessageErrorCode;
+          updateResult = updateSwapStatus({
+            getStorage: getStorage,
+            setStorage: setStorage,
+            nextStatus: 'failed',
+            nextStepStatus: 'failed',
+            message: extraMessage,
+            details: extraMessageDetail,
+            errorCode: extraMessageErrorCode
+          });
+          context == null ? void 0 : context.notifier(_extends({
+            eventType: 'task_failed'
+          }, updateResult));
+          getTxReceiptFailed = true;
+          // We shouldn't return here, because we need to trigger check status job in backend.
+          // This is not a ui requirement but the backend one.
+        case 27:
+          _context.prev = 27;
+          _context.next = 30;
           return httpService().checkStatus({
             requestId: swap.requestId,
             txId: txId,
             step: currentStep.id
           });
-        case 8:
+        case 30:
           status = _context.sent;
-          _context.next = 17;
+          _context.next = 39;
           break;
-        case 11:
-          _context.prev = 11;
-          _context.t0 = _context["catch"](5);
-          _context.next = 15;
+        case 33:
+          _context.prev = 33;
+          _context.t1 = _context["catch"](27);
+          _context.next = 37;
           return delay(INTERVAL_FOR_CHECK);
-        case 15:
+        case 37:
           retry();
           return _context.abrupt("return");
-        case 17:
+        case 39:
+          if (!getTxReceiptFailed) {
+            _context.next = 41;
+            break;
+          }
+          return _context.abrupt("return", failed());
+        case 41:
           if (!((currentStep == null ? void 0 : currentStep.status) === 'failed')) {
-            _context.next = 19;
+            _context.next = 43;
             break;
           }
           return _context.abrupt("return");
-        case 19:
-          outputAmount = ((_status = status) == null ? void 0 : _status.outputAmount) || (!!currentStep.outputAmount ? currentStep.outputAmount : null);
+        case 43:
+          outputAmount = ((_status = status) == null ? void 0 : _status.outputAmount) || (currentStep.outputAmount ? currentStep.outputAmount : null);
           prevOutputAmount = currentStep.outputAmount || null;
           swap.extraMessage = ((_status2 = status) == null ? void 0 : _status2.extraMessage) || swap.extraMessage;
           swap.extraMessageSeverity = exports.MessageSeverity.info;
@@ -2209,32 +1985,11 @@ function _checkTransactionStatus() {
           currentStep.explorerUrl = ((_status5 = status) == null ? void 0 : _status5.explorerUrl) || currentStep.explorerUrl;
           currentStep.internalSteps = ((_status6 = status) == null ? void 0 : _status6.steps) || null;
           newTransaction = (_status7 = status) == null ? void 0 : _status7.newTx;
-          if (!!newTransaction) {
+          if (newTransaction) {
             currentStep.status = 'created';
             currentStep.executedTransactionId = null;
             currentStep.executedTransactionTime = null;
-            currentStep.transferTransaction = null;
-            currentStep.cosmosTransaction = null;
-            currentStep.evmTransaction = null;
-            currentStep.solanaTransaction = null;
-            currentStep.evmApprovalTransaction = null;
-            currentStep.starknetApprovalTransaction = null;
-            currentStep.starknetTransaction = null;
-            currentStep.tronApprovalTransaction = null;
-            currentStep.tronTransaction = null;
-            if (isEvmTransaction(newTransaction)) {
-              if (newTransaction.isApprovalTx) currentStep.evmApprovalTransaction = newTransaction;else currentStep.evmTransaction = newTransaction;
-            } else if (isCosmosTransaction(newTransaction)) {
-              currentStep.cosmosTransaction = newTransaction;
-            } else if (isSolanaTransaction(newTransaction)) {
-              currentStep.solanaTransaction = newTransaction;
-            } else if (isTrasnferTransaction(newTransaction)) {
-              currentStep.transferTransaction = newTransaction;
-            } else if (isStarknetTransaction(newTransaction)) {
-              if (newTransaction.isApprovalTx) currentStep.starknetApprovalTransaction = newTransaction;else currentStep.starknetTransaction = newTransaction;
-            } else if (isTronTransaction(newTransaction)) {
-              if (newTransaction.isApprovalTx) currentStep.tronApprovalTransaction = newTransaction;else currentStep.tronTransaction = newTransaction;
-            }
+            setCurrentStepTx(currentStep, newTransaction);
           }
           if (prevOutputAmount === null && outputAmount !== null) context.notifier({
             eventType: 'step_completed_with_output',
@@ -2251,7 +2006,7 @@ function _checkTransactionStatus() {
           if (currentStep.status === 'success') {
             nextStep = getNextStep(swap, currentStep);
             swap.extraMessageDetail = '';
-            swap.extraMessage = !!nextStep ? "starting next step: " + nextStep.swapperId + ": " + nextStep.fromBlockchain + " -> " + nextStep.toBlockchain : '';
+            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;
@@ -2264,31 +2019,31 @@ function _checkTransactionStatus() {
             swapDetails: swap
           }));
           if (!(((_status9 = status) == null ? void 0 : _status9.status) === 'failed')) {
-            _context.next = 38;
+            _context.next = 62;
             break;
           }
           failed();
-          _context.next = 46;
+          _context.next = 70;
           break;
-        case 38:
+        case 62:
           if (!(((_status10 = status) == null ? void 0 : _status10.status) === 'success' || ((_status11 = status) == null ? void 0 : _status11.status) === 'running' && !!status.newTx)) {
-            _context.next = 43;
+            _context.next = 67;
             break;
           }
           schedule(SwapActionTypes.SCHEDULE_NEXT_STEP);
           next();
-          _context.next = 46;
+          _context.next = 70;
           break;
-        case 43:
-          _context.next = 45;
+        case 67:
+          _context.next = 69;
           return delay(INTERVAL_FOR_CHECK);
-        case 45:
+        case 69:
           retry();
-        case 46:
+        case 70:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[5, 11]]);
+    }, _callee, null, [[10, 21], [27, 33]]);
   }));
   return _checkTransactionStatus.apply(this, arguments);
 }
@@ -2305,48 +2060,115 @@ 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, message, details, updateResult;
+    var getStorage, setStorage, next, schedule, retry, failed, context, swap, meta, _useTransactionsRespo2, getTransactionResponseByHash, setTransactionResponseByHash, currentStep, txId, signer, txType, sourceWallet, _signer2, txResponse, _yield$signer$wait2, updatedTxHash, updatedTxResponse, currentStepBlockchain, explorerUrl, _currentStep$explorer2, _prettifyErrorMessage2, extraMessage, extraMessageDetail, extraMessageErrorCode, updateResult, isApproved, response, message, details, _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, failed = _ref2.failed, context = _ref2.context;
-          swap = getStorage().swapDetails; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          swap = getStorage().swapDetails;
+          meta = context.meta;
+          _useTransactionsRespo2 = useTransactionsResponse(), getTransactionResponseByHash = _useTransactionsRespo2.getTransactionResponseByHash, setTransactionResponseByHash = _useTransactionsRespo2.setTransactionResponseByHash;
           currentStep = getCurrentStep(swap);
+          if (currentStep) {
+            _context2.next = 8;
+            break;
+          }
+          console.log('ignore check status, current step is null');
+          return _context2.abrupt("return");
+        case 8:
+          txId = currentStep.executedTransactionId;
+          signer = null;
+          try {
+            txType = getCurrentStepTxType(currentStep);
+            sourceWallet = getRelatedWallet(swap, currentStep);
+            if (txType && sourceWallet) signer = context.getSigners(sourceWallet.walletType).getSigner(txType);
+          } catch (error) {
+            // wallet is not connected yet
+            // no need to do anything
+          }
+          _context2.prev = 11;
+          if (!((_signer2 = signer) != null && _signer2.wait)) {
+            _context2.next = 20;
+            break;
+          }
+          txResponse = getTransactionResponseByHash(txId);
+          _context2.next = 16;
+          return signer.wait(txId, txResponse);
+        case 16:
+          _yield$signer$wait2 = _context2.sent;
+          updatedTxHash = _yield$signer$wait2.hash;
+          updatedTxResponse = _yield$signer$wait2.response;
+          if (updatedTxHash !== txId) {
+            currentStep.executedTransactionId = updatedTxHash || currentStep.executedTransactionId;
+            currentStepBlockchain = getCurrentBlockchainOf(swap, currentStep);
+            explorerUrl = getScannerUrl(currentStep.executedTransactionId, currentStepBlockchain, meta.blockchains);
+            if (explorerUrl) {
+              if (currentStep.explorerUrl && ((_currentStep$explorer2 = currentStep.explorerUrl) == null ? void 0 : _currentStep$explorer2.length) >= 1) {
+                currentStep.explorerUrl[currentStep.explorerUrl.length - 1] = {
+                  url: explorerUrl,
+                  description: 'Replaced Approve'
+                };
+              }
+            }
+            txId = currentStep.executedTransactionId;
+            if (updatedTxHash && updatedTxResponse) setTransactionResponseByHash(updatedTxHash, updatedTxResponse);
+          }
+        case 20:
+          _context2.next = 28;
+          break;
+        case 22:
+          _context2.prev = 22;
+          _context2.t0 = _context2["catch"](11);
+          _prettifyErrorMessage2 = prettifyErrorMessage(_context2.t0), extraMessage = _prettifyErrorMessage2.extraMessage, extraMessageDetail = _prettifyErrorMessage2.extraMessageDetail, extraMessageErrorCode = _prettifyErrorMessage2.extraMessageErrorCode;
+          updateResult = updateSwapStatus({
+            getStorage: getStorage,
+            setStorage: setStorage,
+            nextStatus: 'failed',
+            nextStepStatus: 'failed',
+            message: extraMessage,
+            details: extraMessageDetail,
+            errorCode: extraMessageErrorCode
+          });
+          context == null ? void 0 : context.notifier(_extends({
+            eventType: 'task_failed'
+          }, updateResult));
+          return _context2.abrupt("return", failed());
+        case 28:
           isApproved = false;
-          _context2.prev = 4;
-          _context2.next = 7;
+          _context2.prev = 29;
+          _context2.next = 32;
           return httpService().checkApproval(swap.requestId, currentStep.executedTransactionId || '');
-        case 7:
+        case 32:
           response = _context2.sent;
           if (!((currentStep == null ? void 0 : currentStep.status) === 'failed')) {
-            _context2.next = 10;
+            _context2.next = 35;
             break;
           }
           return _context2.abrupt("return");
-        case 10:
+        case 35:
           isApproved = response.isApproved;
           if (!isApproved && (response.txStatus === 'failed' || response.txStatus === 'success')) {
             if (response.txStatus === 'failed') {
               message = 'Approve transaction failed';
-              details = 'Smart contract approval failed in blockchain.';
+              details = 'Smart contract approval tx 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({
+            _updateResult = updateSwapStatus({
               getStorage: getStorage,
               setStorage: setStorage,
               nextStatus: 'failed',
               nextStepStatus: 'failed',
-              errorCode: 'SEND_TX_FAILED',
+              errorCode: 'INSUFFICIENT_APPROVE',
               message: message,
               details: details
             });
             context.notifier(_extends({
-              eventType: 'smart_contract_call_failed'
-            }, updateResult));
+              eventType: 'not_enough_approval'
+            }, _updateResult));
             failed();
           } else if (!isApproved) {
             // it is needed to set notification after reloading the page
@@ -2356,15 +2178,15 @@ function _checkApprovalStatus() {
               step: currentStep
             });
           }
-          _context2.next = 17;
+          _context2.next = 42;
           break;
-        case 14:
-          _context2.prev = 14;
-          _context2.t0 = _context2["catch"](4);
+        case 39:
+          _context2.prev = 39;
+          _context2.t1 = _context2["catch"](29);
           isApproved = false;
-        case 17:
+        case 42:
           if (!isApproved) {
-            _context2.next = 33;
+            _context2.next = 58;
             break;
           }
           currentStep.status = 'approved';
@@ -2386,18 +2208,18 @@ function _checkApprovalStatus() {
           });
           schedule(SwapActionTypes.SCHEDULE_NEXT_STEP);
           next();
-          _context2.next = 36;
+          _context2.next = 61;
           break;
-        case 33:
-          _context2.next = 35;
+        case 58:
+          _context2.next = 60;
           return delay(2000);
-        case 35:
+        case 60:
           retry();
-        case 36:
+        case 61:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[4, 14]]);
+    }, _callee2, null, [[11, 22], [29, 39]]);
   }));
   return _checkApprovalStatus.apply(this, arguments);
 }
@@ -2410,27 +2232,35 @@ function _checkStatus() {
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          swap = actions.getStorage().swapDetails; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          currentStep = getCurrentStep(swap); // Reset network status
+          swap = actions.getStorage().swapDetails;
+          currentStep = getCurrentStep(swap);
+          if (currentStep) {
+            _context3.next = 5;
+            break;
+          }
+          console.log('ignore check status, current step is null', swap.requestId);
+          return _context3.abrupt("return");
+        case 5:
+          // Reset network status
           // Because when check status is on `loading` or `failed` status, it shows previous message that isn't related to current state.
           resetNetworkStatus(actions);
           if (!(currentStep.status === 'running')) {
-            _context3.next = 8;
+            _context3.next = 11;
             break;
           }
-          _context3.next = 6;
+          _context3.next = 9;
           return checkTransactionStatus(actions);
-        case 6:
-          _context3.next = 11;
+        case 9:
+          _context3.next = 14;
           break;
-        case 8:
+        case 11:
           if (!(currentStep.status === 'waitingForApproval')) {
-            _context3.next = 11;
+            _context3.next = 14;
             break;
           }
-          _context3.next = 11;
+          _context3.next = 14;
           return checkApprovalStatus(actions);
-        case 11:
+        case 14:
         case "end":
           return _context3.stop();
       }
@@ -2451,15 +2281,15 @@ function createTransaction(_x) {
 }
 function _createTransaction() {
   _createTransaction = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(actions) {
-    var setStorage, getStorage, next, schedule, context, swap, currentStep, evmTransaction, cosmosTransaction, transferTransaction, evmApprovalTransaction, solanaTransaction, tronTransaction, tronApprovalTransaction, starknetTransaction, starknetApprovalTransaction, request, _yield$throwOnOK, transaction, _prettifyErrorMessage, extraMessage, extraMessageDetail, updateResult;
+    var setStorage, getStorage, next, schedule, context, swap, currentStep, transaction, request, _yield$throwOnOK, _transaction, _prettifyErrorMessage, extraMessage, extraMessageDetail, updateResult;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           setStorage = actions.setStorage, getStorage = actions.getStorage, next = actions.next, schedule = actions.schedule, context = actions.context;
           swap = getStorage().swapDetails; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
           currentStep = getCurrentStep(swap);
-          evmTransaction = currentStep.evmTransaction, cosmosTransaction = currentStep.cosmosTransaction, transferTransaction = currentStep.transferTransaction, evmApprovalTransaction = currentStep.evmApprovalTransaction, solanaTransaction = currentStep.solanaTransaction, tronTransaction = currentStep.tronTransaction, tronApprovalTransaction = currentStep.tronApprovalTransaction, starknetTransaction = currentStep.starknetTransaction, starknetApprovalTransaction = currentStep.starknetApprovalTransaction;
-          if (!(!evmTransaction && !evmApprovalTransaction && !tronTransaction && !tronApprovalTransaction && !starknetTransaction && !starknetApprovalTransaction && !cosmosTransaction && !transferTransaction && !solanaTransaction)) {
+          transaction = getCurrentStepTx(currentStep);
+          if (transaction) {
             _context.next = 25;
             break;
           }
@@ -2480,22 +2310,8 @@ function _createTransaction() {
           return throwOnOK(httpService().createTransaction(request));
         case 9:
           _yield$throwOnOK = _context.sent;
-          transaction = _yield$throwOnOK.transaction;
-          if (transaction) {
-            if (isEvmTransaction(transaction)) {
-              if (transaction.isApprovalTx) currentStep.evmApprovalTransaction = transaction;else currentStep.evmTransaction = transaction;
-            } else if (isCosmosTransaction(transaction)) {
-              currentStep.cosmosTransaction = transaction;
-            } else if (isSolanaTransaction(transaction)) {
-              currentStep.solanaTransaction = transaction;
-            } else if (isTrasnferTransaction(transaction)) {
-              currentStep.transferTransaction = transaction;
-            } else if (isStarknetTransaction(transaction)) {
-              if (transaction.isApprovalTx) currentStep.starknetApprovalTransaction = transaction;else currentStep.starknetTransaction = transaction;
-            } else if (isTronTransaction(transaction)) {
-              if (transaction.isApprovalTx) currentStep.tronApprovalTransaction = transaction;else currentStep.tronTransaction = transaction;
-            }
-          }
+          _transaction = _yield$throwOnOK.transaction;
+          if (_transaction) setCurrentStepTx(currentStep, _transaction);
           setStorage(_extends({}, getStorage(), {
             swapDetails: swap
           }));