From 082a162257cf59bd6561e5724c8f33084feafa41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20J=C3=A4derberg?=
 <joakim.jaderberg@scandichotels.com>
Date: Thu, 27 Feb 2025 08:41:34 +0000
Subject: [PATCH] Merged in fix/pinned-yarn-version (pull request #1428)

fix: different packageManager versions in different package.json's caused issues when installing

* fix: different packageManager versions in different package.json's caused issues when installing

* fix: build error


Approved-by: Anton Gunnarsson
---
 .../BookingConfirmation/Rooms/index.tsx       |  9 ++---
 apps/scandic-web/package.json                 |  1 -
 package.json                                  | 34 +++++++++----------
 yarn.lock                                     |  4 +--
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx
index 5ecfa95d9..c55cdb9bc 100644
--- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx
+++ b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx
@@ -1,5 +1,8 @@
 import { Suspense } from "react"
 
+import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
+import { getIntl } from "@/i18n"
+
 import { LinkedReservationCardSkeleton } from "./LinkedReservation/LinkedReservationCardSkeleton"
 import { LinkedReservation } from "./LinkedReservation"
 import Room from "./Room"
@@ -7,8 +10,6 @@ import Room from "./Room"
 import styles from "./rooms.module.css"
 
 import type { BookingConfirmationRoomsProps } from "@/types/components/hotelReservation/bookingConfirmation/rooms"
-import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
-import { getIntl } from "@/i18n"
 
 export default async function Rooms({
   booking,
@@ -19,7 +20,7 @@ export default async function Rooms({
   return (
     <section className={styles.rooms}>
       <div className={styles.room}>
-        {linkedReservations.length ? (
+        {(linkedReservations?.length ?? 0 > 0) ? (
           <Subtitle color="mainGrey60" type="two">
             {intl.formatMessage({ id: "Room {roomIndex}" }, { roomIndex: 1 })}
           </Subtitle>
@@ -32,7 +33,7 @@ export default async function Rooms({
       </div>
 
       {linkedReservations?.map((reservation, idx) => (
-        <div className={styles.room}>
+        <div key={idx} className={styles.room}>
           <Subtitle color="mainGrey60" type="two">
             {intl.formatMessage(
               { id: "Room {roomIndex}" },
diff --git a/apps/scandic-web/package.json b/apps/scandic-web/package.json
index a6137ab75..752553333 100644
--- a/apps/scandic-web/package.json
+++ b/apps/scandic-web/package.json
@@ -3,7 +3,6 @@
   "version": "0.1.0",
   "private": true,
   "type": "module",
-  "packageManager": "yarn@4.0.0",
   "scripts": {
     "prebuild": "yarn lint && yarn test:unit",
     "build": "next build",
diff --git a/package.json b/package.json
index f228d44f2..55578d911 100644
--- a/package.json
+++ b/package.json
@@ -1,19 +1,19 @@
 {
-  "name": "scandic",
-  "packageManager": "yarn@4.5.1",
-  "scripts": {
-    "build": "yarn workspace @scandic-hotels/design-system build && yarn workspace @scandic-hotels/scandic-web build",
-    "lint": "yarn workspace @scandic-hotels/scandic-web lint",
-    "postinstall": "husky"
-  },
-  "workspaces": [
-    "apps/*",
-    "packages/*"
-  ],
-  "devDependencies": {
-    "@types/react": "^18",
-    "@types/react-dom": "^18",
-    "husky": "^9.1.7",
-    "lint-staged": "^15.2.2"
-  }
+    "name": "scandic",
+    "packageManager": "yarn@4.6.0",
+    "scripts": {
+        "build": "yarn workspace @scandic-hotels/design-system build && yarn workspace @scandic-hotels/scandic-web build",
+        "lint": "yarn workspace @scandic-hotels/scandic-web lint",
+        "postinstall": "husky"
+    },
+    "workspaces": [
+        "apps/*",
+        "packages/*"
+    ],
+    "devDependencies": {
+        "@types/react": "^18",
+        "@types/react-dom": "^18",
+        "husky": "^9.1.7",
+        "lint-staged": "^15.2.2"
+    }
 }
diff --git a/yarn.lock b/yarn.lock
index 36446ebd8..5b5bc0079 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -21212,11 +21212,11 @@ __metadata:
 
 "typescript@patch:typescript@npm%3A^5.2.2#optional!builtin<compat/typescript>":
   version: 5.7.3
-  resolution: "typescript@patch:typescript@npm%3A5.7.3#optional!builtin<compat/typescript>::version=5.7.3&hash=cef18b"
+  resolution: "typescript@patch:typescript@npm%3A5.7.3#optional!builtin<compat/typescript>::version=5.7.3&hash=5786d5"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/3b56d6afa03d9f6172d0b9cdb10e6b1efc9abc1608efd7a3d2f38773d5d8cfb9bbc68dfb72f0a7de5e8db04fc847f4e4baeddcd5ad9c9feda072234f0d788896
+  checksum: 10c0/6fd7e0ed3bf23a81246878c613423730c40e8bdbfec4c6e4d7bf1b847cbb39076e56ad5f50aa9d7ebd89877999abaee216002d3f2818885e41c907caaa192cc4
   languageName: node
   linkType: hard