From faca99fdd720c346ce39f1a924d8e3d35f1ac447 Mon Sep 17 00:00:00 2001
From: BrunoQuaresma <bruno_nonato_quaresma@hotmail.com>
Date: Wed, 19 Mar 2025 18:09:59 +0000
Subject: [PATCH] fix: show notifications on mobile

---
 .../modules/dashboard/Navbar/MobileMenu.tsx   |  3 +-
 .../modules/dashboard/Navbar/NavbarView.tsx   | 42 ++++++++++---------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/site/src/modules/dashboard/Navbar/MobileMenu.tsx b/site/src/modules/dashboard/Navbar/MobileMenu.tsx
index 3debc742a9a37..d973ed5f341c2 100644
--- a/site/src/modules/dashboard/Navbar/MobileMenu.tsx
+++ b/site/src/modules/dashboard/Navbar/MobileMenu.tsx
@@ -67,9 +67,8 @@ export const MobileMenu: FC<MobileMenuProps> = ({
 			<DropdownMenuTrigger asChild>
 				<Button
 					aria-label={open ? "Close menu" : "Open menu"}
-					size="lg"
+					size="icon-lg"
 					variant="subtle"
-					className="ml-auto md:hidden"
 				>
 					{open ? <XIcon /> : <MenuIcon />}
 				</Button>
diff --git a/site/src/modules/dashboard/Navbar/NavbarView.tsx b/site/src/modules/dashboard/Navbar/NavbarView.tsx
index 56ce03f342118..cb636e428e455 100644
--- a/site/src/modules/dashboard/Navbar/NavbarView.tsx
+++ b/site/src/modules/dashboard/Navbar/NavbarView.tsx
@@ -55,7 +55,7 @@ export const NavbarView: FC<NavbarViewProps> = ({
 
 			<NavItems className="ml-4" />
 
-			<div className=" hidden md:flex items-center gap-3 ml-auto">
+			<div className="hidden md:flex items-center gap-3 ml-auto">
 				{proxyContextValue && (
 					<ProxyMenu proxyContextValue={proxyContextValue} />
 				)}
@@ -67,6 +67,17 @@ export const NavbarView: FC<NavbarViewProps> = ({
 					canViewHealth={canViewHealth}
 				/>
 
+				{user && (
+					<UserDropdown
+						user={user}
+						buildInfo={buildInfo}
+						supportLinks={supportLinks}
+						onSignOut={onSignOut}
+					/>
+				)}
+			</div>
+
+			<div className="ml-auto flex items-center gap-3 md:hidden">
 				<NotificationsInbox
 					fetchNotifications={API.getInboxNotifications}
 					markAllAsRead={() => {
@@ -79,26 +90,17 @@ export const NavbarView: FC<NavbarViewProps> = ({
 					}
 				/>
 
-				{user && (
-					<UserDropdown
-						user={user}
-						buildInfo={buildInfo}
-						supportLinks={supportLinks}
-						onSignOut={onSignOut}
-					/>
-				)}
+				<MobileMenu
+					proxyContextValue={proxyContextValue}
+					user={user}
+					supportLinks={supportLinks}
+					onSignOut={onSignOut}
+					canViewAuditLog={canViewAuditLog}
+					canViewOrganizations={canViewOrganizations}
+					canViewDeployment={canViewDeployment}
+					canViewHealth={canViewHealth}
+				/>
 			</div>
-
-			<MobileMenu
-				proxyContextValue={proxyContextValue}
-				user={user}
-				supportLinks={supportLinks}
-				onSignOut={onSignOut}
-				canViewAuditLog={canViewAuditLog}
-				canViewOrganizations={canViewOrganizations}
-				canViewDeployment={canViewDeployment}
-				canViewHealth={canViewHealth}
-			/>
 		</div>
 	);
 };