diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2020-07-07 01:24:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-07 01:24:03 +0200 |
commit | c3187411c26aa00eb5844e4a7f9889f2cb19867e (patch) | |
tree | aa5b0676119c27d73680c5e7dd0d709ebbaaadde /app/javascript/mastodon/features/account/components/header.js | |
parent | 83fd046107999cc8ce166c997afee74409359002 (diff) |
Change design of account notes in web UI (#14208)
* Change design of account notes in web UI * Fix `for` -> `htmlFor`
Diffstat (limited to 'app/javascript/mastodon/features/account/components/header.js')
-rw-r--r-- | app/javascript/mastodon/features/account/components/header.js | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js index 144f6bd94..b5aca574f 100644 --- a/app/javascript/mastodon/features/account/components/header.js +++ b/app/javascript/mastodon/features/account/components/header.js @@ -67,7 +67,6 @@ class Header extends ImmutablePureComponent { identity_props: ImmutablePropTypes.list, onFollow: PropTypes.func.isRequired, onBlock: PropTypes.func.isRequired, - onEditAccountNote: PropTypes.func.isRequired, intl: PropTypes.object.isRequired, domain: PropTypes.string.isRequired, }; @@ -132,8 +131,6 @@ class Header extends ImmutablePureComponent { return null; } - const accountNote = account.getIn(['relationship', 'note']); - let info = []; let actionBtn = ''; let lockedIcon = ''; @@ -184,10 +181,6 @@ class Header extends ImmutablePureComponent { menu.push(null); } - if (accountNote === null) { - menu.push({ text: intl.formatMessage(messages.add_account_note, { name: account.get('username') }), action: this.props.onEditAccountNote }); - } - if (account.get('id') === me) { menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' }); menu.push({ text: intl.formatMessage(messages.preferences), href: '/settings/preferences' }); @@ -294,8 +287,6 @@ class Header extends ImmutablePureComponent { </h1> </div> - <AccountNoteContainer account={account} /> - <div className='account__header__extra'> <div className='account__header__bio'> { (fields.size > 0 || identity_proofs.size > 0) && ( @@ -324,6 +315,8 @@ class Header extends ImmutablePureComponent { </div> )} + {account.get('id') !== me && <AccountNoteContainer account={account} />} + {account.get('note').length > 0 && account.get('note') !== '<p></p>' && <div className='account__header__content' dangerouslySetInnerHTML={content} />} </div> |