Fix

twentyhq · Dec 18, 2024 · e7c5bbd · e7c5bbd
1 parent 96e072e
commit e7c5bbd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 20 deletions.
diff --git a/packages/twenty-front/src/modules/navigation/components/AppNavigationDrawer.tsx b/packages/twenty-front/src/modules/navigation/components/AppNavigationDrawer.tsx
@@ -8,13 +8,10 @@ import {
   NavigationDrawerProps,
 } from '@/ui/navigation/navigation-drawer/components/NavigationDrawer';
 import { isAdvancedModeEnabledState } from '@/ui/navigation/navigation-drawer/states/isAdvancedModeEnabledState';
-import { getImageAbsoluteURI } from 'twenty-shared';
-import { REACT_APP_SERVER_BASE_URL } from '~/config';
 
 import { useIsSettingsDrawer } from '@/navigation/hooks/useIsSettingsDrawer';
 
 import { MainNavigationDrawerItems } from '@/navigation/components/MainNavigationDrawerItems';
-import { isNonEmptyString } from '@sniptt/guards';
 import { AdvancedSettingsToggle } from 'twenty-ui';
 
 export type AppNavigationDrawerProps = {
@@ -41,15 +38,11 @@ export const AppNavigationDrawer = ({
             setIsAdvancedModeEnabled={setIsAdvancedModeEnabled}
           />
         ),
+        logo: '',
       }
     : {
-        logo: isNonEmptyString(currentWorkspace?.logo)
-          ? getImageAbsoluteURI({
-              imageUrl: currentWorkspace.logo,
-              baseUrl: REACT_APP_SERVER_BASE_URL,
-            })
-          : undefined,
-        title: currentWorkspace?.displayName ?? undefined,
+        logo: currentWorkspace?.logo ?? '',
+        title: currentWorkspace?.displayName ?? '',
         children: <MainNavigationDrawerItems />,
         footer: <SupportDropdown />,
       };

diff --git a/.../twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx b/.../twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx
@@ -18,7 +18,7 @@ export type NavigationDrawerProps = {
   children: ReactNode;
   className?: string;
   footer?: ReactNode;
-  logo: string;
+  logo?: string;
   title: string;
 };
 
@@ -111,15 +111,15 @@ export const NavigationDrawer = ({
         onMouseEnter={handleHover}
         onMouseLeave={handleMouseLeave}
       >
-        {isSettingsDrawer && title ? (
-          !isMobile && <NavigationDrawerBackButton title={title} />
-        ) : (
-          <NavigationDrawerHeader
-            name={title}
-            logo={logo}
-            showCollapseButton={isHovered}
-          />
-        )}
+        {isSettingsDrawer && title
+          ? !isMobile && <NavigationDrawerBackButton title={title} />
+          : logo && (
+              <NavigationDrawerHeader
+                name={title}
+                logo={logo}
+                showCollapseButton={isHovered}
+              />
+            )}
         <StyledItemsContainer isSettings={isSettingsDrawer}>
           {children}
         </StyledItemsContainer>