fix(SW-705): Updated logic for language switcher

This commit is contained in:
Pontus Dreij
2024-11-29 17:03:20 +01:00
parent 9d4c6eb25d
commit 89c131e3eb
6 changed files with 33 additions and 41 deletions

View File

@@ -1,6 +1,5 @@
"use client"
import { usePathname } from "next/navigation"
import { Suspense } from "react"
import { useIntl } from "react-intl"
import { logout } from "@/constants/routes/handleAuth"
@@ -10,7 +9,6 @@ import useDropdownStore from "@/stores/main-menu"
import Image from "@/components/Image"
import LoginButton from "@/components/LoginButton"
import Avatar from "@/components/MyPages/Avatar"
import SkeletonShimmer from "@/components/SkeletonShimmer"
import Link from "@/components/TempDesignSystem/Link"
import useLang from "@/hooks/useLang"
import { trackClick } from "@/utils/tracking"
@@ -190,13 +188,7 @@ export function MainMenu({
))}
</ul>
{languageSwitcher ? (
<li className={styles.mobileLi}>
<Suspense
fallback={<SkeletonShimmer height="20px" width="10ch" />}
>
{languageSwitcher}
</Suspense>
</li>
<li className={styles.mobileLi}>{languageSwitcher}</li>
) : null}
{!!user ? (
<li className={`${styles.mobileLi} ${styles.logout}`}>

View File

@@ -1,11 +1,8 @@
import { Suspense } from "react"
import { logout } from "@/constants/routes/handleAuth"
import { overview } from "@/constants/routes/myPages"
import { getName } from "@/lib/trpc/memoizedRequests"
import LoginButton from "@/components/LoginButton"
import SkeletonShimmer from "@/components/SkeletonShimmer"
import Link from "@/components/TempDesignSystem/Link"
import { getIntl } from "@/i18n"
import { getLang } from "@/i18n/serverContext"
@@ -35,13 +32,7 @@ export default async function TopMenu({
<ul className={styles.list}>
{languageSwitcher ? (
<li className={styles.langSwitcher}>
<Suspense
fallback={<SkeletonShimmer height="20px" width="10ch" />}
>
{languageSwitcher}
</Suspense>
</li>
<li className={styles.langSwitcher}>{languageSwitcher}</li>
) : null}
{links.map(({ link }, i) => (