From 53d2893b8a4d6617d6e501d3d5827801f83ca4d4 Mon Sep 17 00:00:00 2001
From: triesap <tyson@radroots.org>
Date: Wed, 18 Feb 2026 22:49:14 +0000
Subject: [PATCH 1/4] Fix wallet status when wallet is unreachable

---
 src/routes/settings/wallet/+page.svelte | 144 +++++++++++++++++++-----
 1 file changed, 116 insertions(+), 28 deletions(-)

diff --git a/src/routes/settings/wallet/+page.svelte b/src/routes/settings/wallet/+page.svelte
index fce83dbc..dfc4e65a 100644
--- a/src/routes/settings/wallet/+page.svelte
+++ b/src/routes/settings/wallet/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import {nwc} from "@getalby/sdk"
+  import cx from "classnames"
   import {LOCALE} from "@welshman/lib"
   import {displayRelayUrl, isNWCWallet, fromMsats} from "@welshman/util"
   import {session, pubkey, profilesByPubkey} from "@welshman/app"
@@ -13,7 +13,7 @@
   import WalletDisconnect from "@app/components/WalletDisconnect.svelte"
   import WalletUpdateReceivingAddress from "@app/components/WalletUpdateReceivingAddress.svelte"
   import {pushModal} from "@app/util/modal"
-  import {getWebLn} from "@app/core/commands"
+  import {getNwcClient, getWebLn} from "@app/core/commands"
   import Wallet2 from "@assets/icons/wallet.svg?dataurl"
   import CheckCircle from "@assets/icons/check-circle.svg?dataurl"
   import AddCircle from "@assets/icons/add-circle.svg?dataurl"
@@ -40,6 +40,67 @@
       pushModal(WalletConnect)
     }
   }
+
+  const withTimeout = async (promise: Promise<unknown>, timeoutMs: number) => {
+    let timeoutId: ReturnType<typeof setTimeout> | undefined
+
+    try {
+      return await Promise.race([
+        promise,
+        new Promise((_, reject) => {
+          timeoutId = setTimeout(() => reject(new Error("Wallet check timed out")), timeoutMs)
+        }),
+      ])
+    } finally {
+      if (timeoutId) {
+        clearTimeout(timeoutId)
+      }
+    }
+  }
+
+  const checkNwcStatus = async () => {
+    try {
+      await withTimeout(getNwcClient().getInfo(), 5000)
+      return "connected" as const
+    } catch (error) {
+      console.warn("NWC wallet unavailable", error)
+      return "unavailable" as const
+    }
+  }
+
+  let walletStatus = $state<"checking" | "connected" | "unavailable">("checking")
+  let walletStatusRequestId = 0
+
+  const isWalletAvailable = $derived(Boolean($session?.wallet) && walletStatus === "connected")
+  const statusClass = $derived(
+    cx("flex items-center gap-2 text-sm", {
+      "text-success": walletStatus === "connected",
+      "text-warning": walletStatus === "unavailable",
+    }),
+  )
+  const connectionVerb = $derived(walletStatus === "connected" ? "Connected to" : "Configured for")
+
+  $effect(() => {
+    const wallet = $session?.wallet
+
+    if (!wallet) {
+      walletStatus = "checking"
+      return
+    }
+
+    const requestId = ++walletStatusRequestId
+
+    walletStatus = "checking"
+
+    void (async () => {
+      const nextStatus =
+        wallet.type === "nwc" ? await checkNwcStatus() : getWebLn() ? "connected" : "unavailable"
+
+      if (requestId === walletStatusRequestId) {
+        walletStatus = nextStatus
+      }
+    })()
+  })
 </script>
 
 <div class="content column gap-4">
