Rework toasts

src/i18n/locales/en/translations.json

@@ -352,10 +352,6 @@
   "liquidity.reviewTransaction.modal.error.copy": "Copy error message",
   "liquidity.reviewTransaction.modal.error.copied": "Message copied!",
   "liquidity.reviewTransaction.modal.error.tip": "Not enough HDX for TIP",
-  "liquidity.reviewTransaction.toast.pending": "Submitting transaction...",
-  "liquidity.reviewTransaction.toast.success": "Transaction successful.",
-  "liquidity.reviewTransaction.toast.error": "Transaction failed.",
-  "liquidity.reviewTransaction.toast.unknown": "Transaction status unknown.",
   "liquidity.reviewTransaction.calldata.encoded": "Encoded call data",
   "liquidity.reviewTransaction.calldata.encodedHash": "Encoded call hash",
   "liquidity.reviewTransaction.calldata.decoded": "Decoded",
@@ -1105,5 +1101,9 @@
   "memepad.summary.adminRights.burn": "Burn admin rights",
   "memepad.summary.adminRights.burned": "Admin rights revoked",
   "memepad.summary.adminRights.toast.onLoading": "Revoking admin rights...",
-  "memepad.summary.adminRights.toast.onSuccess": "Admin rights revoked."
+  "memepad.summary.adminRights.toast.onSuccess": "Admin rights revoked.",
+  "toast.pending": "Submitting transaction...",
+  "toast.success": "Transaction successful.",
+  "toast.error": "Transaction failed.",
+  "toast.unknown": "Transaction status unknown."
 }

src/sections/transaction/ReviewTransaction.tsx

@@ -8,7 +8,6 @@ import { ReviewTransactionError } from "./ReviewTransactionError"
 import { ReviewTransactionForm } from "./ReviewTransactionForm"
 import { ReviewTransactionPending } from "./ReviewTransactionPending"
 import { ReviewTransactionSuccess } from "./ReviewTransactionSuccess"
-import { ReviewTransactionToast } from "./ReviewTransactionToast"
 import { ReviewTransactionXCallForm } from "./ReviewTransactionXCallForm"
 import { WalletUpgradeModal } from "sections/web3-connect/upgrade/WalletUpgradeModal"
 import { isEvmXCall } from "sections/transaction/ReviewTransactionXCallForm.utils"
@@ -28,13 +27,13 @@ export const ReviewTransaction = (props: Transaction) => {
     isSuccess,
     isError: isSendError,
     error: sendError,
-    data,
     txState,
     reset,
-    txLink,
-    txHash,
-    bridge,
-  } = useSendTx()
+  } = useSendTx({
+    toast: props.toast,
+    onSuccess: (data) => props.onSuccess?.(data),
+    onError: props.onError,
+  })
 
   if (!isLoaded) return null
 
@@ -54,32 +53,19 @@ export const ReviewTransaction = (props: Transaction) => {
             props.description ?? t("liquidity.reviewTransaction.modal.desc"),
         }
 
-  const handleTxOnClose = () => {
-    if (isLoading) {
-      setMinimizeModal(true)
-      return
-    }
-
-    if (isSuccess) {
-      props.onSuccess?.(data)
-    } else {
-      props.onError?.()
-    }
-  }
-
   const onClose = () => {
-    handleTxOnClose()
+    setMinimizeModal(true)
     props.onClose?.()
   }
 
   const onMinimizeModal = () => {
-    handleTxOnClose()
+    setMinimizeModal(true)
     if (!props.disableAutoClose) props.onClose?.()
   }
 
   const onBack = props.onBack
     ? () => {
-        handleTxOnClose()
+        setMinimizeModal(true)
         props.onBack?.()
       }
     : undefined
@@ -91,22 +77,6 @@ export const ReviewTransaction = (props: Transaction) => {
 
   return (
     <>
-      {minimizeModal && (
-        <ReviewTransactionToast
-          id={props.id}
-          isLoading={isLoading}
-          isSuccess={isSuccess}
-          isError={isError}
-          error={error}
-          link={txLink}
-          txHash={txHash}
-          onReview={onReview}
-          onClose={onMinimizeModal}
-          toastMessage={props.toastMessage}
-          bridge={bridge}
-        />
-      )}
-
       <Modal
         open={!minimizeModal}
         onBack={onBack}