From 6845e6cf7c7c2fefca85d2df02fbb688fe2d21cb Mon Sep 17 00:00:00 2001
From: Chad Curtis <chad@chadwick.site>
Date: Mon, 14 Jul 2025 13:50:22 +0000
Subject: [PATCH] Fallback to manual payment if webln fails - might be due to
 user intentionally closing out of it v2

---
 src/hooks/useZaps.ts | 43 ++++++++++++++++++++++++++++++-------------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/hooks/useZaps.ts b/src/hooks/useZaps.ts
index 91fdb09..4ed7162 100644
--- a/src/hooks/useZaps.ts
+++ b/src/hooks/useZaps.ts
@@ -262,23 +262,40 @@ export function useZaps(
                   variant: 'destructive',
                 });
               }
-            } else if (webln) {  // Try WebLN next
-              await webln.sendPayment(newInvoice);
+            }
+            
+            if (webln) {  // Try WebLN next
+              try {
+                await webln.sendPayment(newInvoice);
 
-              // Clear states immediately on success
-              setIsZapping(false);
-              setInvoice(null);
+                // Clear states immediately on success
+                setIsZapping(false);
+                setInvoice(null);
 
-              toast({
-                title: 'Zap successful!',
-                description: `You sent ${amount} sats to the author.`,
-              });
+                toast({
+                  title: 'Zap successful!',
+                  description: `You sent ${amount} sats to the author.`,
+                });
 
-              // Invalidate zap queries to refresh counts
-              queryClient.invalidateQueries({ queryKey: ['zaps'] });
+                // Invalidate zap queries to refresh counts
+                queryClient.invalidateQueries({ queryKey: ['zaps'] });
 
-              // Close dialog last to ensure clean state
-              onZapSuccess?.();
+                // Close dialog last to ensure clean state
+                onZapSuccess?.();
+              } catch (weblnError) {
+                console.error('webln payment failed, falling back:', weblnError);
+
+                // Show specific WebLN error to user for debugging
+                const errorMessage = weblnError instanceof Error ? weblnError.message : 'Unknown WebLN error';
+                toast({
+                  title: 'WebLN payment failed',
+                  description: `${errorMessage}. Falling back to other payment methods...`,
+                  variant: 'destructive',
+                });
+
+                setInvoice(newInvoice);
+                setIsZapping(false);
+              }
             } else { // Default - show QR code and manual Lightning URI
               setInvoice(newInvoice);
               setIsZapping(false);