Merged in feat/3614-basicInfo (pull request #3427)

feat(SW-3614): use new loyalty prop in basicProfile

* feat(SW-3614): use new loyalty prop in basicProfile

* PR fixes


Approved-by: Matilda Landström

apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/layout.tsx

@@ -1,8 +1,12 @@
 import { TrackingSDK } from "@scandic-hotels/tracking/TrackingSDK"
-import { getEurobonusMembership } from "@scandic-hotels/trpc/routers/user/helpers"
+import {
+  getEurobonusMembership,
+  scandicMembershipTypes,
+} from "@scandic-hotels/trpc/routers/user/helpers"
 
 import { env } from "@/env/server"
 import {
+  getBasicProfileSafely,
   getProfileSafely,
   getProfilingConsent,
 } from "@/lib/trpc/memoizedRequests"
@@ -85,10 +89,10 @@ async function MyPagesLayoutBase({
   breadcrumbs,
   children,
 }: MyPagesLayoutProps) {
-  const profile = await getProfileSafely()
-  const eurobonusMembership = profile?.loyalty
-    ? getEurobonusMembership(profile.loyalty)
-    : null
+  const profile = await getBasicProfileSafely()
+  const eurobonusMembership = profile?.loyalty?.memberships?.find(
+    (m) => m.membershipType === scandicMembershipTypes.SAS_EB
+  )
 
   return (
     <div className={styles.container}>

apps/scandic-web/app/[lang]/(partner)/(sas)/(protected)/sas-x-scandic/link/page.tsx

@@ -1,9 +1,9 @@
 import { redirect } from "next/navigation"
 import React from "react"
 
-import { getEurobonusMembership } from "@scandic-hotels/trpc/routers/user/helpers"
+import { scandicMembershipTypes } from "@scandic-hotels/trpc/routers/user/helpers"
 
-import { getProfileSafely } from "@/lib/trpc/memoizedRequests"
+import { getBasicProfileSafely } from "@/lib/trpc/memoizedRequests"
 
 import { SASModal } from "../components/SASModal"
 import { LinkAccountForm } from "./LinkAccountForm"
@@ -12,11 +12,13 @@ export default async function SASxScandicLinkPage(
   props: PageProps<"/[lang]/sas-x-scandic/link">
 ) {
   const params = await props.params
-  const profile = await getProfileSafely()
+  const profile = await getBasicProfileSafely()
 
   if (!profile || !profile.loyalty) return null
 
-  const eurobonusMembership = getEurobonusMembership(profile.loyalty)
+  const eurobonusMembership = profile.loyalty.memberships?.some(
+    (m) => m.membershipType === scandicMembershipTypes.SAS_EB
+  )
 
   if (eurobonusMembership) {
     redirect(`/${params.lang}/sas-x-scandic/error?errorCode=alreadyLinked`)