Merge branch 'develop' into feature/MED-129

app/home/[account]/_components/team-account-accounts-selector.tsx

@@ -5,11 +5,9 @@ import { useContext } from 'react';
 import { useRouter } from 'next/navigation';
 
 import { AccountSelector } from '@kit/accounts/account-selector';
+import { featureFlagsConfig, pathsConfig } from '@kit/shared/config';
 import { SidebarContext } from '@kit/ui/shadcn-sidebar';
 
-import { pathsConfig, featureFlagsConfig } from '@kit/shared/config';
-
-
 const features = {
   enableTeamCreation: featureFlagsConfig.enableTeamCreation,
 };

app/home/[account]/_components/team-account-layout-mobile-navigation.tsx

@@ -1,12 +1,12 @@
 'use client';
 
-import DropdownLink from '@kit/shared/components/ui/dropdown-link';
 import { useRouter } from 'next/navigation';
 
-import SignOutDropdownItem from '@kit/shared/components/sign-out-dropdown-item';
 import { Home, Menu } from 'lucide-react';
 
 import { AccountSelector } from '@kit/accounts/account-selector';
+import SignOutDropdownItem from '@kit/shared/components/sign-out-dropdown-item';
+import DropdownLink from '@kit/shared/components/ui/dropdown-link';
 import {
   featureFlagsConfig,
   getTeamAccountSidebarConfig,
@@ -93,8 +93,6 @@ export const TeamAccountLayoutMobileNavigation = (
   );
 };
 
-
-
 function TeamAccountsModal(props: {
   accounts: Accounts;
   userId: string;

app/home/[account]/_components/team-account-layout-sidebar-navigation.tsx

@@ -1,12 +0,0 @@
-import { z } from 'zod';
-
-import { NavigationConfigSchema } from '@kit/ui/navigation-schema';
-import { SidebarNavigation } from '@kit/ui/shadcn-sidebar';
-
-export function TeamAccountLayoutSidebarNavigation({
-  config,
-}: React.PropsWithChildren<{
-  config: z.infer<typeof NavigationConfigSchema>;
-}>) {
-  return <SidebarNavigation config={config} />;
-}

app/home/[account]/_components/team-account-layout-sidebar.tsx

@@ -1,20 +1,12 @@
-import type { User } from '@supabase/supabase-js';
-
 import { ApplicationRole } from '@kit/accounts/types/accounts';
-import { ProfileAccountDropdownContainer } from '@kit/shared/components/personal-account-dropdown-container';
 import { getTeamAccountSidebarConfig } from '@kit/shared/config';
 import {
   Sidebar,
   SidebarContent,
-  SidebarFooter,
   SidebarHeader,
+  SidebarNavigation,
 } from '@kit/ui/shadcn-sidebar';
 
-import { TeamAccountNotifications } from '~/home/[account]/_components/team-account-notifications';
-
-import { TeamAccountAccountsSelector } from '../_components/team-account-accounts-selector';
-import { TeamAccountLayoutSidebarNavigation } from './team-account-layout-sidebar-navigation';
-
 type AccountModel = {
   label: string | null;
   value: string | null;
@@ -26,14 +18,12 @@ export function TeamAccountLayoutSidebar(props: {
   account: string;
   accountId: string;
   accounts: AccountModel[];
-  user: User;
 }) {
   return (
     <SidebarContainer
       account={props.account}
       accountId={props.accountId}
       accounts={props.accounts}
-      user={props.user}
     />
   );
 }
@@ -42,45 +32,26 @@ function SidebarContainer(props: {
   account: string;
   accountId: string;
   accounts: AccountModel[];
-  user: User;
 }) {
-  const { account, accounts, user } = props;
-  const userId = user.id;
+  const { account, accounts } = props;
 
   const config = getTeamAccountSidebarConfig(account);
   const collapsible = config.sidebarCollapsedStyle;
 
+  const selectedAccount = accounts.find(({ value }) => value === account);
+  const accountName = selectedAccount?.label || account;
+
   return (
     <Sidebar collapsible={collapsible}>
-      <SidebarHeader className="h-16 justify-center">
-        <div className="flex items-center justify-between gap-x-3">
-          <TeamAccountAccountsSelector
-            userId={userId}
-            selectedAccount={account}
-            accounts={accounts}
-          />
-
-          <div className="group-data-[minimized=true]:hidden">
-            <TeamAccountNotifications
-              userId={userId}
-              accountId={props.accountId}
-            />
-          </div>
+      <SidebarHeader className="h-24 justify-center">
+        <div className="mt-24 flex items-center">
+          <h5>{accountName}</h5>
         </div>
       </SidebarHeader>
 
-      <SidebarContent className={`mt-5 h-[calc(100%-160px)] overflow-y-auto`}>
-        <TeamAccountLayoutSidebarNavigation config={config} />
+      <SidebarContent>
+        <SidebarNavigation config={config} />
       </SidebarContent>
-
-      <SidebarFooter>
-        <SidebarContent>
-          <ProfileAccountDropdownContainer
-            user={props.user}
-            accounts={accounts}
-          />
-        </SidebarContent>
-      </SidebarFooter>
     </Sidebar>
   );
 }

app/home/[account]/_components/team-account-notifications.tsx

@@ -1,8 +1,6 @@
 import { NotificationsPopover } from '@kit/notifications/components';
-
 import { featureFlagsConfig } from '@kit/shared/config';
 
-
 export function TeamAccountNotifications(params: {
   userId: string;
   accountId: string;