Merge branch 'fix-convos' into 'develop'

fix convos Closes #357 See merge request pleroma/pleroma-fe!575
6 years ago · 40b51b659e
parent d6f9f34ad8 688906a61e
commit 40b51b659e
1 changed files with 2 additions and 2 deletions
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@ -9,9 +9,9 @@ const sortById = (a, b) => {
  if (isSeqA && isSeqB) {
    return seqA < seqB ? -1 : 1
  } else if (isSeqA && !isSeqB) {
-    return 1
-  } else if (!isSeqA && isSeqB) {
    return -1
+  } else if (!isSeqA && isSeqB) {
+    return 1
  } else {
    return a.id < b.id ? -1 : 1
  }