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]

types/enums/rewards.ts

@@ -1,31 +0,0 @@
-export enum RewardId {
-  // Food & Beverage
-  TenPercentFood = "tier_10_percent_food_tier",
-  TwoForOneBreakfast = "tier_2_for_one_breakfast",
-  FifteenPercentFood = "tier_15_percent_food",
-  FreeKidsDrink = "tier_free_kids_drink",
-  FreeBreakfast = "tier_free_breakfast",
-
-  // Monetary Vouchers
-  Bonus50SEK = "tier_50_SEK_bonus_voucher",
-  Bonus75SEK = "tier_75_SEK_bonus_voucher",
-  Bonus100SEK = "tier_100_SEK_bonus_voucher",
-  Bonus150SEK = "tier_150_SEK_bonus_voucher",
-  Bonus200SEK = "tier_200_SEK_bonus_voucher",
-
-  // Hotel Perks
-  EarlyCheckin = "tier_early_checkin_tier",
-  LateCheckout = "tier_late_checkout",
-  FreeUpgrade = "tier_free_upgrade",
-  RoomGuarantee48H = "tier_48_h_room_guarantee",
-  // GymAccess = "tier_gym_access",
-
-  // Earning & Points
-  EarnRate25Percent = "tier_25_percent_earn_rate",
-  EarnRate50Percent = "tier_50_percent_earn_rate",
-  StayBoostForKids = "tier_stay_boost_for_kids",
-  MemberRate = "tier_member_rate",
-
-  // Special
-  YearlyExclusiveGift = "tier_yearly_exclusive_gift",
-}

types/stores/enter-details.ts

@@ -37,6 +37,7 @@ export interface DetailsState {
     updateBedType: (data: BedTypeSchema) => void
     updateBreakfast: (data: BreakfastPackage | false) => void
     updateDetails: (data: DetailsSchema) => void
+    updateSeachParamString: (searchParamString: string) => void
   }
   bedType: BedTypeSchema | undefined
   booking: BookingData
@@ -52,6 +53,7 @@ export interface DetailsState {
   roomPrice: Price
   steps: StepEnum[]
   totalPrice: Price
+  searchParamString: string
 }
 
 export type InitialState = Pick<DetailsState, "booking" | "packages"> &