From 9f3c5f6040aa76f987c1a926a154887d0fff6ec0 Mon Sep 17 00:00:00 2001
From: Fredrik Thorsson <fredrik.thorsson@scandichotels.com>
Date: Tue, 10 Dec 2024 13:55:16 +0100
Subject: [PATCH] feat(SW-1012): remove duplicate icon

---
 .../AccordionAmenities/Parking/index.tsx      |  4 +--
 components/Icons/ExternalLink.tsx             | 27 -------------------
 components/Icons/get-icon-by-icon-name.ts     |  3 ---
 components/Icons/index.tsx                    |  1 -
 lib/trpc/memoizedRequests/index.ts            |  4 ---
 server/routers/booking/query.ts               |  5 +++-
 types/trpc/routers/booking/confirmation.ts    |  4 ++-
 7 files changed, 9 insertions(+), 39 deletions(-)
 delete mode 100644 components/Icons/ExternalLink.tsx

diff --git a/components/ContentType/HotelPage/SidePeeks/Amenities/AccordionAmenities/Parking/index.tsx b/components/ContentType/HotelPage/SidePeeks/Amenities/AccordionAmenities/Parking/index.tsx
index a2ef9680c..8f38b0ded 100644
--- a/components/ContentType/HotelPage/SidePeeks/Amenities/AccordionAmenities/Parking/index.tsx
+++ b/components/ContentType/HotelPage/SidePeeks/Amenities/AccordionAmenities/Parking/index.tsx
@@ -1,4 +1,4 @@
-import { ExternalLinkIcon } from "@/components/Icons"
+import { OpenInNewIcon } from "@/components/Icons"
 import AccordionItem from "@/components/TempDesignSystem/Accordion/AccordionItem"
 import Button from "@/components/TempDesignSystem/Button"
 import Divider from "@/components/TempDesignSystem/Divider"
@@ -76,7 +76,7 @@ export default async function ParkingAmenity({
                   target="_blank"
                 >
                   {intl.formatMessage({ id: "Book parking" })}
-                  <ExternalLinkIcon color="white" />
+                  <OpenInNewIcon color="white" />
                 </Link>
               </Button>
             )}