@@ -50,9 +111,17 @@
         Wallet
       </strong>
       {#if $session?.wallet}
-        <div class="flex items-center gap-2 text-sm text-success">
-          <Icon icon={CheckCircle} size={4} />
-          Connected
+        <div class={statusClass}>
+          {#if walletStatus === "checking"}
+            <span class="loading loading-spinner loading-xs"></span>
+            Checking
+          {:else if walletStatus === "connected"}
+            <Icon icon={CheckCircle} size={4} />
+            Connected
+          {:else}
+            <Icon icon={InfoCircle} size={4} />
+            Unavailable
+          {/if}
         </div>
       {:else}
         <Button class="btn btn-primary btn-sm" onclick={connect}>
@@ -67,39 +136,54 @@
           {@const {node, version} = $session.wallet.info}
           <div class="flex flex-col justify-between gap-2 lg:flex-row">
             <p>
-              Connected to <strong>{node?.alias || version || "unknown wallet"}</strong>
+              {connectionVerb} <strong>{node?.alias || version || "unknown wallet"}</strong>
               via <strong>{$session.wallet.type}</strong>
             </p>
             <p class="flex gap-2 whitespace-nowrap">
-              Balance:
-              {#await getWebLn()
-                ?.enable()
-                .then(() => getWebLn().getBalance())}
+              {#if walletStatus === "connected"}
+                Balance:
+                {#await getWebLn()
+                  ?.enable()
+                  .then(() => getWebLn().getBalance())}
+                  <span class="loading loading-spinner loading-sm"></span>
+                {:then res}
+                  {new Intl.NumberFormat(LOCALE).format(res?.balance || 0)}
+                {:catch}
+                  [unknown]
+                {/await}
+                sats
+              {:else if walletStatus === "checking"}
+                Balance:
                 <span class="loading loading-spinner loading-sm"></span>
-              {:then res}
-                {new Intl.NumberFormat(LOCALE).format(res?.balance || 0)}
-              {:catch}
-                [unknown]
-              {/await}
-              sats
+              {:else}
+                Balance unavailable
+              {/if}
             </p>
           </div>
         {:else if $session.wallet.type === "nwc"}
-          {@const {lud16, relayUrl, nostrWalletConnectUrl} = $session.wallet.info}
+          {@const {lud16, relayUrl} = $session.wallet.info}
           <div class="flex flex-col justify-between gap-2 lg:flex-row">
             <p>
-              Connected to <strong>{lud16}</strong> via <strong>{displayRelayUrl(relayUrl)}</strong>
+              {connectionVerb} <strong>{lud16}</strong> via
+              <strong>{displayRelayUrl(relayUrl)}</strong>
             </p>
             <p class="flex gap-2 whitespace-nowrap">
-              Balance:
-              {#await new nwc.NWCClient({nostrWalletConnectUrl}).getBalance()}
+              {#if walletStatus === "connected"}
+                Balance:
+                {#await getNwcClient().getBalance()}
+                  <span class="loading loading-spinner loading-sm"></span>
+                {:then res}
+                  {new Intl.NumberFormat(LOCALE).format(fromMsats(res?.balance || 0))}
+                {:catch}
+                  [unknown]
+                {/await}
+                sats
+              {:else if walletStatus === "checking"}
+                Balance:
                 <span class="loading loading-spinner loading-sm"></span>
-              {:then res}
-                {new Intl.NumberFormat(LOCALE).format(fromMsats(res?.balance || 0))}
-              {:catch}
-                [unknown]
-              {/await}
-              sats
+              {:else}
+                Balance unavailable
+              {/if}
             </p>
           </div>
         {/if}
@@ -109,13 +193,17 @@
             Disconnect Wallet
           </Button>
           <div class="flex w-full gap-4 lg:w-auto">
-            <Button class="btn btn-primary btn-sm flex-1 justify-center lg:flex-none" onclick={pay}>
+            <Button
+              class="btn btn-primary btn-sm flex-1 justify-center lg:flex-none"
+              onclick={pay}
+              disabled={!isWalletAvailable}>
               <Icon icon={UploadMinimalistic} />
               Send
             </Button>
             <Button
               class="btn btn-secondary btn-sm flex-1 justify-center lg:flex-none"
-              onclick={receive}>
+              onclick={receive}
+              disabled={!isWalletAvailable}>
               <Icon icon={DownloadMinimalistic} />
               Receive
             </Button>
-- 
2.52.0


From e24d51310ecb325764372ad2e1d1b93faf8d111e Mon Sep 17 00:00:00 2001
From: triesap <tyson@radroots.org>
Date: Wed, 18 Feb 2026 22:56:12 +0000
Subject: [PATCH 2/4] Add wallet status retry and WebLN probe

---
 src/routes/settings/wallet/+page.svelte | 31 ++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/routes/settings/wallet/+page.svelte b/src/routes/settings/wallet/+page.svelte
index dfc4e65a..ff7292c9 100644
--- a/src/routes/settings/wallet/+page.svelte
+++ b/src/routes/settings/wallet/+page.svelte
@@ -68,6 +68,22 @@
     }
   }
 
+  const checkWebLnStatus = async () => {
+    const webLn = getWebLn()
+
+    if (!webLn) {
+      return "unavailable" as const
+    }
+
+    try {
+      await withTimeout(webLn.getInfo(), 5000)
+      return "connected" as const
+    } catch (error) {
+      console.warn("WebLN wallet unavailable", error)
+      return "unavailable" as const
+    }
+  }
+
   let walletStatus = $state<"checking" | "connected" | "unavailable">("checking")
   let walletStatusRequestId = 0
 
@@ -80,7 +96,7 @@
   )
   const connectionVerb = $derived(walletStatus === "connected" ? "Connected to" : "Configured for")
 
-  $effect(() => {
+  const startWalletStatusCheck = () => {
     const wallet = $session?.wallet
 
     if (!wallet) {
@@ -93,13 +109,19 @@
     walletStatus = "checking"
 
     void (async () => {
-      const nextStatus =
-        wallet.type === "nwc" ? await checkNwcStatus() : getWebLn() ? "connected" : "unavailable"
+      const nextStatus = wallet.type === "nwc" ? await checkNwcStatus() : await checkWebLnStatus()
 
       if (requestId === walletStatusRequestId) {
         walletStatus = nextStatus
       }
     })()
+  }
+
+  const retryStatus = () => startWalletStatusCheck()
+
+  $effect(() => {
+    $session?.wallet
+    startWalletStatusCheck()
   })
 </script>
 
@@ -122,6 +144,9 @@
             <Icon icon={InfoCircle} size={4} />
             Unavailable
           {/if}
+          {#if walletStatus === "unavailable"}
+            <Button class="btn btn-ghost btn-xs" onclick={retryStatus}>Retry</Button>
+          {/if}
         </div>
       {:else}
         <Button class="btn btn-primary btn-sm" onclick={connect}>
-- 
2.52.0


From a58e930216a27574bd4b1e12188508582d94d667 Mon Sep 17 00:00:00 2001
From: triesap <tyson@radroots.org>
Date: Wed, 18 Feb 2026 23:06:42 +0000
Subject: [PATCH 3/4] Remove wallet status retry

---
 src/routes/settings/wallet/+page.svelte | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/routes/settings/wallet/+page.svelte b/src/routes/settings/wallet/+page.svelte
index ff7292c9..6ef7776a 100644
--- a/src/routes/settings/wallet/+page.svelte
+++ b/src/routes/settings/wallet/+page.svelte
@@ -96,9 +96,7 @@
   )
   const connectionVerb = $derived(walletStatus === "connected" ? "Connected to" : "Configured for")
 
-  const startWalletStatusCheck = () => {
-    const wallet = $session?.wallet
-
+  const startWalletStatusCheck = (wallet = $session?.wallet) => {
     if (!wallet) {
       walletStatus = "checking"
       return
@@ -117,11 +115,8 @@
     })()
   }
 
-  const retryStatus = () => startWalletStatusCheck()
-
   $effect(() => {
-    $session?.wallet
-    startWalletStatusCheck()
+    startWalletStatusCheck($session?.wallet)
   })
 </script>
 
@@ -144,9 +139,6 @@
             <Icon icon={InfoCircle} size={4} />
             Unavailable
           {/if}
-          {#if walletStatus === "unavailable"}
-            <Button class="btn btn-ghost btn-xs" onclick={retryStatus}>Retry</Button>
-          {/if}
         </div>
       {:else}
         <Button class="btn btn-primary btn-sm" onclick={connect}>
-- 
2.52.0


From 39c6a332731da6576e173ac375ae034b2e6b9d07 Mon Sep 17 00:00:00 2001
From: triesap <tyson@radroots.org>
Date: Thu, 19 Feb 2026 00:39:30 +0000
Subject: [PATCH 4/4] Simplify wallet status probe

---
 src/routes/settings/wallet/+page.svelte | 63 +++++++------------------
 1 file changed, 16 insertions(+), 47 deletions(-)

diff --git a/src/routes/settings/wallet/+page.svelte b/src/routes/settings/wallet/+page.svelte
index 6ef7776a..b5558d7e 100644
--- a/src/routes/settings/wallet/+page.svelte
+++ b/src/routes/settings/wallet/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import cx from "classnames"
-  import {LOCALE} from "@welshman/lib"
+  import {LOCALE, always, call, sleep} from "@welshman/lib"
   import {displayRelayUrl, isNWCWallet, fromMsats} from "@welshman/util"
   import {session, pubkey, profilesByPubkey} from "@welshman/app"
   import DownloadMinimalistic from "@assets/icons/download-minimalistic.svg?dataurl"
@@ -41,49 +41,6 @@
     }
   }
 
-  const withTimeout = async (promise: Promise<unknown>, timeoutMs: number) => {
-    let timeoutId: ReturnType<typeof setTimeout> | undefined
-
-    try {
-      return await Promise.race([
-        promise,
-        new Promise((_, reject) => {
-          timeoutId = setTimeout(() => reject(new Error("Wallet check timed out")), timeoutMs)
-        }),
-      ])
-    } finally {
-      if (timeoutId) {
-        clearTimeout(timeoutId)
-      }
-    }
-  }
-
-  const checkNwcStatus = async () => {
-    try {
-      await withTimeout(getNwcClient().getInfo(), 5000)
-      return "connected" as const
-    } catch (error) {
-      console.warn("NWC wallet unavailable", error)
-      return "unavailable" as const
-    }
-  }
-
-  const checkWebLnStatus = async () => {
-    const webLn = getWebLn()
-
-    if (!webLn) {
-      return "unavailable" as const
-    }
-
-    try {
-      await withTimeout(webLn.getInfo(), 5000)
-      return "connected" as const
-    } catch (error) {
-      console.warn("WebLN wallet unavailable", error)
-      return "unavailable" as const
-    }
-  }
-
   let walletStatus = $state<"checking" | "connected" | "unavailable">("checking")
   let walletStatusRequestId = 0
 
@@ -106,13 +63,25 @@
 
     walletStatus = "checking"
 
-    void (async () => {
-      const nextStatus = wallet.type === "nwc" ? await checkNwcStatus() : await checkWebLnStatus()
+    call(async () => {
+      const webLn = getWebLn()
+      const nextStatus =
+        wallet.type === "nwc"
+          ? await Promise.race([
+              getNwcClient().getInfo().then(always("connected")).catch(always("unavailable")),
+              sleep(5000).then(always("unavailable")),
+            ])
+          : webLn
+            ? await Promise.race([
+                webLn.getInfo().then(always("connected")).catch(always("unavailable")),
+                sleep(5000).then(always("unavailable")),
+              ])
+            : "unavailable"
 
       if (requestId === walletStatusRequestId) {
         walletStatus = nextStatus
       }
-    })()
+    })
   }
 
   $effect(() => {
-- 
2.52.0