1 files changed, 23 insertions, 17 deletions

diff --git a/web/react/components/rhs_thread.jsx b/web/react/components/rhs_thread.jsx
index fe57bed28..2edcd8b37 100644
--- a/web/react/components/rhs_thread.jsx
+++ b/web/react/components/rhs_thread.jsx
@@ -1,17 +1,17 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var PostStore = require('../stores/post_store.jsx');
-var UserStore = require('../stores/user_store.jsx');
-var PreferenceStore = require('../stores/preference_store.jsx');
-var Utils = require('../utils/utils.jsx');
-var SearchBox = require('./search_bar.jsx');
-var CreateComment = require('./create_comment.jsx');
-var RhsHeaderPost = require('./rhs_header_post.jsx');
-var RootPost = require('./rhs_root_post.jsx');
-var Comment = require('./rhs_comment.jsx');
-var Constants = require('../utils/constants.jsx');
-var FileUploadOverlay = require('./file_upload_overlay.jsx');
+import PostStore from '../stores/post_store.jsx';
+import UserStore from '../stores/user_store.jsx';
+import PreferenceStore from '../stores/preference_store.jsx';
+import * as Utils from '../utils/utils.jsx';
+import SearchBox from './search_bar.jsx';
+import CreateComment from './create_comment.jsx';
+import RhsHeaderPost from './rhs_header_post.jsx';
+import RootPost from './rhs_root_post.jsx';
+import Comment from './rhs_comment.jsx';
+import Constants from '../utils/constants.jsx';
+import FileUploadOverlay from './file_upload_overlay.jsx';
 
 export default class RhsThread extends React.Component {
     constructor(props) {
@@ -82,7 +82,7 @@ export default class RhsThread extends React.Component {
     }
     onChange() {
         var newState = this.getStateFromStores();
-        if (!Utils.areStatesEqual(newState, this.state)) {
+        if (!Utils.areObjectsEqual(newState, this.state)) {
             this.setState(newState);
         }
     }
@@ -94,14 +94,22 @@ export default class RhsThread extends React.Component {
             return;
         }
 
-        var currentPosts = PostStore.getPosts(currentSelected.posts[currentSelected.order[0]].channel_id);
+        var currentPosts = PostStore.getVisiblePosts(currentSelected.posts[currentSelected.order[0]].channel_id);
 
         if (!currentPosts || currentPosts.order.length === 0) {
             return;
         }
 
         if (currentPosts.posts[currentPosts.order[0]].channel_id === currentSelected.posts[currentSelected.order[0]].channel_id) {
-            currentSelected.posts = {};
+            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];
@@ -112,13 +120,11 @@ export default class RhsThread extends React.Component {
         }
 
         var newState = this.getStateFromStores();
-        if (!Utils.areStatesEqual(newState, this.state)) {
+        if (!Utils.areObjectsEqual(newState, this.state)) {
             this.setState(newState);
         }
     }
     resize() {
-        var height = this.state.windowHeight - $('#error_bar').outerHeight() - 100;
-        $('.post-right__scroll').css('height', height + 'px');
         $('.post-right__scroll').scrollTop(100000);
         if (this.state.windowWidth > 768) {
             $('.post-right__scroll').perfectScrollbar();