about summary refs log tree commit diff
path: root/app/javascript/flavours
diff options
context:
space:
mode:
authorcwm <chriswmartin@protonmail.com>2018-01-09 08:50:55 -0600
committercwm <chriswmartin@protonmail.com>2018-01-09 08:50:55 -0600
commit8a0e4bb9a4007efb2c2966fa1ffa9027a1a6da5d (patch)
treeaf2e04973535f37a20bf399914679b14da13e6cd /app/javascript/flavours
parent5963630c6308062ba38d6f527e9d3a38f05df282 (diff)
Hide moved account's follow button in search result (tootsuite pr #5913)
Diffstat (limited to 'app/javascript/flavours')
-rw-r--r--app/javascript/flavours/glitch/components/account.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/javascript/flavours/glitch/components/account.js b/app/javascript/flavours/glitch/components/account.js
index bb1979cc7..265ee94f6 100644
--- a/app/javascript/flavours/glitch/components/account.js
+++ b/app/javascript/flavours/glitch/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';
@@ -94,12 +94,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} />;
       }
     }