diff --git a/src/pages/menu/components/BackButton.tsx b/src/pages/menu/components/BackButton.tsx index 5a5551e..01c0b7c 100644 --- a/src/pages/menu/components/BackButton.tsx +++ b/src/pages/menu/components/BackButton.tsx @@ -1,15 +1,21 @@ import { Button } from "antd"; import BackIcon from "components/Icons/BackIcon"; import NextIcon from "components/Icons/NextIcon"; +import { useNavigate } from "react-router-dom"; import { useAppSelector } from "redux/hooks"; interface BackButtonProps { - navigateBack?: boolean; // true = use router.back(), false = just clear state + customRoute?: string; } -export default function BackButton({ navigateBack = true }: BackButtonProps) { +export default function BackButton({ customRoute }: BackButtonProps) { + const router = useNavigate(); const handleBack = () => { - if (navigateBack) window.history.back(); + if (customRoute) { + router(customRoute); + } else { + router(-1); + } }; const { isRTL } = useAppSelector((state) => state.locale); diff --git a/src/pages/menu/page.tsx b/src/pages/menu/page.tsx index 716fa10..320fef8 100644 --- a/src/pages/menu/page.tsx +++ b/src/pages/menu/page.tsx @@ -38,6 +38,7 @@ function MenuPage() { const { subdomain } = useParams(); const { isRTL } = useAppSelector((state) => state.locale); const { orderType } = useAppSelector((state) => state.order); + const { token } = useAppSelector((state) => state.auth); const { t } = useTranslation(); const { data: restaurant, isLoading: isLoadingRestaurant } = useGetRestaurantDetailsQuery(subdomain, { @@ -91,7 +92,9 @@ function MenuPage() {