1 files changed, 5 insertions, 19 deletions
diff --git a/src/app.js b/src/app.js
index 7dde883..5e3fba4 100644
--- a/src/app.js
+++ b/src/app.js
@@ -681,7 +681,11 @@ function renderInner() {
     ui.navAnimSkip = false;
   }
   applyAnim(screen, 'anim-page', (performance.now() - _navAt) < 340 ? performance.now() - _navAt : -1);
-  morphChildren(root, [screen, footer(), ...(ui.lightbox ? [imageViewer()] : [])]);
+  // The bottom nav rides every page of a signed-in wallet and a visitor's
+  // public pages — never over sign-in, onboarding or the lock prompt.
+  const navPage = ui.pubProf || (activeAccount() && ['wallet', 'accounts', 'accountSettings'].includes(ui.screen) && !(ui.onb || onbInProgress()));
+  const bottomNav = navPage && !lockAsk && !_bootDeciding ? featureHook('bottomNav') : null;
+  morphChildren(root, [screen, footer(), ...(bottomNav ? [bottomNav] : []), ...(ui.lightbox ? [imageViewer()] : [])]);
   promoteLazySrc(root); // sources on the nodes that actually made it into the page
   try { document.documentElement.classList.toggle('no-scroll', !!ui.lightbox); } catch {}
   if (fpath) {
@@ -2488,23 +2492,6 @@ function lockBtn() {
   }, h('span', { style: 'font-size:15px;line-height:1;margin-right:6px' }, locked ? '\u{1F512}' : '\u{1F513}'), locked ? t('unlock') : t('lockWallet'));
 }
 
-// Messages sit one tap away, left of the wallet selector. The dot is presence,
-// not a count — it says "someone's waiting", and the chat list says who.
-function messagesBtn() {
-  const me = (featureHook('nostrLoginIdentity') || {}).pubkey || (wallet.nostrPubkey && wallet.nostrPubkey());
-  if (!me) return null;
-  const unread = featureHook('unreadMessages') || 0;
-  return h('button', {
-    class: 'header-msgs' + (unread ? ' unread' : ''),
-    title: t('msgDmsTitle'),
-    'aria-label': t('msgDmsTitle'),
-    onClick: () => { clearFeatureNav(); ui.screen = 'wallet'; ui.chatOpen = true; ui.msgView = 'home'; render(); },
-  }, h('span', {
-    class: 'hm-ico',
-    html: '<svg width="21" height="21" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.9" stroke-linecap="round" stroke-linejoin="round"><path d="M21 11.5a8.38 8.38 0 0 1-.9 3.8 8.5 8.5 0 0 1-7.6 4.7 8.38 8.38 0 0 1-3.8-.9L3 21l1.9-5.7a8.38 8.38 0 0 1-.9-3.8 8.5 8.5 0 0 1 4.7-7.6 8.38 8.38 0 0 1 3.8-.9h.5a8.48 8.48 0 0 1 8 8v.5z"/></svg>',
-  }));
-}
-
 // Find anyone on nostr from the header — results open their profile.
 function searchBtn() {
   if (!featureHook('userSearchAvailable')) return null;
@@ -2539,7 +2526,6 @@ function brandHeader(withLock) {
     withLock
       ? h('div', { class: 'row gap6', style: 'align-items:center' },
           searchBtn(),
-          messagesBtn(),
           settingsBtn(),
           avatarMenu())
       : ui.pubProf && !acc ? visitorButtons() : null