Merged in fix/SW-2716-wrong-package-for-breakfast (pull request #2063)

fix: add correct package for callback

* fix: add correct package for callback


Approved-by: Niclas Edenvin
Approved-by: Linus Flood

apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/index.tsx

@@ -248,10 +248,6 @@ export default function AddAncillaryFlowModal({
   const onSubmit = (data: AncillaryFormData) => {
     if (!validateTermsAndConditions(data)) return
 
-    setAncillarySessionData({
-      formData: data,
-      selectedAncillary,
-    })
     const packagesToAdd = !isBreakfast
       ? buildAncillaryPackages(data, selectedAncillary)
       : breakfastData
@@ -266,6 +262,11 @@ export default function AddAncillaryFlowModal({
       )
       return
     }
+    setAncillarySessionData({
+      formData: data,
+      selectedAncillary,
+      packages: packagesToAdd,
+    })
     const shouldSkipGuarantee =
       booking.guaranteeInfo || (data.quantityWithCard ?? 0) <= 0
 

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

@@ -6,7 +6,6 @@ import { useEffect } from "react"
 import { trpc } from "@/lib/trpc/client"
 
 import {
-  buildAncillaryPackages,
   clearAncillarySessionData,
   getAncillarySessionData,
 } from "@/components/HotelReservation/MyStay/utils/ancillaries"
@@ -39,13 +38,16 @@ export default function GuaranteeAncillaryHandler({
     }
 
     const sessionData = getAncillarySessionData()
-    if (!sessionData?.formData || !sessionData?.selectedAncillary) {
+    if (
+      !sessionData?.formData ||
+      !sessionData?.selectedAncillary ||
+      !sessionData?.packages
+    ) {
       router.replace(`${returnUrl}&errorCode=AncillaryFailed`)
       return
     }
 
-    const { formData, selectedAncillary } = sessionData
-    const packages = buildAncillaryPackages(formData, selectedAncillary)
+    const { formData, selectedAncillary, packages } = sessionData
 
     addAncillary.mutate(
       {