From 56915dbb69fd222ad2669a9ba89cd1af062cf28b Mon Sep 17 00:00:00 2001
From: thePR0M3TH3AN <53631862+PR0M3TH3AN@users.noreply.github.com>
Date: Tue, 21 Oct 2025 22:43:52 -0400
Subject: [PATCH] Fix NIP-46 pairing flow

---
 components/login-modal.html | 10 ++++++--
 js/nostr.js                 | 47 +++++++++++++++++++++++++++++++++++--
 2 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/components/login-modal.html b/components/login-modal.html
index 61d5aff1..83c2baf4 100644
--- a/components/login-modal.html
+++ b/components/login-modal.html
@@ -9,7 +9,10 @@
 >
   <div class="bv-modal-backdrop" data-dismiss></div>
 
-  <div class="modal-sheet max-h-modal-shell overflow-hidden" tabindex="-1">
+  <div
+    class="modal-sheet max-h-modal-shell flex min-h-0 flex-col overflow-hidden"
+    tabindex="-1"
+  >
     <!-- Header with the special exit button (unchanged) -->
     <div class="modal-header">
       <h2 id="loginModalTitle" class="text-xl font-bold text-text">
@@ -37,7 +40,10 @@
     </div>
 
     <!-- Body -->
-    <div id="loginModalDescription" class="modal-body space-y-6 overflow-y-auto">
+    <div
+      id="loginModalDescription"
+      class="modal-body flex-1 space-y-6 overflow-y-auto"
+    >
       <div class="space-y-2 text-left">
         <p class="text-sm text-text-muted">
           Choose how you'd like to sign in. Connect a browser extension, link a
diff --git a/js/nostr.js b/js/nostr.js
index 7b9d6c8a..abfc241a 100644
--- a/js/nostr.js
+++ b/js/nostr.js
@@ -4993,6 +4993,49 @@ export class NostrClient {
 
     const waitTimeout = Number.isFinite(timeoutMs) && timeoutMs > 0 ? timeoutMs : NIP46_HANDSHAKE_TIMEOUT_MS;
 
+    const coerceStructuredString = (value) => {
+      if (typeof value === "string") {
+        return value.trim();
+      }
+      if (Array.isArray(value)) {
+        for (const entry of value) {
+          const candidate = coerceStructuredString(entry);
+          if (candidate) {
+            return candidate;
+          }
+        }
+        return "";
+      }
+      if (value && typeof value === "object") {
+        const preferredKeys = [
+          "secret",
+          "message",
+          "status",
+          "reason",
+          "detail",
+          "description",
+          "value",
+          "result",
+          "url",
+        ];
+        for (const key of preferredKeys) {
+          if (Object.prototype.hasOwnProperty.call(value, key)) {
+            const candidate = coerceStructuredString(value[key]);
+            if (candidate) {
+              return candidate;
+            }
+          }
+        }
+        for (const entry of Object.values(value)) {
+          const candidate = coerceStructuredString(entry);
+          if (candidate) {
+            return candidate;
+          }
+        }
+      }
+      return "";
+    };
+
     return new Promise((resolve, reject) => {
       let settled = false;
       const cleanup = () => {
@@ -5051,8 +5094,8 @@ export class NostrClient {
               return;
             }
 
-            const resultValue = typeof parsed?.result === "string" ? parsed.result.trim() : "";
-            const errorValue = typeof parsed?.error === "string" ? parsed.error.trim() : "";
+            const resultValue = coerceStructuredString(parsed?.result);
+            const errorValue = coerceStructuredString(parsed?.error);
 
             if (resultValue === "auth_url" && errorValue) {
               if (typeof onAuthUrl === "function") {