From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 4 Jun 2018 02:19:16 +0000 (+0200)
Subject: Fix bug in order of conversations in web UI (#7721)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e18390cfe6f5f0eb55abafe072b14b7fa123e808;p=mastodon.git

Fix bug in order of conversations in web UI (#7721)
---

diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index 505a88a3f..96144b19e 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -77,9 +77,12 @@ const makeMapStateToProps = () => {
           let id        = ids.shift();
           const replies = state.getIn(['contexts', 'replies', id]);
 
+          if (status.get('id') !== id) {
+            mutable.push(id);
+          }
+
           if (replies) {
-            replies.forEach(reply => {
-              mutable.push(reply);
+            replies.reverse().forEach(reply => {
               ids.unshift(reply);
             });
           }