Merged in fix/SW-1153-correct-breakfast-message (pull request #1060)

fix(SW-1153): fix breakfast message for ScandicGo hotels

Approved-by: Pontus Dreij

components/HotelReservation/SelectRate/RoomSelection/RoomCard/index.tsx

@@ -20,9 +20,11 @@ import styles from "./roomCard.module.css"
 
 import type { RoomCardProps } from "@/types/components/hotelReservation/selectRate/roomCard"
 import { RoomPackageCodeEnum } from "@/types/components/hotelReservation/selectRate/roomFilter"
+import { HotelTypeEnum } from "@/types/enums/hotelType"
 
 export default function RoomCard({
   hotelId,
+  hotelType,
   rateDefinitions,
   roomConfiguration,
   roomCategories,
@@ -59,17 +61,14 @@ export default function RoomCard({
   }
 
   const getBreakfastMessage = (rate: RateDefinition | undefined) => {
-    const breakfastIncluded = getRateDefinitionForRate(rate)?.breakfastIncluded
+    if (hotelType === HotelTypeEnum.ScandicGo) {
-    switch (breakfastIncluded) {
+      return intl.formatMessage({
-      case true:
+        id: "Breakfast deal can be purchased at the hotel.",
-        return intl.formatMessage({ id: "Breakfast is included." })
+      })
-      case false:
-        return intl.formatMessage({ id: "Breakfast selection in next step." })
-      default:
-        return intl.formatMessage({
-          id: "Breakfast deal can be purchased at the hotel.",
-        })
     }
+    return getRateDefinitionForRate(rate)?.breakfastIncluded
+      ? intl.formatMessage({ id: "Breakfast is included." })
+      : intl.formatMessage({ id: "Breakfast selection in next step." })
   }
 
   const petRoomPackage =

components/HotelReservation/SelectRate/RoomSelection/index.tsx

@@ -18,6 +18,7 @@ export default function RoomSelection({
   selectedPackages,
   setRateCode,
   rateSummary,
+  hotelType,
 }: RoomSelectionProps) {
   const router = useRouter()
   const searchParams = useSearchParams()
@@ -67,6 +68,7 @@ export default function RoomSelection({
             <li key={roomConfiguration.roomTypeCode}>
               <RoomCard
                 hotelId={roomsAvailability.hotelId.toString()}
+                hotelType={hotelType}
                 rateDefinitions={rateDefinitions}
                 roomConfiguration={roomConfiguration}
                 roomCategories={roomCategories}

components/HotelReservation/SelectRate/Rooms/RoomsContainer.tsx

@@ -96,6 +96,7 @@ export async function RoomsContainer({
       availablePackages={packages ?? []}
       roomsAvailability={roomsAvailability}
       roomCategories={hotelData?.included ?? []}
+      hotelType={hotelData?.data.attributes?.hotelType}
     />
   )
 }

components/HotelReservation/SelectRate/Rooms/index.tsx

@@ -25,6 +25,7 @@ export default function Rooms({
   roomCategories = [],
   user,
   availablePackages,
+  hotelType,
 }: SelectRateProps) {
   const visibleRooms: RoomConfiguration[] =
     filterDuplicateRoomTypesByLowestPrice(roomsAvailability.roomConfigurations)
@@ -165,6 +166,7 @@ export default function Rooms({
         selectedPackages={selectedPackages}
         setRateCode={setSelectedRate}
         rateSummary={rateSummary}
+        hotelType={hotelType}
       />
     </div>
   )

types/components/hotelReservation/selectRate/roomCard.ts

@@ -14,6 +14,7 @@ import type { RateCode } from "./selectRate"
 
 export type RoomCardProps = {
   hotelId: string
+  hotelType: string | undefined
   roomConfiguration: RoomConfiguration
   rateDefinitions: RateDefinition[]
   roomCategories: RoomData[]

types/components/hotelReservation/selectRate/roomSelection.ts

@@ -12,6 +12,7 @@ export interface RoomSelectionProps {
   selectedPackages: RoomPackageCodes[]
   setRateCode: React.Dispatch<React.SetStateAction<RateCode | undefined>>
   rateSummary: Rate | null
+  hotelType: string | undefined
 }
 
 export interface SelectRateProps {
@@ -19,4 +20,5 @@ export interface SelectRateProps {
   roomCategories: RoomData[]
   user: SafeUser
   availablePackages: RoomPackageData
+  hotelType: string | undefined
 }