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

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.96",
   "license": "MIT",
   "module": "dist/queue-manager-rango-preset.esm.js",
   "main": "dist/index.js",

package/src/actions/checkStatus.ts

@@ -1,4 +1,5 @@
 import { ExecuterActions } from '@rango-dev/queue-manager-core';
+import { Network } from '@rango-dev/wallets-shared';
 import {
   delay,
   getCurrentStep,
@@ -81,6 +82,7 @@ async function checkTransactionStatus({
     currentStep.starknetTransaction = null;
     currentStep.tronApprovalTransaction = null;
     currentStep.tronTransaction = null;
+    currentStep.fromBlockchain = newTransaction.blockChain as Network;
 
     if (isEvmTransaction(newTransaction)) {
       if (newTransaction.isApprovalTx)

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

@@ -87,6 +87,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 +1531,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 +1556,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 +1633,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;
   }