treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

[Glitch] Display unfollow button even if account moved 

Backport 1a90ef9c25 to glitch-soc
lolsob-rspec
Thibaut Girka 2018-03-29 14:46:00 +02:00
parent f63450c7ec
commit 32ede640af
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/components/account.js
View File

@ -99,7 +99,7 @@ export default class Account extends ImmutablePureComponent {
{hidingNotificationsButton} {hidingNotificationsButton}
</Fragment> </Fragment>
); );
} else if (!account.get('moved')) { } else if (!account.get('moved') || following) {
buttons = <IconButton icon={following ? 'user-times' : 'user-plus'} title={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={this.handleFollow} active={following} />; buttons = <IconButton icon={following ? 'user-times' : 'user-plus'} title={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={this.handleFollow} active={following} />;
} }
} }

2
app/javascript/flavours/glitch/features/account/components/header.js
View File

@ -76,7 +76,7 @@ export default class Header extends ImmutablePureComponent {
} }
} }
if (account.get('moved')) { if (account.get('moved') && !account.getIn(['relationship', 'following'])) {
actionBtn = ''; actionBtn = '';
} }