Fix #6128 - Display unfollow button even if account moved (#6258)

7 years ago · 1a90ef9c25
parent 87dd003ea5
commit 1a90ef9c25
2 changed files with 2 additions and 2 deletions
--- a/app/javascript/mastodon/components/account.js
+++ b/app/javascript/mastodon/components/account.js
@ -93,7 +93,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} />;
      }
    }
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@ -103,7 +103,7 @@ export default class Header extends ImmutablePureComponent {
      }
    }

-    if (account.get('moved')) {
+    if (account.get('moved') && !account.getIn(['relationship', 'following'])) {
      actionBtn = '';
    }