diff --git a/apps/scandic-web/components/Blocks/DynamicContent/SAS/LinkedAccounts/index.tsx b/apps/scandic-web/components/Blocks/DynamicContent/SAS/LinkedAccounts/index.tsx index 89b94426b..77f0781af 100644 --- a/apps/scandic-web/components/Blocks/DynamicContent/SAS/LinkedAccounts/index.tsx +++ b/apps/scandic-web/components/Blocks/DynamicContent/SAS/LinkedAccounts/index.tsx @@ -89,7 +89,8 @@ async function MatchedAccountInfo() { eurobonusMembership.boostedTier || eurobonusMembership.tier ] const sasMembershipNumber = eurobonusMembership.membershipNumber - const sasTierExpirationDate = eurobonusMembership.tierExpires + const sasTierExpirationDate = + eurobonusMembership.boostedTierExpires || eurobonusMembership.tierExpires const scandicLevelName = TIER_TO_FRIEND_MAP[friendsMembership.membershipLevel] const scandicExpirationDate = friendsMembership.tierExpirationDate @@ -302,6 +303,13 @@ async function TierMatchExpiration({ const intl = await getIntl() + const displayedExpirationDate = + matchState === "boostedBySAS" ? scandicExpirationDate : sasExpirationDate + + if (!displayedExpirationDate) { + return null + } + return (
-

- {matchState === "boostedBySAS" - ? scandicExpirationDate - : sasExpirationDate} -

+

{displayedExpirationDate}

) diff --git a/apps/scandic-web/server/routers/user/output.ts b/apps/scandic-web/server/routers/user/output.ts index 7046dc97f..03bc44d9f 100644 --- a/apps/scandic-web/server/routers/user/output.ts +++ b/apps/scandic-web/server/routers/user/output.ts @@ -31,8 +31,17 @@ export const sasMembershipSchema = z spendablePoints: z.number().nullish(), boostedByScandic: z.boolean().nullish(), boostedTier: sasEurobonusTier.nullish(), + boostedTierExpires: z.string().nullish().default(null), }) .merge(commonMembershipSchema) + .transform((response) => { + return { + ...response, + tierExpires: + // SAS API returns 1900-01-01 for non-expiring tiers + response.tierExpires === "1900-01-01" ? null : response.tierExpires, + } + }) export const friendsMembershipSchema = z .object({