Merge remote-tracking branch 'origin' into feat/tracking-payment

app/[lang]/(live)/(public)/hotelreservation/(standard)/step/page.tsx

@@ -126,7 +126,7 @@ export default async function StepPage({
     return notFound()
   }
 
-  const mustBeGuaranteed = roomAvailability?.mustBeGuaranteed ?? false
+  const { mustBeGuaranteed, breakfastIncluded } = roomAvailability
 
   const paymentGuarantee = intl.formatMessage({
     id: "Payment Guarantee",
@@ -190,13 +190,18 @@ export default async function StepPage({
     isMember: !!user,
     rateDetails: roomAvailability.rateDetails,
     roomType: roomAvailability.selectedRoom.roomType,
+    breakfastIncluded,
   }
 
+  const showBreakfastStep = Boolean(
+    breakfastPackages?.length && !breakfastIncluded
+  )
+
   return (
     <EnterDetailsProvider
       bedTypes={roomAvailability.bedTypes}
       booking={booking}
-      breakfastPackages={breakfastPackages}
+      showBreakfastStep={showBreakfastStep}
       packages={packages}
       roomRate={{
         memberRate: roomAvailability.memberRate,
@@ -230,13 +235,13 @@ export default async function StepPage({
                 </SectionAccordion>
               ) : null}
 
-              {breakfastPackages?.length ? (
+              {showBreakfastStep ? (
                 <SectionAccordion
                   header={intl.formatMessage({ id: "Food options" })}
                   label={intl.formatMessage({ id: "Select breakfast options" })}
                   step={StepEnum.breakfast}
                 >
-                  <Breakfast packages={breakfastPackages} />
+                  <Breakfast packages={breakfastPackages!} />
                 </SectionAccordion>
               ) : null}