diff --git a/components/MyPages/AccountPage/Content.tsx b/components/MyPages/AccountPage/Content.tsx index 99bd03a99..af4ce9027 100644 --- a/components/MyPages/AccountPage/Content.tsx +++ b/components/MyPages/AccountPage/Content.tsx @@ -37,7 +37,9 @@ function DynamicComponent({ component, props }: AccountPageContentProps) { case DynamicContentComponents.my_points: return case DynamicContentComponents.expiring_points: - return + // TODO: Add once available + // return + return null case DynamicContentComponents.earn_and_burn: return default: diff --git a/components/MyPages/Blocks/Points/CurrentPointsBalance/index.tsx b/components/MyPages/Blocks/Points/CurrentPointsBalance/index.tsx index 6e93d9ba9..f0ef8709c 100644 --- a/components/MyPages/Blocks/Points/CurrentPointsBalance/index.tsx +++ b/components/MyPages/Blocks/Points/CurrentPointsBalance/index.tsx @@ -1,16 +1,18 @@ import { _ } from "@/lib/translation" +import { serverClient } from "@/lib/trpc/server" import styles from "./currentPointsBalance.module.css" -function CurrentPointsBalance() { - const points = 30000 - +async function CurrentPointsBalance() { + const user = await serverClient().user.get() return (
-

{_("Total points*")}

-

{`${_("Points")}: ${points}`}

+

{`${_("Total points")}*`}

+

{`${_("Points")}: ${user.membership.currentPoints}`}

- {_("*Points may take up to 10 days to be displayed.")} + {`*${_("Points may take up to 10 days to be displayed.")}`}

) diff --git a/components/MyPages/Blocks/Points/EarnAndBurn/earnAndBurn.module.css b/components/MyPages/Blocks/Points/EarnAndBurn/earnAndBurn.module.css index 20432b2f7..ad19d150f 100644 --- a/components/MyPages/Blocks/Points/EarnAndBurn/earnAndBurn.module.css +++ b/components/MyPages/Blocks/Points/EarnAndBurn/earnAndBurn.module.css @@ -30,3 +30,13 @@ text-align: left; padding: 16px 32px; } + +.emptyPlaceholder { + display: flex; + flex-direction: column; + align-items: center; + padding: 20px; + font-size: var(--typography-Title5-Desktop-fontSize); + border: 1px solid var(--Base-Fill-Normal); + border-top: none; +} diff --git a/components/MyPages/Blocks/Points/EarnAndBurn/index.tsx b/components/MyPages/Blocks/Points/EarnAndBurn/index.tsx index 829faa31e..0a54fb0cd 100644 --- a/components/MyPages/Blocks/Points/EarnAndBurn/index.tsx +++ b/components/MyPages/Blocks/Points/EarnAndBurn/index.tsx @@ -38,8 +38,7 @@ function EarnAndBurn({ lang }: EarnAndBurnProps) { } const transactions = data?.pages.flatMap((page) => page.data) ?? [] - - return ( + return transactions.length ? (
@@ -61,7 +60,8 @@ function EarnAndBurn({ lang }: EarnAndBurnProps) { ))}
- + */} +
+ ) : ( +
+ + + + {tableHeadings.map((heading) => ( + + ))} + + +
+ {heading} +
+
+ {_("No transactions available")} +
) }