diff --git a/app/[lang]/(live)/@header/[...paths]/@myPagesMobileDropdown/page.tsx b/app/[lang]/(live)/@header/[...paths]/@myPagesMobileDropdown/page.tsx index 4f412f82f..1c912e168 100644 --- a/app/[lang]/(live)/@header/[...paths]/@myPagesMobileDropdown/page.tsx +++ b/app/[lang]/(live)/@header/[...paths]/@myPagesMobileDropdown/page.tsx @@ -3,11 +3,12 @@ import { serverClient } from "@/lib/trpc/server" import MyPagesMobileDropdown from "@/components/Current/Header/MyPagesMobileDropdown" -export default async function MyPagesMobileDropdownPage() { - // TODO: Figure out how to pass down props at the paralell route level. - // - Possibly by parsing [...paths] +import { LangParams, PageArgs } from "@/types/params" +export default async function MyPagesMobileDropdownPage({ + params, +}: PageArgs) { const navigation = await serverClient().contentstack.myPages.navigation.get() if (!navigation) return null - return + return } diff --git a/app/[lang]/(live-current)/@myPagesMobileDropdown/page.tsx b/app/[lang]/(live-current)/@myPagesMobileDropdown/page.tsx index cc0f9d69e..c67a198fd 100644 --- a/app/[lang]/(live-current)/@myPagesMobileDropdown/page.tsx +++ b/app/[lang]/(live-current)/@myPagesMobileDropdown/page.tsx @@ -2,14 +2,14 @@ import { serverClient } from "@/lib/trpc/server" import MyPagesMobileDropdown from "@/components/Current/Header/MyPagesMobileDropdown" -export default async function MyPagesMobileDropdownPage() { - // TODO: Remove data call and pass down props at the paralell route level. - const [data, navigation] = await Promise.all([ - serverClient().contentstack.languageSwitcher.get(), - serverClient().contentstack.myPages.navigation.get(), - ]) - if (!data || !navigation) { +import { LangParams, PageArgs } from "@/types/params" + +export default async function MyPagesMobileDropdownPage({ + params, +}: PageArgs) { + const navigation = await serverClient().contentstack.myPages.navigation.get() + if (!navigation) { return null } - return + return } diff --git a/components/Current/Header/MyPagesMobileDropdown/index.tsx b/components/Current/Header/MyPagesMobileDropdown/index.tsx index 432ad6558..c1b8d8b41 100644 --- a/components/Current/Header/MyPagesMobileDropdown/index.tsx +++ b/components/Current/Header/MyPagesMobileDropdown/index.tsx @@ -1,5 +1,6 @@ "use client" import { Fragment } from "react" +import { useIntl } from "react-intl" import { Lang } from "@/constants/languages" import { logout } from "@/constants/routes/handleAuth" @@ -21,8 +22,10 @@ export default function MyPagesMobileDropdown({ navigation: Navigation lang: Lang | null }) { + const { formatMessage } = useIntl() const { toggleMyPagesMobileMenu, isMyPagesMobileMenuOpen } = useDropdownStore() + if (!navigation) { return null } @@ -53,20 +56,19 @@ export default function MyPagesMobileDropdown({ ))} - {/*TODO: Reintroduce once we figure out how to pass lang param. */} - {/* {menuItem.display_sign_out_link ? ( */} - {/*
  • */} - {/* */} - {/* {formatMessage({ id: "Log out" })} */} - {/* */} - {/*
  • */} - {/* ) : null} */} + {menuItem.display_sign_out_link && lang ? ( +
  • + + {formatMessage({ id: "Log out" })} + +
  • + ) : null}