From aa2e74bcd7477e16d225077ce575006d53be05dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20G=C3=B3mez?= <alejandrogomez@bitrefill.com>
Date: Mon, 15 Dec 2025 17:57:20 +0100
Subject: [PATCH] feat: show zapped e and a

---
 .../nostr/kinds/ZapReceiptRenderer.tsx        | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/components/nostr/kinds/ZapReceiptRenderer.tsx b/src/components/nostr/kinds/ZapReceiptRenderer.tsx
index 3df5a65..67e71d3 100644
--- a/src/components/nostr/kinds/ZapReceiptRenderer.tsx
+++ b/src/components/nostr/kinds/ZapReceiptRenderer.tsx
@@ -27,13 +27,13 @@ export function Kind9735Renderer({ event }: BaseEventProps) {
   const zapAmount = useMemo(() => getZapAmount(event), [event]);
   const zapRequest = useMemo(() => getZapRequest(event), [event]);
 
-  // Get zapped content pointer (e tag or a tag)
+  // Get zapped content pointers (e tag and/or a tag)
   const eventPointer = useMemo(() => getZapEventPointer(event), [event]);
   const addressPointer = useMemo(() => getZapAddressPointer(event), [event]);
-  const pointer = eventPointer || addressPointer;
 
-  // Fetch the zapped event
-  const zappedEvent = useNostrEvent(pointer || undefined);
+  // Fetch both events separately
+  const zappedEvent = useNostrEvent(eventPointer || undefined);
+  const zappedAddress = useNostrEvent(addressPointer || undefined);
 
   // Get zap comment from request
   const zapComment = useMemo(() => {
@@ -92,12 +92,26 @@ export function Kind9735Renderer({ event }: BaseEventProps) {
           </div>
         )}
 
-        {/* Loading state */}
-        {pointer && !zappedEvent && (
+        {/* Embedded zapped address (if loaded and different from event) */}
+        {zappedAddress && (
+          <div className="border border-muted">
+            <EmbeddedEvent event={zappedAddress} />
+          </div>
+        )}
+
+        {/* Loading state for event pointer */}
+        {eventPointer && !zappedEvent && (
           <div className="border border-muted p-2 text-xs text-muted-foreground">
             Loading zapped event...
           </div>
         )}
+
+        {/* Loading state for address pointer */}
+        {addressPointer && !zappedAddress && (
+          <div className="border border-muted p-2 text-xs text-muted-foreground">
+            Loading zapped address...
+          </div>
+        )}
       </div>
     </BaseEventContainer>
   );