ICU-716 Fixed position of channels with mentions in unreads section a…

…fter reading (#736)
mattermost · Feb 7, 2018 · 2a9c7cf · 2a9c7cf
1 parent ea5567e
commit 2a9c7cf
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/reducers/views/channel.js b/reducers/views/channel.js
@@ -95,13 +95,13 @@ function keepChannelIdAsUnread(state = null, action) {
  }
 
  const msgCount = channel.total_msg_count - member.msg_count;
- const showChannelAsUnread = member.mentionCount > 0 ||
-  (member.notify_props.mark_unread !== NotificationLevels.MENTION && msgCount > 0);
+ const hadMentions = member.mention_count > 0;
+ const hadUnreads = member.notify_props.mark_unread !== NotificationLevels.MENTION && msgCount > 0;
 
- if (showChannelAsUnread) {
+ if (hadMentions || hadUnreads) {
  return {
  id: member.channel_id,
- hadMentions: member.mentionCount > 0
+ hadMentions
  };
  }