Merge pull request #1611 from mattermost/PLT-1301

PLT-1310 fixing regression caused by fix for PLT-1310

1 files changed, 9 insertions, 0 deletions

diff --git a/web/react/components/rhs_thread.jsx b/web/react/components/rhs_thread.jsx
index d111094e7..2edcd8b37 100644
--- a/web/react/components/rhs_thread.jsx
+++ b/web/react/components/rhs_thread.jsx
@@ -101,6 +101,15 @@ export default class RhsThread extends React.Component {
         }
 
         if (currentPosts.posts[currentPosts.order[0]].channel_id === currentSelected.posts[currentSelected.order[0]].channel_id) {
+            for (var key in currentSelected.posts) {
+                if (currentSelected.posts.hasOwnProperty(key)) {
+                    var post = currentSelected.posts[key];
+                    if (post.pending_post_id) {
+                        Reflect.deleteProperty(currentSelected.posts, key);
+                    }
+                }
+            }
+
             for (var postId in currentPosts.posts) {
                 if (currentPosts.posts.hasOwnProperty(postId)) {
                     currentSelected.posts[postId] = currentPosts.posts[postId];