From 4872847ecb7af8c312c0f856bc48b597ea69140d Mon Sep 17 00:00:00 2001
From: Christel Westerberg <christel.westerberg@scandichotels.com>
Date: Wed, 11 Dec 2024 15:19:43 +0100
Subject: [PATCH] fix: add special requests to store

---
 .../EnterDetails/Details/index.tsx            | 22 +++++++++----------
 .../EnterDetails/Details/schema.ts            |  2 +-
 .../sectionAccordion.module.css               |  2 +-
 .../TempDesignSystem/Form/TextArea/index.tsx  | 10 +--------
 i18n/dictionaries/da.json                     |  3 ++-
 i18n/dictionaries/de.json                     |  3 ++-
 i18n/dictionaries/en.json                     |  3 ++-
 i18n/dictionaries/fi.json                     |  3 ++-
 i18n/dictionaries/no.json                     |  3 ++-
 i18n/dictionaries/sv.json                     |  5 +++--
 10 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/components/HotelReservation/EnterDetails/Details/index.tsx b/components/HotelReservation/EnterDetails/Details/index.tsx
index 33adf16a3..5ecc9e003 100644
--- a/components/HotelReservation/EnterDetails/Details/index.tsx
+++ b/components/HotelReservation/EnterDetails/Details/index.tsx
@@ -53,9 +53,17 @@ export default function Details({ user, memberPrice }: DetailsProps) {
       membershipNo: initialData.membershipNo,
       phoneNumber: user?.phoneNumber ?? initialData.phoneNumber,
       zipCode: initialData.zipCode,
+      specialRequests: initialData.specialRequests,
     },
   })
 
