Merge branch 'develop' into feat/sw-386-current-header-fixes

app/[lang]/(live)/(protected)/layout.tsx

@@ -2,7 +2,7 @@ import { headers } from "next/headers"
 import { redirect } from "next/navigation"
 
 import { overview } from "@/constants/routes/myPages"
-import { serverClient } from "@/lib/trpc/server"
+import { getProfile } from "@/lib/trpc/memoizedRequests"
 
 import { auth } from "@/auth"
 import { getLang } from "@/i18n/serverContext"
@@ -27,7 +27,7 @@ export default async function ProtectedLayout({
     redirect(redirectURL)
   }
 
-  const user = await serverClient().user.get()
+  const user = await getProfile()
 
   if (user && "error" in user) {
     // redirect(redirectURL)

app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx

@@ -1,4 +1,4 @@
-import Breadcrumbs from "@/components/MyPages/Breadcrumbs"
+import Breadcrumbs from "@/components/Breadcrumbs"
 import { setLang } from "@/i18n/serverContext"
 
 import { LangParams, PageArgs } from "@/types/params"

app/[lang]/(live)/(protected)/my-pages/[...path]/page.tsx

@@ -1,6 +1,6 @@
 import { serverClient } from "@/lib/trpc/server"
 
-import Content from "@/components/MyPages/AccountPage/Content"
+import Blocks from "@/components/Blocks"
 import Title from "@/components/TempDesignSystem/Text/Title"
 import TrackingSDK from "@/components/TrackingSDK"
 import { getIntl } from "@/i18n"
@@ -10,7 +10,7 @@ import styles from "./page.module.css"
 
 import type { LangParams, PageArgs } from "@/types/params"
 
-export { generateMetadata } from "@/utils/generateMetadata"
+export { generateMetadataAccountPage as generateMetadata } from "@/utils/generateMetadata"
 
 export default async function MyPages({
   params,
@@ -30,8 +30,8 @@ export default async function MyPages({
     <>
       <main className={styles.blocks}>
         <Title>{accountPage.heading}</Title>
-        {accountPage.content.length ? (
-          <Content content={accountPage.content} />
+        {accountPage.content?.length ? (
+          <Blocks blocks={accountPage.content} />
         ) : (
           <p>{formatMessage({ id: "No content published" })}</p>
         )}

app/[lang]/(live)/(protected)/my-pages/profile/@profile/edit/page.tsx

@@ -1,4 +1,4 @@
-import { serverClient } from "@/lib/trpc/server"
+import { getProfile } from "@/lib/trpc/memoizedRequests"
 
 import Form from "@/components/Forms/Edit/Profile"
 import { setLang } from "@/i18n/serverContext"
@@ -10,7 +10,7 @@ export default async function EditProfileSlot({
 }: PageArgs<LangParams>) {
   setLang(params.lang)
 
-  const user = await serverClient().user.get()
+  const user = await getProfile()
   if (!user || "error" in user) {
     return null
   }

app/[lang]/(live)/(protected)/my-pages/profile/@profile/page.tsx

@@ -1,6 +1,6 @@
 import { languages, languageSelect } from "@/constants/languages"
 import { profileEdit } from "@/constants/routes/myPages"
-import { serverClient } from "@/lib/trpc/server"
+import { getProfile } from "@/lib/trpc/memoizedRequests"
 
 import {
   CalendarIcon,
@@ -16,7 +16,7 @@ import Link from "@/components/TempDesignSystem/Link"
 import Body from "@/components/TempDesignSystem/Text/Body"
 import Title from "@/components/TempDesignSystem/Text/Title"
 import { getIntl } from "@/i18n"
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"
 
 import styles from "./page.module.css"
 
@@ -25,7 +25,7 @@ import { LangParams, PageArgs } from "@/types/params"
 export default async function Profile({ params }: PageArgs<LangParams>) {
   setLang(params.lang)
   const { formatMessage } = await getIntl()
-  const user = await serverClient().user.get()
+  const user = await getProfile()
   if (!user || "error" in user) {
     return null
   }
@@ -44,7 +44,7 @@ export default async function Profile({ params }: PageArgs<LangParams>) {
           </Title>
         </hgroup>
         <Button asChild intent="primary" size="small" theme="base">
-          <Link prefetch={false} color="none" href={profileEdit[getLang()]}>
+          <Link prefetch={false} color="none" href={profileEdit[params.lang]}>
             {formatMessage({ id: "Edit profile" })}
           </Link>
         </Button>

app/[lang]/(live)/(protected)/my-pages/profile/edit/page.tsx

@@ -1,5 +1,5 @@
 import ProfilePage from "../page"
 
-export { generateMetadata } from "@/utils/generateMetadata"
+export { generateMetadataAccountPage as generateMetadata } from "@/utils/generateMetadata"
 
 export default ProfilePage

app/[lang]/(live)/(protected)/my-pages/profile/page.tsx

@@ -7,7 +7,7 @@ import { setLang } from "@/i18n/serverContext"
 
 import { LangParams, PageArgs } from "@/types/params"
 
-export { generateMetadata } from "@/utils/generateMetadata"
+export { generateMetadataAccountPage as generateMetadata } from "@/utils/generateMetadata"
 
 export default async function ProfilePage({ params }: PageArgs<LangParams>) {
   setLang(params.lang)

app/[lang]/(live)/(public)/[contentType]/[uid]/@breadcrumbs/page.tsx

@@ -1,4 +1,4 @@
-import Breadcrumbs from "@/components/MyPages/Breadcrumbs"
+import Breadcrumbs from "@/components/Breadcrumbs"
 import { setLang } from "@/i18n/serverContext"
 
 import { LangParams, PageArgs } from "@/types/params"

app/[lang]/(live)/(public)/hotelreservation/page.tsx

@@ -1,9 +1,8 @@
 import { setLang } from "@/i18n/serverContext"
 
-import { LangParams, PageArgs } from "@/types/params"
+import type { LangParams, PageArgs } from "@/types/params"
 
 export default function HotelReservationPage({ params }: PageArgs<LangParams>) {
   setLang(params.lang)
-
   return null
 }

app/[lang]/(live)/@bookingwidget/page.tsx

@@ -1,17 +1,17 @@
 import { serverClient } from "@/lib/trpc/server"
 
-import BookingWidget from "@/components/BookingWidget"
+import BookingWidget, { preload } from "@/components/BookingWidget"
 
 export default async function BookingWidgetPage() {
+  preload()
+
   // Get the booking widget show/hide status based on page specific settings
   const bookingWidgetToggle =
-    await serverClient().contentstack.bookingwidget.getToggle()
+    await serverClient().contentstack.bookingwidget.toggle.get()
 
-  return (
-    <>
-      {bookingWidgetToggle && bookingWidgetToggle.hideBookingWidget ? null : (
-        <BookingWidget />
-      )}
-    </>
-  )
+  if (bookingWidgetToggle.hideBookingWidget) {
+    return null
+  }
+
+  return <BookingWidget />
 }

app/[lang]/(live)/layout.tsx

@@ -17,7 +17,7 @@ import { ToastHandler } from "@/components/TempDesignSystem/Toasts"
 import { preloadUserTracking } from "@/components/TrackingSDK"
 import { getIntl } from "@/i18n"
 import ServerIntlProvider from "@/i18n/Provider"
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"
 
 import type { LangParams, LayoutArgs } from "@/types/params"
 
@@ -37,7 +37,7 @@ export default async function RootLayout({
   const { defaultLocale, locale, messages } = await getIntl()
 
   return (
-    <html lang={getLang()}>
+    <html lang={params.lang}>
       <head>
         <AdobeSDKScript />
         <Script data-cookieconsent="ignore" src="/_static/js/cookie-bot.js" />

app/[lang]/(live)/middleware-error/[status]/page.tsx

@@ -1,4 +1,4 @@
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"
 
 import styles from "./page.module.css"
 
@@ -11,7 +11,7 @@ export default function MiddlewareError({
 
   return (
     <div className={styles.layout}>
-      Middleware Error {getLang()}: {params.status}
+      Middleware Error {params.lang}: {params.status}
     </div>
   )
 }