feat(SW-415): Fix merge issues

app/[lang]/(live)/(public)/hotelreservation/layout.module.css

@@ -1,7 +1,5 @@
 .layout {
   min-height: 100dvh;
-  max-width: var(--max-width);
-  margin: 0 auto;
   background-color: var(--Base-Background-Primary-Normal);
   max-width: var(--max-width);
   margin: 0 auto;

components/HotelReservation/SelectRate/RoomSelection/index.tsx

@@ -36,31 +36,11 @@ export default function RoomSelection({
         <ul className={styles.roomList}>
           {roomConfigurations.roomConfigurations.map((roomConfiguration) => (
             <li key={roomConfiguration.roomType}>
-              <form
+              <RoomCard
-                method="GET"
+                rateDefinitions={roomConfigurations.rateDefinitions}
-                action={`select-bed?${searchParams}`}
+                roomConfiguration={roomConfiguration}
-                onSubmit={handleSubmit}
+                roomCategories={roomCategories}
-              >
+              />
-                <ul className={styles.roomList}>
-                  {roomConfigurations.roomConfigurations.map(
-                    (roomConfiguration) => (
-                      <li key={roomConfiguration.roomType}>
-                        <RoomCard
-                          rateDefinitions={roomConfigurations.rateDefinitions}
-                          roomConfiguration={roomConfiguration}
-                          roomCategories={roomCategories}
-                        />
-                      </li>
-                    )
-                  )}
-                </ul>
-                <div className={styles.summary}>
-                  This is summary
-                  <Button type="submit" size="small" theme="primaryDark">
-                    {intl.formatMessage({ id: "Choose room" })}
-                  </Button>
-                </div>
-              </form>
             </li>
           ))}
         </ul>

i18n/dictionaries/da.json

@@ -20,6 +20,7 @@
   "Approx.": "Ca.",
   "Are you sure you want to remove the card ending with {lastFourDigits} from your member profile?": "Er du sikker på, at du vil fjerne kortet, der slutter me {lastFourDigits} fra din medlemsprofil?",
   "Arrival date": "Ankomstdato",
+  "as of today": "pr. dags dato",
   "As our": "Som vores {level}",
   "As our Close Friend": "Som vores nære ven",
   "At latest": "Senest",
@@ -216,7 +217,6 @@
   "Please enter a valid phone number": "Indtast venligst et gyldigt telefonnummer",
   "points": "Point",
   "Points": "Point",
-  "points": "Point",
   "Points being calculated": "Point udregnes",
   "Points earned prior to May 1, 2021": "Point optjent inden 1. maj 2021",
   "Points may take up to 10 days to be displayed.": "Det kan tage op til 10 dage at få vist point.",

i18n/dictionaries/fi.json

@@ -219,7 +219,6 @@
   "Please enter a valid phone number": "Ole hyvä ja näppäile voimassaoleva puhelinnumero",
   "points": "pistettä",
   "Points": "Pisteet",
-  "points": "pistettä",
   "Points being calculated": "Pisteitä lasketaan",
   "Points earned prior to May 1, 2021": "Pisteet, jotka ansaittu ennen 1.5.2021",
   "Points may take up to 10 days to be displayed.": "Pisteiden näyttäminen voi kestää jopa 10 päivää.",

i18n/dictionaries/sv.json

@@ -134,7 +134,7 @@
   "Image gallery": "Bildgalleri",
   "Included": "Inkluderad",
   "It is not posible to manage your communication preferences right now, please try again later or contact support if the problem persists.": "Det gick inte att hantera dina kommunikationsinställningar just nu, försök igen senare eller kontakta supporten om problemet kvarstår.",
-
+  "Join at no cost": "Gå med utan kostnad",
   "Join Scandic Friends": "Gå med i Scandic Friends",
   "King bed": "King size-säng",
   "Language": "Språk",