Merged in feat/membership-information (pull request #233)

Feat(WEB-307) Display correct membership information

* fix: fix typo

* chore: update fetch of user membership

* chore: update components to use api data

* chore: remove lang as static value

* fix: adapt to dev updates

* fix: adapt to code from dev

* fix: break out MembershipLevel into its a React component

* fix: add enum to zod validation

* refactor: rename tier to level

* refactor: remove unnecessary casts

* refactor: change toString() to hideEmpty=false

* refactor: remove toString()

* refactor: remove hideEmpty from title and subtitle

* fix: update currentLevel with data

* fix: fix from rebase


Approved-by: Michael Zetterberg
This commit is contained in:
Matilda Landström
2024-06-18 13:14:09 +00:00
committed by Michael Zetterberg
parent aca9221ea6
commit 9931d9edef
33 changed files with 473 additions and 357 deletions

View File

@@ -1,13 +1,13 @@
import { z } from "zod"
import { membershipLevels } from "@/constants/membershipLevels"
import { MembershipLevelEnum } from "@/constants/membershipLevels"
import { countriesMap } from "@/components/TempDesignSystem/Form/Country/countries"
export const getUserSchema = z.object({
address: z.object({
city: z.string().optional(),
country: z.nativeEnum(countriesMap).optional(),
countryCode: z.nativeEnum(countriesMap).optional(),
streetAddress: z.string().optional(),
zipCode: z.string(),
}),
@@ -21,9 +21,7 @@ export const getUserSchema = z.object({
currentPoints: z.number(),
expirationDate: z.string(),
membershipNumber: z.string(),
membershipLevel: z
.enum(["L1", "L2", "L3", "L4", "L5", "L6", "L7"])
.optional(),
membershipLevel: z.nativeEnum(MembershipLevelEnum).optional(),
memberSince: z.string(),
membershipType: z.string(),
})