From a5acae14e6f7abff728d0269ed283ec44cd14be5 Mon Sep 17 00:00:00 2001
From: Jonathan Staab <shtaab@gmail.com>
Date: Fri, 3 Mar 2023 16:30:11 -0600
Subject: [PATCH] Some PR cleanup

---
 ROADMAP.md        |  1 +
 src/agent/sync.ts | 17 +++++++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index 24adff64..1f922749 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,5 +1,6 @@
 # Current
 
+- [ ] Show loading/success on zap invoice screen
 - [ ] Fix iOS/safari/firefox
 - [ ] Add dynamic title tag
 - [ ] Show more link on long notes (rather than just an ellipsis)
diff --git a/src/agent/sync.ts b/src/agent/sync.ts
index bdfdbfc1..9a56623d 100644
--- a/src/agent/sync.ts
+++ b/src/agent/sync.ts
@@ -307,28 +307,25 @@ const verifyNip05 = (pubkey, as) =>
   }, noop)
 
 const verifyZapper = async (pubkey, address) => {
-  let url
+  let url, zapper, lnurl
+
+  // Try to parse it as a lud06 LNURL or as a lud16 address
   if (address.startsWith('lnurl1')) {
-    // Try to parse it as a lud06 LNURL
     url = lnurlDecode(address)
-    const lnurl = address
   } else if (address.includes('@')) {
-    // Otherwise try to parse it as a lud16 address
     const [name, domain] = address.split('@')
 
-    if (!domain || !name) {
-      return
+    if (domain && name) {
+      url = `https://${domain}/.well-known/lnurlp/${name}`
     }
+  }
 
-    url = `https://${domain}/.well-known/lnurlp/${name}`
-  } else {
-    // Otherwise this is not valid
+  if (!url) {
     return
   }
 
   const res = await tryFetch(() => fetch(url))
 
-  let zapper
   if (res) {
     zapper = await res.json()
     lnurl = lnurlEncode('lnurl', url)