fix: rename retried-wrapped fetch to make caching work again

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

@@ -10,6 +10,8 @@ import styles from "./page.module.css"
 
 import type { LangParams, PageArgs } from "@/types/params"
 
+export { generateMetadata } from "@/utils/generateMetadata"
+
 export default async function MyPages({
   params,
 }: PageArgs<LangParams & { path: string[] }>) {

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

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

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

@@ -7,6 +7,8 @@ import { setLang } from "@/i18n/serverContext"
 
 import { LangParams, PageArgs } from "@/types/params"
 
+export { generateMetadata } from "@/utils/generateMetadata"
+
 export default async function ProfilePage({ params }: PageArgs<LangParams>) {
   setLang(params.lang)
   const accountPage = await serverClient().contentstack.accountPage.get()

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

@@ -12,6 +12,8 @@ import {
   UIDParams,
 } from "@/types/params"
 
+export { generateMetadata } from "@/utils/generateMetadata"
+
 export default async function ContentTypePage({
   params,
 }: PageArgs<LangParams & ContentTypeParams & UIDParams, {}>) {

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

@@ -23,7 +23,7 @@ export default async function SelectHotelPage({
   const hotel = tempHotelData.data.attributes
   const hotels = [hotel]
 
-  const hotelFilters = await serverClient().hotel.getFilters({
+  const hotelFilters = await serverClient().hotel.filters.get({
     hotelId: "879",
   })
 

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

@@ -6,7 +6,7 @@ import BedSelection from "@/components/HotelReservation/SelectRate/BedSelection"
 import BreakfastSelection from "@/components/HotelReservation/SelectRate/BreakfastSelection"
 import FlexibilitySelection from "@/components/HotelReservation/SelectRate/FlexibilitySelection"
 import RoomSelection from "@/components/HotelReservation/SelectRate/RoomSelection"
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"
 
 import styles from "./page.module.css"
 
@@ -18,7 +18,7 @@ export default async function SelectRate({ params }: PageArgs<LangParams>) {
   // TODO: Use real endpoint.
   const hotel = tempHotelData.data.attributes
 
-  const rooms = await serverClient().hotel.getRates({
+  const rooms = await serverClient().hotel.rates.get({
     // TODO: pass the correct hotel ID and all other parameters that should be included in the search
     hotelId: "1",
   })

app/[lang]/(live)/@header/[...paths]/layout.tsx

@@ -1,11 +1,17 @@
 import Header from "@/components/Current/Header"
+import { setLang } from "@/i18n/serverContext"
+
+import type { LangParams, LayoutArgs } from "@/types/params"
 
 export default function HeaderLayout({
   languageSwitcher,
   myPagesMobileDropdown,
-}: {
+  params,
+}: LayoutArgs<LangParams> & {
   languageSwitcher: React.ReactNode
-} & { myPagesMobileDropdown: React.ReactNode }) {
+  myPagesMobileDropdown: React.ReactNode
+}) {
+  setLang(params.lang)
   return (
     <Header
       myPagesMobileDropdown={myPagesMobileDropdown}

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

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

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

@@ -17,8 +17,6 @@ import { getLang, setLang } from "@/i18n/serverContext"
 
 import type { LangParams, LayoutArgs } from "@/types/params"
 
-export { generateMetadata } from "@/utils/generateMetadata"
-
 export default async function RootLayout({
   children,
   params,

app/[lang]/(live-current)/current-content-page/page.tsx

@@ -6,7 +6,7 @@ import { request } from "@/lib/graphql/request"
 
 import ContentPage from "@/components/Current/ContentPage"
 import Tracking from "@/components/Current/Tracking"
-import { getLang, setLang } from "@/i18n/serverContext"
+import { setLang } from "@/i18n/serverContext"
 
 import type { LangParams, PageArgs, UriParams } from "@/types/params"
 import type { GetCurrentBlockPageData } from "@/types/requests/currentBlockPage"
@@ -26,10 +26,10 @@ export default async function CurrentContentPage({
     const response = await request<GetCurrentBlockPageData>(
       GetCurrentBlockPage,
       {
-        locale: getLang(),
+        locale: params.lang,
         url: searchParams.uri,
       },
-      { tags: [`${searchParams.uri}-${getLang()}`] }
+      { cache: "no-store" }
     )
 
     if (!response.data?.all_current_blocks_page?.total) {
@@ -43,13 +43,13 @@ export default async function CurrentContentPage({
     const pageDataForTracking = await request<TrackingData>(
       GetCurrentBlockPageTrackingData,
       { uid: response.data.all_current_blocks_page.items[0].system.uid },
-      { tags: [`${searchParams.uri}-en`] }
+      { cache: "no-store" }
     )
 
     const pageData = response.data.all_current_blocks_page.items[0]
 
     const trackingData = {
-      lang: getLang(),
+      lang: params.lang,
       publishedDate: pageData.system.updated_at,
       createdDate: pageData.system.created_at,
       pageId: pageData.system.uid,