Merge branches 'develop' and 't3chguy/clean_up_TextualBody' of github.com:matrix-org/matrix-react-sdk into t3chguy/clean_up_TextualBody

Conflicts: yarn.lock
2020-01-09 12:17:21 +00:00
parent 8116ac74ce 1d9d706b9c
commit 245a68b3ba
16 changed files with 338 additions and 446 deletions
@@ -88,6 +88,8 @@ export default class ProfileSettings extends React.Component {
            newState.avatarUrl = client.mxcUrlToHttp(uri, 96, 96, 'crop', false);
            newState.originalAvatarUrl = newState.avatarUrl;
            newState.avatarFile = null;
+        } else if (this.state.originalAvatarUrl !== this.state.avatarUrl) {
+            await client.setAvatarUrl(""); // use empty string as Synapse 500s on undefined
        }

        this.setState(newState);