diff --git a/packages/experience/src/components/IdentifierRegisterForm/index.tsx b/packages/experience/src/components/IdentifierRegisterForm/index.tsx index 47265c4ac..e2f88f3f0 100644 --- a/packages/experience/src/components/IdentifierRegisterForm/index.tsx +++ b/packages/experience/src/components/IdentifierRegisterForm/index.tsx @@ -121,13 +121,13 @@ const IdentifierRegisterForm = ({ className, autoFocus, signUpMethods }: Props) return true; }, }} - render={({ field }) => ( + render={({ field, formState: { defaultValues } }) => ( : true; }, }} - render={({ field }) => ( + render={({ field, formState: { defaultValues } }) => ( isDanger={!!errors.identifier || !!errorMessage} errorMessage={errors.identifier?.message} enabledTypes={enabledSignInMethods} - defaultValue={field.value.value} + defaultValue={defaultValues?.identifier?.value} /> )} /> diff --git a/packages/experience/src/components/PasswordSignInForm/index.tsx b/packages/experience/src/components/PasswordSignInForm/index.tsx index 0b6821678..ef595faee 100644 --- a/packages/experience/src/components/PasswordSignInForm/index.tsx +++ b/packages/experience/src/components/PasswordSignInForm/index.tsx @@ -121,7 +121,7 @@ const PasswordSignInForm = ({ className, autoFocus, signInMethods }: Props) => { return errorMessage ? getGeneralIdentifierErrorMessage(signInMethods, 'invalid') : true; }, }} - render={({ field }) => ( + render={({ field, formState: { defaultValues } }) => ( { isDanger={!!errors.identifier} errorMessage={errors.identifier?.message} enabledTypes={signInMethods} - defaultValue={field.value.value} + defaultValue={defaultValues?.identifier?.value} /> )} /> diff --git a/packages/experience/src/components/SingleSignOnForm/index.tsx b/packages/experience/src/components/SingleSignOnForm/index.tsx index 22514b01e..56bc68343 100644 --- a/packages/experience/src/components/SingleSignOnForm/index.tsx +++ b/packages/experience/src/components/SingleSignOnForm/index.tsx @@ -35,6 +35,11 @@ const SingleSignOnForm = ({ isTermsAndPrivacyCheckboxVisible }: Props) => { formState: { errors, isValid, isSubmitting }, } = useForm({ reValidateMode: 'onBlur', + defaultValues: { + identifier: { + value: ssoEmail, + }, + }, }); useEffect(() => { @@ -82,13 +87,13 @@ const SingleSignOnForm = ({ isTermsAndPrivacyCheckboxVisible }: Props) => { : true; }, }} - render={({ field }) => ( + render={({ field, formState: { defaultValues } }) => ( diff --git a/packages/experience/src/pages/ForgotPassword/ForgotPasswordForm/index.tsx b/packages/experience/src/pages/ForgotPassword/ForgotPasswordForm/index.tsx index 293d2661a..07fd8e390 100644 --- a/packages/experience/src/pages/ForgotPassword/ForgotPasswordForm/index.tsx +++ b/packages/experience/src/pages/ForgotPassword/ForgotPasswordForm/index.tsx @@ -98,12 +98,12 @@ const ForgotPasswordForm = ({ className, autoFocus, defaultValue = '', enabledTy return true; }, }} - render={({ field }) => ( + render={({ field, formState: { defaultValues } }) => (