From bb38da613dc29ec7ede158c422679300f8fcd321 Mon Sep 17 00:00:00 2001
From: Pablo Lara <larabjj@gmail.com>
Date: Mon, 3 Mar 2025 12:01:05 +0100
Subject: [PATCH] chore: tweaks for the new sidebar

---
 ui/components/ui/sidebar-new/menu.tsx  | 16 ++++++++--------
 ui/components/ui/user-nav/user-nav.tsx | 10 ++++------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/ui/components/ui/sidebar-new/menu.tsx b/ui/components/ui/sidebar-new/menu.tsx
index 213cefa1c..ad92dd771 100644
--- a/ui/components/ui/sidebar-new/menu.tsx
+++ b/ui/components/ui/sidebar-new/menu.tsx
@@ -20,11 +20,7 @@ import { Button } from "../button/button";
 import { CustomButton } from "../custom/custom-button";
 import { ScrollArea } from "../scroll-area/scroll-area";
 
-interface MenuProps {
-  isOpen: boolean | undefined;
-}
-
-export function Menu({ isOpen }: MenuProps) {
+export const Menu = ({ isOpen }: { isOpen: boolean }) => {
   const pathname = usePathname();
   const menuList = getMenuList(pathname);
 
@@ -45,10 +41,14 @@ export function Menu({ isOpen }: MenuProps) {
       </div>
       <ScrollArea className="[&>div>div[style]]:!block">
         <nav className="mt-2 h-full w-full lg:mt-6">
-          <ul className="flex min-h-[calc(100vh-48px-36px-16px-32px)] flex-col items-start space-y-1 px-2 lg:min-h-[calc(100vh-32px-40px-32px)]">
+          <ul className="flex min-h-[calc(100vh-16px-60px-40px-16px-32px-40px-32px)] flex-col items-start space-y-1 px-2 lg:min-h-[calc(100vh-16px-60px-40px-16px-64px-16px)]">
             {menuList.map(({ groupLabel, menus }, index) => (
               <li
-                className={cn("w-full", groupLabel ? "pt-2" : "")}
+                className={cn(
+                  "w-full",
+                  groupLabel ? "pt-2" : "",
+                  "last:!mt-auto",
+                )}
                 key={index}
               >
                 {(isOpen && groupLabel) || isOpen === undefined ? (
@@ -168,4 +168,4 @@ export function Menu({ isOpen }: MenuProps) {
       </div>
     </>
   );
-}
+};
diff --git a/ui/components/ui/user-nav/user-nav.tsx b/ui/components/ui/user-nav/user-nav.tsx
index 7f1c9a7fc..b5023a9ec 100644
--- a/ui/components/ui/user-nav/user-nav.tsx
+++ b/ui/components/ui/user-nav/user-nav.tsx
@@ -28,12 +28,10 @@ import { UserProfileProps } from "@/types";
 
 import { Button } from "../button/button";
 
-export function UserNav({ user }: { user: UserProfileProps }) {
-  const { data } = user;
+export const UserNav = ({ user }: { user?: UserProfileProps }) => {
+  if (!user || !user.data) return null;
 
-  if (!data) return null;
-
-  const { name, email, company_name } = data.attributes;
+  const { name, email, company_name } = user.data.attributes;
 
   return (
     <DropdownMenu>
@@ -97,4 +95,4 @@ export function UserNav({ user }: { user: UserProfileProps }) {
       </DropdownMenuContent>
     </DropdownMenu>
   );
-}
+};