Merged in fix/booking-code-error-messages (pull request #1824)

fix: booking code and reward night messages are now displayed correctly

Approved-by: Michael Zetterberg

apps/scandic-web/components/Forms/BookingWidget/FormContent/BookingCode/index.tsx

@@ -12,6 +12,7 @@ import Modal from "@/components/Modal"
 import Button from "@/components/TempDesignSystem/Button"
 import Checkbox from "@/components/TempDesignSystem/Form/Checkbox"
 import Input from "@/components/TempDesignSystem/Form/Input"
+import { getErrorMessage } from "@/components/TempDesignSystem/Form/Input/errors"
 import Switch from "@/components/TempDesignSystem/Form/Switch"
 import Body from "@/components/TempDesignSystem/Text/Body"
 import Caption from "@/components/TempDesignSystem/Text/Caption"
@@ -289,10 +290,7 @@ function BookingCodeError({ codeError }: { codeError: FieldError }) {
           }
           className={styles.errorIcon}
         />
-        {intl.formatMessage({
+        {getErrorMessage(intl, codeError.message)}
-          // eslint-disable-next-line formatjs/enforce-default-message
-          defaultMessage: codeError.message,
-        })}
       </Caption>
       {isMultiroomErr ? (
         <RemoveExtraRooms className={styles.hideOnMobile} />

apps/scandic-web/components/Forms/BookingWidget/FormContent/RewardNight/index.tsx

@@ -12,6 +12,7 @@ import { REDEMPTION } from "@/constants/booking"
 import Modal from "@/components/Modal"
 import Button from "@/components/TempDesignSystem/Button"
 import Checkbox from "@/components/TempDesignSystem/Form/Checkbox"
+import { getErrorMessage } from "@/components/TempDesignSystem/Form/Input/errors"
 import Caption from "@/components/TempDesignSystem/Text/Caption"
 
 import { RemoveExtraRooms } from "../BookingCode"
@@ -125,10 +126,7 @@ export default function RewardNight() {
               color="Icon/Feedback/Information"
               className={styles.errorIcon}
             />
-            {intl.formatMessage({
+            {getErrorMessage(intl, redemptionErr.message)}
-              // eslint-disable-next-line formatjs/enforce-default-message
-              defaultMessage: redemptionErr.message,
-            })}
           </Caption>
           {isMultiRoomError ? <RemoveExtraRooms /> : null}
         </div>

apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/Rooms/RoomsHeader/RoomPackageFilter/roomPackageFilter.module.css

@@ -2,7 +2,7 @@
   display: flex;
   gap: var(--Space-x1);
   flex-direction: column-reverse;
-  align-items: start;
+  align-items: flex-start;
 }
 
 .selectedPackages {