1 files changed, 25 insertions, 12 deletions

diff --git a/src/features/nostrlogin.js b/src/features/nostrlogin.js
index 83144cd..4a811fc 100644
--- a/src/features/nostrlogin.js
+++ b/src/features/nostrlogin.js
@@ -364,6 +364,11 @@ export function nostrLoginFeature(ctx) {
       await run(() => keySigner(sk));
     } catch (e) {
       if (/derive a wallet key/.test(e.message) || e.message === pass.LOCK_PASSKEY) { ui.nostrLoginError = e.message; render(); return; }
+      // Only "no passkey here" (NotAllowedError, as browsers report it) rolls
+      // into creating one; anything else is a failure to show, not a reason
+      // to make a second passkey (the Beta's "RP ID cannot be validated" went
+      // on to fail a create too, 2026-11-06).
+      if (e && e.name && e.name !== 'NotAllowedError') { ui.nostrLoginError = e.message || String(e); render(); return; }
       try {
         const sk = await pass.passkeyCreate();
         await run(() => keySigner(sk));
@@ -422,21 +427,25 @@ export function nostrLoginFeature(ctx) {
         h('button', { class: 'btn-sm', type: 'button', onClick: () => { if (amberDeliver(e.text)) e.text = ''; else { ui.nostrLoginError = t('nlAmberBadPaste'); render(); } } }, t('nlAmberPasteBtn'))),
       h('button', { class: 'btn-ghost btn-sm', type: 'button', onClick: () => amberCancel() }, t('cancel')));
   }
-  function externalButtons(run, big = false) {
+  // passkeyFirst: the front door lists the passkey right under the seed
+  // phrase, before Google (Adam, 2026-11-06)
+  // short: under a "Sign in" heading the buttons just name the way in
+  function externalButtons(run, big = false, passkeyFirst = false, short = false) {
     const hasPasskey = typeof window !== 'undefined' && !!window.PublicKeyCredential && !!navigator.credentials;
     const pad = big ? 'padding:14px' : '';
-    return [
+    const google = [
       h('button', { class: 'btn-block', style: pad, disabled: ui.nostrLoginBusy,
         onClick: () => googleLogin(run) },
-        markedLabel(GOOGLE_MARK, t('nlGoogle'), ui.nostrLoginVia === 'google')),
+        markedLabel(GOOGLE_MARK, t(short ? 'doorGoogle' : 'nlGoogle'), ui.nostrLoginVia === 'google')),
       GOOGLE_CENTRAL !== GOOGLE_LEGACY
         ? h('button', { class: 'linklike small', style: 'align-self:center', disabled: ui.nostrLoginBusy, onClick: () => googleLogin(run, GOOGLE_LEGACY) }, t('nlGooglePrev'))
         : null,
-      hasPasskey
-        ? h('button', { class: 'btn-block', style: pad, disabled: ui.nostrLoginBusy,
-            onClick: () => passkeyLogin(run) }, markedLabel(PASSKEY_MARK, t('nlPasskey'), ui.nostrLoginVia === 'passkey'))
-        : null,
     ];
+    const passkey = hasPasskey
+      ? h('button', { class: 'btn-block', style: pad, disabled: ui.nostrLoginBusy,
+          onClick: () => passkeyLogin(run) }, markedLabel(PASSKEY_MARK, t(short ? 'doorPasskey' : 'nlPasskey'), ui.nostrLoginVia === 'passkey'))
+      : null;
+    return passkeyFirst ? [passkey, ...google] : [...google, passkey];
   }
 
   // The ways in, as buttons. `run` receives a signer factory. The expanded
@@ -852,9 +861,12 @@ export function nostrLoginFeature(ctx) {
         .catch(() => { _spendingHinted = false; });
       return true;
     },
-    frontDoorSignin() {
-      return h('div', { class: 'col', style: 'gap:8px' },
-        ...externalButtons(loginWith, true),
+    // The front door's ways in, loose: the page spaces them evenly with the
+    // seed-phrase and coinos.io doors around them (a wrapper of their own
+    // put 8px between these and 20px between them and the rest).
+    frontDoorSignin({ short = false } = {}) {
+      return [
+        ...externalButtons(loginWith, true, true, short),
         h('button', { class: 'btn-block', style: 'padding:14px', onClick: () => {
           if (ui.onb) ui.onb.step = 'signin';
           ui.nostrLoginOpen = true;
@@ -862,8 +874,9 @@ export function nostrLoginFeature(ctx) {
           render();
         } }, h('span', { style: 'display:flex;align-items:center;justify-content:center;gap:8px' },
           h('span', { style: 'display:flex;flex-shrink:0', html: OSTRICH }),
-          t('nlSignInNostr'))),
-        ui.nostrLoginError ? h('div', { class: 'notice err' }, ui.nostrLoginError) : null);
+          t(short ? 'doorNostr' : 'nlSignInNostr'))),
+        ui.nostrLoginError ? h('div', { class: 'notice err' }, ui.nostrLoginError) : null,
+      ].filter(Boolean);
     },
     nostrSettingsCards() { return [settingsCard()]; },
   };