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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/queue-manager-rango-preset",
-  "version": "0.1.10-next.95",
+  "version": "0.1.10-next.98",
   "license": "MIT",
   "module": "dist/queue-manager-rango-preset.esm.js",
   "main": "dist/index.js",

package/src/actions/executeTransaction.ts

@@ -57,9 +57,13 @@ export async function executeTransaction(
   const isWrongAddress = !isRequiredWalletConnected(swap, context.state);
   if (isWrongAddress) {
     const { type, address } = getRequiredWallet(swap);
-    const description = !wallets
-      ? ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION(type)
-      : ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION_WRONG_WALLET(type, address);
+    const isWalletInCompatible = wallets?.blockchains?.find(
+      (w) => !w.accounts?.find((account) => account.walletType === type)
+    );
+    const description =
+      !wallets || isWalletInCompatible
+        ? ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION(type)
+        : ERROR_MESSAGE_WAIT_FOR_WALLET_DESCRIPTION_WRONG_WALLET(type, address);
 
     const blockedFor = {
       reason: BlockReason.WAIT_FOR_CONNECT_WALLET,

package/src/helpers.ts

@@ -1,4 +1,8 @@
-import { ExecuterActions, QueueType } from '@rango-dev/queue-manager-core';
+import {
+  ExecuterActions,
+  QueueInfo,
+  QueueType,
+} from '@rango-dev/queue-manager-core';
 import {
   BlockReason,
   SwapActionTypes,
@@ -87,6 +91,16 @@ function claimQueue() {
   };
 }
 
+/**
+ *
+ * Returns "wallet and network" separately, even if the wallet is dashed inside.
+ *
+ */
+
+function splitWalletNetwork(input: string): string[] {
+  return input?.split(/-(?=[^-]*$)/);
+}
+
 /**
  *
  * Returns `steps`, if it's a `running` swap.
@@ -1521,8 +1535,7 @@ export function checkWaitingForConnectWalletChange(params: {
   evmChains: EvmBlockchainMeta[];
 }): void {
   const { wallet_network, evmChains, manager } = params;
-  const [wallet, network] = wallet_network.split('-');
-
+  const [wallet, network] = splitWalletNetwork(wallet_network);
   // We only need change network for EVM chains.
   if (!evmChains.some((chain) => chain.name == network)) return;
 
@@ -1547,7 +1560,11 @@ export function checkWaitingForConnectWalletChange(params: {
           }
         );
 
-        if (currentStepRequiredWallet === wallet && hasWaitingForConnect) {
+        if (
+          currentStepRequiredWallet === wallet &&
+          hasWaitingForConnect &&
+          getCurrentBlockchainOfOrNull(swap, currentStep) != network
+        ) {
           const queueInstance = q.list;
           const { type } = getRequiredWallet(swap);
           const description = ERROR_MESSAGE_WAIT_FOR_CHANGE_NETWORK(type);
@@ -1620,7 +1637,7 @@ export function retryOn(
   manager?: Manager,
   options = { fallbackToOnlyWallet: true }
 ): void {
-  const [wallet, network] = wallet_network.split('-');
+  const [wallet, network] = splitWalletNetwork(wallet_network);
   if (!wallet || !network) {
     return;
   }
@@ -1638,7 +1655,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);
@@ -1706,3 +1723,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',
+  });
+}

package/src/index.ts

@@ -48,5 +48,6 @@ export {
   getCurrentStep,
   getEvmProvider,
   getRelatedWallet,
+  cancelSwap,
 } from './helpers';
 export { useMigration, useQueueManager } from './hooks';