diff --git a/apps/scandic-web/components/ContentType/StartPage/Blocks/index.tsx b/apps/scandic-web/components/ContentType/StartPage/Blocks/index.tsx index 6af3f3a08..754db2790 100644 --- a/apps/scandic-web/components/ContentType/StartPage/Blocks/index.tsx +++ b/apps/scandic-web/components/ContentType/StartPage/Blocks/index.tsx @@ -45,6 +45,7 @@ export function Blocks({ blocks }: BlocksProps) { case BlocksEnums.block.FullWidthCampaign: return ( diff --git a/packages/booking-flow/lib/components/EnterDetails/Details/Multiroom/index.tsx b/packages/booking-flow/lib/components/EnterDetails/Details/Multiroom/index.tsx index cc3ecf84c..f01d61066 100644 --- a/packages/booking-flow/lib/components/EnterDetails/Details/Multiroom/index.tsx +++ b/packages/booking-flow/lib/components/EnterDetails/Details/Multiroom/index.tsx @@ -7,9 +7,9 @@ import { useIntl } from "react-intl" import { usePhoneNumberParsing } from "@scandic-hotels/common/hooks/usePhoneNumberParsing" import { getDefaultCountryFromLang } from "@scandic-hotels/common/utils/phone" -import Footnote from "@scandic-hotels/design-system/Footnote" import CountrySelect from "@scandic-hotels/design-system/Form/Country" import Phone from "@scandic-hotels/design-system/Form/Phone" +import { Typography } from "@scandic-hotels/design-system/Typography" import { useFormTracking } from "@scandic-hotels/tracking/useFormTracking" import { useBookingFlowConfig } from "../../../../bookingFlowConfig/bookingFlowConfigContext" @@ -198,17 +198,14 @@ export default function Details() { )}
- - {intl.formatMessage({ - id: "enterDetails.roomInfo.title", - defaultMessage: "Guest information", - })} - + +

+ {intl.formatMessage({ + id: "enterDetails.roomInfo.title", + defaultMessage: "Guest information", + })} +

+
{ refs.current.firstName = el diff --git a/packages/booking-flow/lib/components/EnterDetails/Details/Multiroom/schema.ts b/packages/booking-flow/lib/components/EnterDetails/Details/Multiroom/schema.ts index 81a8c4e67..dc04df56a 100644 --- a/packages/booking-flow/lib/components/EnterDetails/Details/Multiroom/schema.ts +++ b/packages/booking-flow/lib/components/EnterDetails/Details/Multiroom/schema.ts @@ -61,8 +61,10 @@ export function getMultiroomDetailsSchema( (data) => !crossValidationData.some( (room) => - room.firstName?.toLowerCase() === data.firstName.toLowerCase() && - room.lastName?.toLowerCase() === data.lastName.toLowerCase() + room.firstName?.toLowerCase().trim() === + data.firstName.toLowerCase().trim() && + room.lastName?.toLowerCase().trim() === + data.lastName.toLowerCase().trim() ), { message: multiroomErrors.FIRST_AND_LAST_NAME_UNIQUE, @@ -73,8 +75,10 @@ export function getMultiroomDetailsSchema( (data) => !crossValidationData.some( (room) => - room.firstName?.toLowerCase() === data.firstName.toLowerCase() && - room.lastName?.toLowerCase() === data.lastName.toLowerCase() + room.firstName?.toLowerCase().trim() === + data.firstName.toLowerCase().trim() && + room.lastName?.toLowerCase().trim() === + data.lastName.toLowerCase().trim() ), { message: multiroomErrors.FIRST_AND_LAST_NAME_UNIQUE, diff --git a/packages/booking-flow/lib/components/EnterDetails/Details/RoomOne/index.tsx b/packages/booking-flow/lib/components/EnterDetails/Details/RoomOne/index.tsx index 0700b6e32..468b733d3 100644 --- a/packages/booking-flow/lib/components/EnterDetails/Details/RoomOne/index.tsx +++ b/packages/booking-flow/lib/components/EnterDetails/Details/RoomOne/index.tsx @@ -7,9 +7,9 @@ import { useIntl } from "react-intl" import { usePhoneNumberParsing } from "@scandic-hotels/common/hooks/usePhoneNumberParsing" import { getDefaultCountryFromLang } from "@scandic-hotels/common/utils/phone" -import Footnote from "@scandic-hotels/design-system/Footnote" import CountrySelect from "@scandic-hotels/design-system/Form/Country" import Phone from "@scandic-hotels/design-system/Form/Phone" +import { Typography } from "@scandic-hotels/design-system/Typography" import { useFormTracking } from "@scandic-hotels/tracking/useFormTracking" import { useBookingFlowConfig } from "../../../../bookingFlowConfig/bookingFlowConfigContext" @@ -208,17 +208,14 @@ export default function Details({ user }: DetailsProps) { ) : null}
- - {intl.formatMessage({ - id: "enterDetails.roomInfo.title", - defaultMessage: "Guest information", - })} - + +

+ {intl.formatMessage({ + id: "enterDetails.roomInfo.title", + defaultMessage: "Guest information", + })} +

+
{ refs.current.firstName = el