@rango-dev/queue-manager-rango-preset 0.1.13-next.10 → 0.1.13-next.12

package/package.json

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

package/src/actions/checkStatus.ts

@@ -28,6 +28,7 @@ async function checkTransactionStatus({
   next,
   schedule,
   retry,
+  failed,
   context,
 }: ExecuterActions<
   SwapStorage,
@@ -132,14 +133,17 @@ async function checkTransactionStatus({
   } else if (currentStep.status === 'failed') {
     swap.extraMessage = 'Transaction failed in blockchain';
     swap.extraMessageSeverity = MessageSeverity.error;
-    swap.extraMessageDetail = '';
+    swap.extraMessageDetail = status?.extraMessage || '';
+    swap.status = 'failed';
+    swap.finishTime = new Date().getTime().toString();
   }
 
   // Sync data with storage
   setStorage({ ...getStorage(), swapDetails: swap });
 
-  if (
-    status?.status === 'failed' ||
+  if (status?.status === 'failed') {
+    failed();
+  } else if (
     status?.status === 'success' ||
     (status?.status === 'running' && !!status.newTx)
   ) {
@@ -181,7 +185,20 @@ async function checkApprovalStatus({
     if (currentStep?.status === 'failed') return;
 
     isApproved = response.isApproved;
-    if (!isApproved && response.txStatus === 'failed') {
+    if (
+      !isApproved &&
+      (response.txStatus === 'failed' || response.txStatus === 'success')
+    ) {
+      let message, details;
+      if (response.txStatus === 'failed') {
+        message = 'Approve transaction failed';
+        details = 'Smart contract approval failed in blockchain.';
+      } else {
+        message = 'Not enough approval';
+        if (response.requiredApprovedAmount && response.currentApprovedAmount)
+          details = `Required approval: ${response.requiredApprovedAmount}, current approval: ${response.currentApprovedAmount}`;
+        else details = `You still don't have enough approval for this swap.`;
+      }
       // approve transaction failed on
       // we should fail the whole swap
       const updateResult = updateSwapStatus({
@@ -190,15 +207,14 @@ async function checkApprovalStatus({
         nextStatus: 'failed',
         nextStepStatus: 'failed',
         errorCode: 'SEND_TX_FAILED',
-        message: 'Approve transaction failed',
-        details: 'Smart contract approval failed in blockchain.',
+        message: message,
+        details: details,
       });
       context.notifier({
-        eventType: 'smart_contract_call_failed',
+        eventType: 'smart_contract_call_failed', // TODO better event type
         ...updateResult,
       });
       failed();
-      // onFinish();
     } else if (!isApproved) {
       // it is needed to set notification after reloading the page
       context.notifier({

package/src/actions/scheduleNextStep.ts

@@ -21,13 +21,14 @@ export function scheduleNextStep({
 }: ExecuterActions<SwapStorage, SwapActionTypes, SwapQueueContext>): void {
   const swap = getStorage().swapDetails;
   const currentStep = getCurrentStep(swap);
-  if (!!currentStep) {
+  const isFailed = swap.steps.find((step) => step.status === 'failed');
+
+  if (!!currentStep && !isFailed) {
     if (isTxAlreadyCreated(swap, currentStep)) {
       schedule(SwapActionTypes.EXECUTE_TRANSACTION);
       return next();
     }
 
-    // TODO double check it after approval changes
     if (currentStep?.executedTransactionId) {
       schedule(SwapActionTypes.CHECK_TRANSACTION_STATUS);
       return next();
@@ -40,7 +41,6 @@ export function scheduleNextStep({
     schedule(SwapActionTypes.CREATE_TRANSACTION);
     next();
   } else {
-    const isFailed = swap.steps.find((step) => step.status === 'failed');
     swap.status = isFailed ? 'failed' : 'success';
     swap.finishTime = new Date().getTime().toString();