From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Thu, 7 Dec 2017 14:59:31 +0000 (+0900)
Subject: Hide moved account's follow button in search result (#5913)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9a6fc0333295ded6b466b63807bcd5e7e57df169;p=mastodon.git

Hide moved account's follow button in search result (#5913)
---

diff --git a/app/javascript/mastodon/components/account.js b/app/javascript/mastodon/components/account.js
index 0cca586ac..b0479db4f 100644
--- a/app/javascript/mastodon/components/account.js
+++ b/app/javascript/mastodon/components/account.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { Fragment } from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import Avatar from './avatar';
@@ -87,12 +87,12 @@ export default class Account extends ImmutablePureComponent {
           hidingNotificationsButton = <IconButton active icon='bell-slash' title={intl.formatMessage(messages.mute_notifications, { name: account.get('username')  })} onClick={this.handleMuteNotifications} />;
         }
         buttons = (
-          <div>
+          <Fragment>
             <IconButton active icon='volume-up' title={intl.formatMessage(messages.unmute, { name: account.get('username') })} onClick={this.handleMute} />
             {hidingNotificationsButton}
-          </div>
+          </Fragment>
         );
-      } else {
+      } else if (!account.get('moved')) {
         buttons = <IconButton icon={following ? 'user-times' : 'user-plus'} title={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={this.handleFollow} active={following} />;
       }
     }