@rango-dev/queue-manager-rango-preset 0.1.15-next.6 → 0.1.15-next.8

package/dist/types.d.ts

@@ -32,6 +32,7 @@ export interface SwapQueueContext extends QueueContext {
     providers: Providers;
     getSigners: (type: WalletType) => SignerFactory;
     switchNetwork: (wallet: WalletType, network: Network) => Promise<ConnectResult> | undefined;
+    canSwitchNetworkTo: (type: WalletType, network: Network) => boolean;
     connect: (wallet: WalletType, network: Network) => Promise<ConnectResult> | undefined;
     state: (type: WalletType) => WalletState;
     isMobileWallet: (type: WalletType) => boolean;
@@ -45,5 +46,6 @@ export interface UseQueueManagerParams {
     clearDisconnectedWallet: () => void;
     evmChains: EvmBlockchainMeta[];
     notifier: SwapQueueContext['notifier'];
+    canSwitchNetworkTo: (type: WalletType, network: Network) => boolean;
 }
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EACL,IAAI,EACJ,OAAO,EACP,WAAW,EACX,UAAU,EACX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE/D,oBAAY,YAAY,GAAG,QAAQ,CACjC,WAAW,EACX,eAAe,EACf,gBAAgB,CACjB,CAAC;AAEF,MAAM,WAAW,WAAY,SAAQ,YAAY;IAC/C,WAAW,EAAE,WAAW,CAAC;CAC1B;AAED,oBAAY,eAAe;IACzB,KAAK,UAAU;IACf,kBAAkB,uBAAuB;IACzC,kBAAkB,uBAAuB;IACzC,mBAAmB,wBAAwB;IAC3C,wBAAwB,6BAA6B;CACtD;AAED,oBAAY,iBAAiB,GAAG,CAC9B,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,OAAO,KACb,MAAM,GAAG,SAAS,CAAC;AAExB,oBAAY,WAAW;IACrB,uBAAuB,kCAAkC;IACzD,uBAAuB,+BAA+B;IACtD,uBAAuB,4BAA4B;CACpD;AAGD,MAAM,WAAW,KAAK,CAAC,CAAC,GAAG,GAAG;IAC5B,MAAM,EAAE,WAAW,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,CAAC;CACb;AAED,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACpD,IAAI,EAAE,IAAI,CAAC;IACX,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,aAAa,CAAC;IAChD,aAAa,EAAE,CACb,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,OAAO,KACb,OAAO,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;IACxC,OAAO,EAAE,CACP,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,OAAO,KACb,OAAO,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;IACxC,KAAK,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,WAAW,CAAC;IACzC,cAAc,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,OAAO,CAAC;IAC9C,QAAQ,EAAE,CAAC,IAAI,EAAE,wBAAwB,KAAK,IAAI,CAAC;IAGnD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,qBAAqB;IACpC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,kBAAkB,EAAE,UAAU,GAAG,SAAS,CAAC;IAC3C,uBAAuB,EAAE,MAAM,IAAI,CAAC;IACpC,SAAS,EAAE,iBAAiB,EAAE,CAAC;IAC/B,QAAQ,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAC;CACxC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EACL,IAAI,EACJ,OAAO,EACP,WAAW,EACX,UAAU,EACX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE/D,oBAAY,YAAY,GAAG,QAAQ,CACjC,WAAW,EACX,eAAe,EACf,gBAAgB,CACjB,CAAC;AAEF,MAAM,WAAW,WAAY,SAAQ,YAAY;IAC/C,WAAW,EAAE,WAAW,CAAC;CAC1B;AAED,oBAAY,eAAe;IACzB,KAAK,UAAU;IACf,kBAAkB,uBAAuB;IACzC,kBAAkB,uBAAuB;IACzC,mBAAmB,wBAAwB;IAC3C,wBAAwB,6BAA6B;CACtD;AAED,oBAAY,iBAAiB,GAAG,CAC9B,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,OAAO,KACb,MAAM,GAAG,SAAS,CAAC;AAExB,oBAAY,WAAW;IACrB,uBAAuB,kCAAkC;IACzD,uBAAuB,+BAA+B;IACtD,uBAAuB,4BAA4B;CACpD;AAGD,MAAM,WAAW,KAAK,CAAC,CAAC,GAAG,GAAG;IAC5B,MAAM,EAAE,WAAW,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,CAAC;CACb;AAED,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACpD,IAAI,EAAE,IAAI,CAAC;IACX,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,aAAa,CAAC;IAChD,aAAa,EAAE,CACb,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,OAAO,KACb,OAAO,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;IACxC,kBAAkB,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC;IACpE,OAAO,EAAE,CACP,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,OAAO,KACb,OAAO,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;IACxC,KAAK,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,WAAW,CAAC;IACzC,cAAc,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,OAAO,CAAC;IAC9C,QAAQ,EAAE,CAAC,IAAI,EAAE,wBAAwB,KAAK,IAAI,CAAC;IAGnD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,qBAAqB;IACpC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,kBAAkB,EAAE,UAAU,GAAG,SAAS,CAAC;IAC3C,uBAAuB,EAAE,MAAM,IAAI,CAAC;IACpC,SAAS,EAAE,iBAAiB,EAAE,CAAC;IAC/B,QAAQ,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAC;IACvC,kBAAkB,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC;CACrE"}

package/package.json

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

package/src/actions/checkStatus.ts

@@ -6,7 +6,7 @@ import {
   resetNetworkStatus,
   setCurrentStepTx,
   updateSwapStatus,
-  useTransactionsResponse,
+  useTransactionsData,
 } from '../helpers';
 import { SwapActionTypes, SwapQueueContext, SwapStorage } from '../types';
 import {
@@ -35,17 +35,24 @@ async function checkTransactionStatus({
   retry,
   failed,
   context,
-}: ExecuterActions<SwapStorage, SwapActionTypes, SwapQueueContext>): Promise<void> {
+}: ExecuterActions<
+  SwapStorage,
+  SwapActionTypes,
+  SwapQueueContext
+>): Promise<void> {
   const swap = getStorage().swapDetails;
   const { meta } = context;
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const currentStep = getCurrentStep(swap)!;
+
+  if (!currentStep?.executedTransactionId) return;
   let txId = currentStep.executedTransactionId;
 
   let getTxReceiptFailed = false;
   let status: TransactionStatusResponse | null = null;
   let signer: GenericSigner<Transaction> | null = null;
-  const { getTransactionResponseByHash, setTransactionResponseByHash } = useTransactionsResponse();
+  const { getTransactionDataByHash, setTransactionDataByHash } =
+    useTransactionsData();
 
   try {
     const txType = getCurrentStepTxType(currentStep);
@@ -59,19 +66,19 @@ async function checkTransactionStatus({
 
   try {
     // if wallet is connected, try to get transaction reciept
-    if (signer?.wait) {
-      const txResponse = getTransactionResponseByHash(txId!);
-      const { hash: updatedTxHash, response: updatedTxResponse } = await signer.wait(
-        txId!,
-        txResponse,
-      );
+    const { response: txResponse, receiptReceived } =
+      getTransactionDataByHash(txId);
+    if (signer?.wait && !receiptReceived) {
+      const { hash: updatedTxHash, response: updatedTxResponse } =
+        await signer.wait(txId, txResponse);
       if (updatedTxHash !== txId) {
-        currentStep.executedTransactionId = updatedTxHash || currentStep.executedTransactionId;
+        currentStep.executedTransactionId =
+          updatedTxHash || currentStep.executedTransactionId;
         const currentStepBlockchain = getCurrentBlockchainOf(swap, currentStep);
         const explorerUrl = getScannerUrl(
-          currentStep.executedTransactionId!,
+          currentStep.executedTransactionId,
           currentStepBlockchain,
-          meta.blockchains,
+          meta.blockchains
         );
         if (explorerUrl) {
           if (currentStep.explorerUrl && currentStep.explorerUrl?.length >= 1) {
@@ -83,11 +90,18 @@ async function checkTransactionStatus({
         }
         txId = currentStep.executedTransactionId;
         if (updatedTxHash && updatedTxResponse)
-          setTransactionResponseByHash(updatedTxHash, updatedTxResponse);
+          setTransactionDataByHash(updatedTxHash, {
+            response: updatedTxResponse,
+          });
+      } else {
+        setTransactionDataByHash(updatedTxHash, {
+          receiptReceived: true,
+        });
       }
     }
   } catch (error) {
-    const { extraMessage, extraMessageDetail, extraMessageErrorCode } = prettifyErrorMessage(error);
+    const { extraMessage, extraMessageDetail, extraMessageErrorCode } =
+      prettifyErrorMessage(error);
     const updateResult = updateSwapStatus({
       getStorage,
       setStorage,
@@ -110,7 +124,7 @@ async function checkTransactionStatus({
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     status = await httpService().checkStatus({
       requestId: swap.requestId,
-      txId: txId!,
+      txId,
       step: currentStep.id,
     });
   } catch (e) {
@@ -126,14 +140,16 @@ async function checkTransactionStatus({
   if (currentStep?.status === 'failed') return;
 
   const outputAmount: string | null =
-    status?.outputAmount || (currentStep.outputAmount ? currentStep.outputAmount : null);
+    status?.outputAmount ||
+    (currentStep.outputAmount ? currentStep.outputAmount : null);
   const prevOutputAmount = currentStep.outputAmount || null;
   swap.extraMessage = status?.extraMessage || swap.extraMessage;
   swap.extraMessageSeverity = MessageSeverity.info;
   swap.extraMessageDetail = '';
 
   currentStep.status = status?.status || currentStep.status;
-  currentStep.diagnosisUrl = status?.diagnosisUrl || currentStep.diagnosisUrl || null;
+  currentStep.diagnosisUrl =
+    status?.diagnosisUrl || currentStep.diagnosisUrl || null;
   currentStep.outputAmount = outputAmount || currentStep.outputAmount;
   currentStep.explorerUrl = status?.explorerUrl || currentStep.explorerUrl;
   currentStep.internalSteps = status?.steps || null;
@@ -181,7 +197,10 @@ async function checkTransactionStatus({
 
   if (status?.status === 'failed') {
     failed();
-  } else if (status?.status === 'success' || (status?.status === 'running' && !!status.newTx)) {
+  } else if (
+    status?.status === 'success' ||
+    (status?.status === 'running' && !!status.newTx)
+  ) {
     schedule(SwapActionTypes.SCHEDULE_NEXT_STEP);
     next();
   } else {
@@ -202,10 +221,15 @@ async function checkApprovalStatus({
   retry,
   failed,
   context,
-}: ExecuterActions<SwapStorage, SwapActionTypes, SwapQueueContext>): Promise<void> {
+}: ExecuterActions<
+  SwapStorage,
+  SwapActionTypes,
+  SwapQueueContext
+>): Promise<void> {
   const swap = getStorage().swapDetails as SwapStorage['swapDetails'];
   const { meta } = context;
-  const { getTransactionResponseByHash, setTransactionResponseByHash } = useTransactionsResponse();
+  const { getTransactionDataByHash, setTransactionDataByHash } =
+    useTransactionsData();
 
   const currentStep = getCurrentStep(swap);
   if (!currentStep) {
@@ -213,6 +237,7 @@ async function checkApprovalStatus({
     return;
   }
 
+  if (!currentStep?.executedTransactionId) return;
   let txId = currentStep.executedTransactionId;
 
   let signer: GenericSigner<Transaction> | null = null;
@@ -227,20 +252,20 @@ async function checkApprovalStatus({
   }
 
   try {
+    const { response: txResponse, receiptReceived } =
+      getTransactionDataByHash(txId);
     // if wallet is connected, try to get transaction reciept
-    if (signer?.wait) {
-      const txResponse = getTransactionResponseByHash(txId!);
-      const { hash: updatedTxHash, response: updatedTxResponse } = await signer.wait(
-        txId!,
-        txResponse,
-      );
+    if (signer?.wait && !receiptReceived) {
+      const { hash: updatedTxHash, response: updatedTxResponse } =
+        await signer.wait(txId, txResponse);
       if (updatedTxHash !== txId) {
-        currentStep.executedTransactionId = updatedTxHash || currentStep.executedTransactionId;
+        currentStep.executedTransactionId =
+          updatedTxHash || currentStep.executedTransactionId;
         const currentStepBlockchain = getCurrentBlockchainOf(swap, currentStep);
         const explorerUrl = getScannerUrl(
-          currentStep.executedTransactionId!,
+          currentStep.executedTransactionId,
           currentStepBlockchain,
-          meta.blockchains,
+          meta.blockchains
         );
         if (explorerUrl) {
           if (currentStep.explorerUrl && currentStep.explorerUrl?.length >= 1) {
@@ -252,11 +277,18 @@ async function checkApprovalStatus({
         }
         txId = currentStep.executedTransactionId;
         if (updatedTxHash && updatedTxResponse)
-          setTransactionResponseByHash(updatedTxHash, updatedTxResponse);
+          setTransactionDataByHash(updatedTxHash, {
+            response: updatedTxResponse,
+          });
+      } else {
+        setTransactionDataByHash(updatedTxHash, {
+          receiptReceived: true,
+        });
       }
     }
   } catch (error) {
-    const { extraMessage, extraMessageDetail, extraMessageErrorCode } = prettifyErrorMessage(error);
+    const { extraMessage, extraMessageDetail, extraMessageErrorCode } =
+      prettifyErrorMessage(error);
     const updateResult = updateSwapStatus({
       getStorage,
       setStorage,
@@ -277,13 +309,16 @@ async function checkApprovalStatus({
   try {
     const response = await httpService().checkApproval(
       swap.requestId,
-      currentStep.executedTransactionId || '',
+      currentStep.executedTransactionId
     );
     // If user cancel swap during check status api call, we should ignore check approval response
     if (currentStep?.status === 'failed') return;
 
     isApproved = response.isApproved;
-    if (!isApproved && (response.txStatus === 'failed' || response.txStatus === 'success')) {
+    if (
+      !isApproved &&
+      (response.txStatus === 'failed' || response.txStatus === 'success')
+    ) {
       let message, details;
       if (response.txStatus === 'failed') {
         message = 'Approve transaction failed';
@@ -360,7 +395,7 @@ async function checkApprovalStatus({
  *
  */
 export async function checkStatus(
-  actions: ExecuterActions<SwapStorage, SwapActionTypes, SwapQueueContext>,
+  actions: ExecuterActions<SwapStorage, SwapActionTypes, SwapQueueContext>
 ): Promise<void> {
   const swap = actions.getStorage().swapDetails;
   const currentStep = getCurrentStep(swap);

package/src/helpers.ts

@@ -93,16 +93,27 @@ export function claimQueue() {
 /**
  *
  * We use module-level variable to keep track of
- * map of transactions hash to the TransactionResponse
+ * map of transactions hash to the TransactionResponse and ...
  *
  */
-let swapTransactionToResponseMap: { [id: string]: any } = {};
-export function useTransactionsResponse() {
+type TransactionData = {
+  response?: any; // e.g. TransactionResponse in case of EVM transactions
+  receiptReceived?: boolean; // e.g. is TransactionReceipt ready in case of EVM transactions
+};
+const swapTransactionToDataMap: { [id: string]: TransactionData } = {};
+export function useTransactionsData() {
   return {
-    getTransactionResponseByHash: (hash: string) =>
-      swapTransactionToResponseMap[hash],
-    setTransactionResponseByHash: (hash: string, response: any) => {
-      swapTransactionToResponseMap[hash] = response;
+    getTransactionDataByHash: (hash: string) =>
+      swapTransactionToDataMap[hash] || {},
+    setTransactionDataByHash: (hash: string, data: TransactionData) => {
+      const r = swapTransactionToDataMap[hash];
+      if (!r) swapTransactionToDataMap[hash] = {};
+      swapTransactionToDataMap[hash].response =
+        data.response || swapTransactionToDataMap[hash].response;
+      swapTransactionToDataMap[hash].receiptReceived =
+        data.receiptReceived ||
+        swapTransactionToDataMap[hash].receiptReceived ||
+        false;
     },
   };
 }
@@ -286,7 +297,7 @@ export function updateSwapStatus({
   const currentStep = getCurrentStep(swap);
   if (!!nextStepStatus && !!currentStep) currentStep.status = nextStepStatus;
 
-  if (!!nextStatus) swap.status = nextStatus;
+  if (nextStatus) swap.status = nextStatus;
   swap.hasAlreadyProceededToSign = hasAlreadyProceededToSign;
   if (!!nextStatus && ['failed', 'success'].includes(nextStatus))
     swap.finishTime = new Date().getTime().toString();
@@ -354,7 +365,7 @@ export function setStepTransactionIds(
   const currentStep = getCurrentStep(swap)!;
   currentStep.executedTransactionId = txId;
   currentStep.executedTransactionTime = new Date().getTime().toString();
-  if (!!explorerUrl?.url)
+  if (explorerUrl?.url)
     currentStep.explorerUrl = [
       ...(currentStep.explorerUrl || []),
       {
@@ -376,7 +387,7 @@ export function setStepTransactionIds(
     ...getStorage(),
     swapDetails: swap,
   });
-  if (!!eventType)
+  if (eventType)
     notifier({ eventType: eventType, swap: swap, step: currentStep });
 }
 
@@ -613,7 +624,7 @@ export async function isNetworkMatchedForTransaction(
   if (!fromBlockChain) return false;
 
   if (
-    !!meta.evmBasedChains.find(
+    meta.evmBasedChains.find(
       (evmBlochain) => evmBlochain.name === fromBlockChain
     )
   ) {
@@ -783,16 +794,18 @@ export function onBlockForChangeNetwork(
   // Try to auto switch
   const { type, network } = getRequiredWallet(swap);
   if (!!type && !!network) {
-    const result = context.switchNetwork(type, network);
-    if (result) {
-      result
-        .then(() => {
-          queue.unblock();
-        })
-        .catch((error) => {
-          // ignore switch network errors
-          console.log({ error });
-        });
+    if (context.canSwitchNetworkTo(type, network)) {
+      const result = context.switchNetwork(type, network);
+      if (result) {
+        result
+          .then(() => {
+            queue.unblock();
+          })
+          .catch((error) => {
+            // ignore switch network errors
+            console.log({ error });
+          });
+      }
     }
   }
 }
@@ -860,7 +873,12 @@ export function onDependsOnOtherQueues(
     resetClaimedBy: () => {
       reset();
       // TODO: Use key generator
-      retryOn(`${type}-${network}:${address}`, context.notifier, manager);
+      retryOn(
+        `${type}-${network}:${address}`,
+        context.notifier,
+        manager,
+        context.canSwitchNetworkTo
+      );
     },
   });
 }
@@ -888,7 +906,7 @@ export function isRequiredWalletConnected(
 export function singTransaction(
   actions: ExecuterActions<SwapStorage, SwapActionTypes, SwapQueueContext>
 ): void {
-  const { setTransactionResponseByHash } = useTransactionsResponse();
+  const { setTransactionDataByHash } = useTransactionsData();
   const { getStorage, setStorage, failed, next, schedule, context } = actions;
   const { meta, getSigners, notifier, isMobileWallet } = context;
   const swap = getStorage().swapDetails;
@@ -991,7 +1009,7 @@ export function singTransaction(
           : undefined
       );
       // response used for evm transactions to get receipt and track replaced
-      response && setTransactionResponseByHash(hash, response);
+      response && setTransactionDataByHash(hash, { response });
       schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
       next();
       onFinish();
@@ -1147,7 +1165,7 @@ export function checkWaitingForNetworkChange(manager?: Manager): void {
  */
 export function getRunningSwaps(manager: Manager): PendingSwap[] {
   const queues = manager?.getAll() || new Map<QueueName, QueueInfo>();
-  let result: PendingSwap[] = [];
+  const result: PendingSwap[] = [];
   queues.forEach((q) => {
     // retry only on affected queues
     const queueStorage = q.list.getStorage() as SwapStorage | undefined;
@@ -1204,6 +1222,7 @@ export function retryOn(
   wallet_network: string,
   notifier: SwapQueueContext['notifier'],
   manager?: Manager,
+  canSwitchNetworkTo?: (type: WalletType, network: Network) => boolean,
   options = { fallbackToOnlyWallet: true }
 ): void {
   const [wallet, network] = splitWalletNetwork(wallet_network);
@@ -1258,7 +1277,9 @@ export function retryOn(
     finalQueueToBeRun = onlyWalletMatched[0];
   }
 
-  finalQueueToBeRun?.checkBlock();
+  if (!canSwitchNetworkTo?.(wallet, network as Network))
+    finalQueueToBeRun?.unblock();
+  else finalQueueToBeRun?.checkBlock();
 }
 
 /* 
@@ -1276,17 +1297,13 @@ For backward compatibilty with server and sdk, we use this wrapper to reject the
 export async function throwOnOK(
   rawResponse: Promise<CreateTransactionResponse>
 ): Promise<CreateTransactionResponse> {
-  try {
-    const responseBody = await rawResponse;
-    if (!responseBody.ok || !responseBody.transaction) {
-      throw PrettyError.CreateTransaction(
-        responseBody.error || 'bad response from create tx endpoint'
-      );
-    }
-    return responseBody;
-  } catch (e) {
-    throw e;
+  const responseBody = await rawResponse;
+  if (!responseBody.ok || !responseBody.transaction) {
+    throw PrettyError.CreateTransaction(
+      responseBody.error || 'bad response from create tx endpoint'
+    );
   }
+  return responseBody;
 }
 
 export function cancelSwap(

package/src/hooks.ts

@@ -56,7 +56,12 @@ function useQueueManager(params: UseQueueManagerParams): void {
         manager,
         notifier: params.notifier,
       });
-      retryOn(params.lastConnectedWallet, params.notifier, manager);
+      retryOn(
+        params.lastConnectedWallet,
+        params.notifier,
+        manager,
+        params.canSwitchNetworkTo
+      );
     }
   }, [params.lastConnectedWallet]);
 

package/src/types.ts

@@ -55,6 +55,7 @@ export interface SwapQueueContext extends QueueContext {
     wallet: WalletType,
     network: Network
   ) => Promise<ConnectResult> | undefined;
+  canSwitchNetworkTo: (type: WalletType, network: Network) => boolean;
   connect: (
     wallet: WalletType,
     network: Network
@@ -74,4 +75,5 @@ export interface UseQueueManagerParams {
   clearDisconnectedWallet: () => void;
   evmChains: EvmBlockchainMeta[];
   notifier: SwapQueueContext['notifier'];
+  canSwitchNetworkTo: (type: WalletType, network: Network) => boolean;
 }