error handling

TheDotflow · Sep 7, 2023 · 29e5cec · 29e5cec
1 parent 32317ec
commit 29e5cec
Show file tree

Hide file tree

Showing 8 changed files with 113 additions and 73 deletions.
diff --git a/src/pages/transfer.tsx b/src/pages/transfer.tsx
@@ -249,16 +249,20 @@ const TransferPage = () => {
 
       setTransferring(true);
 
-      await NativeTransfer.transfer(
-        api,
-        keypair.pairs[0],
-        selectedAsset,
-        receiverKeypair.pairs[0].publicKey,
-        amount * Math.pow(10, selectedAsset.decimals),
-        activeSigner
-      );
-
-      setTransferring(false);
+      try {
+        await NativeTransfer.transfer(
+          api,
+          keypair.pairs[0],
+          selectedAsset,
+          receiverKeypair.pairs[0].publicKey,
+          amount * Math.pow(10, selectedAsset.decimals),
+          activeSigner
+        );
+      } catch (e: any) {
+        toastError(`Transfer failed. Error: ${e.toString()}`);
+      } finally {
+        setTransferring(false);
+      }
 
       return;
     }

diff --git a/src/utils/nativeTransfer/assets.ts b/src/utils/nativeTransfer/assets.ts
@@ -24,13 +24,17 @@ class SubstrateAssets {
 
     const account = signer ? sender.address : sender;
     // eslint-disable-next-line no-async-promise-executor
-    return new Promise(async (resolve) => {
-      const unsub = await transferCall.signAndSend(account, (result: any) => {
-        if (result.status.isFinalized) {
-          unsub();
-          resolve();
-        }
-      })
+    return new Promise(async (resolve, reject) => {
+      try {
+        const unsub = await transferCall.signAndSend(account, (result: any) => {
+          if (result.status.isFinalized) {
+            unsub();
+            resolve();
+          }
+        })
+      } catch (e) {
+        reject(e);
+      }
     });
   }
 }

diff --git a/src/utils/nativeTransfer/native.ts b/src/utils/nativeTransfer/native.ts
@@ -22,13 +22,17 @@ class SubstrateNative {
 
     const account = signer ? sender.address : sender;
     // eslint-disable-next-line no-async-promise-executor
-    return new Promise(async (resolve) => {
-      const unsub = await transferCall.signAndSend(account, (result: any) => {
-        if (result.status.isFinalized) {
-          unsub();
-          resolve();
-        }
-      });
+    return new Promise(async (resolve, reject) => {
+      try {
+        const unsub = await transferCall.signAndSend(account, (result: any) => {
+          if (result.status.isFinalized) {
+            unsub();
+            resolve();
+          }
+        });
+      } catch (e) {
+        reject(e);
+      }
     });
   }
 }

diff --git a/src/utils/nativeTransfer/orml.ts b/src/utils/nativeTransfer/orml.ts
@@ -27,13 +27,17 @@ class SubstrateOrml {
 
     const account = signer ? sender.address : sender;
     // eslint-disable-next-line no-async-promise-executor
-    return new Promise(async (resolve) => {
-      const unsub = await transferCall.signAndSend(account, (result: any) => {
-        if (result.status.isFinalized) {
-          unsub();
-          resolve();
-        }
-      })
+    return new Promise(async (resolve, reject) => {
+      try {
+        const unsub = await transferCall.signAndSend(account, (result: any) => {
+          if (result.status.isFinalized) {
+            unsub();
+            resolve();
+          }
+        })
+      } catch (e) {
+        reject(e);
+      }
     });
   }
 }

diff --git a/src/utils/nativeTransfer/tokens.ts b/src/utils/nativeTransfer/tokens.ts
@@ -34,13 +34,17 @@ class SubstrateTokens {
 
     const account = signer ? sender.address : sender;
     // eslint-disable-next-line no-async-promise-executor
-    return new Promise(async (resolve) => {
-      const unsub = await transferCall.signAndSend(account, (result: any) => {
-        if (result.status.isFinalized) {
-          unsub();
-          resolve();
-        }
-      })
+    return new Promise(async (resolve, reject) => {
+      try {
+        const unsub = await transferCall.signAndSend(account, (result: any) => {
+          if (result.status.isFinalized) {
+            unsub();
+            resolve();
+          }
+        })
+      } catch (e) {
+        reject(e);
+      }
     });
   }
 }

diff --git a/src/utils/xcmTransfer/reserveTransfer.ts b/src/utils/xcmTransfer/reserveTransfer.ts
@@ -41,13 +41,17 @@ class ReserveTransfer {
     const account = signer ? sender.keypair.address : sender.keypair;
 
     // eslint-disable-next-line no-async-promise-executor
-    return new Promise(async (resolve) => {
-      const unsub = await reserveTransfer.signAndSend(account, (result: any) => {
-        if (result.status.isFinalized) {
-          unsub();
-          resolve();
-        }
-      })
+    return new Promise(async (resolve, reject) => {
+      try {
+        const unsub = await reserveTransfer.signAndSend(account, (result: any) => {
+          if (result.status.isFinalized) {
+            unsub();
+            resolve();
+          }
+        })
+      } catch (e) {
+        reject(e);
+      }
     });
   }
 
@@ -80,13 +84,17 @@ class ReserveTransfer {
     const account = signer ? sender.keypair.address : sender.keypair;
 
     // eslint-disable-next-line no-async-promise-executor
-    return new Promise(async (resolve) => {
-      const unsub = await reserveTransfer.signAndSend(account, (result: any) => {
-        if (result.status.isFinalized) {
-          unsub();
-          resolve();
-        }
-      })
+    return new Promise(async (resolve, reject) => {
+      try {
+        const unsub = await reserveTransfer.signAndSend(account, (result: any) => {
+          if (result.status.isFinalized) {
+            unsub();
+            resolve();
+          }
+        })
+      } catch (e) {
+        reject(e);
+      }
     });
   }
 
@@ -119,13 +127,17 @@ class ReserveTransfer {
     const account = signer ? sender.keypair.address : sender.keypair;
 
     // eslint-disable-next-line no-async-promise-executor
-    return new Promise(async (resolve) => {
-      const unsub = await reserveTransfer.signAndSend(account, (result: any) => {
-        if (result.status.isFinalized) {
-          unsub();
-          resolve();
-        }
-      })
+    return new Promise(async (resolve, reject) => {
+      try {
+        const unsub = await reserveTransfer.signAndSend(account, (result: any) => {
+          if (result.status.isFinalized) {
+            unsub();
+            resolve();
+          }
+        })
+      } catch (e) {
+        reject(e);
+      }
     });
   }
 

diff --git a/src/utils/xcmTransfer/teleportTransfer.ts b/src/utils/xcmTransfer/teleportTransfer.ts
@@ -46,13 +46,17 @@ class TeleportTransfer {
     const account = signer ? sender.address : sender;
 
     // eslint-disable-next-line no-async-promise-executor
-    return new Promise(async (resolve) => {
-      const unsub = await teleport.signAndSend(account, (result: any) => {
-        if (result.status.isFinalized) {
-          unsub();
-          resolve();
-        }
-      })
+    return new Promise(async (resolve, reject) => {
+      try {
+        const unsub = await teleport.signAndSend(account, (result: any) => {
+          if (result.status.isFinalized) {
+            unsub();
+            resolve();
+          }
+        });
+      } catch (e) {
+        reject(e);
+      }
     });
   }
 }

diff --git a/src/utils/xcmTransfer/transferAsset.ts b/src/utils/xcmTransfer/transferAsset.ts
@@ -40,13 +40,17 @@ class TransferAsset {
 
     const account = signer ? sender.address : sender;
     // eslint-disable-next-line no-async-promise-executor
-    return new Promise(async (resolve) => {
-      const unsub = await xcmExecute.signAndSend(account, (result: any) => {
-        if (result.status.isFinalized) {
-          unsub();
-          resolve();
-        }
-      })
+    return new Promise(async (resolve, reject) => {
+      try {
+        const unsub = await xcmExecute.signAndSend(account, (result: any) => {
+          if (result.status.isFinalized) {
+            unsub();
+            resolve();
+          }
+        })
+      } catch (e) {
+        reject(e);
+      }
     });
   }