From 3ab6e3921d1672fc36b27d9665c5a6d369eefa4e Mon Sep 17 00:00:00 2001
From: BrunoQuaresma <bruno_nonato_quaresma@hotmail.com>
Date: Fri, 21 Mar 2025 16:55:48 +0000
Subject: [PATCH] fix: fix double ws connection for notifications

---
 .../modules/dashboard/Navbar/NavbarView.tsx   | 64 +++++++++----------
 1 file changed, 30 insertions(+), 34 deletions(-)

diff --git a/site/src/modules/dashboard/Navbar/NavbarView.tsx b/site/src/modules/dashboard/Navbar/NavbarView.tsx
index 40f9b0ad3a70b..204828c2fd8ac 100644
--- a/site/src/modules/dashboard/Navbar/NavbarView.tsx
+++ b/site/src/modules/dashboard/Navbar/NavbarView.tsx
@@ -55,17 +55,21 @@ export const NavbarView: FC<NavbarViewProps> = ({
 
 			<NavItems className="ml-4" />
 
-			<div className="hidden md:flex items-center gap-3 ml-auto">
+			<div className="flex items-center gap-3 ml-auto">
 				{proxyContextValue && (
-					<ProxyMenu proxyContextValue={proxyContextValue} />
+					<div className="hidden md:block">
+						<ProxyMenu proxyContextValue={proxyContextValue} />
+					</div>
 				)}
 
-				<DeploymentDropdown
-					canViewAuditLog={canViewAuditLog}
-					canViewOrganizations={canViewOrganizations}
-					canViewDeployment={canViewDeployment}
-					canViewHealth={canViewHealth}
-				/>
+				<div className="hidden md:block">
+					<DeploymentDropdown
+						canViewAuditLog={canViewAuditLog}
+						canViewOrganizations={canViewOrganizations}
+						canViewDeployment={canViewDeployment}
+						canViewHealth={canViewHealth}
+					/>
+				</div>
 
 				<NotificationsInbox
 					fetchNotifications={API.getInboxNotifications}
@@ -78,36 +82,28 @@ export const NavbarView: FC<NavbarViewProps> = ({
 				/>
 
 				{user && (
-					<UserDropdown
+					<div className="hidden md:block">
+						<UserDropdown
+							user={user}
+							buildInfo={buildInfo}
+							supportLinks={supportLinks}
+							onSignOut={onSignOut}
+						/>
+					</div>
+				)}
+
+				<div className="md:hidden">
+					<MobileMenu
+						proxyContextValue={proxyContextValue}
 						user={user}
-						buildInfo={buildInfo}
 						supportLinks={supportLinks}
 						onSignOut={onSignOut}
+						canViewAuditLog={canViewAuditLog}
+						canViewOrganizations={canViewOrganizations}
+						canViewDeployment={canViewDeployment}
+						canViewHealth={canViewHealth}
 					/>
-				)}
-			</div>
-
-			<div className="ml-auto flex items-center gap-3 md:hidden">
-				<NotificationsInbox
-					fetchNotifications={API.getInboxNotifications}
-					markAllAsRead={API.markAllInboxNotificationsAsRead}
-					markNotificationAsRead={(notificationId) =>
-						API.updateInboxNotificationReadStatus(notificationId, {
-							is_read: true,
-						})
-					}
-				/>
-
-				<MobileMenu
-					proxyContextValue={proxyContextValue}
-					user={user}
-					supportLinks={supportLinks}
-					onSignOut={onSignOut}
-					canViewAuditLog={canViewAuditLog}
-					canViewOrganizations={canViewOrganizations}
-					canViewDeployment={canViewDeployment}
-					canViewHealth={canViewHealth}
-				/>
+				</div>
 			</div>
 		</div>
 	);