zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

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

* Check for empty "last_status" before sorting

* Small touchups for codeclimate
This commit is contained in:
Steven Tappert 2018-11-05 18:51:43 +01:00 committed by Eugen Rochko
parent d6c7b01d08
commit a7e3bd0300
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/mastodon/reducers/conversations.js
View File

@ -56,7 +56,13 @@ const expandNormalizedConversations = (state, conversations, next) => {
list = list.concat(items); 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;
});
}); });
} }