@@ -92,24 +47,24 @@ function LevelCard({ formatMessage, lang, level }: LevelCardProps) {
color="primaryLightOnSurfaceAccent"
tilted="large"
>
- {formatMessage({ id: "Level" })} {level.level}
+ {intl.formatMessage({ id: "Level" })} {level.user_facing_tag}
-
+
{pointsString}
- {level.requiredNights ? (
+ {level.required_nights ? (
- {formatMessage({ id: "or" })} {level.requiredNights}{" "}
- {formatMessage({ id: "nights" })}
+ {intl.formatMessage({ id: "or" })} {level.required_nights}{" "}
+ {intl.formatMessage({ id: "nights" })}
) : null}
- {level.benefits.map((benefit) => (
+ {level.rewards.map((reward) => (
@@ -117,7 +72,7 @@ function LevelCard({ formatMessage, lang, level }: LevelCardProps) {
className={styles.checkIcon}
color="primaryLightOnSurfaceAccent"
/>
- {benefit.title}
+ {reward.label}
))}
diff --git a/components/Blocks/DynamicContent/Overview/Friend/MembershipLevel/index.tsx b/components/Blocks/DynamicContent/Overview/Friend/MembershipLevel/index.tsx
deleted file mode 100644
index 07d4743ee..000000000
--- a/components/Blocks/DynamicContent/Overview/Friend/MembershipLevel/index.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { membershipLevels } from "@/constants/membershipLevels"
-
-import {
- BestFriend,
- CloseFriend,
- DearFriend,
- GoodFriend,
- LoyalFriend,
- NewFriend,
- TrueFriend,
-} from "@/components/Levels"
-
-import styles from "./membershipLevel.module.css"
-
-import type { MembershipLevelProps } from "@/types/components/myPages/membership"
-
-export default function MembershipLevel({ level }: MembershipLevelProps) {
- switch (level) {
- case membershipLevels.L1:
- return
- case membershipLevels.L2:
- return
- case membershipLevels.L3:
- return
- case membershipLevels.L4:
- return
- case membershipLevels.L5:
- return
- case membershipLevels.L6:
- return
- case membershipLevels.L7:
- return
- default:
- return null
- }
-}
diff --git a/components/Blocks/DynamicContent/Overview/Friend/MembershipLevel/membershipLevel.module.css b/components/Blocks/DynamicContent/Overview/Friend/MembershipLevel/membershipLevel.module.css
deleted file mode 100644
index 25b922864..000000000
--- a/components/Blocks/DynamicContent/Overview/Friend/MembershipLevel/membershipLevel.module.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.level {
- height: 105px;
- width: 219px;
-}
diff --git a/components/Blocks/DynamicContent/Overview/Friend/index.tsx b/components/Blocks/DynamicContent/Overview/Friend/index.tsx
index c581765b6..3f1b30ed1 100644
--- a/components/Blocks/DynamicContent/Overview/Friend/index.tsx
+++ b/components/Blocks/DynamicContent/Overview/Friend/index.tsx
@@ -1,12 +1,14 @@
-import { membershipLevels } from "@/constants/membershipLevels"
+import {
+ MembershipLevelEnum,
+ membershipLevels,
+} from "@/constants/membershipLevels"
+import MembershipLevelIcon from "@/components/Levels/Icon"
import Body from "@/components/TempDesignSystem/Text/Body"
import Title from "@/components/TempDesignSystem/Text/Title"
import { getIntl } from "@/i18n"
import { isHighestMembership } from "@/utils/user"
-import MembershipLevel from "./MembershipLevel"
-
import styles from "./friend.module.css"
import type { FriendProps } from "@/types/components/myPages/friend"
@@ -20,7 +22,6 @@ export default async function Friend({
if (!membership?.membershipLevel) {
return null
}
- // @ts-expect-error: membershiplevel needs proper fix
const isHighestLevel = isHighestMembership(membership.membershipLevel)
return (
@@ -30,16 +31,14 @@ export default async function Friend({
{formatMessage(
isHighestLevel
? { id: "Highest level" }
- : // @ts-expect-error: membershiplevel needs proper fix
- { id: `Level ${membershipLevels[membership.membershipLevel]}` }
+ : { id: `Level ${membershipLevels[membership.membershipLevel]}` }
)}