Skip to content

Commit 289ee72

Browse files
committed
feat(webapp): show the collapsed Account submenu at the bottom of the org menu
Moves the "Account" submenu shown on the collapsed rail from the top of the org popover to the bottom, with the divider now above it instead of below.
1 parent b06d18e commit 289ee72

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

apps/webapp/app/components/navigation/SideMenu.tsx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,17 +1289,6 @@ function OrgSelector({
12891289
align="start"
12901290
style={{ maxHeight: `calc(var(--radix-popover-content-available-height) - 10vh)` }}
12911291
>
1292-
{/*
1293-
When collapsed the standalone account button is hidden, so surface the account menu here
1294-
as a submenu at the top of the org popover (the only always-reachable menu on the rail).
1295-
*/}
1296-
{isCollapsed && (
1297-
<div className="border-b border-grid-bright p-1">
1298-
<SideMenuPopoverSubMenu title="Account" icon={<UserProfilePhoto className="size-5" />}>
1299-
<AccountMenuItems isAdmin={isAdmin} isImpersonating={isImpersonating} />
1300-
</SideMenuPopoverSubMenu>
1301-
</div>
1302-
)}
13031292
<div className="flex flex-col gap-1 p-1">
13041293
<PopoverMenuItem
13051294
to={organizationSettingsPath(organization)}
@@ -1389,6 +1378,17 @@ function OrgSelector({
13891378
/>
13901379
)}
13911380
</div>
1381+
{/*
1382+
When collapsed the standalone account button is hidden, so surface the account menu here
1383+
as a submenu at the bottom of the org popover (the only always-reachable menu on the rail).
1384+
*/}
1385+
{isCollapsed && (
1386+
<div className="border-t border-grid-bright p-1">
1387+
<SideMenuPopoverSubMenu title="Account" icon={<UserProfilePhoto className="size-5" />}>
1388+
<AccountMenuItems isAdmin={isAdmin} isImpersonating={isImpersonating} />
1389+
</SideMenuPopoverSubMenu>
1390+
</div>
1391+
)}
13921392
</PopoverContent>
13931393
</Popover>
13941394
);

0 commit comments

Comments
 (0)