Merged in fix/SW-3020-paymentInfo-tracking (pull request #2403)

fix(SW-3020): add correct paymentInfo in booking flow and ancillary flow

* fix(SW-3020): add correct paymentInfo in booking flow and ancillary flow

* fix(SW-3020): fix pr comments


Approved-by: Tobias Johansson

apps/scandic-web/components/HotelReservation/EnterDetails/Payment/PaymentClient.tsx

@@ -43,7 +43,12 @@ import PriceChangeDialog from "../PriceChangeDialog"
 import { writeGlaToSessionStorage } from "./PaymentCallback/helpers"
 import BookingAlert from "./BookingAlert"
 import GuaranteeDetails from "./GuaranteeDetails"
-import { hasFlexibleRate, hasPrepaidRate, isPaymentMethodEnum } from "./helpers"
+import {
+  hasFlexibleRate,
+  hasPrepaidRate,
+  isPaymentMethodEnum,
+  writePaymentInfoToSessionStorage,
+} from "./helpers"
 import MixedRatePaymentBreakdown from "./MixedRatePaymentBreakdown"
 import PaymentOptionsGroup from "./PaymentOptionsGroup"
 import { type PaymentFormData, paymentSchema } from "./schema"
@@ -216,10 +221,12 @@ export default function PaymentClient({
       const currentPaymentMethod = methods.getValues("paymentMethod")
       const smsEnable = methods.getValues("smsConfirmation")
       const guarantee = methods.getValues("guarantee")
-      const isSavedCreditCard = savedCreditCards?.some(
+      const savedCreditCard = savedCreditCards?.find(
         (card) => card.id === currentPaymentMethod
       )
 
+      const isSavedCreditCard = !!savedCreditCard
+
       if (guarantee || (bookingMustBeGuaranteed && hasOnlyFlexRates)) {
         const lateArrivalGuarantee = guarantee ? "yes" : "mandatory"
         trackEvent({
@@ -233,13 +240,14 @@ export default function PaymentClient({
             isSavedCreditCard,
             hotelId,
             status: "glacardsavefailed",
+            type: savedCreditCard ? savedCreditCard.type : currentPaymentMethod,
           },
         })
       } else {
         trackPaymentEvent({
           event: "paymentFail",
           hotelId,
-          method: currentPaymentMethod,
+          method: savedCreditCard ? savedCreditCard.type : currentPaymentMethod,
           isSavedCreditCard,
           smsEnable,
           errorMessage,
@@ -355,21 +363,29 @@ export default function PaymentClient({
             cancel: `${paymentRedirectUrl}/cancel`,
           }
         : undefined
-
+      const paymentMethodType = savedCreditCard
+        ? savedCreditCard.type
+        : paymentMethod
       if (guarantee || (bookingMustBeGuaranteed && hasOnlyFlexRates)) {
         const lateArrivalGuarantee = guarantee ? "yes" : "mandatory"
-        writeGlaToSessionStorage(lateArrivalGuarantee, hotelId)
+        writeGlaToSessionStorage(
+          lateArrivalGuarantee,
+          hotelId,
+          paymentMethodType,
+          !!savedCreditCard
+        )
         trackGlaSaveCardAttempt(hotelId, savedCreditCard, lateArrivalGuarantee)
       } else if (!hasOnlyFlexRates) {
         trackPaymentEvent({
           event: "paymentAttemptStart",
           hotelId,
-          method: savedCreditCard ? savedCreditCard.type : paymentMethod,
+          method: paymentMethodType,
           isSavedCreditCard: !!savedCreditCard,
           smsEnable: data.smsConfirmation,
           status: "attempt",
         })
       }
+      writePaymentInfoToSessionStorage(paymentMethodType, !!savedCreditCard)
 
       const payload = {
         checkInDate: fromDate,