about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features/account/components/action_bar.js
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-12-06 18:23:28 -0600
committerDavid Yip <yipdw@member.fsf.org>2017-12-06 18:23:28 -0600
commit133f5b3b538263c777243900af114289c986523a (patch)
tree0554932259193ff00279befd0489cb24b234f5ba /app/javascript/flavours/glitch/features/account/components/action_bar.js
parent061211a1e3bd4cb6af45fda47cd8be2f53ebfbac (diff)
Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour (#239)
Diffstat (limited to 'app/javascript/flavours/glitch/features/account/components/action_bar.js')
-rw-r--r--app/javascript/flavours/glitch/features/account/components/action_bar.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/features/account/components/action_bar.js b/app/javascript/flavours/glitch/features/account/components/action_bar.js
index 7c9c1af4e..df8cb3733 100644
--- a/app/javascript/flavours/glitch/features/account/components/action_bar.js
+++ b/app/javascript/flavours/glitch/features/account/components/action_bar.js
@@ -63,9 +63,8 @@ export default class ActionBar extends React.PureComponent {
     if (account.get('id') === me) {
       menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' });
     } else {
-      const following = account.getIn(['relationship', 'following']);
-      if (following) {
-        if (following.get('reblogs')) {
+      if (account.getIn(['relationship', 'following'])) {
+        if (account.getIn(['relationship', 'showing_reblogs'])) {
           menu.push({ text: intl.formatMessage(messages.hideReblogs, { name: account.get('username') }), action: this.props.onReblogToggle });
         } else {
           menu.push({ text: intl.formatMessage(messages.showReblogs, { name: account.get('username') }), action: this.props.onReblogToggle });