diff --git a/app/javascript/mastodon/features/status/components/detailed_status.jsx b/app/javascript/mastodon/features/status/components/detailed_status.jsx index e11db926a1a800..0f37c7655dea06 100644 --- a/app/javascript/mastodon/features/status/components/detailed_status.jsx +++ b/app/javascript/mastodon/features/status/components/detailed_status.jsx @@ -222,9 +222,9 @@ class DetailedStatus extends ImmutablePureComponent { } let emojiReactionsBar = null; + const emojiReactionAvailableServer = !isHideItem('emoji_reaction_unavailable_server') || status.getIn(['account', 'emoji_reaction_available_server']); if (status.get('emoji_reactions')) { const emojiReactions = status.get('emoji_reactions'); - const emojiReactionAvailableServer = !isHideItem('emoji_reaction_unavailable_server') || status.getIn(['account', 'emoji_reaction_available_server']); if (emojiReactions.size > 0 && enableEmojiReaction && emojiReactionAvailableServer) { emojiReactionsBar = ; } @@ -279,7 +279,9 @@ class DetailedStatus extends ImmutablePureComponent { ); } - if (this.props.history) { + if (!enableEmojiReaction || !emojiReactionAvailableServer) { + emojiReactionsLink = null; + } else if (this.props.history) { emojiReactionsLink = (