imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

Browse source
This commit is contained in:
Travis Ralston 2020-01-09 14:15:09 -07:00
commit fde32f13a5
190 changed files with 6185 additions and 2225 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
View file

@ -37,12 +37,13 @@ export class IgnoredUser extends React.Component {
};
render() {
const id = `mx_SecurityUserSettingsTab_ignoredUser_${this.props.userId}`;
return (
<div className='mx_SecurityUserSettingsTab_ignoredUser'>
<AccessibleButton onClick={this._onUnignoreClicked} kind='primary_sm'>
{_t('Unignore')}
<AccessibleButton onClick={this._onUnignoreClicked} kind='primary_sm' aria-describedby={id}>
{ _t('Unignore') }
</AccessibleButton>
<span>{this.props.userId}</span>
<span id={id}>{ this.props.userId }</span>
</div>
);
}