diff --git a/frontend/src/routes/guest/register/registerPage.tsx b/frontend/src/routes/guest/register/registerPage.tsx index 5de260df569e765f4252372f8146e6b2ca486ac1..5e99ea2be9805459e7aea12c0b34f2b6fedd40e3 100644 --- a/frontend/src/routes/guest/register/registerPage.tsx +++ b/frontend/src/routes/guest/register/registerPage.tsx @@ -130,6 +130,7 @@ const GuestRegisterStep = forwardRef( const maxBirthDate = subYears(1)(today) useEffect(() => { + // Take values coming from the server, if present, and insert them into the form setCountryCode(guestData.countryForCallingCode) setValue( 'mobilePhoneCountry', @@ -141,6 +142,7 @@ const GuestRegisterStep = forwardRef( 'mobilePhone', guestData.mobile_phone ? guestData.mobile_phone : '' ) + setValue('dateOfBirth', guestData.dateOfBirth) }, [guestData]) function doSubmit() { @@ -225,11 +227,15 @@ const GuestRegisterStep = forwardRef( <Controller name="dateOfBirth" control={control} + rules={{ + required: true, + }} render={({ field }) => ( <DatePicker mask="____-__-__" label={t('input.dateOfBirth')} - value={field.value} + // If value is set to undefined the birth date is set to today. Using null makes the field blank + value={field.value === undefined ? null : field.value} minDate={minBirthDate} maxDate={maxBirthDate} inputFormat="yyyy-MM-dd"