Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix not to show follow button in global suggestion (#16045)

Browse source 
* Fix not to show follow button in global suggestion

* Fix style
This commit is contained in:
Takeshi Umeda 2021-04-16 17:06:42 +09:00 • committed by GitHub
parent 9bb3341849
commit baed52c2a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/mastodon/components/account.js
View file

@ -78,8 +78,10 @@ class Account extends ImmutablePureComponent {
let buttons;
if (onActionClick && actionIcon) {
buttons = <IconButton icon={actionIcon} title={actionTitle} onClick={this.handleAction} />;
if (actionIcon) {
if (onActionClick) {
buttons = <IconButton icon={actionIcon} title={actionTitle} onClick={this.handleAction} />;
}
} else if (account.get('id') !== me && account.get('relationship', null) !== null) {
const following = account.getIn(['relationship', 'following']);
const requested = account.getIn(['relationship', 'requested']);