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

* Check for empty "last_status" before sorting * Small touchups for codeclimate

Check for empty "last_status" before sorting DM column (#9207)
* Check for empty "last_status" before sorting * Small touchups for codeclimate
449e6e45 · Steven Tappert · Eugen Rochko · ba06a5f4 · 449e6e45
Commit 449e6e45 authored 6 years ago by Steven Tappert Committed by Eugen Rochko 6 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 7 additions and 1 deletion
+7 -1
--- 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;
+        });
      });
    }