fix(LOY-119): hiding redeemed rewards

some smaller cleanup on coupon property to avoid optional checks

server/routers/contentstack/reward/query.ts

@@ -35,6 +35,7 @@ import {
   getCurrentRewardCounter,
   getCurrentRewardFailCounter,
   getCurrentRewardSuccessCounter,
+  getNonRedeemedRewardIds,
   getRedeemCounter,
   getRedeemFailCounter,
   getRedeemSuccessCounter,
@@ -226,10 +227,7 @@ export const rewardQueryRouter = router({
         return null
       }
 
-      const rewardIds = validatedApiRewards.data
-        .map((reward) => reward?.rewardId)
-        .filter((rewardId): rewardId is string => !!rewardId)
-        .sort()
+      const rewardIds = getNonRedeemedRewardIds(validatedApiRewards.data)
 
       const cmsRewards = await getCmsRewards(ctx.lang, rewardIds)
 
@@ -243,7 +241,7 @@ export const rewardQueryRouter = router({
             reward.type === "coupon" &&
             reward.rewardType === "Surprise" &&
             "coupon" in reward &&
-            reward.coupon?.some(({ unwrapped }) => !unwrapped)
+            reward.coupon.some(({ unwrapped }) => !unwrapped)
         )
         .map(({ rewardId }) => rewardId)
 
@@ -259,7 +257,7 @@ export const rewardQueryRouter = router({
           const redeemableCoupons =
             (apiReward &&
               "coupon" in apiReward &&
-              apiReward.coupon?.filter(
+              apiReward.coupon.filter(
                 (coupon) => coupon.state !== "redeemed" && coupon.unwrapped
               )) ||
             []
@@ -381,7 +379,7 @@ export const rewardQueryRouter = router({
         }
 
         const unwrappedCoupons =
-          reward.coupon?.filter((coupon) => !coupon.unwrapped) || []
+          reward.coupon.filter((coupon) => !coupon.unwrapped) || []
         if (unwrappedCoupons.length === 0) {
           return false
         }