Check for empty "last_status" before sorting DM column (mastodon#9207)

* Check for empty "last_status" before sorting * Small touchups for codeclimate
dwango · Nov 23, 2018 · 449e6e4 · 449e6e4
1 parent ba06a5f
commit 449e6e4
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/javascript/mastodon/reducers/conversations.js b/app/javascript/mastodon/reducers/conversations.js
@@ -56,7 +56,13 @@ const expandNormalizedConversations = (state, conversations, next) => {
 
         list = list.concat(items);
 
-        return list.sortBy(x => x.get('last_status'), (a, b) => compareId(a, b) * -1);
+        return list.sortBy(x => x.get('last_status'), (a, b) => {
+          if(a === null || b === null) {
+            return -1;
+          }
+
+          return compareId(a, b) * -1;
+        });
       });
     }