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

types/components/myPages/myPage/accountPage.ts

@@ -1,8 +1,11 @@
-import { z } from "zod"
+import type { z } from "zod"
 
-import { blocksSchema } from "@/server/routers/contentstack/accountPage/output"
-
-import { DynamicContent } from "@/types/trpc/routers/contentstack/blocks"
+import type { DynamicContent } from "@/types/trpc/routers/contentstack/blocks"
+import type { blocksSchema } from "@/server/routers/contentstack/accountPage/output"
+import type {
+  Reward,
+  RewardWithRedeem,
+} from "@/server/routers/contentstack/reward/output"
 
 export interface AccountPageContentProps
   extends Pick<DynamicContent, "dynamic_content"> {}
@@ -18,3 +21,17 @@ type Content = z.output<typeof blocksSchema>
 export type ContentProps = {
   content: Content[]
 }
+
+export interface CurrentRewardsClientProps {
+  rewards: (Reward | RewardWithRedeem)[]
+  pageSize: number
+  showRedeem: boolean
+}
+
+export interface RedeemProps {
+  reward: RewardWithRedeem
+}
+
+export type RedeemModalState = "unmounted" | "hidden" | "visible"
+
+export type RedeemStep = "initial" | "confirmation" | "redeemed"

types/components/myPages/myPage/earnAndBurn.ts

@@ -1,7 +1,6 @@
-import { awardPointsVariants } from "@/components/Blocks/DynamicContent/Points/EarnAndBurn/AwardPoints/awardPointsVariants"
-
 import type { VariantProps } from "class-variance-authority"
 
+import type { awardPointsVariants } from "@/components/Blocks/DynamicContent/Points/EarnAndBurn/AwardPoints/awardPointsVariants"
 import type { Lang } from "@/constants/languages"
 import type { UserQueryRouter } from "../user"
 
@@ -31,19 +30,6 @@ export interface RowProps {
   transaction: Transaction
 }
 
-export interface PaginationProps {
-  pageCount: number
-  isFetching: boolean
-  handlePageChange: (page: number) => void
-  currentPage: number
-}
-
-export interface PaginationButtonProps {
-  disabled: boolean
-  isActive?: boolean
-  handleClick: () => void
-}
-
 export interface AwardPointsProps extends Pick<Transaction, "awardPoints"> {}
 
 export interface AwardPointsVariantProps

types/components/myPages/pagination.ts

@@ -0,0 +1,12 @@
+export interface PaginationProps {
+  pageCount: number
+  isFetching?: boolean
+  handlePageChange: (page: number) => void
+  currentPage: number
+}
+
+export interface PaginationButtonProps {
+  disabled: boolean
+  isActive?: boolean
+  handleClick: () => void
+}

types/components/myPages/rewards.ts

@@ -0,0 +1,6 @@
+import type { IconProps } from "@/types/components/icon"
+
+export interface RewardIconProps extends IconProps {
+  rewardId: string
+  size?: "small" | "medium" | "large"
+}