Merge pull request #2397 from mattermost/plt-2185

PLT-2185 Fix ... for usernames on first page load

web/react/components/post.jsx

@@ -98,7 +98,7 @@ export default class Post extends React.Component {
             return true;
         }
 
-        if (nextProps.hasProfiles !== this.props.hasProfiles) {
+        if (!Utils.areObjectsEqual(nextProps.user, this.props.user)) {
             return true;
         }
 
@@ -226,7 +226,6 @@ export default class Post extends React.Component {
                                 posts={posts}
                                 handleCommentClick={this.handleCommentClick}
                                 retryPost={this.retryPost}
-                                hasProfiles={this.props.hasProfiles}
                             />
                         </div>
                     </div>
@@ -246,6 +245,5 @@ Post.propTypes = {
     hideProfilePic: React.PropTypes.bool,
     isLastComment: React.PropTypes.bool,
     shouldHighlight: React.PropTypes.bool,
-    displayNameType: React.PropTypes.string,
-    hasProfiles: React.PropTypes.bool
+    displayNameType: React.PropTypes.string
 };

web/react/components/post_body.jsx

@@ -215,8 +215,7 @@ PostBody.propTypes = {
     post: React.PropTypes.object.isRequired,
     parentPost: React.PropTypes.object,
     retryPost: React.PropTypes.func.isRequired,
-    handleCommentClick: React.PropTypes.func.isRequired,
-    hasProfiles: React.PropTypes.bool
+    handleCommentClick: React.PropTypes.func.isRequired
 };
 
 export default injectIntl(PostBody);

web/react/components/posts_view.jsx

@@ -250,7 +250,6 @@ export default class PostsView extends React.Component {
                     shouldHighlight={shouldHighlight}
                     onClick={() => EventHelpers.emitPostFocusEvent(post.id)} //eslint-disable-line no-loop-func
                     displayNameType={this.state.displayNameType}
-                    hasProfiles={profiles && Object.keys(profiles).length > 1}
                     user={profile}
                 />
             );

web/react/components/posts_view_container.jsx

@@ -149,11 +149,15 @@ export default class PostsViewContainer extends React.Component {
         }
     }
     shouldComponentUpdate(nextProps, nextState) {
-        if (Utils.areObjectsEqual(this.state, nextState)) {
-            return false;
+        if (!Utils.areObjectsEqual(this.state, nextState)) {
+            return true;
         }
 
-        return true;
+        if (!Utils.areObjectsEqual(this.props, nextProps)) {
+            return true;
+        }
+
+        return false;
     }
     render() {
         const postLists = this.state.postLists;