diff options
author | beatrix <beatrix.bitrot@gmail.com> | 2017-12-06 19:59:15 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-06 19:59:15 -0500 |
commit | de5620995175b7c1c0fc458bd78c12d8c5860aad (patch) | |
tree | 5cc51ad8d5b972aa4a1c1f6cb52451f08e8911e4 /app/javascript/flavours/glitch/components/account.js | |
parent | c63e6c9a2ca064a8ff65c8558f38abe9ab037620 (diff) | |
parent | 133f5b3b538263c777243900af114289c986523a (diff) |
Merge pull request #240 from glitch-soc/copy-api-changes
Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour (#239)
Diffstat (limited to 'app/javascript/flavours/glitch/components/account.js')
-rw-r--r-- | app/javascript/flavours/glitch/components/account.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/components/account.js b/app/javascript/flavours/glitch/components/account.js index c8dacb0ab..ac07051db 100644 --- a/app/javascript/flavours/glitch/components/account.js +++ b/app/javascript/flavours/glitch/components/account.js @@ -81,7 +81,7 @@ export default class Account extends ImmutablePureComponent { buttons = <IconButton active icon='unlock-alt' title={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.handleBlock} />; } else if (muting) { let hidingNotificationsButton; - if (muting.get('notifications')) { + if (account.getIn(['relationship', 'muting_notifications'])) { hidingNotificationsButton = <IconButton active icon='bell' title={intl.formatMessage(messages.unmute_notifications, { name: account.get('username') })} onClick={this.handleUnmuteNotifications} />; } else { hidingNotificationsButton = <IconButton active icon='bell-slash' title={intl.formatMessage(messages.mute_notifications, { name: account.get('username') })} onClick={this.handleMuteNotifications} />; @@ -93,7 +93,7 @@ export default class Account extends ImmutablePureComponent { </div> ); } else { - buttons = <IconButton icon={following ? 'user-times' : 'user-plus'} title={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={this.handleFollow} active={following ? true : false} />; + buttons = <IconButton icon={following ? 'user-times' : 'user-plus'} title={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={this.handleFollow} active={following} />; } } |