OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4598 from matrix-org/travis/fix-emails-release 

Remove debugging that causes email addresses to load forever (to release)
pull/21833/head
Travis Ralston 2020-05-14 10:01:56 -06:00 committed by GitHub
parent 81174b5f55 67822f9e69
commit 6cdfe869be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
View File

@ -348,7 +348,7 @@ export default class GeneralUserSettingsTab extends React.Component {
// For newer homeservers with separate 3PID add and bind methods (MSC2290), // For newer homeservers with separate 3PID add and bind methods (MSC2290),
// there is no such concern, so we can always show the HS account 3PIDs. // there is no such concern, so we can always show the HS account 3PIDs.
if (this.state.haveIdServer || this.state.serverSupportsSeparateAddAndBind === true) { if (this.state.haveIdServer || this.state.serverSupportsSeparateAddAndBind === true) {
const emails = this.state.loading3pids || true const emails = this.state.loading3pids
? <Spinner /> ? <Spinner />
: <EmailAddresses : <EmailAddresses
emails={this.state.emails} emails={this.state.emails}