Merged in fix/make-user-loyalty-optional (pull request #2044)

fix: Make loyalty optional on user

* Optional user loyalty

* merge


Approved-by: Joakim Jäderberg
Approved-by: Linus Flood

apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/ExpiringPoints/index.tsx

@@ -10,7 +10,7 @@ import type { UserProps } from "@/types/components/myPages/user"
 
 export default async function ExpiringPoints({ user }: UserProps) {
   const intl = await getIntl()
-  const membership = getFriendsMembership(user.loyalty)
+  const membership = user.loyalty ? getFriendsMembership(user.loyalty) : null
 
   if (!membership || !membership.pointsToExpire) {
     //  TODO: handle this case?

apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/Points/index.tsx

@@ -12,7 +12,7 @@ import type { UserProps } from "@/types/components/myPages/user"
 export default async function Points({ user }: UserProps) {
   const intl = await getIntl()
 
-  const membership = getFriendsMembership(user.loyalty)
+  const membership = user.loyalty ? getFriendsMembership(user.loyalty) : null
 
   const nextLevel =
     membership?.nextLevel && MembershipLevelEnum[membership.nextLevel]

apps/scandic-web/components/Blocks/DynamicContent/SAS/LinkedAccounts/index.tsx

@@ -72,7 +72,7 @@ export default async function SASLinkedAccount({
 async function MatchedAccountInfo() {
   const user = await getProfileWithExtendedPartnerData()
 
-  if (!user || "error" in user) {
+  if (!user || "error" in user || !user.loyalty) {
     return null
   }
 

apps/scandic-web/components/Blocks/DynamicContent/SAS/TransferPoints/TransferPointsForm.tsx

@@ -16,7 +16,7 @@ import type { Lang } from "@/constants/languages"
 
 export async function TransferPointsForm({ lang }: { lang: Lang }) {
   const profile = await getProfileWithExtendedPartnerData()
-  if (!profile) return null
+  if (!profile || !profile.loyalty) return null
 
   const eurobonusMembership = getEurobonusMembership(profile?.loyalty)
   if (!eurobonusMembership) return null

apps/scandic-web/components/HotelReservation/MyStay/accessBooking.test.ts

@@ -149,7 +149,7 @@ const authenticatedUser: SafeUser = {
   language: undefined,
   lastName: "Booking",
   membershipNumber: "01234567890123",
-  membership: undefined,
+  membership: null,
   loyalty: {
     memberships: [],
     pointExpirations: [],
@@ -180,7 +180,7 @@ const badAuthenticatedUser: SafeUser = {
   language: undefined,
   lastName: `Bad name ${Math.random()}`,
   membershipNumber: "0987654321",
-  membership: undefined,
+  membership: null,
   loyalty: {
     memberships: [],
     pointExpirations: [],

apps/scandic-web/components/MyPages/Sidebar/index.tsx

@@ -15,7 +15,7 @@ import styles from "./sidebar.module.css"
 export default async function SidebarMyPages() {
   const intl = await getIntl()
   const profile = await getProfileSafely()
-  const eurobonusMembership = profile
+  const eurobonusMembership = profile?.loyalty
     ? getEurobonusMembership(profile.loyalty)
     : null