tx success ui fix

hckrg · Jul 17, 2023 · 9d9e67f · 9d9e67f
1 parent 5bf60fa
commit 9d9e67f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/src/components/IssueModal.tsx b/src/components/IssueModal.tsx
@@ -64,7 +64,7 @@ function IssueTokenModal({ onClose, basketDetails, type}: IssueTokenModalProps)
         })
 
         console.log("Transaction Id : ", txId)
-        subscribeTxStatus(txId)          
+        subscribeTxStatus(txId, onClose)          
     }
 
     return (

diff --git a/src/components/RedeemModal.tsx b/src/components/RedeemModal.tsx
@@ -71,7 +71,7 @@ function RedeemTokenModal({ onClose, basketDetails}: IssueTokenModalProps) {
         })
 
         console.log("Transaction Id : ", txId)
-        subscribeTxStatus(txId)        
+        subscribeTxStatus(txId, onClose)        
     }
 
     useEffect(() => {

diff --git a/src/utils/subscribeTxStatus.ts b/src/utils/subscribeTxStatus.ts
@@ -3,7 +3,7 @@ import * as fcl from '@onflow/fcl'
 import { NavigateFunction } from 'react-router-dom'
 import { toast } from 'react-toastify'
 
-export const subscribeTxStatus = (transactionId: string, navigate?: NavigateFunction) => {
+export const subscribeTxStatus = (transactionId: string, onClose: () => void) => {
     const loaderId = toast.loading('Transaction in process...')
     console.log('Transaction ID: ', transactionId)
     fcl.tx(transactionId).subscribe((res: any) => {      
@@ -12,11 +12,17 @@ export const subscribeTxStatus = (transactionId: string, navigate?: NavigateFunc
             if (res?.errorMessage === "") {
                 toast.dismiss(loaderId)
                 toast.success('Transaction sealed')
-                navigate ? navigate('/dashboard') : window.location.reload()
-            } else
+            } else {
+                toast.dismiss(loaderId)
                 toast.error(res?.errorMessage)
+            }
         } else if (res?.statusString === "EXECUTED") {
-            toast.success('Transaction executed')
+            if (res?.errorMessage === "") {
+                toast.success('Transaction executed')
+            } else {
+                toast.dismiss(loaderId)
+                toast.error(res?.errorMessage)
+            }
         } else if (res?.statusString === "PENDING") {
             toast.success('Transaction pending')
         } else if (res?.statusString === "EXPIRED") {