Merge branch 'develop' into fix/custom-translation

RocketChat · Dec 15, 2022 · cbe7a2b · cbe7a2b
2 parents b925690 + f53520f
commit cbe7a2b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/packages/web-ui-registration/src/LoginForm.tsx b/packages/web-ui-registration/src/LoginForm.tsx
@@ -45,6 +45,9 @@ export const LoginForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRoute
 	const login = useLoginWithPassword();
 	const showFormLogin = useSetting('Accounts_ShowFormLogin');
 
+	const usernameOrEmailPlaceholder = String(useSetting('Accounts_EmailOrUsernamePlaceholder'));
+	const passwordPlaceholder = String(useSetting('Accounts_PasswordPlaceholder'));
+
 	const loginMutation: UseMutationResult<
 		void,
 		Error,
@@ -110,7 +113,7 @@ export const LoginForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRoute
 												clearErrors(['username', 'password']);
 											},
 										})}
-										placeholder={t('registration.component.form.emailPlaceholder')}
+										placeholder={usernameOrEmailPlaceholder || t('registration.component.form.emailPlaceholder')}
 										error={
 											errors.username?.message ||
 											(errors.username?.type === 'required' ? t('registration.component.form.requiredField') : undefined)
@@ -134,6 +137,7 @@ export const LoginForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRoute
 												clearErrors(['username', 'password']);
 											},
 										})}
+										placeholder={passwordPlaceholder}
 										error={
 											errors.password?.message ||
 											(errors.password?.type === 'required' ? t('registration.component.form.requiredField') : undefined)

diff --git a/packages/web-ui-registration/src/RegisterForm.tsx b/packages/web-ui-registration/src/RegisterForm.tsx
@@ -25,6 +25,10 @@ export const LoginRegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLo
 	const requiresPasswordConfirmation = useSetting('Accounts_RequirePasswordConfirmation');
 	const manuallyApproveNewUsersRequired = useSetting('Accounts_ManuallyApproveNewUsers');
 
+	const usernameOrEmailPlaceholder = String(useSetting('Accounts_EmailOrUsernamePlaceholder'));
+	const passwordPlaceholder = String(useSetting('Accounts_PasswordPlaceholder'));
+	const passwordConfirmationPlaceholder = String(useSetting('Accounts_ConfirmPasswordPlaceholder'));
+
 	const formLabelId = useUniqueId();
 	const registerUser = useRegisterMethod();
 
@@ -101,7 +105,7 @@ export const LoginRegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLo
 								{...register('email', {
 									required: true,
 								})}
-								placeholder='example@example.com'
+								placeholder={usernameOrEmailPlaceholder || t('registration.component.form.emailPlaceholder')}
 								error={
 									errors.email &&
 									t('The_field_is_required', {
@@ -155,6 +159,7 @@ export const LoginRegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLo
 								error={errors.password && (errors.password?.message || t('registration.component.form.requiredField'))}
 								aria-invalid={errors.password ? 'true' : undefined}
 								id='password'
+								placeholder={passwordPlaceholder}
 							/>
 						</Field.Row>
 						{errors.password && <Field.Error>{errors.password.message}</Field.Error>}
@@ -172,6 +177,7 @@ export const LoginRegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLo
 									error={errors.passwordConfirmation?.type === 'validate' ? t('Invalid_confirm_pass') : undefined}
 									aria-invalid={errors.passwordConfirmation ? 'true' : false}
 									id='passwordConfirmation'
+									placeholder={passwordConfirmationPlaceholder}
 								/>
 							</Field.Row>
 							{errors.passwordConfirmation?.type === 'validate' && <Field.Error>{t('Invalid_confirm_pass')}</Field.Error>}