From 700141f45e8cb67e0666a908bccdbd9e28a1fc14 Mon Sep 17 00:00:00 2001
From: Anton Gunnarsson <anton.gunnarsson@scandichotels.com>
Date: Wed, 16 Apr 2025 08:32:20 +0000
Subject: [PATCH] Merged in fix/sw-2413-tier-expiration-validation (pull
 request #1806)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SW-2413 Update tier expiration validation

* Update tier expiration validation

* Set tierExpires default to null


Approved-by: Christian Andolf
Approved-by: Joakim Jäderberg
Approved-by: Linus Flood
---
 .../Blocks/DynamicContent/SAS/LinkedAccounts/index.tsx          | 2 +-
 .../MyPages/myprofile/membershipCards/membershipcards.tsx       | 2 +-
 apps/scandic-web/server/routers/user/output.ts                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 5c15385f7..89b94426b 100644
--- a/apps/scandic-web/components/Blocks/DynamicContent/SAS/LinkedAccounts/index.tsx
+++ b/apps/scandic-web/components/Blocks/DynamicContent/SAS/LinkedAccounts/index.tsx
@@ -288,7 +288,7 @@ async function TierMatchMessageSkeleton() {
 
 type TierMatchExpirationProps = {
   matchState: MatchState
-  sasExpirationDate: string | undefined
+  sasExpirationDate: string | null
   scandicExpirationDate: string | undefined
 }
 async function TierMatchExpiration({
diff --git a/apps/scandic-web/components/MyPages/myprofile/membershipCards/membershipcards.tsx b/apps/scandic-web/components/MyPages/myprofile/membershipCards/membershipcards.tsx
index 439898bd5..6d8de5eaf 100644
--- a/apps/scandic-web/components/MyPages/myprofile/membershipCards/membershipcards.tsx
+++ b/apps/scandic-web/components/MyPages/myprofile/membershipCards/membershipcards.tsx
@@ -70,7 +70,7 @@ export default async function MembershipCardSlot() {
                   defaultMessage: "Expiration Date: {expirationDate}",
                 },
                 {
-                  expirationDate: card.expirationDate.split("T")[0],
+                  expirationDate: card.expirationDate?.split("T")[0],
                 }
               )}
             </span>
diff --git a/apps/scandic-web/server/routers/user/output.ts b/apps/scandic-web/server/routers/user/output.ts
index 716fd5212..7046dc97f 100644
--- a/apps/scandic-web/server/routers/user/output.ts
+++ b/apps/scandic-web/server/routers/user/output.ts
@@ -11,7 +11,7 @@ const sasEurobonusTier = z.enum(["EBB", "EBS", "EBG", "EBD", "EBP"])
 
 const commonMembershipSchema = z.object({
   membershipNumber: z.string(),
-  tierExpires: z.string(),
+  tierExpires: z.string().nullish().default(null),
   memberSince: z.string().nullish(),
 })