Merged in chore/move-enter-details (pull request #2778)

Chore/move enter details

Approved-by: Anton Gunnarsson

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

@@ -3,6 +3,8 @@ import { useIntl } from "react-intl"
 
 import { AlertTypeEnum } from "@scandic-hotels/common/constants/alert"
 import { PaymentMethodEnum } from "@scandic-hotels/common/constants/paymentMethod"
+import { bookingTermsAndConditionsRoutes } from "@scandic-hotels/common/constants/routes/bookingTermsAndConditionsRoutes"
+import { privacyPolicyRoutes } from "@scandic-hotels/common/constants/routes/privacyPolicyRoutes"
 import { dt } from "@scandic-hotels/common/dt"
 import { Alert } from "@scandic-hotels/design-system/Alert"
 import Checkbox from "@scandic-hotels/design-system/Form/Checkbox"
@@ -13,7 +15,6 @@ import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon"
 import Link from "@scandic-hotels/design-system/Link"
 import { Typography } from "@scandic-hotels/design-system/Typography"
 
-import { bookingTermsAndConditions, privacyPolicy } from "@/constants/webHrefs"
 import { useAddAncillaryStore } from "@/stores/my-stay/add-ancillary-flow"
 
 import useLang from "@/hooks/useLang"
@@ -182,7 +183,7 @@ export default function ConfirmationStep({
                     textDecoration="underline"
                     color="Text/Interactive/Secondary"
                     target="_blank"
-                    href={bookingTermsAndConditions[lang]}
+                    href={bookingTermsAndConditionsRoutes[lang]}
                   >
                     {str}
                   </Link>
@@ -192,7 +193,7 @@ export default function ConfirmationStep({
                     textDecoration="underline"
                     color="Text/Interactive/Secondary"
                     target="_blank"
-                    href={privacyPolicy[lang]}
+                    href={privacyPolicyRoutes[lang]}
                   >
                     {str}
                   </Link>

apps/scandic-web/components/HotelReservation/MyStay/Receipt/tracking.tsx

@@ -1,9 +1,9 @@
+import { TrackingSDK } from "@scandic-hotels/tracking/TrackingSDK"
 import {
   TrackingChannelEnum,
   type TrackingSDKPageData,
-} from "@scandic-hotels/common/tracking/types"
+} from "@scandic-hotels/tracking/types"
 
-import TrackingSDK from "@/components/TrackingSDK"
 import { getLang } from "@/i18n/serverContext"
 
 export default async function Tracking() {

apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Actions/NotCancelled/ManageStay/Actions/GuaranteeLateArrival/Form/index.tsx

@@ -3,8 +3,11 @@ import { zodResolver } from "@hookform/resolvers/zod"
 import { FormProvider, useForm } from "react-hook-form"
 import { useIntl } from "react-intl"
 
+import { writeGlaToSessionStorage } from "@scandic-hotels/booking-flow/components/EnterDetails/Payment/PaymentCallback/helpers"
 import { PaymentMethodEnum } from "@scandic-hotels/common/constants/paymentMethod"
+import { bookingTermsAndConditionsRoutes } from "@scandic-hotels/common/constants/routes/bookingTermsAndConditionsRoutes"
 import { guaranteeCallback } from "@scandic-hotels/common/constants/routes/hotelReservation"
+import { privacyPolicyRoutes } from "@scandic-hotels/common/constants/routes/privacyPolicyRoutes"
 import { formatPrice } from "@scandic-hotels/common/utils/numberFormatting"
 import { Divider } from "@scandic-hotels/design-system/Divider"
 import Checkbox from "@scandic-hotels/design-system/Form/Checkbox"
@@ -16,11 +19,9 @@ import { LoadingSpinner } from "@scandic-hotels/design-system/LoadingSpinner"
 import { toast } from "@scandic-hotels/design-system/Toast"
 import { Typography } from "@scandic-hotels/design-system/Typography"
 
-import { bookingTermsAndConditions, privacyPolicy } from "@/constants/webHrefs"
 import { env } from "@/env/client"
 import { useMyStayStore } from "@/stores/my-stay"
 
-import { writeGlaToSessionStorage } from "@/components/HotelReservation/EnterDetails/Payment/PaymentCallback/helpers"
 import { useGuaranteeBooking } from "@/hooks/booking/useGuaranteeBooking"
 import useLang from "@/hooks/useLang"
 import { trackUpdatePaymentMethod } from "@/utils/tracking"
@@ -72,7 +73,11 @@ export default function Form() {
     const savedCreditCard = savedCreditCards?.find(
       (card) => card.id === data.paymentMethod
     )
-    trackGlaSaveCardAttempt(hotelId, savedCreditCard, "yes")
+    trackGlaSaveCardAttempt({
+      hotelId,
+      hasSavedCreditCard: !!savedCreditCard,
+      lateArrivalGuarantee: "yes",
+    })
     if (confirmationNumber) {
       const card = savedCreditCard
         ? {
@@ -117,7 +122,7 @@ export default function Form() {
           textDecoration="underline"
           color="Text/Interactive/Secondary"
           target="_blank"
-          href={bookingTermsAndConditions[lang]}
+          href={bookingTermsAndConditionsRoutes[lang]}
           onClick={(e) => e.stopPropagation()}
         >
           {str}
@@ -128,7 +133,7 @@ export default function Form() {
           textDecoration="underline"
           color="Text/Interactive/Secondary"
           target="_blank"
-          href={privacyPolicy[lang]}
+          href={privacyPolicyRoutes[lang]}
           onClick={(e) => e.stopPropagation()}
         >
           {str}

apps/scandic-web/components/HotelReservation/MyStay/Rooms/SingleRoom/Details/Packages.tsx

@@ -1,6 +1,6 @@
 import { useIntl } from "react-intl"
 
-import { getFeatureDescription } from "@scandic-hotels/booking-flow/utils/getRoomFeatureDescription"
+import { getRoomFeatureDescription } from "@scandic-hotels/booking-flow/utils/getRoomFeatureDescription"
 import { RoomPackageCodeEnum } from "@scandic-hotels/trpc/enums/roomFilter"
 
 import { useMyStayStore } from "@/stores/my-stay"
@@ -19,7 +19,7 @@ export default function Packages() {
           )
         )
         .map((item) =>
-          getFeatureDescription(item.code, item.description, intl)
+          getRoomFeatureDescription(item.code, item.description, intl)
         ) || []
   )
 

apps/scandic-web/components/HotelReservation/MyStay/TrackGuarantee.tsx

@@ -3,14 +3,14 @@
 import { useRouter } from "next/navigation"
 import { useEffect } from "react"
 
-import { PaymentCallbackStatusEnum } from "@scandic-hotels/common/constants/booking"
-import { trackEvent } from "@scandic-hotels/common/tracking/base"
-import { LoadingSpinner } from "@scandic-hotels/design-system/LoadingSpinner"
-
 import {
   clearGlaSessionStorage,
   readGlaFromSessionStorage,
-} from "@/components/HotelReservation/EnterDetails/Payment/PaymentCallback/helpers"
+} from "@scandic-hotels/booking-flow/components/EnterDetails/Payment/PaymentCallback/helpers"
+import { PaymentCallbackStatusEnum } from "@scandic-hotels/common/constants/paymentCallbackStatusEnum"
+import { LoadingSpinner } from "@scandic-hotels/design-system/LoadingSpinner"
+import { trackEvent } from "@scandic-hotels/tracking/base"
+
 import { getAncillarySessionData } from "@/components/HotelReservation/MyStay/utils/ancillaries"
 import {
   buildAncillariesTracking,