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

package/src/helpers.ts

@@ -1,4 +1,9 @@
-import { ExecuterActions, QueueType } from '@rango-dev/queue-manager-core';
+import {
+  ExecuterActions,
+  QueueInfo,
+  QueueName,
+  QueueType,
+} from '@rango-dev/queue-manager-core';
 import {
   BlockReason,
   SwapActionTypes,
@@ -47,20 +52,21 @@ import {
   PendingSwap,
   PendingSwapNetworkStatus,
   PendingSwapStep,
-  prettifyErrorMessage,
   StepStatus,
   SwapStatus,
   Wallet,
-  WalletTypeAndAddress,
   SwapProgressNotification,
+  getRelatedWallet,
+  getCurrentAddressOf,
 } from './shared';
 import { logRPCError } from './shared-sentry';
 import {
   PrettyError,
   mapAppErrorCodesToAPIErrorCode,
-  APIErrorCode,
+  prettifyErrorMessage,
 } from './shared-errors';
 import { httpService } from './services';
+import { APIErrorCode, SignerErrorCode } from 'rango-types/lib';
 
 type WhenTaskBlocked = Parameters<NonNullable<SwapQueueDef['whenTaskBlocked']>>;
 type WhenTaskBlockedEvent = WhenTaskBlocked[0];
@@ -88,13 +94,26 @@ 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: string): string[] {
-  return input?.split(/-(?=[^-]*$)/);
+export function splitWalletNetwork(input: string): string[] {
+  const removedAddressInput = input?.split(':')[0] || '';
+  const splittedInput = removedAddressInput.split('-');
+  const network = splittedInput[splittedInput.length - 1];
+  const walletNetwork = splittedInput.slice(0, -1);
+
+  if (walletNetwork[walletNetwork.length - 1] === network) {
+    walletNetwork.pop();
+  }
+  const wallet = walletNetwork.join('-');
+
+  return [wallet, network];
 }
 
 /**
@@ -139,7 +158,7 @@ export function updateSwapStatus({
   nextStepStatus?: StepStatus;
   message?: string;
   details?: string | null | undefined;
-  errorCode?: string | null;
+  errorCode?: APIErrorCode | SignerErrorCode | null;
   hasAlreadyProceededToSign?: boolean;
 }): {
   swap: PendingSwap;
@@ -154,9 +173,10 @@ export function updateSwapStatus({
   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)) {
     //if user cancel the swap, we should pass relevant reason to the server.
@@ -170,9 +190,7 @@ export function updateSwapStatus({
       .reportFailure({
         requestId: swap.requestId,
         step: currentStep?.id || 1,
-        eventType: mapAppErrorCodesToAPIErrorCode(
-          hasAlreadyProceededToSign ? APIErrorCode.TX_FAIL : errorCode
-        ),
+        eventType: mapAppErrorCodesToAPIErrorCode(errorCode),
         reason: errorReason || '',
         data: walletType ? { wallet: walletType } : undefined,
       })
@@ -202,19 +220,40 @@ export function updateSwapStatus({
 export function setStepTransactionIds(
   { getStorage, setStorage }: ExecuterActions<SwapStorage, SwapActionTypes>,
   txId: string | null,
-  eventType: EventType,
-  notifier: SwapQueueContext['notifier']
+  notifier: SwapQueueContext['notifier'],
+  eventType?: EventType,
+  approveUrl?: string
 ): void {
   const swap = getStorage().swapDetails;
   swap.hasAlreadyProceededToSign = null;
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const currentStep = getCurrentStep(swap)!;
-  currentStep.executedTransactionId = txId || currentStep.executedTransactionId;
+  currentStep.executedTransactionId = txId;
+  currentStep.executedTransactionTime = new Date().getTime().toString();
+  if (!!approveUrl)
+    currentStep.explorerUrl = [
+      ...(currentStep.explorerUrl || []),
+      {
+        url: approveUrl,
+        description: `approve`,
+      },
+    ];
+  if (eventType === 'check_tx_status') {
+    swap.extraMessage = 'Checking transaction status ...';
+    swap.extraMessageDetail = '';
+    swap.extraMessageSeverity = MessageSeverity.info;
+  } else if (eventType === 'check_approve_tx_status') {
+    swap.extraMessage = 'Checking approve transaction status ...';
+    swap.extraMessageDetail = '';
+    swap.extraMessageSeverity = MessageSeverity.info;
+  }
+
   setStorage({
     ...getStorage(),
     swapDetails: swap,
   });
-  notifier({ eventType: eventType, swap: swap, step: currentStep });
+  if (!!eventType)
+    notifier({ eventType: eventType, swap: swap, step: currentStep });
 }
 
 export function getSwapNotitfication(
@@ -320,7 +359,10 @@ export function markRunningSwapAsSwitchingNetwork({
 export function markRunningSwapAsDependsOnOtherQueues({
   getStorage,
   setStorage,
-}: Pick<ExecuterActions, 'getStorage' | 'setStorage'>):
+  notifier,
+}: Pick<ExecuterActions, 'getStorage' | 'setStorage'> & {
+  notifier: SwapQueueContext['notifier'];
+}):
   | {
       swap: PendingSwap;
       step: PendingSwapStep;
@@ -334,6 +376,12 @@ export function markRunningSwapAsDependsOnOtherQueues({
   swap.networkStatusExtraMessageDetail = '';
   currentStep.networkStatus = PendingSwapNetworkStatus.WaitingForQueue;
 
+  notifier({
+    eventType: 'waiting_for_queue',
+    swap,
+    step: currentStep,
+  });
+
   setStorage({
     ...getStorage(),
     swapDetails: swap,
@@ -462,7 +510,6 @@ export async function isNetworkMatchedForTransaction(
   providers: Providers
 ): Promise<boolean> {
   if (isWalletNull(wallet)) {
-    console.warn('wallet object is null');
     return false;
   }
   const fromBlockChain = getCurrentBlockchainOfOrNull(swap, step);
@@ -529,51 +576,6 @@ export async function isNetworkMatchedForTransaction(
   return true;
 }
 
-/**
- * Returns the wallet address, based on the current step of `PendingSwap`.
- */
-export const getCurrentAddressOf = (
-  swap: PendingSwap,
-  step: PendingSwapStep
-): string => {
-  const result =
-    swap.wallets[step.evmTransaction?.blockChain || ''] ||
-    swap.wallets[step.evmApprovalTransaction?.blockChain || ''] ||
-    swap.wallets[step.tronTransaction?.blockChain || ''] ||
-    swap.wallets[step.tronApprovalTransaction?.blockChain || ''] ||
-    swap.wallets[step.starknetTransaction?.blockChain || ''] ||
-    swap.wallets[step.starknetApprovalTransaction?.blockChain || ''] ||
-    swap.wallets[step.cosmosTransaction?.blockChain || ''] ||
-    swap.wallets[step.solanaTransaction?.blockChain || ''] ||
-    (step.transferTransaction?.fromWalletAddress
-      ? { address: step.transferTransaction?.fromWalletAddress }
-      : null) ||
-    null;
-  if (result == null) throw PrettyError.WalletMissing();
-  return result.address;
-};
-
-// Todo: Is it same with `getRequiredWallet`?
-export function getRelatedWallet(
-  swap: PendingSwap,
-  currentStep: PendingSwapStep
-): WalletTypeAndAddress {
-  const walletAddress = getCurrentAddressOf(swap, currentStep);
-  const walletKV =
-    Object.keys(swap.wallets)
-      .map((k) => ({ k, v: swap.wallets[k] }))
-      .find(({ v }) => v.address === walletAddress) || null;
-  const blockchain = walletKV?.k || null;
-  const wallet = walletKV?.v || null;
-
-  const walletType = wallet?.walletType;
-  if (walletType === WalletType.UNKNOWN || wallet === null)
-    throw PrettyError.AssertionFailed(
-      `Wallet for source ${blockchain} not passed: walletType: ${walletType}`
-    );
-  return wallet;
-}
-
 export const isTxAlreadyCreated = (
   swap: PendingSwap,
   step: PendingSwapStep
@@ -633,7 +635,7 @@ export function updateNetworkStatus(
 
 /**
  * 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.
@@ -645,11 +647,16 @@ export function onBlockForConnectWallet(
   const { context, queue } = meta;
   const swap = queue.getStorage().swapDetails as SwapStorage['swapDetails'];
 
-  if (!isRequiredWalletConnected(swap, context.state)) {
+  const { ok, reason } = isRequiredWalletConnected(swap, context.state);
+
+  if (!ok) {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const 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,
     });
@@ -714,7 +721,7 @@ export function onBlockForChangeNetwork(
 
 /**
  * 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.
@@ -723,7 +730,7 @@ export function onDependsOnOtherQueues(
   _event: WhenTaskBlockedEvent,
   meta: WhenTaskBlockedMeta
 ): void {
-  const { getBlockedTasks, forceExecute, queue, manager } = meta;
+  const { getBlockedTasks, forceExecute, queue, manager, context } = meta;
   const { setClaimer, claimedBy, reset } = claimQueue();
 
   // We only needs those blocked tasks that have DEPENDS_ON_OTHER_QUEUES reason.
@@ -738,12 +745,15 @@ export function onDependsOnOtherQueues(
   const claimerId = claimedBy();
   const 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),
+      notifier: context.notifier,
     });
     return;
   }
@@ -772,7 +782,7 @@ export function onDependsOnOtherQueues(
     resetClaimedBy: () => {
       reset();
       // TODO: Use key generator
-      retryOn(`${type}-${network}-${address}`, manager);
+      retryOn(`${type}-${network}:${address}`, context.notifier, manager);
     },
   });
 }
@@ -780,19 +790,21 @@ export function onDependsOnOtherQueues(
 export function isRequiredWalletConnected(
   swap: PendingSwap,
   getState: (type: WalletType) => WalletState
-): boolean {
+): { ok: boolean; reason: 'not_connected' | 'account_miss_match' } {
   const { type, address } = getRequiredWallet(swap);
   if (!type || !address) {
-    return false;
+    return { ok: false, reason: 'not_connected' };
   }
   const walletState = getState(type);
-  const { accounts } = walletState;
+  const { accounts, connected } = walletState;
   const connectedAccounts = accounts || [];
+  if (!connected) return { ok: false, reason: 'not_connected' };
 
-  return connectedAccounts.some((account) => {
+  const matched = connectedAccounts.some((account) => {
     const { address: accountAddress } = readAccountAddress(account);
     return address === accountAddress;
   });
+  return { ok: matched, reason: 'account_miss_match' };
 }
 
 export function singTransaction(
@@ -819,6 +831,7 @@ export function singTransaction(
   const walletSigners = getSigners(sourceWallet.walletType);
 
   const onFinish = () => {
+    // TODO resetClaimedBy is undefined here
     if (actions.context.resetClaimedBy) {
       actions.context.resetClaimedBy();
     }
@@ -847,7 +860,7 @@ export function singTransaction(
         'Waiting for approve transaction to be mined and confirmed successfully',
     });
     notifier({
-      eventType: 'confirm_contract',
+      eventType: 'confirm_approve_contract',
       ...updateResult,
     });
 
@@ -857,25 +870,18 @@ export function singTransaction(
       .signAndSendTx(evmApprovalTransaction, walletAddress, null)
       .then(
         (hash) => {
-          console.debug('transaction of approval minted successfully', hash);
           const approveUrl = getEvmApproveUrl(
             hash,
             getCurrentBlockchainOf(swap, currentStep),
             meta.evmBasedChains
           );
-          currentStep.explorerUrl = [
-            ...(currentStep.explorerUrl || []),
-            {
-              url: approveUrl,
-              description: `approve`,
-            },
-          ];
-
-          // `currentStep` has been mutated, let's update storage.
-          setStorage({
-            ...getStorage(),
-            swapDetails: swap,
-          });
+          setStepTransactionIds(
+            actions,
+            hash,
+            notifier,
+            'check_approve_tx_status',
+            approveUrl
+          );
           schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
           next();
           onFinish();
@@ -883,7 +889,7 @@ export function singTransaction(
 
         (error) => {
           if (swap.status === 'failed') return;
-          console.debug('error in approving', error);
+
           const { extraMessage, extraMessageDetail, extraMessageErrorCode } =
             prettifyErrorMessage(error);
           if (
@@ -936,7 +942,7 @@ export function singTransaction(
         'Waiting for approve transaction to be mined and confirmed successfully',
     });
     notifier({
-      eventType: 'confirm_contract',
+      eventType: 'confirm_approve_contract',
       ...updateResult,
     });
 
@@ -946,21 +952,14 @@ export function singTransaction(
       .signAndSendTx(tronApprovalTransaction, walletAddress, null)
       .then(
         (hash) => {
-          console.debug('transaction of approval minted successfully', hash);
           const approveUrl = getTronApproveUrl(hash);
-          currentStep.explorerUrl = [
-            ...(currentStep.explorerUrl || []),
-            {
-              url: approveUrl,
-              description: `approve`,
-            },
-          ];
-
-          // `currentStep` has been mutated, let's update storage.
-          setStorage({
-            ...getStorage(),
-            swapDetails: swap,
-          });
+          setStepTransactionIds(
+            actions,
+            hash,
+            notifier,
+            'check_approve_tx_status',
+            approveUrl
+          );
           schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
           next();
           onFinish();
@@ -968,7 +967,7 @@ export function singTransaction(
 
         (error) => {
           if (swap.status === 'failed') return;
-          console.debug('error in approving', error);
+
           const { extraMessage, extraMessageDetail, extraMessageErrorCode } =
             prettifyErrorMessage(error);
           if (
@@ -1021,7 +1020,7 @@ export function singTransaction(
         'Waiting for approve transaction to be mined and confirmed successfully',
     });
     notifier({
-      eventType: 'confirm_contract',
+      eventType: 'confirm_approve_contract',
       ...updateResult,
     });
 
@@ -1031,21 +1030,14 @@ export function singTransaction(
       .signAndSendTx(starknetApprovalTransaction, walletAddress, null)
       .then(
         (hash) => {
-          console.debug('transaction of approval minted successfully', hash);
           const approveUrl = getStarknetApproveUrl(hash);
-          currentStep.explorerUrl = [
-            ...(currentStep.explorerUrl || []),
-            {
-              url: approveUrl,
-              description: `approve`,
-            },
-          ];
-
-          // `currentStep` has been mutated, let's update storage.
-          setStorage({
-            ...getStorage(),
-            swapDetails: swap,
-          });
+          setStepTransactionIds(
+            actions,
+            hash,
+            notifier,
+            'check_approve_tx_status',
+            approveUrl
+          );
           schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
           next();
           onFinish();
@@ -1053,7 +1045,7 @@ export function singTransaction(
 
         (error) => {
           if (swap.status === 'failed') return;
-          console.debug('error in approving', error);
+
           const { extraMessage, extraMessageDetail, extraMessageErrorCode } =
             prettifyErrorMessage(error);
           if (
@@ -1094,6 +1086,11 @@ export function singTransaction(
 
   const hasAlreadyProceededToSign =
     typeof swap.hasAlreadyProceededToSign === 'boolean';
+  const nextStepStatusBasedOnHasAlreadyProceededToSign =
+    hasAlreadyProceededToSign ? 'failed' : 'running';
+  const errorCodeBasedOnHasAlreadyProceededToSign = hasAlreadyProceededToSign
+    ? 'TX_EXPIRED'
+    : null;
   const executeMessage = hasAlreadyProceededToSign
     ? 'Transaction is expired. Please try again'
     : 'executing transaction';
@@ -1107,11 +1104,12 @@ export function singTransaction(
     const updateResult = updateSwapStatus({
       getStorage,
       setStorage,
-      nextStepStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
-      nextStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
+      nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
+      nextStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
       message: executeMessage,
       details: executeDetails,
       hasAlreadyProceededToSign,
+      errorCode: errorCodeBasedOnHasAlreadyProceededToSign,
     });
 
     const notification = getSwapNotitfication('confirm_transfer', updateResult);
@@ -1126,12 +1124,7 @@ export function singTransaction(
         .signAndSendTx(transferTransaction, walletAddress, null)
         .then(
           (txId) => {
-            setStepTransactionIds(
-              actions,
-              txId,
-              'transfer_confirmed',
-              notifier
-            );
+            setStepTransactionIds(actions, txId, notifier, 'check_tx_status');
             schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
             next();
             onFinish();
@@ -1162,11 +1155,12 @@ export function singTransaction(
     const updateResult = updateSwapStatus({
       getStorage,
       setStorage,
-      nextStepStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
-      nextStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
+      nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
+      nextStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
       message: executeMessage,
       details: executeDetails,
       hasAlreadyProceededToSign,
+      errorCode: errorCodeBasedOnHasAlreadyProceededToSign,
     });
     const notification = getSwapNotitfication(
       'calling_smart_contract',
@@ -1183,12 +1177,7 @@ export function singTransaction(
         .signAndSendTx(evmTransaction, walletAddress, null)
         .then(
           (id) => {
-            setStepTransactionIds(
-              actions,
-              id,
-              'smart_contract_called',
-              notifier
-            );
+            setStepTransactionIds(actions, id, notifier, 'check_tx_status');
             schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
             next();
             onFinish();
@@ -1234,11 +1223,12 @@ export function singTransaction(
     const updateResult = updateSwapStatus({
       getStorage,
       setStorage,
-      nextStepStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
-      nextStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
+      nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
+      nextStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
       message: executeMessage,
       details: executeDetails,
       hasAlreadyProceededToSign,
+      errorCode: errorCodeBasedOnHasAlreadyProceededToSign,
     });
     const notification = getSwapNotitfication(
       'calling_smart_contract',
@@ -1288,12 +1278,7 @@ export function singTransaction(
         .then(
           // todo
           (id: string | null) => {
-            setStepTransactionIds(
-              actions,
-              id,
-              'smart_contract_called',
-              notifier
-            );
+            setStepTransactionIds(actions, id, notifier, 'check_tx_status');
             schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
             next();
             onFinish();
@@ -1324,11 +1309,12 @@ export function singTransaction(
     const updateResult = updateSwapStatus({
       getStorage,
       setStorage,
-      nextStepStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
-      nextStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
+      nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
+      nextStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
       message: executeMessage,
       details: executeDetails,
       hasAlreadyProceededToSign,
+      errorCode: errorCodeBasedOnHasAlreadyProceededToSign,
     });
     const notification = getSwapNotitfication(
       'calling_smart_contract',
@@ -1346,12 +1332,7 @@ export function singTransaction(
         .signAndSendTx(tx, walletAddress, null)
         .then(
           (txId) => {
-            setStepTransactionIds(
-              actions,
-              txId,
-              'smart_contract_called',
-              notifier
-            );
+            setStepTransactionIds(actions, txId, notifier, 'check_tx_status');
             schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
             next();
             onFinish();
@@ -1382,11 +1363,12 @@ export function singTransaction(
     const updateResult = updateSwapStatus({
       getStorage,
       setStorage,
-      nextStepStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
-      nextStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
+      nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
+      nextStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
       message: executeMessage,
       details: executeDetails,
       hasAlreadyProceededToSign,
+      errorCode: errorCodeBasedOnHasAlreadyProceededToSign,
     });
     const notification = getSwapNotitfication(
       'calling_smart_contract',
@@ -1403,12 +1385,7 @@ export function singTransaction(
         .signAndSendTx(tronTransaction, walletAddress, null)
         .then(
           (id) => {
-            setStepTransactionIds(
-              actions,
-              id,
-              'smart_contract_called',
-              notifier
-            );
+            setStepTransactionIds(actions, id, notifier, 'check_tx_status');
             schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
             next();
             onFinish();
@@ -1454,11 +1431,12 @@ export function singTransaction(
     const updateResult = updateSwapStatus({
       getStorage,
       setStorage,
-      nextStepStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
-      nextStatus: hasAlreadyProceededToSign ? 'failed' : 'running',
+      nextStepStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
+      nextStatus: nextStepStatusBasedOnHasAlreadyProceededToSign,
       message: executeMessage,
       details: executeDetails,
       hasAlreadyProceededToSign,
+      errorCode: errorCodeBasedOnHasAlreadyProceededToSign,
     });
     const notification = getSwapNotitfication(
       'calling_smart_contract',
@@ -1475,12 +1453,7 @@ export function singTransaction(
         .signAndSendTx(starknetTransaction, walletAddress, null)
         .then(
           (id) => {
-            setStepTransactionIds(
-              actions,
-              id,
-              'smart_contract_called',
-              notifier
-            );
+            setStepTransactionIds(actions, id, notifier, 'check_tx_status');
             schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
             next();
             onFinish();
@@ -1529,6 +1502,7 @@ export function checkWaitingForConnectWalletChange(params: {
   wallet_network: string;
   manager?: Manager;
   evmChains: EvmBlockchainMeta[];
+  notifier: SwapQueueContext['notifier'];
 }): void {
   const { wallet_network, evmChains, manager } = params;
   const [wallet, network] = splitWalletNetwork(wallet_network);
@@ -1549,6 +1523,7 @@ export function checkWaitingForConnectWalletChange(params: {
             const task = q.list.state.tasks[taskId];
             return (
               task.status === Status.BLOCKED &&
+              // TODO double check later
               [BlockReason.WAIT_FOR_CONNECT_WALLET].includes(
                 task.blockedFor?.reason
               )
@@ -1573,10 +1548,18 @@ export function checkWaitingForConnectWalletChange(params: {
             silent: true,
           });
 
-          markRunningSwapAsSwitchingNetwork({
+          const result = markRunningSwapAsSwitchingNetwork({
             getStorage: queueInstance.getStorage.bind(queueInstance),
             setStorage: queueInstance.setStorage.bind(queueInstance),
           });
+
+          if (result) {
+            params?.notifier({
+              eventType: 'waiting_for_network_change',
+              swap: result.swap,
+              step: result.step,
+            });
+          }
         }
       }
     }
@@ -1617,6 +1600,56 @@ export function checkWaitingForNetworkChange(manager?: Manager): void {
   });
 }
 
+/**
+ * Get list of all running swaps
+ *
+ * @param manager
+ * @returns list of pending swaps
+ */
+export function getRunningSwaps(manager: Manager): PendingSwap[] {
+  const queues = manager?.getAll() || new Map<QueueName, QueueInfo>();
+  let result: PendingSwap[] = [];
+  queues.forEach((q) => {
+    // retry only on affected queues
+    const queueStorage = q.list.getStorage() as SwapStorage | undefined;
+    const swap = 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
+ */
+export function resetRunningSwapNotifsOnPageLoad(
+  runningSwaps: PendingSwap[],
+  notifier: SwapQueueContext['notifier']
+) {
+  runningSwaps.forEach((swap) => {
+    const currentStep = getCurrentStep(swap);
+    let eventType: EventType | undefined;
+    if (currentStep?.networkStatus === PendingSwapNetworkStatus.WaitingForQueue)
+      eventType = 'waiting_for_queue';
+    else if (swap?.status === 'running') {
+      eventType = 'waiting_for_connecting_wallet';
+    }
+    if (!!eventType && !!notifier) {
+      notifier({
+        eventType,
+        swap: swap,
+        step: currentStep,
+      });
+    }
+  });
+}
+
 /**
  *
  * Try to run blocked tasks by wallet and network name.
@@ -1630,6 +1663,7 @@ export function checkWaitingForNetworkChange(manager?: Manager): void {
  */
 export function retryOn(
   wallet_network: string,
+  notifier: SwapQueueContext['notifier'],
   manager?: Manager,
   options = { fallbackToOnlyWallet: true }
 ): void {
@@ -1651,7 +1685,7 @@ export function retryOn(
         const currentStep = getCurrentStep(swap);
         if (currentStep) {
           if (
-            currentStep.fromBlockchain == network &&
+            getCurrentBlockchainOfOrNull(swap, currentStep) == network &&
             queueStorage?.swapDetails.wallets[network]?.walletType === wallet
           ) {
             walletAndNetworkMatched.push(q.list);
@@ -1666,7 +1700,6 @@ export function retryOn(
     }
   });
 
-  // const isWaitingForConnectWallet = (status: Status) =>
   let finalQueueToBeRun: QueueType | undefined = undefined;
   if (walletAndNetworkMatched.length > 0) {
     finalQueueToBeRun = walletAndNetworkMatched[0];
@@ -1678,6 +1711,7 @@ export function retryOn(
         markRunningSwapAsDependsOnOtherQueues({
           getStorage: currentQueue.getStorage.bind(currentQueue),
           setStorage: currentQueue.setStorage.bind(currentQueue),
+          notifier: notifier,
         });
       }
     }
@@ -1719,3 +1753,20 @@ export async function throwOnOK(
     throw e;
   }
 }
+
+export function cancelSwap(swap: QueueInfo): {
+  swap: PendingSwap;
+  step: PendingSwapStep | null;
+} {
+  swap.actions.cancel();
+  return updateSwapStatus({
+    getStorage: swap.actions.getStorage,
+    setStorage: swap.actions.setStorage,
+    message: 'Swap canceled by user.',
+    details:
+      "Warning: If you've already signed and sent a transaction, it won't be affected, but next swap steps will not be executed.",
+    nextStatus: 'failed',
+    nextStepStatus: 'failed',
+    errorCode: 'USER_CANCEL',
+  });
+}