From 8c5ca8eb1e937c45513e02d981f5ad6e6448c596 Mon Sep 17 00:00:00 2001
From: AlexMadM <alex.alexandrov.1988@gmail.com>
Date: Mon, 16 Mar 2026 20:39:21 -0700
Subject: [PATCH] =?UTF-8?q?refactor(web):=20=D0=BE=D0=BF=D1=82=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B3=D0=B8=D0=BA=D1=83=20=D0=BE=D0=BF=D1=80=D0=B5=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BE=D0=BC=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B4=D1=8B=20=D0=B8=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=20=D1=81=D0=B0?=
 =?UTF-8?q?=D0=B9=D0=B4=D0=B1=D0=B0=D1=80=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../widgets/main-layout/ui/sidebar/sidebar.tsx    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/apps/web/widgets/main-layout/ui/sidebar/sidebar.tsx b/apps/web/widgets/main-layout/ui/sidebar/sidebar.tsx
index 5ffebf57..d6da24aa 100644
--- a/apps/web/widgets/main-layout/ui/sidebar/sidebar.tsx
+++ b/apps/web/widgets/main-layout/ui/sidebar/sidebar.tsx
@@ -33,9 +33,12 @@ const Sidebar = ({ className, forceOpen, onNavigate }: Props) => {
 	const params = useParams<{ id?: string; projectId?: string }>()
 	const { data: teams } = useTeamsList()
 	const isOpen = forceOpen ?? isDesktopOpen
-	const teamId = typeof params.id === 'string' ? params.id : (teams?.[0]?.id ?? null)
+	const selectedTeamId = typeof params.id === 'string' ? params.id : null
+	const teamId = selectedTeamId ?? teams?.[0]?.id ?? null
 	const projectId = typeof params.projectId === 'string' ? params.projectId : null
-	const currentTeam = teams?.find((team) => team.id === teamId) ?? null
+	const currentTeam = selectedTeamId
+		? (teams?.find((team) => team.id === selectedTeamId) ?? null)
+		: null
 	const activeRouteId = getSidebarRouteId(pathname)
 	const sections = getSidebarSections(teamId)
 	const [workSection, ...otherSections] = sections
@@ -80,9 +83,11 @@ const Sidebar = ({ className, forceOpen, onNavigate }: Props) => {
 							<div className='truncate text-sm font-semibold leading-5'>
 								{sidebarWorkspace.title}
 							</div>
-							<div className='truncate text-xs text-muted-foreground'>
-								{currentTeam?.name ?? sidebarWorkspace.subtitle}
-							</div>
+							{currentTeam?.name ? (
+								<div className='truncate text-xs text-muted-foreground'>
+									{currentTeam.name}
+								</div>
+							) : null}
 						</div>
 					)}
 				</Link>