Merged in feat/book-425-optimize-campaign-rate-card (pull request #3015)

Feat/book 425 optimize campaign rate card

* feat(BOOK-425): design updates to RateCard

* feat(BOOK-425): design updates to campaign BookingCodeChip

* feat(BOOK-425): fixed breakfast message & booking code chips on select rate and enter detailss

* feat(BOOK-425): fixed booking code chip on Booking Confirmation page

* fixed draft comments

* fixed more comments

* feat(BOOK-425): removed fixed height from RateCard banner

* fixed another variable comment

* fixed more pr comments

* fixed more pr comments

* updated ratecard campaign standard rate title color

* removed deconstructed props


Approved-by: Bianca Widstam
Approved-by: Erik Tiekstra

packages/booking-flow/lib/components/SelectRate/RoomsContainer/Rooms/RoomsHeader/RemoveBookingCodeButton/RemoveBookingCodeButton.tsx

@@ -6,6 +6,7 @@ export function RemoveBookingCodeButton() {
   const {
     input: { bookingCode },
     actions: { removeBookingCode },
+    hasCampaignRates,
   } = useSelectRateContext()
 
   if (!bookingCode) {
@@ -16,6 +17,7 @@ export function RemoveBookingCodeButton() {
     <BookingCodeChip
       bookingCode={bookingCode}
       filledIcon
+      isCampaign={hasCampaignRates}
       withCloseButton={true}
       withText={false}
       onClose={() => {

packages/booking-flow/lib/components/SelectRate/RoomsContainer/Rooms/RoomsList/RoomListItem/Rates/Campaign.tsx

@@ -148,8 +148,9 @@ function Inner({
     id: "booking.campaign",
     defaultMessage: "Campaign",
   })
+
   if (product.bookingCode) {
-    bannerText = product.bookingCode
+    bannerText = `${bannerText} ∙ ${product.bookingCode.trim()}`
   }
 
   if (product.rateDefinition.breakfastIncluded) {
@@ -157,11 +158,6 @@ function Inner({
       id: "booking.breakfastIncluded",
       defaultMessage: "Breakfast included",
     })}`
-  } else {
-    bannerText = `${bannerText} ∙ ${intl.formatMessage({
-      id: "booking.breakfastExcluded",
-      defaultMessage: "Breakfast excluded",
-    })}`
   }
 
   const pkgsSum = sumPackages(selectedPackages)

packages/booking-flow/lib/components/SelectRate/RoomsContainer/Rooms/RoomsList/RoomListItem/Rates/index.tsx

@@ -1,7 +1,5 @@
 "use client"
 
-import { Divider } from "@scandic-hotels/design-system/Divider"
-
 import { useSelectRateContext } from "../../../../../../../contexts/SelectRate/SelectRateContext"
 import { BookingCodeFilterEnum } from "../../../../../../../stores/bookingCode-filter"
 import { BreakfastMessage } from "./BreakfastMessage"
@@ -44,22 +42,38 @@ export function Rates({
     selectedPackages,
   }
   const showAllRates = bookingCodeFilter === BookingCodeFilterEnum.All
-  const hasBookingCodeRates = !!(campaign.length || code.length)
   const hasRegularRates = !!regular.length
-  const showDivider = showAllRates && hasBookingCodeRates && hasRegularRates
+
+  const showSeparateCampaignBreakfastMessage = campaign.some((camp) => {
+    return (
+      camp.rateDefinition.breakfastIncluded ||
+      camp.rateDefinitionMember?.breakfastIncluded
+    )
+  })
 
   return (
     <>
       <Code {...sharedProps} code={code} />
+
+      {!showSeparateCampaignBreakfastMessage && showAllRates && (
+        <BreakfastMessage
+          breakfastIncludedMember={breakfastIncludedInAllRatesMember}
+          breakfastIncludedStandard={breakfastIncludedInAllRates}
+          hasRegularRates={hasRegularRates && showAllRates}
+          roomIndex={roomIndex}
+        />
+      )}
       <Campaign {...sharedProps} campaign={campaign} />
       <Redemptions {...sharedProps} redemptions={redemptions} />
-      {showDivider ? <Divider color="Border/Divider/Subtle" /> : null}
-      <BreakfastMessage
-        breakfastIncludedMember={breakfastIncludedInAllRatesMember}
-        breakfastIncludedStandard={breakfastIncludedInAllRates}
-        hasRegularRates={hasRegularRates && showAllRates}
-        roomIndex={roomIndex}
-      />
+
+      {showSeparateCampaignBreakfastMessage && showAllRates && (
+        <BreakfastMessage
+          breakfastIncludedMember={breakfastIncludedInAllRatesMember}
+          breakfastIncludedStandard={breakfastIncludedInAllRates}
+          hasRegularRates={hasRegularRates && showAllRates}
+          roomIndex={roomIndex}
+        />
+      )}
       <RegularRate {...sharedProps} regular={regular} />
     </>
   )