From 7d0bc3ddf661420ea65e72d95633a23a1bff1641 Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 18 Nov 2025 17:25:32 -0600
Subject: [PATCH 1/2] Show the currently selected account in the menu

This is a regression. Showing the current account means you always see
the same items in this menu section as you move back and forth
---
 app/views/my/menus/show.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/my/menus/show.html.erb b/app/views/my/menus/show.html.erb
index f4ab9fa86..ee0f0287b 100644
--- a/app/views/my/menus/show.html.erb
+++ b/app/views/my/menus/show.html.erb
@@ -61,12 +61,12 @@
       <% end %>
     <% end %>
 
-    <% accounts = Current.identity.accounts.where.not(id: Current.account) %>
-    <% if accounts.any? %>
+    <% accounts = Current.identity.accounts %>
+    <% if accounts.many? %>
       <% cache [ Current.identity, accounts ] do %>
         <%= collapsible_nav_section "Accounts" do %>
           <% accounts.each do |account| %>
-            <%= filter_place_menu_item landing_url(script_name: account.slug), account.name, "marker", new_window: true %>
+            <%= filter_place_menu_item landing_url(script_name: account.slug), account.name, "marker", new_window: true, current: account == Current.account %>
           <% end %>
         <% end %>
       <% end %>

From e9819000b6bc7f9896c0106153dd81497c4dd75a Mon Sep 17 00:00:00 2001
From: Jason Zimdars <jz@37signals.com>
Date: Tue, 18 Nov 2025 17:26:40 -0600
Subject: [PATCH 2/2] We can simplify this now

---
 app/views/my/menus/_jump.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/my/menus/_jump.html.erb b/app/views/my/menus/_jump.html.erb
index 5e627784e..e35d03105 100644
--- a/app/views/my/menus/_jump.html.erb
+++ b/app/views/my/menus/_jump.html.erb
@@ -1,7 +1,7 @@
 <div class="flex gap">
   <div class="flex flex-column full-width justify-center gap-half">
     <div class="nav__header">
-      <% if Current.user.identity.users.many? %>
+      <% if Current.identity.accounts.many? %>
         <div class="nav__header-title max-width">
           <div class="overflow-ellipsis"><strong><%= Current.account.name %></strong></div>
         </div>