Merged in feat/LOY-354-L7-Progress-Card (pull request #2786)

Feat/LOY-354 L7 Progress Card

* feat(LOY-354): Add Trophy icon

* fix(LOY-354): include new tierPoints value

* feat(LOY-354): L7 Progress Level Card support

* refactor(LOY-354): Refactoring of component structure

* fix(LOY-354): Remove intl prop drilling

* fix(LOY-354): cleanup progress section code


Approved-by: Erik Tiekstra

packages/design-system/lib/components/Icons/IconByCSSelect.tsx

@@ -71,6 +71,7 @@ export default function IconByCSSelect({
     case 'tram':
     case 'transit_ticket':
     case 'travel':
+    case 'trophy':
     case 'travel_luggage_and_bags':
     case 'favorite':
       return (

packages/design-system/lib/components/Icons/IconByIconName.tsx

@@ -347,6 +347,8 @@ export function IconByIconName({
       return <MaterialIcon icon="train" {...props} />
     case IconName.Tripadvisor:
       return <TripadvisorIcon {...props} />
+    case IconName.Trophy:
+      return <MaterialIcon icon="trophy" {...props} />
     case IconName.TshirtWash:
       return <MaterialIcon icon="laundry" {...props} />
     case IconName.TvCasting:

packages/design-system/lib/components/Icons/MaterialIcon/MaterialSymbol/consts.ts

@@ -3177,6 +3177,7 @@ export const SymbolCodepointsArray = [
   'train',
   'tram',
   'transit_ticket',
+  'trophy',
   'transcribe',
   'transfer_within_a_station',
   'transform',

packages/design-system/lib/fonts.css

@@ -269,7 +269,7 @@
   font-style: normal;
   font-weight: 400;
   font-display: block;
-  src: url(/_static/fonts/material-symbols/rounded-93de53b3.woff2)
+  src: url(/_static/fonts/material-symbols/rounded-f2d895e1.woff2)
     format('woff2');
 }
 

packages/trpc/lib/routers/user/helpers.ts

@@ -40,6 +40,7 @@ export function getFriendsMembership(userLoyalty: UserLoyalty) {
     nightsToTopTier: friendsMembership.nightsToTopTier,
     pointsRequiredToNextlevel: friendsMembership.pointsToNextTier,
     tierExpirationDate: loyalty.tierExpires,
+    tierPoints: friendsMembership.tierPoints,
     pointsExpiryDate: pointExpiration?.expires,
     pointsToExpire: pointExpiration?.points,
     memberSince: friendsMembership.memberSince,

packages/trpc/lib/routers/user/output.ts

@@ -47,6 +47,7 @@ export const friendsMembershipSchema = z
     tier: scandicFriendsTier,
     nextTier: scandicFriendsTier.nullish(),
     pointsToNextTier: z.number().nullish(),
+    tierPoints: z.number().nullish(),
     nightsToTopTier: z.number().nullish(),
   })
   .merge(commonMembershipSchema)