From dc6aae0b8cb6f568d8e0f61433a0136af3610ff1 Mon Sep 17 00:00:00 2001
From: Bobo <bobo.kovacevic@gmail.com>
Date: Tue, 5 Dec 2023 08:54:25 +0100
Subject: [PATCH] Handle errors (#1072)

---
 .../implementations/PolkadotWalletService.ts  | 92 ++++++++++---------
 1 file changed, 48 insertions(+), 44 deletions(-)

diff --git a/src/v2/services/implementations/PolkadotWalletService.ts b/src/v2/services/implementations/PolkadotWalletService.ts
index 3f677337e..d359751d6 100644
--- a/src/v2/services/implementations/PolkadotWalletService.ts
+++ b/src/v2/services/implementations/PolkadotWalletService.ts
@@ -99,56 +99,60 @@ export class PolkadotWalletService extends WalletService implements IWalletServi
             resolve(error.message);
           }
         } else {
-          const unsub = await extrinsic.signAndSend(
-            senderAddress,
-            {
-              signer: await this.getSigner(senderAddress),
-              nonce: -1,
-              tip,
-            },
-            (result) => {
-              try {
-                isDetectExtensionsAction && this.detectExtensionsAction(false);
-                isSnap && this.eventAggregator.publish(new BusyMessage(true));
-                if (result.isCompleted) {
-                  if (!this.isExtrinsicFailed(result.events)) {
-                    if (result.isError) {
-                      this.eventAggregator.publish(
-                        new ExtrinsicStatusMessage({ success: false, message: AlertMsg.ERROR })
-                      );
-                    } else {
-                      const subscanUrl = getSubscanExtrinsic({
-                        subscanBase: subscan,
-                        hash: result.txHash.toHex(),
-                      });
-                      this.eventAggregator.publish(
-                        new ExtrinsicStatusMessage({
-                          success: true,
-                          message: successMessage ?? AlertMsg.SUCCESS,
-                          method: `${extrinsic.method.section}.${extrinsic.method.method}`,
-                          explorerUrl: subscanUrl,
-                        })
-                      );
+          try {
+            const unsub = await extrinsic.signAndSend(
+              senderAddress,
+              {
+                signer: await this.getSigner(senderAddress),
+                nonce: -1,
+                tip,
+              },
+              (result) => {
+                try {
+                  isDetectExtensionsAction && this.detectExtensionsAction(false);
+                  isSnap && this.eventAggregator.publish(new BusyMessage(true));
+                  if (result.isCompleted) {
+                    if (!this.isExtrinsicFailed(result.events)) {
+                      if (result.isError) {
+                        this.eventAggregator.publish(
+                          new ExtrinsicStatusMessage({ success: false, message: AlertMsg.ERROR })
+                        );
+                      } else {
+                        const subscanUrl = getSubscanExtrinsic({
+                          subscanBase: subscan,
+                          hash: result.txHash.toHex(),
+                        });
+                        this.eventAggregator.publish(
+                          new ExtrinsicStatusMessage({
+                            success: true,
+                            message: successMessage ?? AlertMsg.SUCCESS,
+                            method: `${extrinsic.method.section}.${extrinsic.method.method}`,
+                            explorerUrl: subscanUrl,
+                          })
+                        );
+                      }
+                    }
+                    this.eventAggregator.publish(new BusyMessage(false));
+                    if (finalizedCallback) {
+                      finalizedCallback(result);
+                    }
+                    resolve(extrinsic.hash.toHex());
+                    unsub();
+                  } else {
+                    if (isMobileDevice && !result.isCompleted) {
+                      this.eventAggregator.publish(new BusyMessage(true));
                     }
                   }
+                } catch (error) {
                   this.eventAggregator.publish(new BusyMessage(false));
-                  if (finalizedCallback) {
-                    finalizedCallback(result);
-                  }
-                  resolve(extrinsic.hash.toHex());
                   unsub();
-                } else {
-                  if (isMobileDevice && !result.isCompleted) {
-                    this.eventAggregator.publish(new BusyMessage(true));
-                  }
+                  reject(error as Error);
                 }
-              } catch (error) {
-                this.eventAggregator.publish(new BusyMessage(false));
-                unsub();
-                reject(error as Error);
               }
-            }
-          );
+            );
+          } catch (error) {
+            reject(error as Error);
+          }
         }
       });
     } catch (e) {