1 files changed, 16 insertions, 4 deletions
diff --git a/src/features/zaps.js b/src/features/zaps.js
index b501c76..76296cf 100644
--- a/src/features/zaps.js
+++ b/src/features/zaps.js
@@ -196,6 +196,16 @@ export function zapsFeature(ctx) {
     render();
   }
 
+  // A zap request is signed as the person zapping: the login identity when
+  // there is one (the face their chat line and the streamer's overlay
+  // show), else the wallet's own key. It used to be the wallet key always,
+  // and a signed-in person's zaps showed under a stranger's npub.
+  async function zapSigner() {
+    const id = hook('nostrLoginIdentity');
+    const signer = id && (id.signer || await Promise.resolve(hook('nostrLoginResume')).catch(() => null));
+    return signer ? (e) => signer.signEvent(e) : (e) => wallet.nostrSign(e);
+  }
+
   // One-tap zap at the user's default amount: resolve, invoice, pay through
   // the ark seam (its quote + retries included), and report by toast — the
   // whole flow without a single screen.
@@ -214,10 +224,11 @@ export function zapsFeature(ctx) {
     }
     let zapRequest = null;
     if (p.allowsNostr && t2.pk && wallet.nostrSign) {
-      zapRequest = buildZapRequest({
+      const sign = await zapSigner();
+      zapRequest = await buildZapRequest({
         amountMsat: msat, relays: wallet.nostrRelays(), lnurlBech32: t2.lnurlBech32,
         recipientPk: t2.pk, eventId: t2.eventId || null, moment: t2.moment, comment: '',
-        signFn: (partial) => wallet.nostrSign(partial),
+        signFn: sign,
       });
     }
     const invoice = await requestInvoice(p, { amountMsat: msat, zapRequest, lnurlBech32: t2.lnurlBech32 });
@@ -272,10 +283,11 @@ export function zapsFeature(ctx) {
       let zapRequest = null;
       const canZap = p.allowsNostr && z.target.pk && wallet.nostrSign;
       if (canZap) {
-        zapRequest = buildZapRequest({
+        const sign = await zapSigner();
+        zapRequest = await buildZapRequest({
           amountMsat: msat, relays: wallet.nostrRelays(), lnurlBech32: z.target.lnurlBech32,
           recipientPk: z.target.pk, eventId: z.target.eventId || null, moment: z.target.moment, comment: z.comment,
-          signFn: (partial) => wallet.nostrSign(partial),
+          signFn: sign,
         });
       }
       const invoice = await requestInvoice(p, { amountMsat: msat, zapRequest, lnurlBech32: z.target.lnurlBech32, comment: z.comment });