1 files changed, 15 insertions, 0 deletions
diff --git a/src/app.js b/src/app.js
index 47f37fa..5ea8eec 100644
--- a/src/app.js
+++ b/src/app.js
@@ -856,6 +856,7 @@ function enterOfflineFallback() {
   wallet.setOffline(true);
   wallet.deriveWindow(40);
   ui.offlineFallback = true;
+  ui.claimChecking = false; // can't verify a gift offline; don't hang on the loader
   ui.tab = 'settings';
   render();
 }
@@ -1518,6 +1519,20 @@ function claimScreen() {
       )
     );
   }
+  // While verifying the gift is still unclaimed, show a loading screen rather
+  // than flashing the claimable amount (which would then jump to "already
+  // claimed" for a spent gift).
+  if (ui.claimChecking) {
+    return h(
+      'div',
+      { class: 'col', style: 'gap:16px' },
+      brandHeader(false),
+      h('div', { class: 'card col', style: 'align-items:center;text-align:center;gap:14px;padding:32px 14px' },
+        h('span', { class: 'spinner' }),
+        h('p', { class: 'muted', style: 'margin:0' }, t('giftChecking'))
+      )
+    );
+  }
   // Already claimed (funding coin spent, possibly only in the mempool) — show a
   // dead end with a link to the claim, instead of a claimable amount.
   if (ui.claimTaken) {