From 42591b34e590aacb7c237c0412b6ba2de74b874e Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Tue, 2 Jan 2024 17:46:39 +0000 Subject: [PATCH] Fix order tab navigation --- frontend/src/basic/NavBar/NavBar.tsx | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/frontend/src/basic/NavBar/NavBar.tsx b/frontend/src/basic/NavBar/NavBar.tsx index 255d23d0..55c709f3 100644 --- a/frontend/src/basic/NavBar/NavBar.tsx +++ b/frontend/src/basic/NavBar/NavBar.tsx @@ -21,17 +21,8 @@ import { GarageContext, type UseGarageStoreType } from '../../contexts/GarageCon const NavBar = (): JSX.Element => { const theme = useTheme(); const { t } = useTranslation(); - const { - page, - setPage, - settings, - setSlideDirection, - open, - setOpen, - windowSize, - navbarHeight, - hostUrl, - } = useContext(AppContext); + const { page, setPage, settings, setSlideDirection, open, setOpen, windowSize, navbarHeight } = + useContext(AppContext); const { garage, orderUpdatedAt, robotUpdatedAt } = useContext(GarageContext); const navigate = useNavigate(); @@ -62,6 +53,9 @@ const NavBar = (): JSX.Element => { navigate('/robot'); setPage('robot'); } + if (isPage(pathPage) && pathPage.includes('order')) { + setPage(pathPage); + } }, [location, navigate, setPage, orderUpdatedAt, robotUpdatedAt]); const handleSlideDirection = function (oldPage: Page, newPage: Page): void {