From a9cb7bbd990580364af8d5b32da224ae51d95b09 Mon Sep 17 00:00:00 2001
From: Matthew Taylor <mewtaylor@gmail.com>
Date: Tue, 19 Sep 2017 17:11:46 -0400
Subject: [PATCH] =?UTF-8?q?don=E2=80=99t=20iterate=20over=20list=20if=20no?=
 =?UTF-8?q?=20filter=20applied?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

thanks @chrisgarrity !
---
 src/views/messages/container.jsx    | 20 +++++++++++---------
 src/views/messages/presentation.jsx |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/views/messages/container.jsx b/src/views/messages/container.jsx
index 91ea7574c..f6a32383c 100644
--- a/src/views/messages/container.jsx
+++ b/src/views/messages/container.jsx
@@ -118,19 +118,21 @@ var Messages = React.createClass({
     },
     filterMessages: function (messages, typesAllowed, unreadCount) {
         var filteredMessages = [];
-        for (var i in messages) {
-            // check to see if the position of the message in the list is earlier
-            // than the unread count. If it is, then the message is totally unread.
-            messages[i].unread = false;
-            if (i < unreadCount) messages[i].unread = true;
+        if (typesAllowed.length > 0) {
+            for (var i in messages) {
+                // check to see if the position of the message in the list is earlier
+                // than the unread count. If it is, then the message is totally unread.
+                messages[i].unread = false;
+                if (i < unreadCount) messages[i].unread = true;
 
-            if (typesAllowed.length > 0) {
                 if (typesAllowed.indexOf(messages[i].type) > -1) {
                     filteredMessages.push(messages[i]);
                 }
-            } else {
-                // if empty, then we're looking at all messages, so just like add the message
-                filteredMessages.push(messages[i]);
+            }
+        } else {
+            filteredMessages = messages;
+            for (var j = 0; j < unreadCount; j++) {
+                filteredMessages[j].unread = true;
             }
         }
         return filteredMessages;
diff --git a/src/views/messages/presentation.jsx b/src/views/messages/presentation.jsx
index 08c4c19ad..5043b3011 100644
--- a/src/views/messages/presentation.jsx
+++ b/src/views/messages/presentation.jsx
@@ -43,7 +43,7 @@ var SocialMessagesList = React.createClass({
         };
     },
     getComponentForMessage: function (message) {
-        var className = (message.unread) ? 'mod-unread' : '';
+        var className = (message.unread === true) ? 'mod-unread' : '';
         var key = message.type + '_' + message.id;
 
         switch (message.type) {