Merged in fix/LOY-439-boosted-by-sas-bug (pull request #3047)

fix(LOY-439): fix "boosted by sas" issue

* fix(LOY-439): fix "boosted by sas" issue


Approved-by: Chuma Mcphoy (We Ahead)

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

@@ -2,13 +2,12 @@ import { MembershipLevelEnum } from "@scandic-hotels/common/constants/membership
 import { Divider } from "@scandic-hotels/design-system/Divider"
 import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon"
 import { Typography } from "@scandic-hotels/design-system/Typography"
-import { getEurobonusMembership } from "@scandic-hotels/trpc/routers/user/helpers"
+import { isBoostedBySas } from "@scandic-hotels/trpc/routers/user/helpers"
 
 import { membershipLevels } from "@/constants/membershipLevels"
 
 import MembershipLevelIcon from "@/components/Levels/Icon"
 import { getIntl } from "@/i18n"
-import { getSasTierExpirationDate } from "@/utils/sas"
 
 import SasBoostStatus from "./SasBoostStatus"
 
@@ -34,23 +33,16 @@ export default async function MembershipOverviewCard({
       ? intl.formatNumber(user.membership.currentPoints)
       : intl.formatMessage({ id: "common.NA", defaultMessage: "N/A" })
 
-  const sasMembership = user.loyalty
-    ? getEurobonusMembership(user.loyalty)
-    : null
-
-  const showSasBoostIcon =
-    sasMembership &&
-    getSasTierExpirationDate(sasMembership) &&
-    !sasMembership.boostedByScandic
+  const boostedBySas = user.loyalty ? isBoostedBySas(user.loyalty) : null
 
   return (
     <section className={styles.card} aria-labelledby="membership-level">
       <header className={styles.membershipHeader}>
-        {showSasBoostIcon && (
+        {boostedBySas ? (
           <MaterialIcon icon="travel" size={20} color="Icon/Accent" />
-        )}
+        ) : null}
         <Typography variant="Title/Overline/sm">
-          <h2 className={styles.levelText} id="membership-level">
+          <h2 className={styles.headingText} id="membership-level">
             {intl.formatMessage(
               {
                 id: "common.membershipLevelWithValue",
@@ -60,9 +52,10 @@ export default async function MembershipOverviewCard({
             )}
           </h2>
         </Typography>
-        {sasMembership && (
-          <SasBoostStatus sasMembership={sasMembership} intl={intl} />
-        )}
+
+        {user.loyalty && boostedBySas ? (
+          <SasBoostStatus expiryDate={user.loyalty?.tierExpires} />
+        ) : null}
       </header>
 
       <MembershipLevelIcon
@@ -78,7 +71,7 @@ export default async function MembershipOverviewCard({
       />
 
       <Typography variant="Title/Overline/sm">
-        <h3 className={styles.pointsLabel}>
+        <h3 className={styles.headingText}>
           {intl.formatMessage({
             id: "common.pointsToSpend",
             defaultMessage: "Points to spend",