Merged in fix/LOY-359-revert-to-loyalty-level-to-support-boosted-level (pull request #2954)

fix(LOY-359): Revert back to allow non-native loyalty level in overview cards

* fix(LOY-359): Revert back to allow non-native loyalty level in overview cards


Approved-by: Erik Tiekstra

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

@@ -1,6 +1,5 @@
 import { dt } from "@scandic-hotels/common/dt"
 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"
@@ -21,17 +20,13 @@ export default async function LevelProgressCard({
   className,
   color = "Surface/Brand/Primary 1/OnSurface/Default",
 }: levelProgressCardProps) {
-  const friendsMembership = user.loyalty
-    ? getScandicNativeMembership(user.loyalty)
-    : null
-
-  if (!friendsMembership) {
+  if (!user.membership?.membershipLevel) {
     return null
   }
 
   const intl = await getIntl()
   const lang = await getLang()
-  const data = await getLevelProgressData(friendsMembership)
+  const data = await getLevelProgressData(user.membership)
   const classNames = levelProgressCardVariants({ className, color })
 
   return (
@@ -49,7 +44,7 @@ export default async function LevelProgressCard({
             {intl.formatMessage(
               { defaultMessage: "Valid until {date}" },
               {
-                date: dt(friendsMembership.tierExpires)
+                date: dt(user.membership.tierExpirationDate)
                   .locale(lang)
                   .format("D MMM YYYY"),
               }
@@ -58,7 +53,7 @@ export default async function LevelProgressCard({
         </Typography>
         <LevelProgressModal
           color={color}
-          tierExpires={friendsMembership.tierExpires}
+          tierExpires={user.membership.tierExpirationDate}
         />
       </header>