Add TX errors to EVM

galacticcouncil · Apr 11, 2024 · 95175fb · 95175fb
1 parent 860af39
commit 95175fb
Showing 1 changed file with 24 additions and 18 deletions.
diff --git a/src/sections/transaction/ReviewTransaction.utils.tsx b/src/sections/transaction/ReviewTransaction.utils.tsx
@@ -119,7 +119,7 @@ export const useSendEvmTransactionMutation = (
     ISubmittableResult & {
       transactionLink?: string
     },
-    unknown,
+    TransactionError,
     {
       evmTx: TransactionResponse
       tx?: SubmittableExtrinsic<"promise">
@@ -158,7 +158,7 @@ export const useSendEvmTransactionMutation = (
         })
       } catch (err) {
         const { error } = decodeError(err)
-        reject(new Error(error))
+        reject(new TransactionError(error))
       } finally {
         clearTimeout(timeout)
       }
@@ -322,33 +322,38 @@ const useBoundReferralToast = () => {
   }
 }
 
+const useErrorToastUpdate = (id: string) => {
+  const { edit } = useToast()
+
+  return (err: TransactionError) => {
+    if (err?.method) {
+      defer(() => {
+        edit(id, {
+          description: (
+            <p>
+              <strong>{err.method}</strong>
+              {err.docs ? ` - ${err.docs}` : ""}
+            </p>
+          ),
+        })
+      })
+    }
+  }
+}
+
 export const useSendTx = ({ id }: { id: string }) => {
   const [txType, setTxType] = useState<"default" | "evm" | null>(null)
 
-  const { edit } = useToast()
-
   const boundReferralToast = useBoundReferralToast()
+  const updateErrorToast = useErrorToastUpdate(id)
 
   const sendTx = useSendTransactionMutation({
     onMutate: (tx) => {
       boundReferralToast.onLoading(tx)
       setTxType("default")
     },
     onSuccess: boundReferralToast.onSuccess,
-    onError: (err) => {
-      if (err?.method) {
-        defer(() => {
-          edit(id, {
-            description: (
-              <p>
-                <strong>{err.method}</strong>
-                {err.docs ? ` - ${err.docs}` : ""}
-              </p>
-            ),
-          })
-        })
-      }
-    },
+    onError: updateErrorToast,
   })
 
   const sendEvmTx = useSendEvmTransactionMutation({
@@ -357,6 +362,7 @@ export const useSendTx = ({ id }: { id: string }) => {
       setTxType("evm")
     },
     onSuccess: boundReferralToast.onSuccess,
+    onError: updateErrorToast,
   })
 
   const activeMutation = txType === "default" ? sendTx : sendEvmTx