From dc3123d5ab7066d29ce1e70e22b9f52dfc4a2c2c Mon Sep 17 00:00:00 2001
From: Paul Miller <paul@paul.lol>
Date: Wed, 26 Apr 2023 18:19:24 -0500
Subject: [PATCH] fix keysend clearing and prioritize invoice

---
 src/routes/Send.tsx | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/routes/Send.tsx b/src/routes/Send.tsx
index fff9baf..35bfe23 100644
--- a/src/routes/Send.tsx
+++ b/src/routes/Send.tsx
@@ -55,6 +55,7 @@ export default function Send() {
         setInvoice(undefined);
         setAddress(undefined);
         setDescription(undefined);
+        setNodePubkey(undefined);
         setFieldDestination("");
     }
 
@@ -79,16 +80,16 @@ export default function Send() {
             if (source.address) setAddress(source.address)
             if (source.memo) setDescription(source.memo);
 
-            if (source.node_pubkey) {
-                setAmountSats(source.amount_sats || 0n);
-                setNodePubkey(source.node_pubkey);
-                setSource("lightning")
-            } else if (source.invoice) {
+            if (source.invoice) {
                 state.node_manager?.decode_invoice(source.invoice).then(invoice => {
                     if (invoice?.amount_sats) setAmountSats(invoice.amount_sats);
                     setInvoice(invoice)
                     setSource("lightning")
                 });
+            } else if (source.node_pubkey) {
+                setAmountSats(source.amount_sats || 0n);
+                setNodePubkey(source.node_pubkey);
+                setSource("lightning")
             } else {
                 setAmountSats(source.amount_sats || 0n);
                 setSource("onchain")