2 files changed, 10 insertions, 1 deletions
diff --git a/vnext/src/components/Avatar.js b/vnext/src/components/Avatar.js
index a83107ce..660847f2 100644
--- a/vnext/src/components/Avatar.js
+++ b/vnext/src/components/Avatar.js
@@ -27,6 +27,15 @@ class Avatar extends React.Component {
             });
         }
     }
+    shouldComponentUpdate(nextProps, nextState) {
+        return this.state.user.avatar != nextState.user.avatar || this.state.user.uid != nextState.user.uid
+        || this.props.user.avatar != nextProps.user.avatar || this.props.user.uid != nextProps.user.uid;
+    }
+    componentDidUpdate(prevProps, prevState, shouldReload) {
+        this.setState({
+            user: this.props.user
+        });
+    }
     render() {
         let user = this.state.user;
         return (
diff --git a/vnext/src/components/UserInfo.js b/vnext/src/components/UserInfo.js
index 9f8e3ca0..c962add9 100644
--- a/vnext/src/components/UserInfo.js
+++ b/vnext/src/components/UserInfo.js
@@ -75,7 +75,7 @@ export default class UserInfo extends React.Component {
                         </>
                     }
                 </div>
-                { this.props.children }
+                {this.props.children}
             </>
         );
     }