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/CurrentRewards/Client.tsx b/components/Blocks/DynamicContent/Rewards/CurrentRewards/Client.tsx index ae237cf58..761682e83 100644 --- a/components/Blocks/DynamicContent/Rewards/CurrentRewards/Client.tsx +++ b/components/Blocks/DynamicContent/Rewards/CurrentRewards/Client.tsx @@ -53,7 +53,7 @@ export default function ClientCurrentRewards({ {reward.label} - {showRedeem && ( + {showRedeem && "redeem_description" in reward && (
diff --git a/components/Blocks/DynamicContent/Rewards/CurrentRewards/Redeem.tsx b/components/Blocks/DynamicContent/Rewards/CurrentRewards/Redeem.tsx index dd4102bac..5686ad8a0 100644 --- a/components/Blocks/DynamicContent/Rewards/CurrentRewards/Redeem.tsx +++ b/components/Blocks/DynamicContent/Rewards/CurrentRewards/Redeem.tsx @@ -24,15 +24,15 @@ import { RewardIcon } from "../RewardIcon" 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() @@ -121,9 +121,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" && (