imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
 Conflicts:
	yarn.lock
This commit is contained in:
Michael Telatynski 2020-01-09 12:17:21 +00:00
commit 245a68b3ba
16 changed files with 338 additions and 446 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/settings/ProfileSettings.js
View file

@ -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);