diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-03-29 14:46:00 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-03-29 14:59:20 +0200 |
commit | b5948044b31c548de15337dcdca35b4c894224c0 (patch) | |
tree | 61889ce4f92f8aa107eb92f053f119cfdbd07ea1 /app/javascript/flavours/glitch | |
parent | a59c146bf866e28840db37ffe9cfa9759a6497ad (diff) |
[Glitch] Display unfollow button even if account moved
Backport 3987bd18a4bfaee49ea9a3439fc51610aeca6c2c to glitch-soc
Diffstat (limited to 'app/javascript/flavours/glitch')
-rw-r--r-- | app/javascript/flavours/glitch/components/account.js | 2 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/features/account/components/header.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/components/account.js b/app/javascript/flavours/glitch/components/account.js index df17f1897..80f20b8ad 100644 --- a/app/javascript/flavours/glitch/components/account.js +++ b/app/javascript/flavours/glitch/components/account.js @@ -99,7 +99,7 @@ export default class Account extends ImmutablePureComponent { {hidingNotificationsButton} </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} />; } } diff --git a/app/javascript/flavours/glitch/features/account/components/header.js b/app/javascript/flavours/glitch/features/account/components/header.js index 1170bdb49..a208f1a8e 100644 --- a/app/javascript/flavours/glitch/features/account/components/header.js +++ b/app/javascript/flavours/glitch/features/account/components/header.js @@ -76,7 +76,7 @@ export default class Header extends ImmutablePureComponent { } } - if (account.get('moved')) { + if (account.get('moved') && !account.getIn(['relationship', 'following'])) { actionBtn = ''; } |