Merged in fix/SW-3208-webviews-change-dates-on-my- (pull request #2638)

fix(SW-3208): Fixed webview for change date in MyStay

* fix(SW-3208): Fixed webview for change date in MyStay


Approved-by: Linus Flood

apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Actions/NotCancelled/ManageStay/Actions/ChangeDates/Steps/index.tsx

@@ -1,5 +1,4 @@
 "use client"
-import { useSession } from "next-auth/react"
 import { useState } from "react"
 import { useIntl } from "react-intl"
 
@@ -11,7 +10,6 @@ import { useMyStayStore } from "@/stores/my-stay"
 
 import { sumPackages } from "@/components/HotelReservation/utils"
 import useLang from "@/hooks/useLang"
-import { isValidClientSession } from "@/utils/clientSession"
 
 import Confirmation from "./Confirmation"
 import Form from "./Form"
@@ -24,8 +22,6 @@ interface Dates {
 }
 
 export default function Steps({ closeModal }: ChangeDatesStepsProps) {
-  const { data: session } = useSession()
-  const isLoggedIn = isValidClientSession(session)
   const intl = useIntl()
   const lang = useLang()
   const utils = trpc.useUtils()
@@ -33,8 +29,8 @@ export default function Steps({ closeModal }: ChangeDatesStepsProps) {
   const [newPrice, setNewPrice] = useState<string | null>(null)
   const [noAvailability, setNoAvailability] = useState(false)
 
-  const { breakfast, currencyCode, hotelId, packages, room } = useMyStayStore(
-    (state) => ({
+  const { breakfast, currencyCode, hotelId, packages, room, isLoggedIn } =
+    useMyStayStore((state) => ({
       breakfast: state.bookedRoom.breakfast,
       currencyCode: state.bookedRoom.currencyCode,
       hotelId: state.bookedRoom.hotelId,
@@ -46,8 +42,8 @@ export default function Steps({ closeModal }: ChangeDatesStepsProps) {
         rateCode: state.bookedRoom.rateDefinition.rateCode,
         roomTypeCode: state.bookedRoom.roomTypeCode,
       },
-    })
-  )
+      isLoggedIn: state.isLoggedIn,
+    }))
 
   async function checkAvailability(fromDate: string, toDate: string) {
     setNoAvailability(false)

apps/scandic-web/components/HotelReservation/MyStay/index.tsx

@@ -218,6 +218,7 @@ export default async function MyStay(props: {
         refId={booking.refId}
         roomCategories={roomCategories}
         savedCreditCards={savedCreditCards}
+        isLoggedIn={isLoggedIn}
       >
         <main className={styles.main}>
           <div className={styles.imageContainer}>

apps/scandic-web/providers/MyStay.tsx

@@ -24,6 +24,7 @@ import type { MyStayStore } from "@/types/contexts/my-stay"
 interface MyStayProviderProps {
   bookingConfirmation: BookingConfirmation
   breakfastPackages: Packages | null
+  isLoggedIn?: boolean
   lang: Lang
   linkedReservationsPromise: Promise<BookingConfirmationSchema[]>
   refId: string
@@ -40,6 +41,7 @@ export default function MyStayProvider({
   refId,
   roomCategories,
   savedCreditCards,
+  isLoggedIn,
 }: React.PropsWithChildren<MyStayProviderProps>) {
   const storeRef = useRef<MyStayStore>(undefined)
   const intl = useIntl()
@@ -101,6 +103,7 @@ export default function MyStayProvider({
       roomCategories,
       rooms,
       savedCreditCards,
+      isLoggedIn,
     })
   }
 

apps/scandic-web/stores/my-stay/index.ts

@@ -24,6 +24,7 @@ export function createMyStayStore({
   roomCategories,
   rooms,
   savedCreditCards,
+  isLoggedIn,
 }: InitialState) {
   const rates = {
     change: intl.formatMessage({
@@ -67,6 +68,7 @@ export function createMyStayStore({
       bookedRoom,
       breakfastPackages,
       hotel,
+      isLoggedIn,
       mainRoom,
       manageStay: false,
       refId,

apps/scandic-web/types/stores/my-stay.ts

@@ -49,6 +49,7 @@ export interface MyStayState {
   bookedRoom: Room
   breakfastPackages: Packages | null
   hotel: Hotel
+  isLoggedIn?: boolean
   mainRoom: Room
   manageStay: boolean
   refId: string
@@ -61,7 +62,7 @@ export interface MyStayState {
 export interface InitialState
   extends Pick<
     MyStayState,
-    "breakfastPackages" | "hotel" | "refId" | "savedCreditCards"
+    "breakfastPackages" | "hotel" | "refId" | "savedCreditCards" | "isLoggedIn"
   > {
   intl: IntlShape
   roomCategories: RoomCategories