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

package/package.json

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

package/src/actions/checkStatus.ts

@@ -1,5 +1,4 @@
 import { ExecuterActions } from '@rango-dev/queue-manager-core';
-import { Network } from '@rango-dev/wallets-shared';
 import {
   delay,
   getCurrentStep,
@@ -82,7 +81,6 @@ 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/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,
@@ -1651,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);
@@ -1719,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';