From 1e566e59f78d183472bfb957b32a7ae43a4835c5 Mon Sep 17 00:00:00 2001 From: Bianca Widstam Date: Wed, 17 Sep 2025 08:11:10 +0000 Subject: [PATCH] Merged in fix/SW-3484-campaign-remove-breakfast-message-chip (pull request #2820) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(SW-3484): remove breakfast message in the booking code chip for campaign * fix(SW-3484): remove breakfast message in the booking code chip for campaign Approved-by: Matilda Landström --- .../EnterDetails/Summary/UI/index.tsx | 5 +--- .../PriceDetailsTable/Row/BookingCode.tsx | 2 -- .../PriceDetailsTable/index.tsx | 3 --- .../BookingCodeChip.stories.tsx | 24 +++---------------- .../lib/components/BookingCodeChip/index.tsx | 20 ++++------------ 5 files changed, 9 insertions(+), 45 deletions(-) diff --git a/packages/booking-flow/lib/components/EnterDetails/Summary/UI/index.tsx b/packages/booking-flow/lib/components/EnterDetails/Summary/UI/index.tsx index 0239d89d4..41eab2d1d 100644 --- a/packages/booking-flow/lib/components/EnterDetails/Summary/UI/index.tsx +++ b/packages/booking-flow/lib/components/EnterDetails/Summary/UI/index.tsx @@ -83,9 +83,7 @@ export default function SummaryUI({ const isAllCampaignRate = rooms.every( (room) => room.room.roomRate.rateDefinition.isCampaignRate ) - const isAllBreakfastIncluded = rooms.every( - (room) => room.room.roomRate.rateDefinition.breakfastIncluded - ) + const containsBookingCodeRate = rooms.find( (r) => r && isBookingCodeRate(r.room.roomRate) ) @@ -227,7 +225,6 @@ export default function SummaryUI({ diff --git a/packages/booking-flow/lib/components/PriceDetailsModal/PriceDetailsTable/Row/BookingCode.tsx b/packages/booking-flow/lib/components/PriceDetailsModal/PriceDetailsTable/Row/BookingCode.tsx index f8cb99df8..58f81e458 100644 --- a/packages/booking-flow/lib/components/PriceDetailsModal/PriceDetailsTable/Row/BookingCode.tsx +++ b/packages/booking-flow/lib/components/PriceDetailsModal/PriceDetailsTable/Row/BookingCode.tsx @@ -12,7 +12,6 @@ interface BookingCodeRowProps { export default function BookingCodeRow({ bookingCode, - isBreakfastIncluded, isCampaignRate, }: BookingCodeRowProps) { if (!bookingCode) { @@ -24,7 +23,6 @@ export default function BookingCodeRow({ diff --git a/packages/booking-flow/lib/components/PriceDetailsModal/PriceDetailsTable/index.tsx b/packages/booking-flow/lib/components/PriceDetailsModal/PriceDetailsTable/index.tsx index d379e768d..ffe1a2707 100644 --- a/packages/booking-flow/lib/components/PriceDetailsModal/PriceDetailsTable/index.tsx +++ b/packages/booking-flow/lib/components/PriceDetailsModal/PriceDetailsTable/index.tsx @@ -91,8 +91,6 @@ export default function PriceDetailsTable({ const departue = dt(toDate).locale(lang).format(longDateFormat[lang]) const duration = ` ${arrival} - ${departue} (${nightsMsg})` - const isAllBreakfastIncluded = rooms.every((room) => room.breakfastIncluded) - const allPricesIsDiscounted = rooms.every((room) => { if (!("regular" in room.price)) { return false @@ -223,7 +221,6 @@ export default function PriceDetailsTable({ diff --git a/packages/design-system/lib/components/BookingCodeChip/BookingCodeChip.stories.tsx b/packages/design-system/lib/components/BookingCodeChip/BookingCodeChip.stories.tsx index 8f30ec938..534690eea 100644 --- a/packages/design-system/lib/components/BookingCodeChip/BookingCodeChip.stories.tsx +++ b/packages/design-system/lib/components/BookingCodeChip/BookingCodeChip.stories.tsx @@ -45,32 +45,14 @@ export const WithCloseButton: Story = { ), } -export const CampaignBreakfastIncluded: Story = { +export const CampaignWithoutBookingCode: Story = { args: {}, - render: () => ( - - ), -} - -export const CampaignBreakfastExcluded: Story = { - args: {}, - render: () => ( - - ), + render: () => , } export const CampaignFilledIcon: Story = { args: {}, render: () => ( - + ), } diff --git a/packages/design-system/lib/components/BookingCodeChip/index.tsx b/packages/design-system/lib/components/BookingCodeChip/index.tsx index b07d3a8a4..1e00cd402 100644 --- a/packages/design-system/lib/components/BookingCodeChip/index.tsx +++ b/packages/design-system/lib/components/BookingCodeChip/index.tsx @@ -12,7 +12,6 @@ import styles from './bookingCodeChip.module.css' type BaseBookingCodeChipProps = { alignCenter?: boolean bookingCode?: string | null - isBreakfastIncluded?: boolean isCampaign?: boolean isUnavailable?: boolean withText?: boolean @@ -33,7 +32,6 @@ type BookingCodeChipProps = export function BookingCodeChip({ alignCenter, bookingCode, - isBreakfastIncluded, isCampaign, isUnavailable, withText = true, @@ -61,19 +59,11 @@ export function BookingCodeChip({ {intl.formatMessage({ defaultMessage: 'Campaign' })} - - - {isBreakfastIncluded - ? // eslint-disable-next-line formatjs/no-literal-string-in-jsx - `${bookingCode ?? ''} ${intl.formatMessage({ - defaultMessage: 'Breakfast included', - })}` - : // eslint-disable-next-line formatjs/no-literal-string-in-jsx - `${bookingCode ?? ''} ${intl.formatMessage({ - defaultMessage: 'Breakfast excluded', - })}`} - - + {bookingCode && ( + + {bookingCode} + + )}

)