Merge branch 'develop' into feat/SW-266-seo-loyalty-pages

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

@@ -1,3 +1,4 @@
+import { env } from "@/env/server"
 import { serverClient } from "@/lib/trpc/server"
 
 import { CreditCard, Delete } from "@/components/Icons"
@@ -18,6 +19,8 @@ export default async function CreditCardSlot({ params }: PageArgs<LangParams>) {
   const { formatMessage } = await getIntl()
   const creditCards = await serverClient().user.creditCards()
 
+  const { lang } = params
+
   return (
     <section className={styles.container}>
       <article className={styles.content}>
@@ -41,7 +44,9 @@ export default async function CreditCardSlot({ params }: PageArgs<LangParams>) {
           ))}
         </div>
       ) : null}
-      <AddCreditCardButton />
+      <AddCreditCardButton
+        redirectUrl={`${env.PUBLIC_URL}/api/web/add-card-callback/${lang}`}
+      />
     </section>
   )
 }

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

@@ -1,4 +1,5 @@
 import { serverClient } from "@/lib/trpc/server"
+import tempHotelData from "@/server/routers/hotels/tempHotelData.json"
 
 import HotelCard from "@/components/HotelReservation/HotelCard"
 import HotelFilter from "@/components/HotelReservation/SelectHotel/HotelFilter"
@@ -18,14 +19,12 @@ export default async function SelectHotelPage({
   const intl = await getIntl()
   setLang(params.lang)
 
-  const { attributes } = await serverClient().hotel.getHotel({
-    hotelId: "d98c7ab1-ebaa-4102-b351-758daf1ddf55",
-    language: getLang(),
-  })
-  const hotels = [attributes]
+  // TODO: Use real endpoint.
+  const hotel = tempHotelData.data.attributes
+  const hotels = [hotel]
 
   const hotelFilters = await serverClient().hotel.getFilters({
-    hotelId: "d98c7ab1-ebaa-4102-b351-758daf1ddf55",
+    hotelId: "879",
   })
 
   const tempSearchTerm = "Stockholm"
@@ -40,12 +39,7 @@ export default async function SelectHotelPage({
           zoomLevel={11}
           mapType="roadmap"
         />
-        <Link
-          className={styles.link}
-          color="burgundy"
-          variant="underscored"
-          href="#"
-        >
+        <Link className={styles.link} color="burgundy" href="#">
           {intl.formatMessage({ id: "Show map" })}
           <ChevronRightIcon color="burgundy" className={styles.icon} />
         </Link>

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

@@ -1,4 +1,5 @@
 import { serverClient } from "@/lib/trpc/server"
+import tempHotelData from "@/server/routers/hotels/tempHotelData.json"
 
 import HotelCard from "@/components/HotelReservation/HotelCard"
 import BedSelection from "@/components/HotelReservation/SelectRate/BedSelection"
@@ -14,11 +15,9 @@ import { LangParams, PageArgs } from "@/types/params"
 export default async function SelectRate({ params }: PageArgs<LangParams>) {
   setLang(params.lang)
 
-  // TODO: pass the correct hotel ID
-  const { attributes: hotel } = await serverClient().hotel.getHotel({
-    hotelId: "d98c7ab1-ebaa-4102-b351-758daf1ddf55",
-    language: getLang(),
-  })
+  // TODO: Use real endpoint.
+  const hotel = tempHotelData.data.attributes
+
   const rooms = await serverClient().hotel.getRates({
     // TODO: pass the correct hotel ID and all other parameters that should be included in the search
     hotelId: "1",

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

@@ -9,6 +9,7 @@ import TokenRefresher from "@/components/Auth/TokenRefresher"
 import AdobeSDKScript from "@/components/Current/AdobeSDKScript"
 import Footer from "@/components/Current/Footer"
 import VwoScript from "@/components/Current/VwoScript"
+import { ToastHandler } from "@/components/TempDesignSystem/Toasts"
 import { preloadUserTracking } from "@/components/TrackingSDK"
 import { getIntl } from "@/i18n"
 import ServerIntlProvider from "@/i18n/Provider"
@@ -55,6 +56,7 @@ export default async function RootLayout({
           <TrpcProvider>
             {header}
             {children}
+            <ToastHandler />
             <Footer />
             <TokenRefresher />
           </TrpcProvider>

app/[lang]/webview/[contentType]/[uid]/page.tsx

@@ -1,3 +1,4 @@
+import { headers } from "next/headers"
 import { notFound, redirect } from "next/navigation"
 
 import { serverClient } from "@/lib/trpc/server"
@@ -28,7 +29,11 @@ export default async function ContentTypePage({
       case "unauthorized": // fall through
       case "forbidden": // fall through
       case "token_expired":
-        redirect(`/${getLang()}/webview/refresh`)
+        const h = headers()
+        const returnURL = `/${getLang()}/webview${h.get("x-pathname")!}`
+        redirect(
+          `/${getLang()}/webview/refresh?returnUrl=${encodeURIComponent(returnURL)}`
+        )
     }
   }