From 7a1d0bbfb03e608ada6d427d2538c9c11f1712f5 Mon Sep 17 00:00:00 2001
From: daniyal <daniyal@nostrdev.com>
Date: Wed, 11 Sep 2024 22:25:03 +0500
Subject: [PATCH] fix: immediately setHasZapped to true after zapping

---
 src/components/Zap.tsx                   | 14 ++++++++++++--
 src/pages/mod/internal/comment/index.tsx |  1 +
 src/pages/mod/internal/zap/index.tsx     |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/components/Zap.tsx b/src/components/Zap.tsx
index 4da9d26..b78cbe7 100644
--- a/src/components/Zap.tsx
+++ b/src/components/Zap.tsx
@@ -120,6 +120,7 @@ type ZapQRProps = {
   handleClose: () => void
   handleQRExpiry: () => void
   setTotalZapAmount?: Dispatch<SetStateAction<number>>
+  setHasZapped?: Dispatch<SetStateAction<boolean>>
 }
 
 export const ZapQR = React.memo(
@@ -127,7 +128,8 @@ export const ZapQR = React.memo(
     paymentRequest,
     handleClose,
     handleQRExpiry,
-    setTotalZapAmount
+    setTotalZapAmount,
+    setHasZapped
   }: ZapQRProps) => {
     useDidMount(() => {
       ZapController.getInstance()
@@ -137,6 +139,7 @@ export const ZapQR = React.memo(
           if (setTotalZapAmount) {
             const amount = getZapAmount(zapReceipt)
             setTotalZapAmount((prev) => prev + amount)
+            if (setHasZapped) setHasZapped(true)
           }
         })
         .catch((err) => {
@@ -227,6 +230,8 @@ type ZapPopUpProps = {
   notCloseAfterZap?: boolean
   lastNode?: ReactNode
   setTotalZapAmount?: Dispatch<SetStateAction<number>>
+  setHasZapped?: Dispatch<SetStateAction<boolean>>
+
   handleClose: () => void
 }
 
@@ -239,6 +244,7 @@ export const ZapPopUp = ({
   lastNode,
   notCloseAfterZap,
   setTotalZapAmount,
+  setHasZapped,
   handleClose
 }: ZapPopUpProps) => {
   const [isLoading, setIsLoading] = useState(false)
@@ -337,6 +343,8 @@ export const ZapPopUp = ({
           toast.success(`Successfully sent ${amount} sats!`)
           if (setTotalZapAmount) {
             setTotalZapAmount((prev) => prev + amount)
+
+            if (setHasZapped) setHasZapped(true)
           }
 
           if (!notCloseAfterZap) {
@@ -357,7 +365,8 @@ export const ZapPopUp = ({
     notCloseAfterZap,
     handleClose,
     generatePaymentRequest,
-    setTotalZapAmount
+    setTotalZapAmount,
+    setHasZapped
   ])
 
   const handleQRExpiry = useCallback(() => {
@@ -438,6 +447,7 @@ export const ZapPopUp = ({
                       handleClose={handleQRClose}
                       handleQRExpiry={handleQRExpiry}
                       setTotalZapAmount={setTotalZapAmount}
+                      setHasZapped={setHasZapped}
                     />
                   )}
                   {lastNode}
diff --git a/src/pages/mod/internal/comment/index.tsx b/src/pages/mod/internal/comment/index.tsx
index 86a1451..93ea146 100644
--- a/src/pages/mod/internal/comment/index.tsx
+++ b/src/pages/mod/internal/comment/index.tsx
@@ -590,6 +590,7 @@ const Zap = (props: Event) => {
           eventId={props.id}
           handleClose={() => setIsOpen(false)}
           setTotalZapAmount={setTotalZappedAmount}
+          setHasZapped={setHasZapped}
         />
       )}
     </>
diff --git a/src/pages/mod/internal/zap/index.tsx b/src/pages/mod/internal/zap/index.tsx
index a2ba08b..ba6d8e9 100644
--- a/src/pages/mod/internal/zap/index.tsx
+++ b/src/pages/mod/internal/zap/index.tsx
@@ -74,6 +74,7 @@ export const Zap = ({ modDetails }: ZapProps) => {
           lastNode={<ZapSite />}
           notCloseAfterZap
           setTotalZapAmount={setTotalZappedAmount}
+          setHasZapped={setHasZapped}
         />
       )}
     </>