From 4583c4e02820db0406ce6bf957db59f82a9088e2 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Mon, 27 Oct 2025 13:36:29 -0700
Subject: [PATCH] fix zapper loading

---
 src/app/components/ZapButton.svelte | 30 +++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/app/components/ZapButton.svelte b/src/app/components/ZapButton.svelte
index 7f2ece4f..64ac9e21 100644
--- a/src/app/components/ZapButton.svelte
+++ b/src/app/components/ZapButton.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import type {Snippet} from "svelte"
   import type {TrustedEvent} from "@welshman/util"
-  import {session, deriveZapperForPubkey} from "@welshman/app"
+  import {session, loadZapperForPubkey} from "@welshman/app"
   import Button from "@lib/components/Button.svelte"
   import Zap from "@app/components/Zap.svelte"
   import InfoZapperError from "@app/components/InfoZapperError.svelte"
@@ -18,19 +18,29 @@
 
   const {url, event, children, replaceState, ...props}: Props = $props()
 
-  const zapper = deriveZapperForPubkey(event.pubkey)
+  const zapperPromise = loadZapperForPubkey(event.pubkey)
 
-  const onClick = () => {
-    if (!$zapper?.allowsNostr) {
-      pushModal(InfoZapperError, {url, pubkey: event.pubkey, eventId: event.id}, {replaceState})
-    } else if ($session?.wallet) {
-      pushModal(Zap, {url, pubkey: event.pubkey, eventId: event.id}, {replaceState})
-    } else {
-      pushModal(WalletConnect, {}, {replaceState})
+  const onClick = async () => {
+    loading = true
+
+    try {
+      const zapper = await zapperPromise
+
+      if (!zapper?.allowsNostr) {
+        pushModal(InfoZapperError, {url, pubkey: event.pubkey, eventId: event.id}, {replaceState})
+      } else if ($session?.wallet) {
+        pushModal(Zap, {url, pubkey: event.pubkey, eventId: event.id}, {replaceState})
+      } else {
+        pushModal(WalletConnect, {}, {replaceState})
+      }
+    } finally {
+      loading = false
     }
   }
+
+  let loading = $state(false)
 </script>
 
-<Button onclick={onClick} {...props}>
+<Button onclick={onClick} disabled={loading} {...props}>
   {@render children?.()}
 </Button>