From 463945e8cc99a03e57b84333616b9afb9246a6b7 Mon Sep 17 00:00:00 2001 From: js029 <75493971+js029@users.noreply.github.com> Date: Wed, 11 Oct 2023 08:15:13 +0200 Subject: [PATCH] [MM-54839] Convert LocalizedInput of 'email_to_ldap.tsx' to regular input component (#24837) --- .../components/claim/components/email_to_ldap.tsx | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/webapp/channels/src/components/claim/components/email_to_ldap.tsx b/webapp/channels/src/components/claim/components/email_to_ldap.tsx index 8399054c91..3e9b35d94b 100644 --- a/webapp/channels/src/components/claim/components/email_to_ldap.tsx +++ b/webapp/channels/src/components/claim/components/email_to_ldap.tsx @@ -3,13 +3,12 @@ import classNames from 'classnames'; import React, {useRef} from 'react'; -import {FormattedMessage} from 'react-intl'; +import {FormattedMessage, useIntl} from 'react-intl'; import type {AuthChangeResponse} from '@mattermost/types/users'; import {emailToLdap} from 'actions/admin_actions.jsx'; -import LocalizedInput from 'components/localized_input/localized_input'; import LoginMfa from 'components/login/login_mfa'; import {ClaimErrors} from 'utils/constants'; @@ -33,6 +32,8 @@ export type SubmitOptions = { } const EmailToLDAP = ({email, siteName, ldapLoginFieldName}: Props) => { + const {formatMessage} = useIntl(); + const emailPasswordInput = useRef(null); const ldapIdInput = useRef(null); const ldapPasswordInput = useRef(null); @@ -127,8 +128,6 @@ const EmailToLDAP = ({email, siteName, ldapLoginFieldName}: Props) => { const loginPlaceholder = ldapLoginFieldName || localizeMessage('claim.email_to_ldap.ldapId', 'AD/LDAP ID'); const titleMessage = {id: t('claim.email_to_ldap.title'), defaultMessage: 'Switch Email/Password Account to AD/LDAP'}; - const placeholderPasswordMessage = {id: t('claim.email_to_ldap.pwd'), defaultMessage: 'Password'}; - const placeholderLdapMessage = {id: t('claim.email_to_ldap.ldapPwd'), defaultMessage: 'AD/LDAP Password'}; if (showMfa) { return ( @@ -177,13 +176,13 @@ const EmailToLDAP = ({email, siteName, ldapLoginFieldName}: Props) => { name='fakeusernameremembered' />
-
@@ -207,13 +206,13 @@ const EmailToLDAP = ({email, siteName, ldapLoginFieldName}: Props) => {
-