Fixed number in title not appearing for direct messages (#3875)

webapp/components/sidebar.jsx

@@ -81,11 +81,10 @@ export default class Sidebar extends React.Component {
 
         Object.keys(unreadCounts).forEach((chId) => {
             const channel = ChannelStore.get(chId);
-            if (channel) {
-                if (channel.team_id === this.state.currentTeam.id) {
-                    msgs += unreadCounts[chId].msgs;
-                    mentions += unreadCounts[chId].mentions;
-                }
+
+            if (channel && (!channel.team_id || channel.team_id === this.state.currentTeam.id)) {
+                msgs += unreadCounts[chId].msgs;
+                mentions += unreadCounts[chId].mentions;
             }
         });
 

webapp/stores/channel_store.jsx

@@ -329,7 +329,6 @@ class ChannelStoreClass extends EventEmitter {
 
         if (ch.type === 'D') {
             chMentionCount = chUnreadCount;
-            chUnreadCount = 0;
         } else if (chMember.notify_props && chMember.notify_props.mark_unread === NotificationPrefs.MENTION) {
             chUnreadCount = 0;
         }