Merged in feat/SW-1676-modify-contact-details-my-stay-anonymous (pull request #1468)

Feat/SW-1676 modify contact details my stay anonymous

* feat(SW-1676): Modify guest details step 1

* feat(SW-1676) Integration to api to update guest details

* feat(SW-1676) Reuse of old modal

* feat(SW-1676) updated modify guest

* feat(SW-1676) cleanup

* feat(SW-1676) updated myStayReturnRoute to sessionStorage


Approved-by: Niclas Edenvin

apps/scandic-web/components/HotelReservation/MyStay/CancelStay/Confirmation/index.tsx

@@ -7,6 +7,7 @@ import Checkbox from "@/components/TempDesignSystem/Form/Checkbox"
 import Body from "@/components/TempDesignSystem/Text/Body"
 import Caption from "@/components/TempDesignSystem/Text/Caption"
 
+import { useMyStayRoomDetailsStore } from "../../stores/myStayRoomDetailsStore"
 import PriceContainer from "../Pricecontainer"
 
 import styles from "../cancelStay.module.css"
@@ -20,10 +21,10 @@ export function CancelStayConfirmation({
   hotel,
   booking,
   stayDetails,
-  roomDetails = [],
 }: CancelStayConfirmationProps) {
   const intl = useIntl()
   const { getValues } = useFormContext<FormValues>()
+  const { rooms: roomDetails } = useMyStayRoomDetailsStore()
 
   return (
     <>
@@ -62,9 +63,7 @@ export function CancelStayConfirmation({
                   <Checkbox
                     name={`rooms.${index}.checked`}
                     registerOptions={{
-                      disabled:
-                        roomDetail?.rateDefinition.cancellationRule !==
-                        "CancellableBefore6PM",
+                      disabled: !roomDetail?.isCancelable,
                     }}
                   >
                     <div className={styles.roomInfo}>

apps/scandic-web/components/HotelReservation/MyStay/CancelStay/index.tsx

@@ -4,11 +4,10 @@ import { zodResolver } from "@hookform/resolvers/zod"
 import { FormProvider, useForm } from "react-hook-form"
 import { useIntl } from "react-intl"
 
+import { ModalContentWithActions } from "@/components/Modal/ModalContentWithActions"
 import Alert from "@/components/TempDesignSystem/Alert"
 import useLang from "@/hooks/useLang"
 
-import { ModalContent } from "../ManageStay/ModalContent"
-import { useMyStayRoomDetailsStore } from "../stores/myStayRoomDetailsStore"
 import useCancelStay from "./hooks/useCancelStay"
 import { CancelStayConfirmation } from "./Confirmation"
 import { FinalConfirmation } from "./FinalConfirmation"
@@ -19,13 +18,9 @@ import {
   cancelStaySchema,
   type FormValues,
 } from "@/types/components/hotelReservation/myStay/cancelStay"
+import { MODAL_STEPS } from "@/types/components/hotelReservation/myStay/myStay"
 import { AlertTypeEnum } from "@/types/enums/alert"
 
-const MODAL_STEPS = {
-  INITIAL: 1,
-  CONFIRMATION: 2,
-}
-
 export default function CancelStay({
   booking,
   hotel,
@@ -35,7 +30,6 @@ export default function CancelStay({
 }: CancelStayProps) {
   const intl = useIntl()
   const lang = useLang()
-  const { rooms: roomDetails } = useMyStayRoomDetailsStore()
 
   const { mainRoom } = booking
 
@@ -86,7 +80,6 @@ export default function CancelStay({
           hotel={hotel}
           booking={booking}
           stayDetails={stayDetails}
-          roomDetails={roomDetails}
         />
       )
 
@@ -112,10 +105,10 @@ export default function CancelStay({
 
   return (
     <FormProvider {...form}>
-      <ModalContent
+      <ModalContentWithActions
         title={getModalCopy().title}
-        onClose={handleCloseModal}
         content={getModalContent()}
+        onClose={handleCloseModal}
         primaryAction={
           mainRoom
             ? {