diff --git a/components/Blocks/DynamicContent/Rewards/CurrentLevel/Client.tsx b/components/Blocks/DynamicContent/Rewards/CurrentLevel/Client.tsx index f0528ed2c..204534cfe 100644 --- a/components/Blocks/DynamicContent/Rewards/CurrentLevel/Client.tsx +++ b/components/Blocks/DynamicContent/Rewards/CurrentLevel/Client.tsx @@ -17,6 +17,7 @@ import type { CurrentRewardsClientProps } from "@/types/components/blocks/curren export default function ClientCurrentRewards({ initialCurrentRewards, + membershipNumber, }: CurrentRewardsClientProps) { const lang = useLang() const { data, isFetching, fetchNextPage, hasNextPage, isLoading } = @@ -81,7 +82,7 @@ export default function ClientCurrentRewards({ ) : ( ))} - + ) } diff --git a/components/Blocks/DynamicContent/Rewards/CurrentLevel/index.tsx b/components/Blocks/DynamicContent/Rewards/CurrentLevel/index.tsx index cb970e5e7..9ab0f5d28 100644 --- a/components/Blocks/DynamicContent/Rewards/CurrentLevel/index.tsx +++ b/components/Blocks/DynamicContent/Rewards/CurrentLevel/index.tsx @@ -1,3 +1,4 @@ +import { getProfile } from "@/lib/trpc/memoizedRequests" import { serverClient } from "@/lib/trpc/server" import SectionContainer from "@/components/Section/Container" @@ -22,10 +23,19 @@ export default async function CurrentRewardsBlock({ return null } + const user = await getProfile() + + if (!user || "error" in user) { + return null + } + return ( - + ) diff --git a/components/Blocks/DynamicContent/Rewards/Surprises/index.tsx b/components/Blocks/DynamicContent/Rewards/Surprises/index.tsx index 917b835f5..5dbb8bc11 100644 --- a/components/Blocks/DynamicContent/Rewards/Surprises/index.tsx +++ b/components/Blocks/DynamicContent/Rewards/Surprises/index.tsx @@ -22,7 +22,10 @@ import styles from "./surprises.module.css" import type { SurprisesProps } from "@/types/components/blocks/surprises" -export default function Surprises({ surprises }: SurprisesProps) { +export default function Surprises({ + surprises, + membershipNumber, +}: SurprisesProps) { const lang = useLang() const [open, setOpen] = useState(true) const [selectedSurprise, setSelectedSurprise] = useState(0) @@ -54,7 +57,7 @@ export default function Surprises({ surprises }: SurprisesProps) { { amount: surprises.length } )}
- + {intl.formatMessage({ id: "Go to My Benefits" })} @@ -105,7 +108,10 @@ export default function Surprises({ surprises }: SurprisesProps) {
Valid through DD M YYYY - Member ID 000000 + + {intl.formatMessage({ id: "Membership ID" })}{" "} + {membershipNumber} +
diff --git a/components/Blocks/DynamicContent/Rewards/Surprises/surprises.module.css b/components/Blocks/DynamicContent/Rewards/Surprises/surprises.module.css index 5932145c8..ddca5f85f 100644 --- a/components/Blocks/DynamicContent/Rewards/Surprises/surprises.module.css +++ b/components/Blocks/DynamicContent/Rewards/Surprises/surprises.module.css @@ -1,7 +1,3 @@ -.icon { - align-self: center; -} - @keyframes modal-fade { from { opacity: 0; @@ -55,7 +51,6 @@ position: absolute; left: 0; bottom: 0; - transition: height 200ms ease-in-out; &[data-entering] { animation: slide-up 200ms; diff --git a/types/components/blocks/currentRewards.ts b/types/components/blocks/currentRewards.ts index f596647a9..ff4fb9ee3 100644 --- a/types/components/blocks/currentRewards.ts +++ b/types/components/blocks/currentRewards.ts @@ -1,9 +1,12 @@ import { ApiReward, Reward } from "@/server/routers/contentstack/reward/output" +import { SafeUser } from "@/types/user" + export type CurrentRewardsClientProps = { initialCurrentRewards: { rewards: Reward[] apiRewards: ApiReward[] nextCursor: number | undefined } + membershipNumber?: string } diff --git a/types/components/blocks/surprises.ts b/types/components/blocks/surprises.ts index ff23d595e..d5aadfd9e 100644 --- a/types/components/blocks/surprises.ts +++ b/types/components/blocks/surprises.ts @@ -2,4 +2,5 @@ import { ApiReward } from "@/server/routers/contentstack/reward/output" export interface SurprisesProps { surprises: ApiReward[] + membershipNumber?: string }