From c435cdba682e5b0653b9f056e72a64dc4b05a932 Mon Sep 17 00:00:00 2001
From: Anton Gunnarsson <anton.gunnarsson@scandichotels.com>
Date: Wed, 22 Oct 2025 07:04:21 +0000
Subject: [PATCH] Merged in fix/sw-3551-rsc-bookingflowconfig (pull request
 #2988)

fix(SW-3551): Fix issue with BookingConfigProvider in RSC

* wip move config to pages

* Move config providing to pages
---
 .../app/[lang]/@bookingwidget/default.tsx     |  6 +-
 .../hotelreservation/[...paths]/loading.tsx   |  4 +-
 apps/partner-sas/app/[lang]/debug/page.tsx    |  3 +-
 .../booking-confirmation/page.tsx             |  3 +
 .../payment-callback/[status]/page.tsx        |  3 +
 .../alternative-hotels/map/page.tsx           |  2 +
 .../(standard)/alternative-hotels/page.tsx    |  7 +-
 .../(standard)/details/page.tsx               | 10 +-
 .../(standard)/select-hotel/map/page.tsx      | 10 +-
 .../(standard)/select-hotel/page.tsx          | 10 +-
 .../(standard)/select-rate/page.tsx           |  9 +-
 apps/partner-sas/app/[lang]/layout.tsx        | 53 +++--------
 apps/partner-sas/app/[lang]/page.tsx          |  8 +-
 .../constants/bookingFlowConfig.ts            | 30 ++++++
 .../booking-confirmation/page.tsx             |  3 +
 .../payment-callback/page.tsx                 |  3 +
 .../alternative-hotels/map/page.tsx           |  2 +
 .../(standard)/alternative-hotels/page.tsx    |  7 +-
 .../(standard)/details/page.tsx               | 10 +-
 .../(standard)/select-hotel/map/page.tsx      |  8 +-
 .../(standard)/select-hotel/page.tsx          | 10 +-
 .../(standard)/select-rate/page.tsx           |  9 +-
 .../destination_city_page/[uid]/page.tsx      |  5 +-
 .../(contentTypes)/hotel_page/[uid]/page.tsx  |  5 +-
 .../hotelreservation/[...paths]/loading.tsx   |  4 +-
 .../@bookingwidget/hotelreservation/page.tsx  |  6 +-
 .../app/[lang]/(live)/@bookingwidget/page.tsx |  6 +-
 apps/scandic-web/app/[lang]/(live)/layout.tsx | 32 +++----
 .../app/[lang]/(no-layout)/layout.tsx         | 18 ++--
 .../app/[lang]/(partner)/layout.tsx           | 18 ++--
 .../ContentType/StartPage/index.tsx           |  7 +-
 .../lib/components/BookingWidget/Client.tsx   |  6 +-
 .../FloatingBookingWidget/index.tsx           | 12 ++-
 .../lib/components/BookingWidget/Skeleton.tsx |  8 +-
 .../lib/components/BookingWidget/index.tsx    | 14 ++-
 .../lib/pages/AlternativeHotelsMapPage.tsx    | 44 +++++----
 .../lib/pages/AlternativeHotelsPage.tsx       | 10 +-
 .../lib/pages/BookingConfirmationPage.tsx     | 15 ++-
 .../lib/pages/EnterDetailsPage.tsx            | 95 ++++++++++---------
 .../lib/pages/PaymentCallbackPage.tsx         | 45 +++++----
 .../lib/pages/SelectHotelMapPage.tsx          | 42 ++++----
 .../lib/pages/SelectHotelPage.tsx             | 10 +-
 .../booking-flow/lib/pages/SelectRatePage.tsx |  7 +-
 .../trpc/lib/utils/getUserPointsBalance.ts    | 16 +++-
 44 files changed, 398 insertions(+), 237 deletions(-)
 create mode 100644 apps/partner-sas/constants/bookingFlowConfig.ts

diff --git a/apps/partner-sas/app/[lang]/@bookingwidget/default.tsx b/apps/partner-sas/app/[lang]/@bookingwidget/default.tsx
index c0e9476f2..99f9ec2a2 100644
--- a/apps/partner-sas/app/[lang]/@bookingwidget/default.tsx
+++ b/apps/partner-sas/app/[lang]/@bookingwidget/default.tsx
@@ -1,6 +1,8 @@
 import { BookingWidget } from "@scandic-hotels/booking-flow/BookingWidget"
 import { parseBookingWidgetSearchParams } from "@scandic-hotels/booking-flow/utils/url"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
+
 import { getLang } from "@/i18n/serverContext"
 
 import type { LangParams, PageArgs } from "@/types/params"
@@ -12,5 +14,7 @@ export default async function BookingWidgetPage(props: PageArgs<LangParams>) {
 
   const lang = await getLang()
 
-  return <BookingWidget booking={booking} lang={lang} />
+  return (
+    <BookingWidget booking={booking} lang={lang} config={bookingFlowConfig} />
+  )
 }
diff --git a/apps/partner-sas/app/[lang]/@bookingwidget/hotelreservation/[...paths]/loading.tsx b/apps/partner-sas/app/[lang]/@bookingwidget/hotelreservation/[...paths]/loading.tsx
index e06bc80f5..b8f33bf74 100644
--- a/apps/partner-sas/app/[lang]/@bookingwidget/hotelreservation/[...paths]/loading.tsx
+++ b/apps/partner-sas/app/[lang]/@bookingwidget/hotelreservation/[...paths]/loading.tsx
@@ -1,5 +1,7 @@
 import { BookingWidgetSkeleton } from "@scandic-hotels/booking-flow/BookingWidget"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
+
 // This file is crucial for displaying a loading
 // state immediately in the booking flow.
 // Next doesn't recognize manually added Suspense
@@ -7,5 +9,5 @@ import { BookingWidgetSkeleton } from "@scandic-hotels/booking-flow/BookingWidge
 // thus making it seem as the page is frozen during
 // the time it takes for `BookingWidget` to resolve.
 export default function BookingWidgetLoading() {
-  return <BookingWidgetSkeleton />
+  return <BookingWidgetSkeleton config={bookingFlowConfig} />
 }
diff --git a/apps/partner-sas/app/[lang]/debug/page.tsx b/apps/partner-sas/app/[lang]/debug/page.tsx
index a69552e70..b1165be24 100644
--- a/apps/partner-sas/app/[lang]/debug/page.tsx
+++ b/apps/partner-sas/app/[lang]/debug/page.tsx
@@ -2,6 +2,7 @@ import { BookingWidget } from "@scandic-hotels/booking-flow/BookingWidget"
 import { parseBookingWidgetSearchParams } from "@scandic-hotels/booking-flow/utils/url"
 import { Typography } from "@scandic-hotels/design-system/Typography"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
 import { serverClient } from "@/lib/trpc"
 
 import { getIntl } from "@/i18n"
@@ -33,7 +34,7 @@ export default async function Debug(props: SearchParams) {
         {/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
         <p>from booking-flow package:</p>
       </Typography>
-      <BookingWidget booking={booking} lang={lang} />
+      <BookingWidget booking={booking} lang={lang} config={bookingFlowConfig} />
       <hr />
       <Typography variant="Title/Decorative/lg">
         {/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
diff --git a/apps/partner-sas/app/[lang]/hotelreservation/(confirmation)/booking-confirmation/page.tsx b/apps/partner-sas/app/[lang]/hotelreservation/(confirmation)/booking-confirmation/page.tsx
index 54f0f1650..5e3512650 100644
--- a/apps/partner-sas/app/[lang]/hotelreservation/(confirmation)/booking-confirmation/page.tsx
+++ b/apps/partner-sas/app/[lang]/hotelreservation/(confirmation)/booking-confirmation/page.tsx
@@ -1,5 +1,7 @@
 import { BookingConfirmationPage as BookingConfirmationPagePrimitive } from "@scandic-hotels/booking-flow/pages/BookingConfirmationPage"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
+
 import { getIntl } from "@/i18n"
 import { getLang } from "@/i18n/serverContext"
 
@@ -17,6 +19,7 @@ export default async function BookingConfirmationPage(
       intl={intl}
       lang={lang}
       searchParams={searchParams}
+      config={bookingFlowConfig}
     />
   )
 }
diff --git a/apps/partner-sas/app/[lang]/hotelreservation/(payment-callback)/payment-callback/[status]/page.tsx b/apps/partner-sas/app/[lang]/hotelreservation/(payment-callback)/payment-callback/[status]/page.tsx
index 57d7c9702..1c5d13540 100644
--- a/apps/partner-sas/app/[lang]/hotelreservation/(payment-callback)/payment-callback/[status]/page.tsx
+++ b/apps/partner-sas/app/[lang]/hotelreservation/(payment-callback)/payment-callback/[status]/page.tsx
@@ -1,6 +1,8 @@
 import { PaymentCallbackPage as PaymentCallbackPagePrimitive } from "@scandic-hotels/booking-flow/pages/PaymentCallbackPage"
 import { logger } from "@scandic-hotels/common/logger"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
+
 import type { PaymentCallbackStatusEnum } from "@scandic-hotels/common/constants/paymentCallbackStatusEnum"
 
 import type { LangParams, PageArgs } from "@/types/params"
@@ -26,6 +28,7 @@ export default async function PaymentCallbackPage(
       userAccessToken={userAccessToken}
       searchParams={searchParams}
       status={params.status as PaymentCallbackStatusEnum}
+      config={bookingFlowConfig}
     />
   )
 }
diff --git a/apps/partner-sas/app/[lang]/hotelreservation/(standard)/alternative-hotels/map/page.tsx b/apps/partner-sas/app/[lang]/hotelreservation/(standard)/alternative-hotels/map/page.tsx
index f534bd1ed..9ab05e1df 100644
--- a/apps/partner-sas/app/[lang]/hotelreservation/(standard)/alternative-hotels/map/page.tsx
+++ b/apps/partner-sas/app/[lang]/hotelreservation/(standard)/alternative-hotels/map/page.tsx
@@ -1,5 +1,6 @@
 import { AlternativeHotelsMapPage as AlternativeHotelsMapPagePrimitive } from "@scandic-hotels/booking-flow/pages/AlternativeHotelsMapPage"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
 import { getHotel } from "@/lib/trpc/memoizedRequests/getHotel"
 
 import { getIntl } from "@/i18n"
@@ -56,6 +57,7 @@ export default async function AlternativeHotelsMapPage(
       <AlternativeHotelsMapPagePrimitive
         lang={lang}
         searchParams={searchParams}
+        config={bookingFlowConfig}
       />
     </div>
   )
diff --git a/apps/partner-sas/app/[lang]/hotelreservation/(standard)/alternative-hotels/page.tsx b/apps/partner-sas/app/[lang]/hotelreservation/(standard)/alternative-hotels/page.tsx
index 51d625b96..341d7d9f5 100644
--- a/apps/partner-sas/app/[lang]/hotelreservation/(standard)/alternative-hotels/page.tsx
+++ b/apps/partner-sas/app/[lang]/hotelreservation/(standard)/alternative-hotels/page.tsx
@@ -1,5 +1,6 @@
 import { AlternativeHotelsPage as AlternativeHotelsPagePrimitive } from "@scandic-hotels/booking-flow/pages/AlternativeHotelsPage"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
 import { getHotel } from "@/lib/trpc/memoizedRequests/getHotel"
 
 import { getIntl } from "@/i18n"
@@ -52,6 +53,10 @@ export default async function AlternativeHotelsPage(
   const lang = await getLang()
 
   return (
-    <AlternativeHotelsPagePrimitive lang={lang} searchParams={searchParams} />
+    <AlternativeHotelsPagePrimitive
+      lang={lang}
+      searchParams={searchParams}
+      config={bookingFlowConfig}
+    />
   )
 }
diff --git a/apps/partner-sas/app/[lang]/hotelreservation/(standard)/details/page.tsx b/apps/partner-sas/app/[lang]/hotelreservation/(standard)/details/page.tsx
index 3b5df1964..4a0688cd8 100644
--- a/apps/partner-sas/app/[lang]/hotelreservation/(standard)/details/page.tsx
+++ b/apps/partner-sas/app/[lang]/hotelreservation/(standard)/details/page.tsx
@@ -1,10 +1,18 @@
 import { EnterDetailsPage as EnterDetailsPagePrimitive } from "@scandic-hotels/booking-flow/pages/EnterDetailsPage"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
+
 import type { LangParams, PageArgs } from "@/types/params"
 
 export default async function DetailsPage(props: PageArgs<LangParams>) {
   const { lang } = await props.params
   const searchParams = await props.searchParams
 
-  return <EnterDetailsPagePrimitive lang={lang} searchParams={searchParams} />
+  return (
+    <EnterDetailsPagePrimitive
+      lang={lang}
+      searchParams={searchParams}
+      config={bookingFlowConfig}
+    />
+  )
 }
diff --git a/apps/partner-sas/app/[lang]/hotelreservation/(standard)/select-hotel/map/page.tsx b/apps/partner-sas/app/[lang]/hotelreservation/(standard)/select-hotel/map/page.tsx
index 970e95c7e..5433dacfd 100644
--- a/apps/partner-sas/app/[lang]/hotelreservation/(standard)/select-hotel/map/page.tsx
+++ b/apps/partner-sas/app/[lang]/hotelreservation/(standard)/select-hotel/map/page.tsx
@@ -1,6 +1,8 @@
 import { SelectHotelMapPage as SelectHotelMapPagePrimitive } from "@scandic-hotels/booking-flow/pages/SelectHotelMapPage"
 import { toCapitalCase } from "@scandic-hotels/common/utils/toCapitalCase"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
+
 import { getLang } from "@/i18n/serverContext"
 
 import type { Metadata } from "next"
@@ -25,5 +27,11 @@ export default async function SelectHotelMapPage(props: PageArgs<LangParams>) {
   const searchParams = await props.searchParams
   const lang = await getLang()
 
-  return <SelectHotelMapPagePrimitive lang={lang} searchParams={searchParams} />
+  return (
+    <SelectHotelMapPagePrimitive
+      lang={lang}
+      searchParams={searchParams}
+      config={bookingFlowConfig}
+    />
+  )
 }
diff --git a/apps/partner-sas/app/[lang]/hotelreservation/(standard)/select-hotel/page.tsx b/apps/partner-sas/app/[lang]/hotelreservation/(standard)/select-hotel/page.tsx
index c7def4927..42485fc53 100644
--- a/apps/partner-sas/app/[lang]/hotelreservation/(standard)/select-hotel/page.tsx
+++ b/apps/partner-sas/app/[lang]/hotelreservation/(standard)/select-hotel/page.tsx
@@ -1,6 +1,8 @@
 import { SelectHotelPage as SelectHotelPagePrimitive } from "@scandic-hotels/booking-flow/pages/SelectHotelPage"
 import { toCapitalCase } from "@scandic-hotels/common/utils/toCapitalCase"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
+
 import { getLang } from "@/i18n/serverContext"
 
 import type { Metadata } from "next"
@@ -25,5 +27,11 @@ export default async function SelectHotelPage(props: PageArgs<LangParams>) {
   const searchParams = await props.searchParams
   const lang = await getLang()
 
-  return <SelectHotelPagePrimitive lang={lang} searchParams={searchParams} />
+  return (
+    <SelectHotelPagePrimitive
+      lang={lang}
+      searchParams={searchParams}
+      config={bookingFlowConfig}
+    />
+  )
 }
diff --git a/apps/partner-sas/app/[lang]/hotelreservation/(standard)/select-rate/page.tsx b/apps/partner-sas/app/[lang]/hotelreservation/(standard)/select-rate/page.tsx
index 6816f1b02..a8766ee08 100644
--- a/apps/partner-sas/app/[lang]/hotelreservation/(standard)/select-rate/page.tsx
+++ b/apps/partner-sas/app/[lang]/hotelreservation/(standard)/select-rate/page.tsx
@@ -1,5 +1,6 @@
 import { SelectRatePage as SelectRatePagePrimitive } from "@scandic-hotels/booking-flow/pages/SelectRatePage"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
 import { getHotel } from "@/lib/trpc/memoizedRequests/getHotel"
 
 import { getLang } from "@/i18n/serverContext"
@@ -38,5 +39,11 @@ export default async function SelectRatePage(props: PageArgs<LangParams>) {
   const searchParams = await props.searchParams
   const lang = await getLang()
 
-  return <SelectRatePagePrimitive lang={lang} searchParams={searchParams} />
+  return (
+    <SelectRatePagePrimitive
+      lang={lang}
+      searchParams={searchParams}
+      config={bookingFlowConfig}
+    />
+  )
 }
diff --git a/apps/partner-sas/app/[lang]/layout.tsx b/apps/partner-sas/app/[lang]/layout.tsx
index b5024fe8f..3ad3d62b6 100644
--- a/apps/partner-sas/app/[lang]/layout.tsx
+++ b/apps/partner-sas/app/[lang]/layout.tsx
@@ -8,13 +8,8 @@ import { ReactQueryDevtools } from "@tanstack/react-query-devtools"
 import Script from "next/script"
 import { SessionProvider } from "next-auth/react"
 
-import { BookingFlowConfig } from "@scandic-hotels/booking-flow/BookingFlowConfig"
 import { NuqsAdapter } from "@scandic-hotels/booking-flow/utils/nuqs"
 import { Lang } from "@scandic-hotels/common/constants/language"
-import { bookingTermsAndConditionsRoutes } from "@scandic-hotels/common/constants/routes/bookingTermsAndConditionsRoutes"
-import { customerService } from "@scandic-hotels/common/constants/routes/customerService"
-import { myStay } from "@scandic-hotels/common/constants/routes/myStay"
-import { privacyPolicyRoutes } from "@scandic-hotels/common/constants/routes/privacyPolicyRoutes"
 import { ToastHandler } from "@scandic-hotels/design-system/ToastHandler"
 
 import AdobeSDKScript from "@/components/AdobeSDKScript"
@@ -34,8 +29,6 @@ import { Footer } from "../../components/Footer/Footer"
 import { Header } from "../../components/Header/Header"
 import { SocialLoginProvider } from "./(auth)/SocialLogin"
 
-import type { LangRoute } from "@scandic-hotels/common/constants/routes/langRoute"
-
 type LangParams = {
   lang: Lang
 }
@@ -55,20 +48,6 @@ export default async function RootLayout(props: RootLayoutProps) {
   const parsedLanguage = setLang(lang)
   const messages = await getMessages(parsedLanguage)
 
-  const bookingFlowConfig: BookingFlowConfig = {
-    bookingCodeEnabled: false,
-    enterDetailsMembershipIdInputLocation: "join-card",
-    variant: "partner-sas",
-    routes: {
-      myStay: routeToScandicWeb(myStay),
-      bookingTermsAndConditions: routeToScandicWeb(
-        bookingTermsAndConditionsRoutes
-      ),
-      customerService: routeToScandicWeb(customerService),
-      privacyPolicy: routeToScandicWeb(privacyPolicyRoutes),
-    },
-  }
-
   return (
     <html lang={lang}>
       <head>
@@ -93,19 +72,17 @@ export default async function RootLayout(props: RootLayoutProps) {
                 <TrpcProvider>
                   <SocialLoginProvider>
                     <RACRouterProvider>
-                      <BookingFlowConfig config={bookingFlowConfig}>
-                        <BookingFlowProviders>
-                          <RouteChange />
-                          <SiteWideAlert />
-                          <Header />
-                          {props.bookingwidget}
-                          <main>{children}</main>
-                          <Footer />
-                          <ToastHandler />
-                          <CookieBotConsent />
-                          <ReactQueryDevtools initialIsOpen={false} />
-                        </BookingFlowProviders>
-                      </BookingFlowConfig>
+                      <BookingFlowProviders>
+                        <RouteChange />
+                        <SiteWideAlert />
+                        <Header />
+                        {props.bookingwidget}
+                        <main>{children}</main>
+                        <Footer />
+                        <ToastHandler />
+                        <CookieBotConsent />
+                        <ReactQueryDevtools initialIsOpen={false} />
+                      </BookingFlowProviders>
                     </RACRouterProvider>
                   </SocialLoginProvider>
                 </TrpcProvider>
@@ -127,11 +104,3 @@ export default async function RootLayout(props: RootLayoutProps) {
     </html>
   )
 }
-
-function routeToScandicWeb(route: LangRoute) {
-  const url = `https://www.scandichotels.com`
-  return Object.entries(route).reduce((acc, [key, value]) => {
-    acc[key as Lang] = `${url}${value}`
-    return acc
-  }, {} as LangRoute)
-}
diff --git a/apps/partner-sas/app/[lang]/page.tsx b/apps/partner-sas/app/[lang]/page.tsx
index 3dd729f87..450921566 100644
--- a/apps/partner-sas/app/[lang]/page.tsx
+++ b/apps/partner-sas/app/[lang]/page.tsx
@@ -3,6 +3,8 @@ import { parseBookingWidgetSearchParams } from "@scandic-hotels/booking-flow/uti
 import Image from "@scandic-hotels/design-system/Image"
 import { TrackingSDK } from "@scandic-hotels/tracking/TrackingSDK"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
+
 import { getLang } from "@/i18n/serverContext"
 import LandingPageHeroImage from "@/public/_static/img/landing-page-hero.png"
 
@@ -30,7 +32,11 @@ export default async function Home(props: PageArgs<LangParams>) {
     <>
       <section className={styles.mainContent}>
         <div className={styles.bookingWidgetWrapper}>
-          <FloatingBookingWidget booking={booking} lang={lang} />
+          <FloatingBookingWidget
+            booking={booking}
+            lang={lang}
+            config={bookingFlowConfig}
+          />
         </div>
         <Image
           alt="Hero Image"
diff --git a/apps/partner-sas/constants/bookingFlowConfig.ts b/apps/partner-sas/constants/bookingFlowConfig.ts
new file mode 100644
index 000000000..6e631636e
--- /dev/null
+++ b/apps/partner-sas/constants/bookingFlowConfig.ts
@@ -0,0 +1,30 @@
+import { bookingTermsAndConditionsRoutes } from "@scandic-hotels/common/constants/routes/bookingTermsAndConditionsRoutes"
+import { customerService } from "@scandic-hotels/common/constants/routes/customerService"
+import { myStay } from "@scandic-hotels/common/constants/routes/myStay"
+import { privacyPolicyRoutes } from "@scandic-hotels/common/constants/routes/privacyPolicyRoutes"
+
+import type { BookingFlowConfig } from "@scandic-hotels/booking-flow/BookingFlowConfig"
+import type { Lang } from "@scandic-hotels/common/constants/language"
+import type { LangRoute } from "@scandic-hotels/common/constants/routes/langRoute"
+
+export const bookingFlowConfig: BookingFlowConfig = {
+  bookingCodeEnabled: false,
+  enterDetailsMembershipIdInputLocation: "join-card",
+  variant: "partner-sas",
+  routes: {
+    myStay: routeToScandicWeb(myStay),
+    bookingTermsAndConditions: routeToScandicWeb(
+      bookingTermsAndConditionsRoutes
+    ),
+    customerService: routeToScandicWeb(customerService),
+    privacyPolicy: routeToScandicWeb(privacyPolicyRoutes),
+  },
+}
+
+function routeToScandicWeb(route: LangRoute) {
+  const url = `https://www.scandichotels.com`
+  return Object.entries(route).reduce((acc, [key, value]) => {
+    acc[key as Lang] = `${url}${value}`
+    return acc
+  }, {} as LangRoute)
+}
diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(confirmation)/booking-confirmation/page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(confirmation)/booking-confirmation/page.tsx
index b772d349d..6b8b2ce6a 100644
--- a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(confirmation)/booking-confirmation/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(confirmation)/booking-confirmation/page.tsx
@@ -1,5 +1,7 @@
 import { BookingConfirmationPage as BookingConfirmationPagePrimitive } from "@scandic-hotels/booking-flow/pages/BookingConfirmationPage"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
+
 import { getIntl } from "@/i18n"
 import { getLang } from "@/i18n/serverContext"
 
@@ -17,6 +19,7 @@ export default async function BookingConfirmationPage(
       intl={intl}
       lang={lang}
       searchParams={searchParams}
+      config={bookingFlowConfig}
     />
   )
 }
diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/page.tsx
index 45daba87f..c1fdb0aa5 100644
--- a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/page.tsx
@@ -2,6 +2,8 @@ import { PaymentCallbackPage as PaymentCallbackPagePrimitive } from "@scandic-ho
 import { logger } from "@scandic-hotels/common/logger"
 import { isValidSession } from "@scandic-hotels/trpc/utils/session"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
+
 import { auth } from "@/auth"
 
 import type { PaymentCallbackStatusEnum } from "@scandic-hotels/common/constants/paymentCallbackStatusEnum"
@@ -35,6 +37,7 @@ export default async function PaymentCallbackPage(
       searchParams={searchParams}
       // TODO refactor this route to get this from params instead of rewriting in next.config
       status={searchParams.status as PaymentCallbackStatusEnum}
+      config={bookingFlowConfig}
     />
   )
 }
diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/alternative-hotels/map/page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/alternative-hotels/map/page.tsx
index 2a029955b..78a35f151 100644
--- a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/alternative-hotels/map/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/alternative-hotels/map/page.tsx
@@ -1,5 +1,6 @@
 import { AlternativeHotelsMapPage as AlternativeHotelsMapPagePrimitive } from "@scandic-hotels/booking-flow/pages/AlternativeHotelsMapPage"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
 import { getHotel } from "@/lib/trpc/memoizedRequests"
 
 import { getIntl } from "@/i18n"
@@ -58,6 +59,7 @@ export default async function AlternativeHotelsMapPage(
       <AlternativeHotelsMapPagePrimitive
         lang={lang}
         searchParams={searchParams}
+        config={bookingFlowConfig}
       />
     </div>
   )
diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/alternative-hotels/page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/alternative-hotels/page.tsx
index a4b458c0f..9783bc2ef 100644
--- a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/alternative-hotels/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/alternative-hotels/page.tsx
@@ -1,5 +1,6 @@
 import { AlternativeHotelsPage as AlternativeHotelsPagePrimitive } from "@scandic-hotels/booking-flow/pages/AlternativeHotelsPage"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
 import { getHotel } from "@/lib/trpc/memoizedRequests"
 
 import { getIntl } from "@/i18n"
@@ -55,6 +56,10 @@ export default async function AlternativeHotelsPage(
   const searchParams = await props.searchParams
   const lang = await getLang()
   return (
-    <AlternativeHotelsPagePrimitive lang={lang} searchParams={searchParams} />
+    <AlternativeHotelsPagePrimitive
+      lang={lang}
+      searchParams={searchParams}
+      config={bookingFlowConfig}
+    />
   )
 }
diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/details/page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/details/page.tsx
index 948c8cf53..6fa46c87d 100644
--- a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/details/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/details/page.tsx
@@ -1,5 +1,7 @@
 import { EnterDetailsPage as EnterDetailsPagePrimitive } from "@scandic-hotels/booking-flow/pages/EnterDetailsPage"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
+
 import type { LangParams, NextSearchParams, PageArgs } from "@/types/params"
 
 export default async function DetailsPage(
@@ -8,5 +10,11 @@ export default async function DetailsPage(
   const { lang } = await props.params
   const searchParams = await props.searchParams
 
-  return <EnterDetailsPagePrimitive lang={lang} searchParams={searchParams} />
+  return (
+    <EnterDetailsPagePrimitive
+      lang={lang}
+      searchParams={searchParams}
+      config={bookingFlowConfig}
+    />
+  )
 }
diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/map/page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/map/page.tsx
index 296c71dac..156608254 100644
--- a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/map/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/map/page.tsx
@@ -1,6 +1,8 @@
 import { SelectHotelMapPage as SelectHotelMapPagePrimitive } from "@scandic-hotels/booking-flow/pages/SelectHotelMapPage"
 import { toCapitalCase } from "@scandic-hotels/common/utils/toCapitalCase"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
+
 import { getLang } from "@/i18n/serverContext"
 
 import styles from "./page.module.css"
@@ -27,7 +29,11 @@ export default async function SelectHotelMapPage(
 
   return (
     <div className={styles.main}>
-      <SelectHotelMapPagePrimitive lang={lang} searchParams={searchParams} />
+      <SelectHotelMapPagePrimitive
+        lang={lang}
+        searchParams={searchParams}
+        config={bookingFlowConfig}
+      />
     </div>
   )
 }
diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/page.tsx
index 526b9a73e..0ccfe5492 100644
--- a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/page.tsx
@@ -1,6 +1,8 @@
 import { SelectHotelPage as SelectHotelPagePrimitive } from "@scandic-hotels/booking-flow/pages/SelectHotelPage"
 import { toCapitalCase } from "@scandic-hotels/common/utils/toCapitalCase"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
+
 import { getLang } from "@/i18n/serverContext"
 
 import type { Metadata } from "next"
@@ -23,5 +25,11 @@ export default async function SelectHotelPage(
   const searchParams = await props.searchParams
   const lang = await getLang()
 
-  return <SelectHotelPagePrimitive lang={lang} searchParams={searchParams} />
+  return (
+    <SelectHotelPagePrimitive
+      lang={lang}
+      searchParams={searchParams}
+      config={bookingFlowConfig}
+    />
+  )
 }
diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx
index 80f1e63d5..83f47ba9a 100644
--- a/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-rate/page.tsx
@@ -1,5 +1,6 @@
 import { SelectRatePage as SelectRatePagePrimitive } from "@scandic-hotels/booking-flow/pages/SelectRatePage"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
 import { getHotel } from "@/lib/trpc/memoizedRequests"
 
 import { getLang } from "@/i18n/serverContext"
@@ -40,5 +41,11 @@ export default async function SelectRatePage(
   const searchParams = await props.searchParams
   const lang = await getLang()
 
-  return <SelectRatePagePrimitive lang={lang} searchParams={searchParams} />
+  return (
+    <SelectRatePagePrimitive
+      lang={lang}
+      searchParams={searchParams}
+      config={bookingFlowConfig}
+    />
+  )
 }
diff --git a/apps/scandic-web/app/[lang]/(live)/@bookingwidget/(contentTypes)/destination_city_page/[uid]/page.tsx b/apps/scandic-web/app/[lang]/(live)/@bookingwidget/(contentTypes)/destination_city_page/[uid]/page.tsx
index 7e23c6cfd..c0946354b 100644
--- a/apps/scandic-web/app/[lang]/(live)/@bookingwidget/(contentTypes)/destination_city_page/[uid]/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/@bookingwidget/(contentTypes)/destination_city_page/[uid]/page.tsx
@@ -1,6 +1,7 @@
 import { BookingWidget } from "@scandic-hotels/booking-flow/BookingWidget"
 import { parseBookingWidgetSearchParams } from "@scandic-hotels/booking-flow/utils/url"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
 import { getDestinationCityPage } from "@/lib/trpc/memoizedRequests"
 
 import { getLang } from "@/i18n/serverContext"
@@ -24,5 +25,7 @@ export default async function BookingWidgetDestinationCityPage(
 
   const lang = await getLang()
 
-  return <BookingWidget booking={booking} lang={lang} />
+  return (
+    <BookingWidget booking={booking} lang={lang} config={bookingFlowConfig} />
+  )
 }
diff --git a/apps/scandic-web/app/[lang]/(live)/@bookingwidget/(contentTypes)/hotel_page/[uid]/page.tsx b/apps/scandic-web/app/[lang]/(live)/@bookingwidget/(contentTypes)/hotel_page/[uid]/page.tsx
index abee13519..07d7033c8 100644
--- a/apps/scandic-web/app/[lang]/(live)/@bookingwidget/(contentTypes)/hotel_page/[uid]/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/@bookingwidget/(contentTypes)/hotel_page/[uid]/page.tsx
@@ -1,6 +1,7 @@
 import { BookingWidget } from "@scandic-hotels/booking-flow/BookingWidget"
 import { parseBookingWidgetSearchParams } from "@scandic-hotels/booking-flow/utils/url"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
 import { getHotel, getHotelPage } from "@/lib/trpc/memoizedRequests"
 
 import { getLang } from "@/i18n/serverContext"
@@ -36,5 +37,7 @@ export default async function BookingWidgetHotelPage(
 
   const booking = parseBookingWidgetSearchParams(bookingWidgetSearchParams)
 
-  return <BookingWidget booking={booking} lang={lang} />
+  return (
+    <BookingWidget booking={booking} lang={lang} config={bookingFlowConfig} />
+  )
 }
diff --git a/apps/scandic-web/app/[lang]/(live)/@bookingwidget/hotelreservation/[...paths]/loading.tsx b/apps/scandic-web/app/[lang]/(live)/@bookingwidget/hotelreservation/[...paths]/loading.tsx
index e06bc80f5..b8f33bf74 100644
--- a/apps/scandic-web/app/[lang]/(live)/@bookingwidget/hotelreservation/[...paths]/loading.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/@bookingwidget/hotelreservation/[...paths]/loading.tsx
@@ -1,5 +1,7 @@
 import { BookingWidgetSkeleton } from "@scandic-hotels/booking-flow/BookingWidget"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
+
 // This file is crucial for displaying a loading
 // state immediately in the booking flow.
 // Next doesn't recognize manually added Suspense
@@ -7,5 +9,5 @@ import { BookingWidgetSkeleton } from "@scandic-hotels/booking-flow/BookingWidge
 // thus making it seem as the page is frozen during
 // the time it takes for `BookingWidget` to resolve.
 export default function BookingWidgetLoading() {
-  return <BookingWidgetSkeleton />
+  return <BookingWidgetSkeleton config={bookingFlowConfig} />
 }
diff --git a/apps/scandic-web/app/[lang]/(live)/@bookingwidget/hotelreservation/page.tsx b/apps/scandic-web/app/[lang]/(live)/@bookingwidget/hotelreservation/page.tsx
index 2924e1e15..45816625a 100644
--- a/apps/scandic-web/app/[lang]/(live)/@bookingwidget/hotelreservation/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/@bookingwidget/hotelreservation/page.tsx
@@ -1,6 +1,8 @@
 import { BookingWidget } from "@scandic-hotels/booking-flow/BookingWidget"
 import { parseBookingWidgetSearchParams } from "@scandic-hotels/booking-flow/utils/url"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
+
 import { getLang } from "@/i18n/serverContext"
 
 import type { LangParams, NextSearchParams, PageArgs } from "@/types/params"
@@ -14,5 +16,7 @@ export default async function BookingWidgetPage(
 
   const lang = await getLang()
 
-  return <BookingWidget booking={booking} lang={lang} />
+  return (
+    <BookingWidget booking={booking} lang={lang} config={bookingFlowConfig} />
+  )
 }
diff --git a/apps/scandic-web/app/[lang]/(live)/@bookingwidget/page.tsx b/apps/scandic-web/app/[lang]/(live)/@bookingwidget/page.tsx
index 2924e1e15..45816625a 100644
--- a/apps/scandic-web/app/[lang]/(live)/@bookingwidget/page.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/@bookingwidget/page.tsx
@@ -1,6 +1,8 @@
 import { BookingWidget } from "@scandic-hotels/booking-flow/BookingWidget"
 import { parseBookingWidgetSearchParams } from "@scandic-hotels/booking-flow/utils/url"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
+
 import { getLang } from "@/i18n/serverContext"
 
 import type { LangParams, NextSearchParams, PageArgs } from "@/types/params"
@@ -14,5 +16,7 @@ export default async function BookingWidgetPage(
 
   const lang = await getLang()
 
-  return <BookingWidget booking={booking} lang={lang} />
+  return (
+    <BookingWidget booking={booking} lang={lang} config={bookingFlowConfig} />
+  )
 }
diff --git a/apps/scandic-web/app/[lang]/(live)/layout.tsx b/apps/scandic-web/app/[lang]/(live)/layout.tsx
index 46daebf73..0ce1b6079 100644
--- a/apps/scandic-web/app/[lang]/(live)/layout.tsx
+++ b/apps/scandic-web/app/[lang]/(live)/layout.tsx
@@ -9,13 +9,11 @@ import { ReactQueryDevtools } from "@tanstack/react-query-devtools"
 import Script from "next/script"
 import { SessionProvider } from "next-auth/react"
 
-import { BookingFlowConfig } from "@scandic-hotels/booking-flow/BookingFlowConfig"
 import StorageCleaner from "@scandic-hotels/booking-flow/components/EnterDetails/StorageCleaner"
 import { NuqsAdapter } from "@scandic-hotels/booking-flow/utils/nuqs"
 import { Lang } from "@scandic-hotels/common/constants/language"
 import { ToastHandler } from "@scandic-hotels/design-system/ToastHandler"
 
-import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
 import TrpcProvider from "@/lib/trpc/Provider"
 
 import { SessionRefresher } from "@/components/Auth/TokenRefresher"
@@ -75,22 +73,20 @@ export default async function RootLayout(
               <NuqsAdapter>
                 <TrpcProvider>
                   <RACRouterProvider>
-                    <BookingFlowConfig config={bookingFlowConfig}>
-                      <BookingFlowProviders>
-                        <RouteChange />
-                        <SitewideAlert />
-                        <Header />
-                        {bookingwidget}
-                        {children}
-                        <Footer />
-                        <ToastHandler />
-                        <SessionRefresher />
-                        <StorageCleaner />
-                        <CookieBotConsent />
-                        <UserExists />
-                        <ReactQueryDevtools initialIsOpen={false} />
-                      </BookingFlowProviders>
-                    </BookingFlowConfig>
+                    <BookingFlowProviders>
+                      <RouteChange />
+                      <SitewideAlert />
+                      <Header />
+                      {bookingwidget}
+                      {children}
+                      <Footer />
+                      <ToastHandler />
+                      <SessionRefresher />
+                      <StorageCleaner />
+                      <CookieBotConsent />
+                      <UserExists />
+                      <ReactQueryDevtools initialIsOpen={false} />
+                    </BookingFlowProviders>
                   </RACRouterProvider>
                 </TrpcProvider>
               </NuqsAdapter>
diff --git a/apps/scandic-web/app/[lang]/(no-layout)/layout.tsx b/apps/scandic-web/app/[lang]/(no-layout)/layout.tsx
index f063321a7..7fedfe73d 100644
--- a/apps/scandic-web/app/[lang]/(no-layout)/layout.tsx
+++ b/apps/scandic-web/app/[lang]/(no-layout)/layout.tsx
@@ -9,13 +9,11 @@ import { ReactQueryDevtools } from "@tanstack/react-query-devtools"
 import Script from "next/script"
 import { SessionProvider } from "next-auth/react"
 
-import { BookingFlowConfig } from "@scandic-hotels/booking-flow/BookingFlowConfig"
 import StorageCleaner from "@scandic-hotels/booking-flow/components/EnterDetails/StorageCleaner"
 import { NuqsAdapter } from "@scandic-hotels/booking-flow/utils/nuqs"
 import { Lang } from "@scandic-hotels/common/constants/language"
 import { ToastHandler } from "@scandic-hotels/design-system/ToastHandler"
 
-import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
 import TrpcProvider from "@/lib/trpc/Provider"
 
 import { SessionRefresher } from "@/components/Auth/TokenRefresher"
@@ -59,15 +57,13 @@ export default async function RootLayout(
           >
             <NuqsAdapter>
               <TrpcProvider>
-                <BookingFlowConfig config={bookingFlowConfig}>
-                  <RouteChange />
-                  {children}
-                  <ToastHandler />
-                  <SessionRefresher />
-                  <StorageCleaner />
-                  <CookieBotConsent />
-                  <ReactQueryDevtools initialIsOpen={false} />
-                </BookingFlowConfig>
+                <RouteChange />
+                {children}
+                <ToastHandler />
+                <SessionRefresher />
+                <StorageCleaner />
+                <CookieBotConsent />
+                <ReactQueryDevtools initialIsOpen={false} />
               </TrpcProvider>
             </NuqsAdapter>
           </ClientIntlProvider>
diff --git a/apps/scandic-web/app/[lang]/(partner)/layout.tsx b/apps/scandic-web/app/[lang]/(partner)/layout.tsx
index 4b0c3911a..5befb6dd2 100644
--- a/apps/scandic-web/app/[lang]/(partner)/layout.tsx
+++ b/apps/scandic-web/app/[lang]/(partner)/layout.tsx
@@ -8,13 +8,11 @@ import "@scandic-hotels/common/polyfills"
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools"
 import Script from "next/script"
 
-import { BookingFlowConfig } from "@scandic-hotels/booking-flow/BookingFlowConfig"
 import StorageCleaner from "@scandic-hotels/booking-flow/components/EnterDetails/StorageCleaner"
 import { NuqsAdapter } from "@scandic-hotels/booking-flow/utils/nuqs"
 import { Lang } from "@scandic-hotels/common/constants/language"
 import { ToastHandler } from "@scandic-hotels/design-system/ToastHandler"
 
-import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
 import TrpcProvider from "@/lib/trpc/Provider"
 
 import TokenRefresher from "@/components/Auth/TokenRefresher"
@@ -59,15 +57,13 @@ export default async function RootLayout(
         >
           <NuqsAdapter>
             <TrpcProvider>
-              <BookingFlowConfig config={bookingFlowConfig}>
-                <RouteChange />
-                {children}
-                <ToastHandler />
-                <TokenRefresher />
-                <StorageCleaner />
-                <CookieBotConsent />
-                <ReactQueryDevtools initialIsOpen={false} />
-              </BookingFlowConfig>
+              <RouteChange />
+              {children}
+              <ToastHandler />
+              <TokenRefresher />
+              <StorageCleaner />
+              <CookieBotConsent />
+              <ReactQueryDevtools initialIsOpen={false} />
             </TrpcProvider>
           </NuqsAdapter>
         </ClientIntlProvider>
diff --git a/apps/scandic-web/components/ContentType/StartPage/index.tsx b/apps/scandic-web/components/ContentType/StartPage/index.tsx
index a5b12d87e..8714b9662 100644
--- a/apps/scandic-web/components/ContentType/StartPage/index.tsx
+++ b/apps/scandic-web/components/ContentType/StartPage/index.tsx
@@ -4,6 +4,7 @@ import { Typography } from "@scandic-hotels/design-system/Typography"
 import { TrackingSDK } from "@scandic-hotels/tracking/TrackingSDK"
 import { BlocksEnums } from "@scandic-hotels/trpc/types/blocksEnum"
 
+import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
 import { getStartPage } from "@/lib/trpc/memoizedRequests"
 
 import Blocks from "@/components/Blocks"
@@ -36,7 +37,11 @@ export default async function StartPage({
               <h1>{header.heading}</h1>
             </Typography>
           ) : null}
-          <FloatingBookingWidget booking={booking} lang={lang} />
+          <FloatingBookingWidget
+            booking={booking}
+            lang={lang}
+            config={bookingFlowConfig}
+          />
         </div>
         {header.hero_image ? (
           <Image
diff --git a/packages/booking-flow/lib/components/BookingWidget/Client.tsx b/packages/booking-flow/lib/components/BookingWidget/Client.tsx
index a92830ee5..56820263b 100644
--- a/packages/booking-flow/lib/components/BookingWidget/Client.tsx
+++ b/packages/booking-flow/lib/components/BookingWidget/Client.tsx
@@ -54,7 +54,7 @@ export default function BookingWidgetClient({
   const [originalOverflowY, setOriginalOverflowY] = useState<string | null>(
     null
   )
-  const { bookingCodeEnabled } = useBookingFlowConfig()
+  const bookingFlowConfig = useBookingFlowConfig()
   const storedBookingWidgetState = useBookingWidgetState()
 
   const shouldFetchAutoComplete = !!data.hotelId || !!data.city
@@ -128,7 +128,7 @@ export default function BookingWidgetClient({
         toDate: toDate.format("YYYY-MM-DD"),
       },
       bookingCode: {
-        value: bookingCodeEnabled ? selectedBookingCode : "",
+        value: bookingFlowConfig.bookingCodeEnabled ? selectedBookingCode : "",
         remember: false,
       },
       redemption: data.searchType === SEARCH_TYPE_REDEMPTION,
@@ -228,7 +228,7 @@ export default function BookingWidgetClient({
   }, [data, methods, storedBookingWidgetState])
 
   if (shouldShowSkeleton) {
-    return <BookingWidgetSkeleton type={type} />
+    return <BookingWidgetSkeleton type={type} config={bookingFlowConfig} />
   }
 
   const classNames = bookingWidgetContainerVariants({
diff --git a/packages/booking-flow/lib/components/BookingWidget/FloatingBookingWidget/index.tsx b/packages/booking-flow/lib/components/BookingWidget/FloatingBookingWidget/index.tsx
index bc1d45b4c..60ab20920 100644
--- a/packages/booking-flow/lib/components/BookingWidget/FloatingBookingWidget/index.tsx
+++ b/packages/booking-flow/lib/components/BookingWidget/FloatingBookingWidget/index.tsx
@@ -1,3 +1,4 @@
+import { BookingFlowConfig } from "../../../bookingFlowConfig/bookingFlowConfig"
 import {
   getPageSettingsBookingCode,
   isBookingWidgetHidden,
@@ -9,6 +10,7 @@ import type { BookingWidgetProps } from ".."
 export async function FloatingBookingWidget({
   booking,
   lang,
+  config,
 }: Omit<BookingWidgetProps, "type">) {
   const isHidden = await isBookingWidgetHidden(lang)
 
@@ -22,9 +24,11 @@ export async function FloatingBookingWidget({
   }
 
   return (
-    <FloatingBookingWidgetClient
-      data={booking}
-      pageSettingsBookingCodePromise={pageSettingsBookingCodePromise}
-    />
+    <BookingFlowConfig config={config}>
+      <FloatingBookingWidgetClient
+        data={booking}
+        pageSettingsBookingCodePromise={pageSettingsBookingCodePromise}
+      />
+    </BookingFlowConfig>
   )
 }
diff --git a/packages/booking-flow/lib/components/BookingWidget/Skeleton.tsx b/packages/booking-flow/lib/components/BookingWidget/Skeleton.tsx
index fd179c52b..90a7909e0 100644
--- a/packages/booking-flow/lib/components/BookingWidget/Skeleton.tsx
+++ b/packages/booking-flow/lib/components/BookingWidget/Skeleton.tsx
@@ -1,30 +1,34 @@
 "use client"
 
+import { BookingFlowConfigContextProvider } from "../../bookingFlowConfig/bookingFlowConfigContext"
 import { BookingWidgetFormSkeleton } from "./BookingWidgetForm"
 import { MobileToggleButtonSkeleton } from "./MobileToggleButton"
 import { bookingWidgetContainerVariants } from "./variant"
 
 import styles from "./bookingWidget.module.css"
 
+import type { BookingFlowConfig } from "../../bookingFlowConfig/bookingFlowConfig"
 import type { BookingWidgetClientProps } from "./Client"
 
 export function BookingWidgetSkeleton({
   type = "full",
+  config,
 }: {
   type?: BookingWidgetClientProps["type"]
+  config: BookingFlowConfig
 }) {
   const classNames = bookingWidgetContainerVariants({
     type,
   })
 
   return (
-    <>
+    <BookingFlowConfigContextProvider config={config}>
       <section className={classNames} style={{ top: 0 }}>
         <MobileToggleButtonSkeleton />
         <div className={styles.formContainer}>
           <BookingWidgetFormSkeleton type={type} />
         </div>
       </section>
-    </>
+    </BookingFlowConfigContextProvider>
   )
 }
diff --git a/packages/booking-flow/lib/components/BookingWidget/index.tsx b/packages/booking-flow/lib/components/BookingWidget/index.tsx
index cdf2961f4..74e28edb2 100644
--- a/packages/booking-flow/lib/components/BookingWidget/index.tsx
+++ b/packages/booking-flow/lib/components/BookingWidget/index.tsx
@@ -1,5 +1,6 @@
 import { Suspense } from "react"
 
+import { BookingFlowConfig } from "../../bookingFlowConfig/bookingFlowConfig"
 import {
   getPageSettingsBookingCode,
   isBookingWidgetHidden,
@@ -39,13 +40,16 @@ export type BookingWidgetProps = {
   type?: BookingWidgetType
   booking: BookingWidgetSearchData
   lang: Lang
+  config: BookingFlowConfig
 }
 
-export async function BookingWidget(props: BookingWidgetProps) {
+export async function BookingWidget({ config, ...props }: BookingWidgetProps) {
   return (
-    <Suspense fallback={<BookingWidgetSkeleton />}>
-      <InternalBookingWidget {...props} />
-    </Suspense>
+    <BookingFlowConfig config={config}>
+      <Suspense fallback={<BookingWidgetSkeleton config={config} />}>
+        <InternalBookingWidget {...props} />
+      </Suspense>
+    </BookingFlowConfig>
   )
 }
 
@@ -53,7 +57,7 @@ async function InternalBookingWidget({
   lang,
   type,
   booking,
-}: BookingWidgetProps) {
+}: Omit<BookingWidgetProps, "config">) {
   const isHidden = await isBookingWidgetHidden(lang)
 
   if (isHidden) {
diff --git a/packages/booking-flow/lib/pages/AlternativeHotelsMapPage.tsx b/packages/booking-flow/lib/pages/AlternativeHotelsMapPage.tsx
index 5e22ba21d..4d86e5caf 100644
--- a/packages/booking-flow/lib/pages/AlternativeHotelsMapPage.tsx
+++ b/packages/booking-flow/lib/pages/AlternativeHotelsMapPage.tsx
@@ -5,7 +5,7 @@ import { safeTry } from "@scandic-hotels/common/utils/safeTry"
 import { TrackingSDK } from "@scandic-hotels/tracking/TrackingSDK"
 
 import { env } from "../../env/server"
-import { getBookingFlowConfig } from "../bookingFlowConfig/bookingFlowConfig"
+import { BookingFlowConfig } from "../bookingFlowConfig/bookingFlowConfig"
 import { MapContainer } from "../components/MapContainer"
 import {
   getFiltersFromHotels,
@@ -27,9 +27,11 @@ import type { NextSearchParams } from "../types"
 export async function AlternativeHotelsMapPage({
   lang,
   searchParams,
+  config,
 }: {
   lang: Lang
   searchParams: NextSearchParams
+  config: BookingFlowConfig
 }) {
   const googleMapId = env.GOOGLE_DYNAMIC_MAP_ID
   const googleMapsApiKey = env.GOOGLE_STATIC_MAP_KEY
@@ -103,29 +105,31 @@ export async function AlternativeHotelsMapPage({
     isBookingCodeRateAvailable,
     isRedemption: redemption,
     isRedemptionAvailable: isRedemptionAvailability,
-    config: getBookingFlowConfig(),
+    config,
   })
 
   const filterList = getFiltersFromHotels(hotels, isBookingCodeRateAvailable)
 
   return (
-    <MapContainer>
-      <Suspense key={booking.hotelId} fallback={<SelectHotelMapSkeleton />}>
-        <SelectHotelMap
-          apiKey={googleMapsApiKey}
-          mapId={googleMapId}
-          hotels={hotels}
-          cityCoordinates={cityCoordinates}
-          bookingCode={booking.bookingCode}
-          isBookingCodeRateAvailable={isBookingCodeRateAvailable}
-          isAlternativeHotels={true}
-          filterList={filterList}
-        />
-        <TrackingSDK
-          hotelInfo={hotelsTrackingData}
-          pageData={pageTrackingData}
-        />
-      </Suspense>
-    </MapContainer>
+    <BookingFlowConfig config={config}>
+      <MapContainer>
+        <Suspense key={booking.hotelId} fallback={<SelectHotelMapSkeleton />}>
+          <SelectHotelMap
+            apiKey={googleMapsApiKey}
+            mapId={googleMapId}
+            hotels={hotels}
+            cityCoordinates={cityCoordinates}
+            bookingCode={booking.bookingCode}
+            isBookingCodeRateAvailable={isBookingCodeRateAvailable}
+            isAlternativeHotels={true}
+            filterList={filterList}
+          />
+          <TrackingSDK
+            hotelInfo={hotelsTrackingData}
+            pageData={pageTrackingData}
+          />
+        </Suspense>
+      </MapContainer>
+    </BookingFlowConfig>
   )
 }
diff --git a/packages/booking-flow/lib/pages/AlternativeHotelsPage.tsx b/packages/booking-flow/lib/pages/AlternativeHotelsPage.tsx
index bed5c0131..e95ba84fc 100644
--- a/packages/booking-flow/lib/pages/AlternativeHotelsPage.tsx
+++ b/packages/booking-flow/lib/pages/AlternativeHotelsPage.tsx
@@ -7,7 +7,7 @@ import { FamilyAndFriendsCodes } from "@scandic-hotels/common/constants/familyAn
 import { NoAvailabilityTracking } from "@scandic-hotels/tracking/NoAvailabilityTracking"
 import { TrackingSDK } from "@scandic-hotels/tracking/TrackingSDK"
 
-import { getBookingFlowConfig } from "../bookingFlowConfig/bookingFlowConfig"
+import { BookingFlowConfig } from "../bookingFlowConfig/bookingFlowConfig"
 import { AlternativeHotelsPageTitle } from "../components/AlternativeHotelsPageTitle"
 import FnFNotAllowedAlert from "../components/FnFNotAllowedAlert"
 import { SelectHotel } from "../components/SelectHotel"
@@ -25,9 +25,11 @@ export { SelectHotelSkeleton as AlternativeHotelsPageSkeleton } from "../compone
 export async function AlternativeHotelsPage({
   lang,
   searchParams,
+  config,
 }: {
   lang: Lang
   searchParams: NextSearchParams
+  config: BookingFlowConfig
 }) {
   const booking = parseSelectHotelSearchParams(searchParams)
 
@@ -108,7 +110,7 @@ export async function AlternativeHotelsPage({
     isBookingCodeRateAvailable,
     isRedemption: searchDetails.redemption,
     isRedemptionAvailable: isRedemptionAvailability,
-    config: getBookingFlowConfig(),
+    config,
   })
 
   const suspenseKey = stringify(searchParams)
@@ -118,7 +120,7 @@ export async function AlternativeHotelsPage({
     (booking.bookingCode && hotels.length > 0 && !isBookingCodeRateAvailable)
   )
   return (
-    <>
+    <BookingFlowConfig config={config}>
       <SelectHotel
         bookingCode={booking.bookingCode}
         city={searchDetails.city}
@@ -142,6 +144,6 @@ export async function AlternativeHotelsPage({
           shouldTrackNoAvailability={shouldTrackNoAvailability}
         />
       </Suspense>
-    </>
+    </BookingFlowConfig>
   )
 }
diff --git a/packages/booking-flow/lib/pages/BookingConfirmationPage.tsx b/packages/booking-flow/lib/pages/BookingConfirmationPage.tsx
index 8c7ba2e2f..f09bf4aa3 100644
--- a/packages/booking-flow/lib/pages/BookingConfirmationPage.tsx
+++ b/packages/booking-flow/lib/pages/BookingConfirmationPage.tsx
@@ -3,6 +3,7 @@ import { notFound, redirect } from "next/navigation"
 
 import { decrypt } from "@scandic-hotels/trpc/utils/encryption"
 
+import { BookingFlowConfig } from "../bookingFlowConfig/bookingFlowConfig"
 import { BookingConfirmation } from "../components/BookingConfirmation"
 import { getBookingConfirmation } from "../trpc/memoizedRequests/getBookingConfirmation"
 import { MEMBERSHIP_FAILED_ERROR } from "../types/membershipFailedError"
@@ -16,10 +17,12 @@ export async function BookingConfirmationPage({
   intl,
   lang,
   searchParams,
+  config,
 }: {
   intl: IntlShape
   lang: Lang
   searchParams: NextSearchParams
+  config: BookingFlowConfig
 }) {
   const refId = searchParams.RefId?.toString()
 
@@ -46,10 +49,12 @@ export async function BookingConfirmationPage({
     searchParams.errorCode === MEMBERSHIP_FAILED_ERROR
 
   return (
-    <BookingConfirmation
-      intl={intl}
-      refId={refId}
-      membershipFailedError={membershipFailedError}
-    />
+    <BookingFlowConfig config={config}>
+      <BookingConfirmation
+        intl={intl}
+        refId={refId}
+        membershipFailedError={membershipFailedError}
+      />
+    </BookingFlowConfig>
   )
 }
diff --git a/packages/booking-flow/lib/pages/EnterDetailsPage.tsx b/packages/booking-flow/lib/pages/EnterDetailsPage.tsx
index 0e8748350..43e007990 100644
--- a/packages/booking-flow/lib/pages/EnterDetailsPage.tsx
+++ b/packages/booking-flow/lib/pages/EnterDetailsPage.tsx
@@ -4,6 +4,7 @@ import { Suspense } from "react"
 
 import { FamilyAndFriendsCodes } from "@scandic-hotels/common/constants/familyAndFriends"
 
+import { BookingFlowConfig } from "../bookingFlowConfig/bookingFlowConfig"
 import HotelHeader from "../components/EnterDetails/Header"
 import Payment from "../components/EnterDetails/Payment"
 import Multiroom from "../components/EnterDetails/Room/Multiroom"
@@ -29,9 +30,11 @@ import type { NextSearchParams } from "../types"
 export async function EnterDetailsPage({
   lang,
   searchParams,
+  config,
 }: {
   lang: Lang
   searchParams: NextSearchParams
+  config: BookingFlowConfig
 }) {
   const selectRoomParams = new URLSearchParams(
     searchParams as Record<string, string>
@@ -116,53 +119,55 @@ export async function EnterDetailsPage({
   // beneath footer to be able to show entire footer upon
   // scrolling down to the bottom of the page
   return (
-    <main data-footer-spacing>
-      <EnterDetailsProvider
-        booking={booking}
-        breakfastPackages={breakfastPackages}
-        lang={lang}
-        rooms={rooms}
-        searchParamsStr={selectRoomParams.toString()}
-        user={user}
-        vat={hotel.vat}
-        roomCategories={hotelData.roomCategories}
-      >
-        <HotelHeader hotelData={hotelData} />
-        <div className={styles.container}>
-          <div className={styles.content}>
-            <RoomProvider idx={0} room={firstRoom}>
-              <RoomOne user={user} />
-            </RoomProvider>
-            {multirooms.map((room, idx) => (
-              // Need to start idx from 1 since first room is
-              // rendered above
-              <RoomProvider key={idx + 1} idx={idx + 1} room={room}>
-                <Multiroom />
-              </RoomProvider>
-            ))}
-            <Suspense>
-              <Payment
-                otherPaymentOptions={
-                  hotel.merchantInformationData.alternatePaymentOptions
-                }
-                supportedCards={hotel.merchantInformationData.cards}
-              />
-            </Suspense>
-          </div>
-          <aside className={styles.summary}>
-            <MobileSummary isUserLoggedIn={!!user} />
-            <DesktopSummary isUserLoggedIn={!!user} />
-          </aside>
-        </div>
-
-        <EnterDetailsTrackingWrapper
+    <BookingFlowConfig config={config}>
+      <main data-footer-spacing>
+        <EnterDetailsProvider
           booking={booking}
-          hotel={hotel}
-          isMember={!!user}
+          breakfastPackages={breakfastPackages}
           lang={lang}
           rooms={rooms}
-        />
-      </EnterDetailsProvider>
-    </main>
+          searchParamsStr={selectRoomParams.toString()}
+          user={user}
+          vat={hotel.vat}
+          roomCategories={hotelData.roomCategories}
+        >
+          <HotelHeader hotelData={hotelData} />
+          <div className={styles.container}>
+            <div className={styles.content}>
+              <RoomProvider idx={0} room={firstRoom}>
+                <RoomOne user={user} />
+              </RoomProvider>
+              {multirooms.map((room, idx) => (
+                // Need to start idx from 1 since first room is
+                // rendered above
+                <RoomProvider key={idx + 1} idx={idx + 1} room={room}>
+                  <Multiroom />
+                </RoomProvider>
+              ))}
+              <Suspense>
+                <Payment
+                  otherPaymentOptions={
+                    hotel.merchantInformationData.alternatePaymentOptions
+                  }
+                  supportedCards={hotel.merchantInformationData.cards}
+                />
+              </Suspense>
+            </div>
+            <aside className={styles.summary}>
+              <MobileSummary isUserLoggedIn={!!user} />
+              <DesktopSummary isUserLoggedIn={!!user} />
+            </aside>
+          </div>
+
+          <EnterDetailsTrackingWrapper
+            booking={booking}
+            hotel={hotel}
+            isMember={!!user}
+            lang={lang}
+            rooms={rooms}
+          />
+        </EnterDetailsProvider>
+      </main>
+    </BookingFlowConfig>
   )
 }
diff --git a/packages/booking-flow/lib/pages/PaymentCallbackPage.tsx b/packages/booking-flow/lib/pages/PaymentCallbackPage.tsx
index 6f3f1eccd..965112808 100644
--- a/packages/booking-flow/lib/pages/PaymentCallbackPage.tsx
+++ b/packages/booking-flow/lib/pages/PaymentCallbackPage.tsx
@@ -11,6 +11,7 @@ import { BookingErrorCodeEnum } from "@scandic-hotels/trpc/enums/bookingErrorCod
 import { getBooking } from "@scandic-hotels/trpc/routers/booking/utils"
 import { encrypt } from "@scandic-hotels/trpc/utils/encryption"
 
+import { BookingFlowConfig } from "../bookingFlowConfig/bookingFlowConfig"
 import { HandleErrorCallback } from "../components/EnterDetails/Payment/PaymentCallback/HandleErrorCallback"
 import { HandleSuccessCallback } from "../components/EnterDetails/Payment/PaymentCallback/HandleSuccessCallback"
 import { serverClient } from "../trpc"
@@ -24,12 +25,14 @@ type PaymentCallbackPageProps = {
   searchParams: NextSearchParams
   userAccessToken: string | null
   status: PaymentCallbackStatusEnum
+  config: BookingFlowConfig
 }
 export async function PaymentCallbackPage({
   lang,
   userAccessToken,
   searchParams,
   status,
+  config,
 }: PaymentCallbackPageProps) {
   const { confirmationNumber } = searchParams
 
@@ -51,12 +54,14 @@ export async function PaymentCallbackPage({
   if (status === PaymentCallbackStatusEnum.Cancel) {
     searchObject.set("errorCode", BookingErrorCodeEnum.TransactionCancelled)
     return (
-      <HandleErrorCallback
-        returnUrl={returnUrl.toString()}
-        searchObject={searchObject}
-        status={status}
-        errorMessage={errorMessage}
-      />
+      <BookingFlowConfig config={config}>
+        <HandleErrorCallback
+          returnUrl={returnUrl.toString()}
+          searchObject={searchObject}
+          status={status}
+          errorMessage={errorMessage}
+        />
+      </BookingFlowConfig>
     )
   }
 
@@ -92,12 +97,14 @@ export async function PaymentCallbackPage({
     )
 
     return (
-      <HandleSuccessCallback
-        refId={refId}
-        sig={sig}
-        successRedirectUrl={confirmationUrl}
-        cardType={booking.guaranteeInfo?.cardType}
-      />
+      <BookingFlowConfig config={config}>
+        <HandleSuccessCallback
+          refId={refId}
+          sig={sig}
+          successRedirectUrl={confirmationUrl}
+          cardType={booking.guaranteeInfo?.cardType}
+        />
+      </BookingFlowConfig>
     )
   }
 
@@ -141,11 +148,13 @@ export async function PaymentCallbackPage({
   }
 
   return (
-    <HandleErrorCallback
-      returnUrl={returnUrl.toString()}
-      searchObject={searchObject}
-      status={status}
-      errorMessage={errorMessage}
-    />
+    <BookingFlowConfig config={config}>
+      <HandleErrorCallback
+        returnUrl={returnUrl.toString()}
+        searchObject={searchObject}
+        status={status}
+        errorMessage={errorMessage}
+      />
+    </BookingFlowConfig>
   )
 }
diff --git a/packages/booking-flow/lib/pages/SelectHotelMapPage.tsx b/packages/booking-flow/lib/pages/SelectHotelMapPage.tsx
index f715a4309..fd87652b7 100644
--- a/packages/booking-flow/lib/pages/SelectHotelMapPage.tsx
+++ b/packages/booking-flow/lib/pages/SelectHotelMapPage.tsx
@@ -6,7 +6,7 @@ import { safeTry } from "@scandic-hotels/common/utils/safeTry"
 import { TrackingSDK } from "@scandic-hotels/tracking/TrackingSDK"
 
 import { env } from "../../env/server"
-import { getBookingFlowConfig } from "../bookingFlowConfig/bookingFlowConfig"
+import { BookingFlowConfig } from "../bookingFlowConfig/bookingFlowConfig"
 import { MapContainer } from "../components/MapContainer"
 import {
   getFiltersFromHotels,
@@ -28,9 +28,11 @@ import type { NextSearchParams } from "../types"
 export async function SelectHotelMapPage({
   lang,
   searchParams,
+  config,
 }: {
   lang: Lang
   searchParams: NextSearchParams
+  config: BookingFlowConfig
 }) {
   const googleMapId = env.GOOGLE_DYNAMIC_MAP_ID
   const googleMapsApiKey = env.GOOGLE_STATIC_MAP_KEY
@@ -104,7 +106,7 @@ export async function SelectHotelMapPage({
     isBookingCodeRateAvailable,
     isRedemption: redemption,
     isRedemptionAvailable: isRedemptionAvailability,
-    config: getBookingFlowConfig(),
+    config,
   })
 
   const filterList = getFiltersFromHotels(hotels, isBookingCodeRateAvailable)
@@ -112,22 +114,24 @@ export async function SelectHotelMapPage({
   const suspenseKey = stringify(searchParams)
 
   return (
-    <MapContainer>
-      <Suspense key={suspenseKey} fallback={<SelectHotelMapSkeleton />}>
-        <SelectHotelMap
-          apiKey={googleMapsApiKey}
-          mapId={googleMapId}
-          hotels={hotels}
-          cityCoordinates={cityCoordinates}
-          bookingCode={booking.bookingCode}
-          isBookingCodeRateAvailable={isBookingCodeRateAvailable}
-          filterList={filterList}
-        />
-        <TrackingSDK
-          hotelInfo={hotelsTrackingData}
-          pageData={pageTrackingData}
-        />
-      </Suspense>
-    </MapContainer>
+    <BookingFlowConfig config={config}>
+      <MapContainer>
+        <Suspense key={suspenseKey} fallback={<SelectHotelMapSkeleton />}>
+          <SelectHotelMap
+            apiKey={googleMapsApiKey}
+            mapId={googleMapId}
+            hotels={hotels}
+            cityCoordinates={cityCoordinates}
+            bookingCode={booking.bookingCode}
+            isBookingCodeRateAvailable={isBookingCodeRateAvailable}
+            filterList={filterList}
+          />
+          <TrackingSDK
+            hotelInfo={hotelsTrackingData}
+            pageData={pageTrackingData}
+          />
+        </Suspense>
+      </MapContainer>
+    </BookingFlowConfig>
   )
 }
diff --git a/packages/booking-flow/lib/pages/SelectHotelPage.tsx b/packages/booking-flow/lib/pages/SelectHotelPage.tsx
index 70fc68aae..59594c7f1 100644
--- a/packages/booking-flow/lib/pages/SelectHotelPage.tsx
+++ b/packages/booking-flow/lib/pages/SelectHotelPage.tsx
@@ -7,7 +7,7 @@ import { FamilyAndFriendsCodes } from "@scandic-hotels/common/constants/familyAn
 import { NoAvailabilityTracking } from "@scandic-hotels/tracking/NoAvailabilityTracking"
 import { TrackingSDK } from "@scandic-hotels/tracking/TrackingSDK"
 
-import { getBookingFlowConfig } from "../bookingFlowConfig/bookingFlowConfig"
+import { BookingFlowConfig } from "../bookingFlowConfig/bookingFlowConfig"
 import FnFNotAllowedAlert from "../components/FnFNotAllowedAlert"
 import { SelectHotel } from "../components/SelectHotel"
 import { getHotels } from "../components/SelectHotel/helpers"
@@ -24,9 +24,11 @@ export { SelectHotelSkeleton as SelectHotelPageSkeleton } from "../components/Se
 export async function SelectHotelPage({
   lang,
   searchParams,
+  config,
 }: {
   lang: Lang
   searchParams: NextSearchParams
+  config: BookingFlowConfig
 }) {
   const booking = parseSelectHotelSearchParams(searchParams)
 
@@ -94,7 +96,7 @@ export async function SelectHotelPage({
     isBookingCodeRateAvailable,
     isRedemption: redemption,
     isRedemptionAvailable: isRedemptionAvailability,
-    config: getBookingFlowConfig(),
+    config,
   })
 
   const suspenseKey = stringify(searchParams)
@@ -105,7 +107,7 @@ export async function SelectHotelPage({
   )
 
   return (
-    <>
+    <BookingFlowConfig config={config}>
       <SelectHotel
         bookingCode={booking.bookingCode}
         isBookingCodeRateAvailable={isBookingCodeRateAvailable}
@@ -126,6 +128,6 @@ export async function SelectHotelPage({
           shouldTrackNoAvailability={shouldTrackNoAvailability}
         />
       </Suspense>
-    </>
+    </BookingFlowConfig>
   )
 }
diff --git a/packages/booking-flow/lib/pages/SelectRatePage.tsx b/packages/booking-flow/lib/pages/SelectRatePage.tsx
index 71b09adf9..a419fb586 100644
--- a/packages/booking-flow/lib/pages/SelectRatePage.tsx
+++ b/packages/booking-flow/lib/pages/SelectRatePage.tsx
@@ -3,6 +3,7 @@ import { notFound } from "next/navigation"
 import { logger } from "@scandic-hotels/common/logger"
 import { SEARCH_TYPE_REDEMPTION } from "@scandic-hotels/trpc/constants/booking"
 
+import { BookingFlowConfig } from "../bookingFlowConfig/bookingFlowConfig"
 import { SelectRate } from "../components/SelectRate"
 import { SelectRateTracking } from "../components/SelectRate/Tracking/SelectRateTracking"
 import { SelectRateProvider } from "../contexts/SelectRate/SelectRateContext"
@@ -28,9 +29,11 @@ const singleRoomRateTypes = combineRegExps(
 export async function SelectRatePage({
   lang,
   searchParams,
+  config,
 }: {
   lang: Lang
   searchParams: NextSearchParams
+  config: BookingFlowConfig
 }) {
   const booking = parseSelectRateSearchParams(searchParams)
 
@@ -71,12 +74,12 @@ export async function SelectRatePage({
   }
 
   return (
-    <>
+    <BookingFlowConfig config={config}>
       <SelectRateProvider hotelData={hotelData}>
         <SelectRate hotelData={hotelData} booking={booking} />
         <SelectRateTracking hotelData={hotelData} booking={booking} />
       </SelectRateProvider>
-    </>
+    </BookingFlowConfig>
   )
 }
 
diff --git a/packages/trpc/lib/utils/getUserPointsBalance.ts b/packages/trpc/lib/utils/getUserPointsBalance.ts
index d7c49ee04..a01a47f57 100644
--- a/packages/trpc/lib/utils/getUserPointsBalance.ts
+++ b/packages/trpc/lib/utils/getUserPointsBalance.ts
@@ -11,10 +11,7 @@ export async function getUserPointsBalance(
 
   const verifiedUser =
     session.token.loginType === "eurobonus"
-      ? await getEuroBonusProfileData({
-          accessToken: session.token.access_token,
-          loginType: session.token.loginType,
-        })
+      ? await getEuroBonusProfileSafely(session)
       : await getVerifiedUser({ session })
 
   if (!verifiedUser || "error" in verifiedUser) {
@@ -28,3 +25,14 @@ export async function getUserPointsBalance(
 
   return points ?? 0
 }
+
+async function getEuroBonusProfileSafely(session: Session) {
+  try {
+    return await getEuroBonusProfileData({
+      accessToken: session.token.access_token,
+      loginType: session.token.loginType,
+    })
+  } catch (_error) {
+    return undefined
+  }
+}