summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorDavid Lu <david.lu@hotmail.com>2016-07-18 09:31:06 -0400
committerChristopher Speller <crspeller@gmail.com>2016-07-18 09:31:06 -0400
commit180adc79af3d14de6ce62f6e687a6735db3fe82f (patch)
tree7016b7e078f2a098d6fb6006056953860bfda9e8 /webapp
parentf7b3731b2b2767b0784e1f2e0ce723cae917c47a (diff)
downloadchat-180adc79af3d14de6ce62f6e687a6735db3fe82f.tar.gz
chat-180adc79af3d14de6ce62f6e687a6735db3fe82f.tar.bz2
chat-180adc79af3d14de6ce62f6e687a6735db3fe82f.zip
updated RHS upon profile picture save (#3604)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/rhs_comment.jsx4
-rw-r--r--webapp/components/rhs_root_post.jsx4
-rw-r--r--webapp/components/rhs_thread.jsx6
3 files changed, 13 insertions, 1 deletions
diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx
index 249d3f14a..ac029f6fa 100644
--- a/webapp/components/rhs_comment.jsx
+++ b/webapp/components/rhs_comment.jsx
@@ -47,6 +47,10 @@ export default class RhsComment extends React.Component {
return true;
}
+ if (!Utils.areObjectsEqual(nextProps.currentUser, this.props.currentUser)) {
+ return true;
+ }
+
return false;
}
createDropdown() {
diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx
index 230e4bb2d..1aee008e7 100644
--- a/webapp/components/rhs_root_post.jsx
+++ b/webapp/components/rhs_root_post.jsx
@@ -44,6 +44,10 @@ export default class RhsRootPost extends React.Component {
return true;
}
+ if (!Utils.areObjectsEqual(nextProps.currentUser, this.props.currentUser)) {
+ return true;
+ }
+
return false;
}
render() {
diff --git a/webapp/components/rhs_thread.jsx b/webapp/components/rhs_thread.jsx
index 9e2ecd159..5da4b2e9b 100644
--- a/webapp/components/rhs_thread.jsx
+++ b/webapp/components/rhs_thread.jsx
@@ -118,6 +118,10 @@ export default class RhsThread extends React.Component {
return true;
}
+ if (!Utils.areObjectsEqual(nextProps.currentUser, this.props.currentUser)) {
+ return true;
+ }
+
return false;
}
forceUpdateInfo() {
@@ -216,7 +220,7 @@ export default class RhsThread extends React.Component {
let profile;
if (UserStore.getCurrentId() === selected.user_id) {
- profile = UserStore.getCurrentUser();
+ profile = this.props.currentUser;
} else {
profile = profiles[selected.user_id];
}