diff --git a/src/components/Calendar/CalendarLayout.tsx b/src/components/Calendar/CalendarLayout.tsx index d1d3482..992023d 100644 --- a/src/components/Calendar/CalendarLayout.tsx +++ b/src/components/Calendar/CalendarLayout.tsx @@ -121,7 +121,9 @@ export default function CalendarLayout(): JSX.Element { currentView={currentView} /> )} - {view === 'settings' && } + {view === 'settings' && ( + + )} ) diff --git a/src/features/Settings/SettingsPage.tsx b/src/features/Settings/SettingsPage.tsx index 6a21451..9bdc475 100644 --- a/src/features/Settings/SettingsPage.tsx +++ b/src/features/Settings/SettingsPage.tsx @@ -4,11 +4,15 @@ import { useScreenSizeDetection } from '@/useScreenSizeDetection' import { SettingErrorSnackbars } from './SettingErrorSnackbars' import { DesktopSettingsPage } from './DesktopSettingsPage' import { MobileSettingsPage } from './MobileSettingsPage' +import { Menubar, type MenubarProps } from '@/components/Menubar/Menubar' export type SidebarNavItem = 'settings' | 'sync' export type SettingsSubTab = 'settings' | 'notifications' -const SettingsPage: React.FC<{ isInIframe?: boolean }> = ({ isInIframe }) => { +const SettingsPage: React.FC<{ + menubarProps?: MenubarProps + isInIframe?: boolean +}> = ({ menubarProps, isInIframe }) => { const { isTooSmall: isMobile } = useScreenSizeDetection() const [activeSettingsSubTab, setActiveSettingsSubTab] = @@ -46,49 +50,57 @@ const SettingsPage: React.FC<{ isInIframe?: boolean }> = ({ isInIframe }) => { } return ( -
- {isMobile ? ( - + {isInIframe && isMobile && menubarProps && } + +
+ {isMobile ? ( + + ) : ( + + )} + - ) : ( - - )} - -
+
+ ) }