@rango-dev/queue-manager-rango-preset 0.1.12-next.0 → 0.1.12-next.2

package/package.json

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

package/src/actions/checkStatus.ts

@@ -56,7 +56,7 @@ async function checkTransactionStatus({
   const outputAmount: string | null =
     status?.outputAmount ||
     (!!currentStep.outputAmount ? currentStep.outputAmount : null);
-  const prevOutputAmount = currentStep.outputAmount;
+  const prevOutputAmount = currentStep.outputAmount || null;
   swap.extraMessage = status?.extraMessage || swap.extraMessage;
   swap.extraMessageSeverity = MessageSeverity.info;
   swap.extraMessageDetail = '';

package/src/helpers.ts

@@ -1755,12 +1755,17 @@ export async function throwOnOK(
   }
 }
 
-export function cancelSwap(swap: QueueInfo): {
+export function cancelSwap(
+  swap: QueueInfo,
+  manager?: Manager
+): {
   swap: PendingSwap;
   step: PendingSwapStep | null;
 } {
+  const { reset } = claimQueue();
   swap.actions.cancel();
-  return updateSwapStatus({
+
+  const updateResult = updateSwapStatus({
     getStorage: swap.actions.getStorage,
     setStorage: swap.actions.setStorage,
     message: 'Swap canceled by user.',
@@ -1770,4 +1775,8 @@ export function cancelSwap(swap: QueueInfo): {
     nextStepStatus: 'failed',
     errorCode: 'USER_CANCEL',
   });
+  reset();
+  if (manager) manager?.retry();
+
+  return updateResult;
 }