From 585cfdd68475d795d7da97147b23f3190ee9b6c8 Mon Sep 17 00:00:00 2001 From: Hrishikesh Vaipurkar Date: Thu, 6 Mar 2025 17:03:16 +0100 Subject: [PATCH] feat: SW-1583 Optmized after rebase --- .../Forms/BookingWidget/FormContent/BookingCode/index.tsx | 1 + .../Forms/BookingWidget/FormContent/RewardNight/index.tsx | 8 +++----- apps/scandic-web/components/GuestsRoomsPicker/Form.tsx | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/apps/scandic-web/components/Forms/BookingWidget/FormContent/BookingCode/index.tsx b/apps/scandic-web/components/Forms/BookingWidget/FormContent/BookingCode/index.tsx index 2c4cc6b51..4946ecdaa 100644 --- a/apps/scandic-web/components/Forms/BookingWidget/FormContent/BookingCode/index.tsx +++ b/apps/scandic-web/components/Forms/BookingWidget/FormContent/BookingCode/index.tsx @@ -275,6 +275,7 @@ export function RemoveExtraRooms({ ...props }: ButtonProps) { const rooms = getValues("rooms")[0] setValue("rooms", [rooms], { shouldValidate: true }) trigger("bookingCode.value") + trigger(REDEMPTION) }, 300) } diff --git a/apps/scandic-web/components/Forms/BookingWidget/FormContent/RewardNight/index.tsx b/apps/scandic-web/components/Forms/BookingWidget/FormContent/RewardNight/index.tsx index 904a3e9c1..c49ea3c5a 100644 --- a/apps/scandic-web/components/Forms/BookingWidget/FormContent/RewardNight/index.tsx +++ b/apps/scandic-web/components/Forms/BookingWidget/FormContent/RewardNight/index.tsx @@ -8,9 +8,10 @@ import { REDEMPTION } from "@/constants/booking" import { ErrorCircleIcon } from "@/components/Icons" import Checkbox from "@/components/TempDesignSystem/Form/Checkbox" -import Body from "@/components/TempDesignSystem/Text/Body" import Caption from "@/components/TempDesignSystem/Text/Caption" +import { RemoveExtraRooms } from "../BookingCode" + import styles from "./reward-night.module.css" import type { BookingWidgetSchema } from "@/types/components/bookingWidget" @@ -97,10 +98,7 @@ export default function RewardNight() { /> {intl.formatMessage({ id: redemptionErr.message })} - {isMultiRoomError ? ( - // ToDo: Replace with Remove extra rooms JSX element after SW-963 is merged - {"Remove extra rooms"} - ) : null} + {isMultiRoomError ? : null} )} diff --git a/apps/scandic-web/components/GuestsRoomsPicker/Form.tsx b/apps/scandic-web/components/GuestsRoomsPicker/Form.tsx index 72927560e..b1b93e470 100644 --- a/apps/scandic-web/components/GuestsRoomsPicker/Form.tsx +++ b/apps/scandic-web/components/GuestsRoomsPicker/Form.tsx @@ -7,7 +7,6 @@ import { useIntl } from "react-intl" import { REDEMPTION } from "@/constants/booking" import { CloseLargeIcon, PlusCircleIcon, PlusIcon } from "../Icons" - import Button from "../TempDesignSystem/Button" import { Tooltip } from "../TempDesignSystem/Tooltip" import { GuestsRoom } from "./GuestsRoom" @@ -143,7 +142,7 @@ export default function GuestsRoomsPickerDialog({