Merge branch 'develop' into travis/sourcemaps

2020-01-13 11:19:41 -07:00 · 2020-01-13 11:19:41 -07:00 · 5fd27a10bb
commit 5fd27a10bb
parent 528777049a 389e1194ff
24 changed files with 722 additions and 41 deletions
--- a/src/components/views/avatars/MemberAvatar.js
+++ b/src/components/views/avatars/MemberAvatar.js
@ -56,7 +56,7 @@ export default createReactClass({
    },

    _getState: function(props) {
-        if (props.member) {
+        if (props.member && props.member.name) {
            return {
                name: props.member.name,
                title: props.title || props.member.userId,