+  const noPreferenceItem = {
+    value: "",
+    label: intl.formatMessage({
+      id: "No preference",
+    }),
+  }
+
   const onSubmit = useCallback(
     (values: DetailsSchema) => {
       updateDetails(values)
@@ -135,12 +143,7 @@ export default function Details({ user, memberPrice }: DetailsProps) {
             label={intl.formatMessage({ id: "Floor preference" })}
             name="specialRequests.floorPreference"
             items={[
-              {
-                value: "",
-                label: intl.formatMessage({
-                  id: "No preference",
-                }),
-              },
+              noPreferenceItem,
               {
                 value: FloorPreference.HIGH,
                 label: intl.formatMessage({ id: FloorPreference.HIGH }),
@@ -156,12 +159,7 @@ export default function Details({ user, memberPrice }: DetailsProps) {
             label={intl.formatMessage({ id: "Elevator preference" })}
             name="specialRequests.elevatorPreference"
             items={[
-              {
-                value: "",
-                label: intl.formatMessage({
-                  id: "No preference",
-                }),
-              },
+              noPreferenceItem,
               {
                 value: ElevatorPreference.AWAY_FROM_ELEVATOR,
                 label: intl.formatMessage({
diff --git a/components/HotelReservation/EnterDetails/Details/schema.ts b/components/HotelReservation/EnterDetails/Details/schema.ts
index 2931cb9c6..c2828d6fc 100644
--- a/components/HotelReservation/EnterDetails/Details/schema.ts
+++ b/components/HotelReservation/EnterDetails/Details/schema.ts
@@ -22,7 +22,7 @@ const specialRequestsSchema = z
   .object({
     floorPreference: z.nativeEnum(FloorPreference).optional(),
     elevatorPreference: z.nativeEnum(ElevatorPreference).optional(),
-    comments: z.string().optional(),
+    comments: z.string().default(""),
   })
   .optional()
 
diff --git a/components/HotelReservation/EnterDetails/SectionAccordion/sectionAccordion.module.css b/components/HotelReservation/EnterDetails/SectionAccordion/sectionAccordion.module.css
index e78a4f42f..08b1bae2c 100644
--- a/components/HotelReservation/EnterDetails/SectionAccordion/sectionAccordion.module.css
+++ b/components/HotelReservation/EnterDetails/SectionAccordion/sectionAccordion.module.css
@@ -118,7 +118,7 @@
   .accordion:not(:last-child) .iconWrapper::after {
     position: absolute;
     left: 12px;
-    bottom: calc(0px - var(--Spacing-x7));
+    bottom: calc(0px - var(--Spacing-x5));
     top: var(--circle-height);
 
     content: "";
diff --git a/components/TempDesignSystem/Form/TextArea/index.tsx b/components/TempDesignSystem/Form/TextArea/index.tsx
index 0a31249ae..c558f5b91 100644
--- a/components/TempDesignSystem/Form/TextArea/index.tsx
+++ b/components/TempDesignSystem/Form/TextArea/index.tsx
@@ -15,8 +15,6 @@ import Body from "../../Text/Body"
 
 import styles from "./textarea.module.css"
 
-import type { HTMLAttributes, WheelEvent } from "react"
-
 import type { TextAreaProps } from "./input"
 
 export default function TextArea({
@@ -29,15 +27,9 @@ export default function TextArea({
   placeholder = "",
   readOnly = false,
   registerOptions = {},
-  type = "text",
 }: TextAreaProps) {
   const { control } = useFormContext()
-  let numberAttributes: HTMLAttributes<HTMLTextAreaElement> = {}
-  if (type === "number") {
-    numberAttributes.onWheel = function (evt: WheelEvent<HTMLTextAreaElement>) {
-      evt.currentTarget.blur()
-    }
-  }
+
   return (
     <Controller
       disabled={disabled}
diff --git a/i18n/dictionaries/da.json b/i18n/dictionaries/da.json
index de5ad389a..cbfc5f089 100644
--- a/i18n/dictionaries/da.json
+++ b/i18n/dictionaries/da.json
@@ -152,7 +152,7 @@
   "First name can't contain any special characters": "Fornavn kan ikke indeholde specielle tegn",
   "First name is required": "Fornavn er påkrævet",
   "Flexibility": "Fleksibilitet",
-  "Floor preferences": "Etagepræferencer",
+  "Floor preference": "Etagepræference",
   "Follow us": "Følg os",
   "Food options": "Madvalg",
   "Former Scandic Hotel": "Tidligere Scandic Hotel",
@@ -265,6 +265,7 @@
   "No breakfast": "Ingen morgenmad",
   "No content published": "Intet indhold offentliggjort",
   "No matching location found": "Der blev ikke fundet nogen matchende placering",
+  "No preference": "Ingen præference",
   "No prices available": "Ingen tilgængelige priser",
   "No results": "Ingen resultater",
   "No transactions available": "Ingen tilgængelige transaktioner",
diff --git a/i18n/dictionaries/de.json b/i18n/dictionaries/de.json
index 4f7901a5c..2298fce4a 100644
--- a/i18n/dictionaries/de.json
+++ b/i18n/dictionaries/de.json
@@ -152,7 +152,7 @@
   "First name can't contain any special characters": "Der Vorname darf keine Sonderzeichen enthalten",
   "First name is required": "Vorname ist erforderlich",
   "Flexibility": "Flexibilität",
-  "Floor preferences": "Etagenpräferenzen",
+  "Floor preference": "Etagenpräferenzen",
   "Follow us": "Folgen Sie uns",
   "Food options": "Speisen & Getränke",
   "Former Scandic Hotel": "Ehemaliges Scandic Hotel",
@@ -264,6 +264,7 @@
   "No breakfast": "Kein Frühstück",
   "No content published": "Kein Inhalt veröffentlicht",
   "No matching location found": "Kein passender Standort gefunden",
+  "No preference": "Keine Präferenz",
   "No prices available": "Keine Preise verfügbar",
   "No results": "Keine Ergebnisse",
   "No transactions available": "Keine Transaktionen verfügbar",
diff --git a/i18n/dictionaries/en.json b/i18n/dictionaries/en.json
index dfd05df29..947ae455d 100644
--- a/i18n/dictionaries/en.json
+++ b/i18n/dictionaries/en.json
@@ -160,7 +160,7 @@
   "First name can't contain any special characters": "First name can't contain any special characters",
   "First name is required": "First name is required",
   "Flexibility": "Flexibility",
-  "Floor preferences": "Floor preferences",
+  "Floor preference": "Floor preference",
   "Follow us": "Follow us",
   "Food options": "Food options",
   "Former Scandic Hotel": "Former Scandic Hotel",
@@ -286,6 +286,7 @@
   "No content published": "No content published",
   "No matching location found": "No matching location found",
   "No membership benefits applied": "No membership benefits applied",
+  "No preference": "No preference",
   "No prices available": "No prices available",
   "No results": "No results",
   "No transactions available": "No transactions available",
diff --git a/i18n/dictionaries/fi.json b/i18n/dictionaries/fi.json
index e7fd86edd..38bcd3dcb 100644
--- a/i18n/dictionaries/fi.json
+++ b/i18n/dictionaries/fi.json
@@ -152,7 +152,7 @@
   "First name can't contain any special characters": "Etunimi ei voi sisältää erikoismerkkejä",
   "First name is required": "Etunimi vaaditaan",
   "Flexibility": "Joustavuus",
-  "Floor preferences": "Kerrostasotoive",
+  "Floor preference": "Kerrostasotoive",
   "Follow us": "Seuraa meitä",
   "Food options": "Ruokavalio",
   "Former Scandic Hotel": "Entinen Scandic-hotelli",
@@ -265,6 +265,7 @@
   "No breakfast": "Ei aamiaista",
   "No content published": "Ei julkaistua sisältöä",
   "No matching location found": "Vastaavaa sijaintia ei löytynyt",
+  "No preference": "Ei toivetta",
   "No prices available": "Hintoja ei ole saatavilla",
   "No results": "Ei tuloksia",
   "No transactions available": "Ei tapahtumia saatavilla",
diff --git a/i18n/dictionaries/no.json b/i18n/dictionaries/no.json
index 8cb03d937..7b57e8167 100644
--- a/i18n/dictionaries/no.json
+++ b/i18n/dictionaries/no.json
@@ -151,7 +151,7 @@
   "First name can't contain any special characters": "Fornavn kan ikke inneholde spesielle tegn",
   "First name is required": "Fornavn kreves",
   "Flexibility": "Fleksibilitet",
-  "Floor preferences": "Etasjepreferanser",
+  "Floor preference": "Etasjepreferans",
   "Follow us": "Følg oss",
   "Food options": "Matvalg",
   "Former Scandic Hotel": "Tidligere Scandic-hotell",
@@ -264,6 +264,7 @@
   "No breakfast": "Ingen frokost",
   "No content published": "Ingen innhold publisert",
   "No matching location found": "Fant ingen samsvarende plassering",
+  "No preference": "Ingen preferanse",
   "No prices available": "Ingen priser tilgjengelig",
   "No results": "Ingen resultater",
   "No transactions available": "Ingen transaksjoner tilgjengelig",
diff --git a/i18n/dictionaries/sv.json b/i18n/dictionaries/sv.json
index 10230a9f8..d4d9a720f 100644
--- a/i18n/dictionaries/sv.json
+++ b/i18n/dictionaries/sv.json
@@ -127,7 +127,7 @@
   "Earn bonus nights & points": "Tjäna bonusnätter och poäng",
   "Edit": "Redigera",
   "Edit profile": "Redigera profil",
-  "Elevator preference": "Hisspreferencer",
+  "Elevator preference": "Hisspreferens",
   "Email": "E-post",
   "Email address": "E-postadress",
   "Email address is required": "E-postadress är obligatorisk",
@@ -151,7 +151,7 @@
   "First name can't contain any special characters": "Förnamn får inte innehålla några specialtecken",
   "First name is required": "Förnamn är obligatoriskt",
   "Flexibility": "Flexibilitet",
-  "Floor preferences": "Våningpreferenser",
+  "Floor preference": "Våningpreferens",
   "Follow us": "Följ oss",
   "Food options": "Matval",
   "Former Scandic Hotel": "Tidigare Scandichotell",
@@ -264,6 +264,7 @@
   "No breakfast": "Ingen frukost",
   "No content published": "Inget innehåll publicerat",
   "No matching location found": "Ingen matchande plats hittades",
+  "No preference": "Ingen preferens",
   "No prices available": "Inga priser tillgängliga",
   "No results": "Inga resultat",
   "No transactions available": "Inga transaktioner tillgängliga",