diff --git a/components/Icons/ExternalLink.tsx b/components/Icons/ExternalLink.tsx
deleted file mode 100644
index b58260209..000000000
--- a/components/Icons/ExternalLink.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { iconVariants } from "./variants"
-
-import type { IconProps } from "@/types/components/icon"
-
-export default function ExternalLinkIcon({
-  className,
-  color,
-  ...props
-}: IconProps) {
-  const classNames = iconVariants({ className, color })
-  return (
-    <svg
-      className={classNames}
-      xmlns="http://www.w3.org/2000/svg"
-      width="25"
-      height="24"
-      viewBox="0 0 25 24"
-      fill="none"
-      {...props}
-    >
-      <path
-        d="M5.59998 20.775C5.08434 20.775 4.64293 20.5914 4.27575 20.2242C3.90857 19.857 3.72498 19.4156 3.72498 18.9V5.09998C3.72498 4.58434 3.90857 4.14293 4.27575 3.77575C4.64293 3.40857 5.08434 3.22498 5.59998 3.22498H11.4875C11.7458 3.22498 11.9666 3.31664 12.15 3.49998C12.3333 3.68331 12.425 3.90414 12.425 4.16248C12.425 4.42081 12.3333 4.64164 12.15 4.82498C11.9666 5.00831 11.7458 5.09998 11.4875 5.09998H5.59998V18.9H19.4V13.0125C19.4 12.7541 19.4916 12.5333 19.675 12.35C19.8583 12.1666 20.0791 12.075 20.3375 12.075C20.5958 12.075 20.8166 12.1666 21 12.35C21.1833 12.5333 21.275 12.7541 21.275 13.0125V18.9C21.275 19.4156 21.0914 19.857 20.7242 20.2242C20.357 20.5914 19.9156 20.775 19.4 20.775H5.59998ZM19.4 6.41248L10.8875 14.925C10.7125 15.1 10.4979 15.1875 10.2437 15.1875C9.98956 15.1875 9.77081 15.0958 9.58748 14.9125C9.40414 14.7291 9.31248 14.5104 9.31248 14.2562C9.31248 14.0021 9.40311 13.7843 9.58438 13.6031L18.0875 5.09998H15.2375C14.9791 5.09998 14.7583 5.00831 14.575 4.82498C14.3916 4.64164 14.3 4.42081 14.3 4.16248C14.3 3.90414 14.3916 3.68331 14.575 3.49998C14.7583 3.31664 14.9791 3.22498 15.2375 3.22498H21.275V9.26248C21.275 9.52081 21.1833 9.74164 21 9.92498C20.8166 10.1083 20.5958 10.2 20.3375 10.2C20.0791 10.2 19.8583 10.1083 19.675 9.92498C19.4916 9.74164 19.4 9.52081 19.4 9.26248V6.41248Z"
-        fill="white"
-      />
-    </svg>
-  )
-}
diff --git a/components/Icons/get-icon-by-icon-name.ts b/components/Icons/get-icon-by-icon-name.ts
index 172a16e20..68d6864a7 100644
--- a/components/Icons/get-icon-by-icon-name.ts
+++ b/components/Icons/get-icon-by-icon-name.ts
@@ -39,7 +39,6 @@ import {
   ElectricBikeIcon,
   ElectricCarIcon,
   EmailIcon,
-  ExternalLinkIcon,
   EyeHideIcon,
   EyeShowIcon,
   FacebookIcon,
@@ -202,8 +201,6 @@ export function getIconByIconName(
       return ElectricCarIcon
     case IconName.Email:
       return EmailIcon
-    case IconName.ExternalLink:
-      return ExternalLinkIcon
     case IconName.EyeHide:
       return EyeHideIcon
     case IconName.EyeShow:
diff --git a/components/Icons/index.tsx b/components/Icons/index.tsx
index d1c61fc22..e5fe75235 100644
--- a/components/Icons/index.tsx
+++ b/components/Icons/index.tsx
@@ -66,7 +66,6 @@ export { default as ElectricBikeIcon } from "./ElectricBike"
 export { default as ElectricCarIcon } from "./ElectricCar"
 export { default as EmailIcon } from "./Email"
 export { default as ErrorCircleIcon } from "./ErrorCircle"
-export { default as ExternalLinkIcon } from "./ExternalLink"
 export { default as EyeHideIcon } from "./EyeHide"
 export { default as EyeShowIcon } from "./EyeShow"
 export { default as FacebookIcon } from "./Facebook"
diff --git a/lib/trpc/memoizedRequests/index.ts b/lib/trpc/memoizedRequests/index.ts
index 006c5f626..22d1ac385 100644
--- a/lib/trpc/memoizedRequests/index.ts
+++ b/lib/trpc/memoizedRequests/index.ts
@@ -13,10 +13,6 @@ import type {
   HotelDataInput,
 } from "@/server/routers/hotels/input"
 import type { GetSavedPaymentCardsInput } from "@/server/routers/user/input"
-import type {
-  BreackfastPackagesInput,
-  PackagesInput,
-} from "@/types/requests/packages"
 
 export const getLocations = cache(async function getMemoizedLocations() {
   return serverClient().hotel.locations.get()
diff --git a/server/routers/booking/query.ts b/server/routers/booking/query.ts
index 3e7d1f216..08279eff9 100644
--- a/server/routers/booking/query.ts
+++ b/server/routers/booking/query.ts
@@ -145,7 +145,10 @@ export const bookingQueryRouter = router({
           ...hotelData.data.attributes,
           included: hotelData.included,
         },
-        room: getBookedHotelRoom(hotelData.included, booking.data.roomTypeCode),
+        room: getBookedHotelRoom(
+          hotelData.included?.rooms,
+          booking.data.roomTypeCode
+        ),
       }
     }),
   status: serviceProcedure.input(getBookingStatusInput).query(async function ({
diff --git a/types/trpc/routers/booking/confirmation.ts b/types/trpc/routers/booking/confirmation.ts
index 7e0b580ce..c9a607a08 100644
--- a/types/trpc/routers/booking/confirmation.ts
+++ b/types/trpc/routers/booking/confirmation.ts
@@ -9,7 +9,9 @@ export interface BookingConfirmationSchema
 export interface BookingConfirmation {
   booking: BookingConfirmationSchema
   hotel: Hotel & {
-    included?: RoomData[]
+    included?: {
+      rooms: RoomData[]
+    }
   }
   room:
     | (RoomData & {