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 897cd0e45..5c15385f7 100644 --- a/apps/scandic-web/components/Blocks/DynamicContent/SAS/LinkedAccounts/index.tsx +++ b/apps/scandic-web/components/Blocks/DynamicContent/SAS/LinkedAccounts/index.tsx @@ -10,7 +10,7 @@ import { TIER_TO_FRIEND_MAP, } from "@/constants/membershipLevels" import { env } from "@/env/server" -import { getProfile } from "@/lib/trpc/memoizedRequests" +import { getProfileWithExtendedPartnerData } from "@/lib/trpc/memoizedRequests" import SectionContainer from "@/components/Section/Container" import SectionHeader from "@/components/Section/Header" @@ -70,7 +70,7 @@ export default async function SASLinkedAccount({ } async function MatchedAccountInfo() { - const user = await getProfile() + const user = await getProfileWithExtendedPartnerData() if (!user || "error" in user) { return null @@ -84,7 +84,10 @@ async function MatchedAccountInfo() { return null } - const sasLevelName = SAS_EUROBONUS_TIER_TO_NAME_MAP[eurobonusMembership.tier] + const sasLevelName = + SAS_EUROBONUS_TIER_TO_NAME_MAP[ + eurobonusMembership.boostedTier || eurobonusMembership.tier + ] const sasMembershipNumber = eurobonusMembership.membershipNumber const sasTierExpirationDate = eurobonusMembership.tierExpires @@ -327,11 +330,11 @@ function Label({ children }: { children: ReactNode }) { type MatchState = "boostedBySAS" | "boostedByScandic" | "noBoost" function calculateMatchState(loyalty: UserLoyalty): MatchState { + const eurobonusMembership = getEurobonusMembership(loyalty) + if (eurobonusMembership?.boostedByScandic) return "boostedByScandic" + if (!loyalty.tierBoostedBy) return "noBoost" if (loyalty.tierBoostedBy === "SAS_EB") return "boostedBySAS" - // const eurobonusMembership = getEurobonusMembership(loyalty) - // if (eurobonusMembership.boostedByScandic) return "boostedByScandic" - return "noBoost" } diff --git a/apps/scandic-web/server/routers/user/output.ts b/apps/scandic-web/server/routers/user/output.ts index 7cf4d71b9..716fd5212 100644 --- a/apps/scandic-web/server/routers/user/output.ts +++ b/apps/scandic-web/server/routers/user/output.ts @@ -29,6 +29,8 @@ export const sasMembershipSchema = z tier: sasEurobonusTier, nextTier: sasEurobonusTier.nullish(), spendablePoints: z.number().nullish(), + boostedByScandic: z.boolean().nullish(), + boostedTier: sasEurobonusTier.nullish(), }) .merge(commonMembershipSchema)