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

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]