Merged develop into feat/hotel-pages-intro-section

types/components/current/header/mainMenu.ts

@@ -16,6 +16,6 @@ export type MainMenuProps = {
   languageSwitcher: React.ReactNode | null
   myPagesMobileDropdown: React.ReactNode | null
   bookingHref: string
-  user: User | null
+  user: Pick<User, "firstName" | "lastName"> | null
   lang: Lang
 }

types/components/loyalty/blocks.ts

@@ -7,9 +7,9 @@ import {
   RteBlockContent,
 } from "@/server/routers/contentstack/loyaltyPage/output"
 
-import type { IntlFormatters } from "@formatjs/intl"
+import { MembershipLevel } from "@/utils/user"
 
-import { User } from "@/types/user"
+import type { IntlFormatters } from "@formatjs/intl"
 
 export type BlocksProps = {
   blocks: Block[]
@@ -32,7 +32,7 @@ export type Content = { content: RteBlockContent["content"]["content"] }
 
 type Benefit = { title: string }
 
-export type OverviewTableProps = { user: User | null }
+export type OverviewTableProps = { activeMembership: MembershipLevel | null }
 
 export type Level = {
   level: membershipLevels