From 77f407e06d21152546ccee3d8f4b21766d598c6f Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam@coinos.io>
Date: Sun, 1 Mar 2026 21:17:58 -0800
Subject: fix nip7 issue

---
 src/lib/nip07.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/lib/nip07.ts b/src/lib/nip07.ts
index ce1cddaf..be3f42e2 100644
--- a/src/lib/nip07.ts
+++ b/src/lib/nip07.ts
@@ -32,18 +32,6 @@ const tryNsecFromStorage = async (): Promise<Uint8Array | null> => {
 // Ensures we have access to a secret key, triggering the signer modal if needed.
 // Returns the sk as Uint8Array, or null if using NIP-07 extension.
 export const ensureSigner = async (userPubkey: string): Promise<Uint8Array | null> => {
-  // Check if NIP-07 extension is available and matches user
-  if (window.nostr) {
-    try {
-      const extPubkey = await window.nostr.getPublicKey();
-      if (extPubkey === userPubkey) {
-        return null; // Use NIP-07
-      }
-    } catch (e) {
-      // Extension didn't work, fall through to signer
-    }
-  }
-
   // Check if signer already has a valid sk (64 hex chars = 32 bytes)
   const currentSigner = get(signer);
   if (currentSigner?.ready && currentSigner?.params?.sk && currentSigner.params.sk.length === 64) {
@@ -54,6 +42,18 @@ export const ensureSigner = async (userPubkey: string): Promise<Uint8Array | nul
   const skFromStorage = await tryNsecFromStorage();
   if (skFromStorage) return skFromStorage;
 
+  // Fall back to NIP-07 extension if available and matches user
+  if (window.nostr) {
+    try {
+      const extPubkey = await window.nostr.getPublicKey();
+      if (extPubkey === userPubkey) {
+        return null; // Use NIP-07
+      }
+    } catch (e) {
+      // Extension didn't work, fall through to signer modal
+    }
+  }
+
   // Clear invalid signer state before triggering modal
   if (
     currentSigner?.ready &&
-- 
cgit v1.2.3