From 12c028ae73c197a520134e2626d475e65a008a24 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Mon, 16 Dec 2019 07:30:04 -0300
Subject: [PATCH] Fix Hamburger and iOS App Icon badge number when marking
 channel as unread (#3705)

* Fix Hamburger and App Icon badge number when marking channel as unread

* Temp mm-redux commit hash

* Update mm-redux commit hash
---
 app/selectors/views.js | 24 ++++++------------------
 package-lock.json      | 14 +++++++-------
 package.json           |  2 +-
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/app/selectors/views.js b/app/selectors/views.js
index e321e4f6d..60f97f1ac 100644
--- a/app/selectors/views.js
+++ b/app/selectors/views.js
@@ -3,8 +3,7 @@
 
 import {createSelector} from 'reselect';
 
-import {getCurrentChannelId, getUnreadsInCurrentTeam} from 'mattermost-redux/selectors/entities/channels';
-import {getCurrentTeamId, getTeamMemberships} from 'mattermost-redux/selectors/entities/teams';
+import {getCurrentChannelId, getUnreads} from 'mattermost-redux/selectors/entities/channels';
 
 const emptyDraft = {
     draft: '',
@@ -45,23 +44,12 @@ export function getProfileImageUri(state) {
 }
 
 export const getBadgeCount = createSelector(
-    getCurrentTeamId,
-    getTeamMemberships,
-    getUnreadsInCurrentTeam,
-    (currentTeamId, myTeamMembers, {mentionCount, messageCount}) => {
-        let mentions = mentionCount;
-        let messages = messageCount;
-
-        const members = Object.values(myTeamMembers).filter((m) => m.team_id !== currentTeamId);
-        members.forEach((m) => {
-            mentions += (m.mention_count || 0);
-            messages += (m.msg_count || 0);
-        });
-
+    getUnreads,
+    ({mentionCount, messageCount}) => {
         let badgeCount = 0;
-        if (mentions) {
-            badgeCount = mentions;
-        } else if (messages) {
+        if (mentionCount) {
+            badgeCount = mentionCount;
+        } else if (messageCount) {
             badgeCount = -1;
         }
 
diff --git a/package-lock.json b/package-lock.json
index 300483801..f16826d97 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2156,9 +2156,9 @@
       },
       "dependencies": {
         "core-js": {
-          "version": "2.6.10",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz",
-          "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA=="
+          "version": "2.6.11",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
+          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
         },
         "regenerator-runtime": {
           "version": "0.11.1",
@@ -4311,7 +4311,7 @@
       "dependencies": {
         "json5": {
           "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+          "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
           "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
           "dev": true
         }
@@ -7217,8 +7217,8 @@
       }
     },
     "mattermost-redux": {
-      "version": "github:mattermost/mattermost-redux#c52a797f5e7865c6628d7fcd0aaec3da8c27e3d0",
-      "from": "github:mattermost/mattermost-redux#c52a797f5e7865c6628d7fcd0aaec3da8c27e3d0",
+      "version": "github:mattermost/mattermost-redux#4e3dedd8323430bf8bbd9338a2577f43b3ef5ab7",
+      "from": "github:mattermost/mattermost-redux#4e3dedd8323430bf8bbd9338a2577f43b3ef5ab7",
       "requires": {
         "form-data": "2.5.1",
         "gfycat-sdk": "1.4.18",
@@ -8285,7 +8285,7 @@
       }
     },
     "mmjstool": {
-      "version": "github:mattermost/mattermost-utilities#b3e2e308b8b85469849a91c21958b46a89ab33ab",
+      "version": "github:mattermost/mattermost-utilities#ce99d7a9e82128a02fd36e44720a4aef2653810d",
       "from": "github:mattermost/mattermost-utilities",
       "dev": true,
       "requires": {
diff --git a/package.json b/package.json
index 37275a7b0..7e32d06f3 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "intl": "1.2.5",
     "jail-monkey": "2.3.0",
     "jsc-android": "241213.1.0",
-    "mattermost-redux": "github:mattermost/mattermost-redux#c52a797f5e7865c6628d7fcd0aaec3da8c27e3d0",
+    "mattermost-redux": "github:mattermost/mattermost-redux#4e3dedd8323430bf8bbd9338a2577f43b3ef5ab7",
     "mime-db": "1.42.0",
     "moment-timezone": "0.5.27",
     "prop-types": "15.7.2",