Merged in fix/remove-useless-check (pull request #1844)

fix: remove useless check since cmsreward is always defined

Approved-by: Chuma Mcphoy (We Ahead)

apps/scandic-web/server/routers/contentstack/reward/query.ts

@@ -284,23 +284,17 @@ export const rewardQueryRouter = router({
         return null
       }
 
-      const surprises: Surprise[] = cmsRewards
+      const surprises: Surprise[] = cmsRewards.map((cmsReward) => {
-        .map((cmsReward) => {
+        // Non-null assertion is used here because we know our reward exist
-          // Non-null assertion is used here because we know our reward exist
+        const apiReward = unwrappedSurpriseRewards.find(
-          const apiReward = unwrappedSurpriseRewards.find(
+          ({ rewardId }) => rewardId === cmsReward.reward_id
-            ({ rewardId }) => rewardId === cmsReward.reward_id
+        )!
-          )!
 
-          if (!cmsReward) {
+        return {
-            return null
+          ...apiReward,
-          }
+          ...cmsReward,
-
+        }
-          return {
+      })
-            ...apiReward,
-            ...cmsReward,
-          }
-        })
-        .flatMap((surprises) => (surprises ? [surprises] : []))
 
       metricsGetSurprises.success()