Merged in fix/sw-2413-tier-expiration-validation (pull request #1806)

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

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({

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>

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(),
 })