From 2482f519cbd070a1d80179e8dcffcee7d412fc74 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 21 Jan 2026 08:55:34 +0000
Subject: [PATCH] fix: use addressPointer for zapping addressable events

When zapping addressable events (like spellbook kind 30777), the zapEvent
function was passing an AddressPointer as eventPointer. This caused an error
because ZapWindow expects eventPointer to have an `id` property, while
AddressPointer has `kind`, `pubkey`, `identifier`.

Fixed by:
- Always passing eventPointer with the event's id for the e-tag
- Additionally passing addressPointer for addressable events for the a-tag
---
 .../nostr/kinds/BaseEventRenderer.tsx         | 76 +++++++++----------
 1 file changed, 36 insertions(+), 40 deletions(-)

diff --git a/src/components/nostr/kinds/BaseEventRenderer.tsx b/src/components/nostr/kinds/BaseEventRenderer.tsx
index ed425be..fb150c4 100644
--- a/src/components/nostr/kinds/BaseEventRenderer.tsx
+++ b/src/components/nostr/kinds/BaseEventRenderer.tsx
@@ -172,29 +172,27 @@ export function EventMenu({ event }: { event: NostrEvent }) {
   };
 
   const zapEvent = () => {
-    // Create event pointer for the zap
-    let eventPointer;
-    if (isAddressableKind(event.kind)) {
-      const dTag = getTagValue(event, "d") || "";
-      eventPointer = {
-        kind: event.kind,
-        pubkey: event.pubkey,
-        identifier: dTag,
-      };
-    } else {
-      eventPointer = {
-        id: event.id,
-      };
-    }
-
     // Get semantic author (e.g., zapper for zaps, host for streams)
     const recipientPubkey = getSemanticAuthor(event);
 
-    // Open zap window with event context
-    addWindow("zap", {
-      recipientPubkey,
-      eventPointer,
-    });
+    // For addressable events, use addressPointer; for regular events, use eventPointer
+    if (isAddressableKind(event.kind)) {
+      const dTag = getTagValue(event, "d") || "";
+      addWindow("zap", {
+        recipientPubkey,
+        eventPointer: { id: event.id },
+        addressPointer: {
+          kind: event.kind,
+          pubkey: event.pubkey,
+          identifier: dTag,
+        },
+      });
+    } else {
+      addWindow("zap", {
+        recipientPubkey,
+        eventPointer: { id: event.id },
+      });
+    }
   };
 
   const openChatWindow = () => {
@@ -334,29 +332,27 @@ export function EventContextMenu({
   };
 
   const zapEvent = () => {
-    // Create event pointer for the zap
-    let eventPointer;
-    if (isAddressableKind(event.kind)) {
-      const dTag = getTagValue(event, "d") || "";
-      eventPointer = {
-        kind: event.kind,
-        pubkey: event.pubkey,
-        identifier: dTag,
-      };
-    } else {
-      eventPointer = {
-        id: event.id,
-      };
-    }
-
     // Get semantic author (e.g., zapper for zaps, host for streams)
     const recipientPubkey = getSemanticAuthor(event);
 
-    // Open zap window with event context
-    addWindow("zap", {
-      recipientPubkey,
-      eventPointer,
-    });
+    // For addressable events, use addressPointer; for regular events, use eventPointer
+    if (isAddressableKind(event.kind)) {
+      const dTag = getTagValue(event, "d") || "";
+      addWindow("zap", {
+        recipientPubkey,
+        eventPointer: { id: event.id },
+        addressPointer: {
+          kind: event.kind,
+          pubkey: event.pubkey,
+          identifier: dTag,
+        },
+      });
+    } else {
+      addWindow("zap", {
+        recipientPubkey,
+        eventPointer: { id: event.id },
+      });
+    }
   };
 
   const openChatWindow = () => {