Merged in fix/LOY-359-use-scandic-native-tier-data (pull request #2846)

fix(LOY-359): Always use scandic native tier data for all level related data

* fix(LOY-359): Always use scandic native tier data for all level related data


Approved-by: Erik Tiekstra
Approved-by: Matilda Landström

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

@@ -1,6 +1,7 @@
 import { dt } from "@scandic-hotels/common/dt"
 import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon"
 import { Typography } from "@scandic-hotels/design-system/Typography"
+import { getScandicNativeMembership } from "@scandic-hotels/trpc/routers/user/helpers"
 
 import { getIntl } from "@/i18n"
 import { getLang } from "@/i18n/serverContext"
@@ -20,13 +21,17 @@ export default async function LevelProgressCard({
   className,
   color = "Surface/Brand/Primary 1/OnSurface/Default",
 }: levelProgressCardProps) {
-  if (!user.membership?.membershipLevel) {
+  const friendsMembership = user.loyalty
+    ? getScandicNativeMembership(user.loyalty)
+    : null
+
+  if (!friendsMembership) {
     return null
   }
 
   const intl = await getIntl()
   const lang = await getLang()
-  const data = await getLevelProgressData(user.membership)
+  const data = await getLevelProgressData(friendsMembership)
   const classNames = levelProgressCardVariants({ className, color })
 
   return (
@@ -44,7 +49,7 @@ export default async function LevelProgressCard({
             {intl.formatMessage(
               { defaultMessage: "Valid until {date}" },
               {
-                date: dt(user.membership.tierExpirationDate)
+                date: dt(friendsMembership.tierExpires)
                   .locale(lang)
                   .format("D MMM YYYY"),
               }