From f2eff7fa8d29d53b31683ad0eedf39393e7ce887 Mon Sep 17 00:00:00 2001
From: Silberengel <silberengel7@protonmail.com>
Date: Mon, 8 Jun 2026 17:46:51 +0200
Subject: [PATCH] reinstate browser extension login on mobile

---
 package-lock.json                            |  4 +--
 package.json                                 |  2 +-
 src/components/AccountManager/index.tsx      |  4 ++-
 src/hooks/useNip07ExtensionAvailable.ts      | 34 ++++++++++++++++++++
 src/providers/NostrProvider/nip-07.signer.ts | 14 ++++----
 5 files changed, 47 insertions(+), 11 deletions(-)
 create mode 100644 src/hooks/useNip07ExtensionAvailable.ts

diff --git a/package-lock.json b/package-lock.json
index 7330379f..bd2ee20a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "imwald",
-  "version": "23.21.6",
+  "version": "23.21.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "imwald",
-      "version": "23.21.6",
+      "version": "23.21.7",
       "license": "MIT",
       "dependencies": {
         "@asciidoctor/core": "^3.0.4",
diff --git a/package.json b/package.json
index 755ba63d..9d9f645e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "imwald",
-  "version": "23.21.6",
+  "version": "23.21.7",
   "description": "Imwald — a user-friendly Nostr client focused on relay feed browsing, publications, and relay discovery",
   "private": true,
   "type": "module",
diff --git a/src/components/AccountManager/index.tsx b/src/components/AccountManager/index.tsx
index e7e5e763..2840301e 100644
--- a/src/components/AccountManager/index.tsx
+++ b/src/components/AccountManager/index.tsx
@@ -2,6 +2,7 @@ import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
 import { Separator } from '@/components/ui/separator'
+import { useNip07ExtensionAvailable } from '@/hooks/useNip07ExtensionAvailable'
 import { useNostr } from '@/providers/NostrProvider'
 import { generateSecretKey } from 'nostr-tools'
 import { nsecEncode } from 'nostr-tools/nip19'
@@ -44,6 +45,7 @@ function AccountManagerNav({
   const { t } = useTranslation()
   const { nip07Login, nsecLogin, accounts, isNip07LoginInFlight, requestAccountNetworkHydrate } =
     useNostr()
+  const nip07ExtensionAvailable = useNip07ExtensionAvailable()
   const [password, setPassword] = useState('')
   const [signingUp, setSigningUp] = useState(false)
   const [extensionLoginPending, setExtensionLoginPending] = useState(false)
@@ -84,7 +86,7 @@ function AccountManagerNav({
           {t('Add an Account')}
         </div>
         <div className="space-y-2 mt-4">
-          {!!window.nostr && (
+          {nip07ExtensionAvailable && (
             <Button
               onClick={() => void handleExtensionLogin()}
               disabled={extensionLoginPending || isNip07LoginInFlight}
diff --git a/src/hooks/useNip07ExtensionAvailable.ts b/src/hooks/useNip07ExtensionAvailable.ts
new file mode 100644
index 00000000..99e3a505
--- /dev/null
+++ b/src/hooks/useNip07ExtensionAvailable.ts
@@ -0,0 +1,34 @@
+import {
+  NIP07_INJECT_CHECK_INTERVAL_MS,
+  NIP07_INJECT_MAX_ATTEMPTS
+} from '@/providers/NostrProvider/nip-07.signer'
+import { useEffect, useState } from 'react'
+
+/**
+ * True once a NIP-07 browser extension has injected `window.nostr`.
+ * Polls briefly — mobile browsers often expose the API after first paint.
+ */
+export function useNip07ExtensionAvailable(): boolean {
+  const [available, setAvailable] = useState(() => !!window.nostr)
+
+  useEffect(() => {
+    if (available) return
+
+    let attempt = 0
+    const id = window.setInterval(() => {
+      if (window.nostr) {
+        setAvailable(true)
+        window.clearInterval(id)
+        return
+      }
+      attempt += 1
+      if (attempt >= NIP07_INJECT_MAX_ATTEMPTS) {
+        window.clearInterval(id)
+      }
+    }, NIP07_INJECT_CHECK_INTERVAL_MS)
+
+    return () => window.clearInterval(id)
+  }, [available])
+
+  return available
+}
diff --git a/src/providers/NostrProvider/nip-07.signer.ts b/src/providers/NostrProvider/nip-07.signer.ts
index 41f4978a..ed6b9207 100644
--- a/src/providers/NostrProvider/nip-07.signer.ts
+++ b/src/providers/NostrProvider/nip-07.signer.ts
@@ -1,6 +1,11 @@
 import { pubkeyFromNip07Extension } from '@/lib/pubkey'
 import { ISigner, TDraftEvent, TNip07 } from '@/types'
 
+/** Poll interval while waiting for a NIP-07 extension to inject `window.nostr`. */
+export const NIP07_INJECT_CHECK_INTERVAL_MS = 100
+/** Some mobile browsers inject the extension API well after first paint. */
+export const NIP07_INJECT_MAX_ATTEMPTS = 120
+
 /** Fresh extension pubkey (hex), after init + optional enable. */
 export async function getExtensionPubkeyHex(): Promise<string> {
   const signer = new Nip07Signer()
@@ -22,12 +27,7 @@ export class Nip07Signer implements ISigner {
   private pubkey: string | null = null
 
   async init() {
-    const checkInterval = 100
-    // Some browser extensions inject `window.nostr` a bit later during startup/reload.
-    // Keep waiting longer to avoid false "no signer extension" failures on session restore.
-    const maxAttempts = 120
-
-    for (let attempt = 0; attempt < maxAttempts; attempt++) {
+    for (let attempt = 0; attempt < NIP07_INJECT_MAX_ATTEMPTS; attempt++) {
       if (window.nostr) {
         this.signer = window.nostr
         if (typeof this.signer.enable === 'function') {
@@ -35,7 +35,7 @@ export class Nip07Signer implements ISigner {
         }
         return
       }
-      await new Promise((resolve) => setTimeout(resolve, checkInterval))
+      await new Promise((resolve) => setTimeout(resolve, NIP07_INJECT_CHECK_INTERVAL_MS))
     }
 
     throw new Error(