From 6ce25cbff5bfb1ffd50c30ee9e30d9cf4a9a35eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s?= <nrriquelme@gmail.com>
Date: Wed, 22 May 2024 05:25:41 -0400
Subject: [PATCH] fix: handling transfer cancellation on substrate (#195)

<!--- Provide a general summary of your changes in the Title above -->

## Description

<!--- Describe your changes in detail -->

Handles user cancelation on substrate transfer

## Related Issue Or Context

<!--- If suggesting a new feature or change, please discuss it in an
issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps
to reproduce -->
<!--- Otherwise, describe context and motivation for change here -->

Closes: #193

## How Has This Been Tested? Testing details.

<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] Documentation

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

- [ ] I have commented my code, particularly in hard-to-understand
areas.
- [ ] I have ensured that all acceptance criteria (or expected behavior)
from issue are met
- [ ] I have updated the documentation locally and in sygma-docs.
- [ ] I have added tests to cover my changes.
- [ ] I have ensured that all the checks are passing and green, I've
signed the CLA bot
---
 .../transfers/substrate/execute.ts            | 55 ++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/packages/widget/src/controllers/transfers/substrate/execute.ts b/packages/widget/src/controllers/transfers/substrate/execute.ts
index a5d631a6..ca901394 100644
--- a/packages/widget/src/controllers/transfers/substrate/execute.ts
+++ b/packages/widget/src/controllers/transfers/substrate/execute.ts
@@ -20,33 +20,38 @@ export async function executeNextSubstrateTransaction(
 
   const provider = this.sourceSubstrateProvider;
   this.waitingTxExecution = true;
-  await (this.pendingTransferTransaction as SubstrateTransaction).signAndSend(
-    sender,
-    { signer: signer },
-    ({ blockNumber, txIndex, status, dispatchError }) => {
-      if (status.isInBlock) {
-        this.waitingTxExecution = false;
-        this.pendingTransferTransaction = undefined;
-        this.transferTransactionId = `${blockNumber?.toString()}-${txIndex?.toString()}`;
-        this.host.requestUpdate();
-      }
-
-      if (status.isBroadcast) {
-        this.waitingUserConfirmation = false;
-        this.host.requestUpdate();
-      }
-
-      if (dispatchError) {
-        if (dispatchError.isModule) {
-          const decoded = provider?.registry.findMetaError(
-            dispatchError.asModule
-          );
-          const [docs] = decoded?.docs || ['Transfer failed'];
-          this.errorMessage = docs;
+  try {
+    await (this.pendingTransferTransaction as SubstrateTransaction).signAndSend(
+      sender,
+      { signer: signer },
+      ({ blockNumber, txIndex, status, dispatchError }) => {
+        if (status.isInBlock) {
           this.waitingTxExecution = false;
+          this.pendingTransferTransaction = undefined;
+          this.transferTransactionId = `${blockNumber?.toString()}-${txIndex?.toString()}`;
           this.host.requestUpdate();
         }
+
+        if (status.isBroadcast) {
+          this.waitingUserConfirmation = false;
+          this.host.requestUpdate();
+        }
+
+        if (dispatchError) {
+          if (dispatchError.isModule) {
+            const decoded = provider?.registry.findMetaError(
+              dispatchError.asModule
+            );
+            const [docs] = decoded?.docs || ['Transfer failed'];
+            this.errorMessage = docs;
+            this.waitingTxExecution = false;
+            this.host.requestUpdate();
+          }
+        }
       }
-    }
-  );
+    );
+  } catch (error) {
+    this.waitingUserConfirmation = false;
+    this.waitingTxExecution = false;
+  }
 }