Merge remote-tracking branch 'origin' into feature/tracking

types/components/hotelReservation/enterDetails/bookingData.ts

@@ -5,7 +5,7 @@ interface Room {
   adults: number
   roomTypeCode: string
   rateCode: string
-  counterRateCode: string
+  counterRateCode?: string
   children?: Child[]
   packages?: RoomPackageCodeEnum[]
 }

types/components/hotelReservation/selectHotel/selectHotel.ts

@@ -46,10 +46,10 @@ export interface SelectHotelProps {
     lang: Lang
   }
   reservationParams: {
-    selectHotelParams: URLSearchParams
+    selectHotelParams: URLSearchParams | undefined
     searchParams: SelectHotelSearchParams
-    adultsParams: number
-    childrenParams: string | undefined
-    child: Child[] | undefined
+    adultsInRoom: number
+    childrenInRoom: string | undefined
+    childrenInRoomArray: Child[] | undefined
   }
 }

types/components/hotelReservation/selectRate/section.ts

@@ -1,6 +1,5 @@
-import { PaymentMethodEnum } from "@/constants/booking"
-
-import { CreditCard, SafeUser } from "@/types/user"
+import type { CreditCard, SafeUser } from "@/types/user"
+import type { PaymentMethodEnum } from "@/constants/booking"
 
 export interface SectionProps {
   nextPath: string

types/components/myPages/myPage/accountPage.ts

@@ -26,10 +26,12 @@ export interface CurrentRewardsClientProps {
   rewards: (Reward | RewardWithRedeem)[]
   pageSize: number
   showRedeem: boolean
+  membershipNumber?: string | null
 }
 
 export interface RedeemProps {
   reward: RewardWithRedeem
+  membershipNumber?: string | null
 }
 
 export type RedeemModalState = "unmounted" | "hidden" | "visible"

types/components/myPages/rewards.ts

@@ -1,6 +1,11 @@
 import type { IconProps } from "@/types/components/icon"
+import type { RESTAURANT_REWARD_IDS, REWARD_IDS } from "@/constants/rewards"
 
 export interface RewardIconProps extends IconProps {
   rewardId: string
   size?: "small" | "medium" | "large"
 }
+
+export type RewardId = (typeof REWARD_IDS)[keyof typeof REWARD_IDS]
+
+export type RestaurantRewardId = (typeof RESTAURANT_REWARD_IDS)[number]