From 0d607d7cc7bd96507f31b477238590374adbe662 Mon Sep 17 00:00:00 2001 From: Christian Andolf Date: Tue, 10 Dec 2024 16:21:08 +0100 Subject: [PATCH] fix: hide new cs rewards model behind feature flag --- .env.local.example | 2 ++ .env.test | 1 + .../Rewards/CurrentLevel/Client.tsx | 4 +-- .../Rewards/CurrentLevel/Redeem.tsx | 13 ++++--- .../Rewards/CurrentLevel/index.tsx | 2 +- env/server.ts | 8 +++++ lib/graphql/Query/Rewards.graphql | 1 - lib/graphql/Query/RewardsWithRedeem.graphql | 16 +++++++++ server/routers/contentstack/reward/output.ts | 36 +++++++++++++++++++ server/routers/contentstack/reward/utils.ts | 35 ++++++++++++------ .../components/myPages/myPage/accountPage.ts | 11 +++--- 11 files changed, 106 insertions(+), 23 deletions(-) create mode 100644 lib/graphql/Query/RewardsWithRedeem.graphql diff --git a/.env.local.example b/.env.local.example index e939323ef..5043646c9 100644 --- a/.env.local.example +++ b/.env.local.example @@ -61,3 +61,5 @@ ENABLE_BOOKING_WIDGET_HOTELRESERVATION_PATH="false" SHOW_SITE_WIDE_ALERT="false" SHOW_SIGNUP_FLOW="true" USE_NEW_REWARDS_ENDPOINT="true" + +USE_NEW_REWARD_MODEL="true" diff --git a/.env.test b/.env.test index a353c6d88..e48b5dc41 100644 --- a/.env.test +++ b/.env.test @@ -45,6 +45,7 @@ GOOGLE_DYNAMIC_MAP_ID="test" HIDE_FOR_NEXT_RELEASE="true" SALESFORCE_PREFERENCE_BASE_URL="test" USE_NEW_REWARDS_ENDPOINT="true" +USE_NEW_REWARD_MODEL="true" TZ=UTC ENABLE_BOOKING_FLOW="false" diff --git a/components/Blocks/DynamicContent/Rewards/CurrentLevel/Client.tsx b/components/Blocks/DynamicContent/Rewards/CurrentLevel/Client.tsx index 2b1f9f793..a75de2a6b 100644 --- a/components/Blocks/DynamicContent/Rewards/CurrentLevel/Client.tsx +++ b/components/Blocks/DynamicContent/Rewards/CurrentLevel/Client.tsx @@ -1,6 +1,6 @@ "use client" -import { useRef,useState } from "react" +import { useRef, useState } from "react" import Image from "@/components/Image" import Pagination from "@/components/MyPages/Pagination" @@ -58,7 +58,7 @@ export default function ClientCurrentRewards({ {reward.label} - {showRedeem && ( + {showRedeem && "redeem_description" in reward && (
diff --git a/components/Blocks/DynamicContent/Rewards/CurrentLevel/Redeem.tsx b/components/Blocks/DynamicContent/Rewards/CurrentLevel/Redeem.tsx index 6e7387f3d..57c978b6a 100644 --- a/components/Blocks/DynamicContent/Rewards/CurrentLevel/Redeem.tsx +++ b/components/Blocks/DynamicContent/Rewards/CurrentLevel/Redeem.tsx @@ -23,15 +23,15 @@ import Title from "@/components/TempDesignSystem/Text/Title" import styles from "./current.module.css" import type { - Redeem, RedeemModalState, + RedeemProps, RedeemStep, } from "@/types/components/myPages/myPage/accountPage" const MotionOverlay = motion(ModalOverlay) const MotionModal = motion(Modal) -export default function Redeem({ reward }: Redeem) { +export default function Redeem({ reward }: RedeemProps) { const [animation, setAnimation] = useState("unmounted") const intl = useIntl() const update = trpc.contentstack.rewards.redeem.useMutation() @@ -125,9 +125,12 @@ export default function Redeem({ reward }: Redeem) { {reward.description} )} - {redeemStep === "confirmation" && ( - {reward.redeem_description} - )} + {redeemStep === "confirmation" && + "redeem_description" in reward && ( + + {reward.redeem_description} + + )} {redeemStep === "initial" && (