[MM-55107] Replace usage of LocalizedIcon in 'update_user_group_modal.tsx' with i/span tags (#25299)

Этот коммит содержится в:
Akbar Abdrakhmanov
2023-11-08 03:16:30 +02:00
коммит произвёл GitHub
родитель b19b62b83f
Коммит f29fbddef1
2 изменённых файлов: 7 добавлений и 16 удалений

Просмотреть файл

@@ -37,18 +37,12 @@ exports[`component/update_user_group_modal should match snapshot 1`] = `
closeLabel="Close" closeLabel="Close"
> >
<button <button
aria-label="Close" aria-label="Back"
className="modal-header-back-button btn btn-icon" className="modal-header-back-button btn btn-icon"
onClick={[Function]} onClick={[Function]}
type="button" type="button"
> >
<LocalizedIcon <i
ariaLabel={
Object {
"defaultMessage": "Back",
"id": "user_groups_modal.goBackLabel",
}
}
className="icon icon-arrow-left" className="icon icon-arrow-left"
/> />
</button> </button>

Просмотреть файл

@@ -3,18 +3,16 @@
import React, {useCallback, useEffect, useState} from 'react'; import React, {useCallback, useEffect, useState} from 'react';
import {Modal} from 'react-bootstrap'; import {Modal} from 'react-bootstrap';
import {FormattedMessage} from 'react-intl'; import {FormattedMessage, useIntl} from 'react-intl';
import type {CustomGroupPatch, Group} from '@mattermost/types/groups'; import type {CustomGroupPatch, Group} from '@mattermost/types/groups';
import type {ActionResult} from 'mattermost-redux/types/actions'; import type {ActionResult} from 'mattermost-redux/types/actions';
import LocalizedIcon from 'components/localized_icon';
import SaveButton from 'components/save_button'; import SaveButton from 'components/save_button';
import Input from 'components/widgets/inputs/input/input'; import Input from 'components/widgets/inputs/input/input';
import Constants, {ItemStatus} from 'utils/constants'; import Constants, {ItemStatus} from 'utils/constants';
import {t} from 'utils/i18n';
import * as Keyboard from 'utils/keyboard'; import * as Keyboard from 'utils/keyboard';
import * as Utils from 'utils/utils'; import * as Utils from 'utils/utils';
@@ -45,6 +43,8 @@ const UpdateUserGroupModal = (props: Props) => {
const [showUnknownError, setShowUnknownError] = useState(false); const [showUnknownError, setShowUnknownError] = useState(false);
const [mentionUpdatedManually, setMentionUpdatedManually] = useState(false); const [mentionUpdatedManually, setMentionUpdatedManually] = useState(false);
const {formatMessage} = useIntl();
const doHide = useCallback(() => { const doHide = useCallback(() => {
setShow(false); setShow(false);
}, []); }, []);
@@ -159,13 +159,10 @@ const UpdateUserGroupModal = (props: Props) => {
<button <button
type='button' type='button'
className='modal-header-back-button btn btn-icon' className='modal-header-back-button btn btn-icon'
aria-label='Close' aria-label={formatMessage({id: 'user_groups_modal.goBackLabel', defaultMessage: 'Back'})}
onClick={goBack} onClick={goBack}
> >
<LocalizedIcon <i className='icon icon-arrow-left'/>
className='icon icon-arrow-left'
ariaLabel={{id: t('user_groups_modal.goBackLabel'), defaultMessage: 'Back'}}
/>
</button> </button>
<Modal.Title <Modal.Title
componentClass='h1' componentClass='h1'