feat: improved the code

twentyhq · Oct 18, 2024 · fa7c1ef · fa7c1ef
1 parent e394f7a
commit fa7c1ef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/packages/twenty-front/src/modules/ui/layout/page/PageHeader.tsx b/packages/twenty-front/src/modules/ui/layout/page/PageHeader.tsx
@@ -15,7 +15,7 @@ import { IconButton } from '@/ui/input/button/components/IconButton';
 import { NavigationDrawerCollapseButton } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton';
 import { isNavigationDrawerOpenState } from '@/ui/navigation/states/isNavigationDrawerOpenState';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
-import { useIsRoute } from '~/utils/currentPage';
+import { matchPath, useLocation } from 'react-router-dom';
 
 export const PAGE_BAR_MIN_HEIGHT = 40;
 
@@ -110,7 +110,8 @@ export const PageHeader = ({
   const isMobile = useIsMobile();
   const theme = useTheme();
   const isNavigationDrawerOpen = useRecoilValue(isNavigationDrawerOpenState);
-  const isSettingsPage = useIsRoute('/settings/profile');
+  const { pathname } = useLocation();
+  const isSettingsPage = matchPath('/settings/*', pathname);
 
   return (
     <StyledTopBarContainer width={width}>

diff --git a/packages/twenty-front/src/utils/currentPage.ts b/packages/twenty-front/src/utils/currentPage.ts