diff --git a/web/apps/accounts/src/pages/_app.tsx b/web/apps/accounts/src/pages/_app.tsx index 681376fb40..a976533374 100644 --- a/web/apps/accounts/src/pages/_app.tsx +++ b/web/apps/accounts/src/pages/_app.tsx @@ -86,7 +86,7 @@ const App: React.FC = ({ Component, pageProps }) => { )} - {showNavbar && } + {showNavbar && } {isI18nReady && } diff --git a/web/apps/auth/src/pages/_app.tsx b/web/apps/auth/src/pages/_app.tsx index 4fe90c22a6..77bb013ad3 100644 --- a/web/apps/auth/src/pages/_app.tsx +++ b/web/apps/auth/src/pages/_app.tsx @@ -162,7 +162,7 @@ const App: React.FC = ({ Component, pageProps }) => { - {showNavbar && } + {showNavbar && } {isI18nReady && offline && t("OFFLINE_MSG")} diff --git a/web/apps/auth/src/pages/auth.tsx b/web/apps/auth/src/pages/auth.tsx index 15ba9a0e3d..d5a3934337 100644 --- a/web/apps/auth/src/pages/auth.tsx +++ b/web/apps/auth/src/pages/auth.tsx @@ -141,10 +141,10 @@ const Page: React.FC = () => { export default Page; const AuthNavbar: React.FC = () => { - const { isMobile, logout } = ensure(useContext(AppContext)); + const { logout } = ensure(useContext(AppContext)); return ( - + diff --git a/web/apps/photos/src/components/pages/gallery/Navbar.tsx b/web/apps/photos/src/components/pages/gallery/Navbar.tsx index 08a52cf628..95c679134e 100644 --- a/web/apps/photos/src/components/pages/gallery/Navbar.tsx +++ b/web/apps/photos/src/components/pages/gallery/Navbar.tsx @@ -7,8 +7,6 @@ import { IconButton, Typography } from "@mui/material"; import SearchBar from "components/Search/SearchBar"; import UploadButton from "components/Upload/UploadButton"; import { t } from "i18next"; -import { AppContext } from "pages/_app"; -import React from "react"; import { Collection } from "types/collection"; import { UpdateSearch } from "types/search"; @@ -35,12 +33,8 @@ export function GalleryNavbar({ setIsInSearchMode, exitHiddenSection, }: Iprops) { - const appContext = React.useContext(AppContext); return ( - + {isInHiddenSection ? ( + diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsx index abd2dbe960..46b83516a0 100644 --- a/web/apps/photos/src/pages/_app.tsx +++ b/web/apps/photos/src/pages/_app.tsx @@ -342,7 +342,7 @@ export default function App({ Component, pageProps }: AppProps) { - {showNavbar && } + {showNavbar && } {isI18nReady && offline && t("OFFLINE_MSG")} diff --git a/web/packages/shared/components/Navbar/app.tsx b/web/packages/shared/components/Navbar/app.tsx index fe87b68eba..b843295b32 100644 --- a/web/packages/shared/components/Navbar/app.tsx +++ b/web/packages/shared/components/Navbar/app.tsx @@ -3,13 +3,9 @@ import { CenteredFlex } from "../../components/Container"; import { EnteLogo } from "../EnteLogo"; import NavbarBase from "./base"; -interface AppNavbarProps { - isMobile: boolean; -} - -export const AppNavbar: React.FC = ({ isMobile }) => { +export const AppNavbar: React.FC = () => { return ( - + diff --git a/web/packages/shared/components/Navbar/base.tsx b/web/packages/shared/components/Navbar/base.tsx index 403dc808ca..67cb67c3a3 100644 --- a/web/packages/shared/components/Navbar/base.tsx +++ b/web/packages/shared/components/Navbar/base.tsx @@ -1,9 +1,7 @@ import { styled } from "@mui/material"; import { FlexWrapper } from "../../components/Container"; -const NavbarBase = styled(FlexWrapper, { - shouldForwardProp: (propName) => propName != "isMobile", -})<{ isMobile: boolean }>` +const NavbarBase = styled(FlexWrapper)` min-height: 64px; position: sticky; top: 0;