From 133f5b3b538263c777243900af114289c986523a Mon Sep 17 00:00:00 2001 From: David Yip Date: Wed, 6 Dec 2017 18:23:28 -0600 Subject: Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour (#239) --- .../flavours/glitch/features/account/components/action_bar.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'app/javascript/flavours/glitch/features/account/components') 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 }); -- cgit