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

Merge pull request #3408 from matrix-org/t3chguy/community_member_invite_IS_text

Browse source 
Fix identity server text in AddressPickerDialog
This commit is contained in:
David Baker 2019-09-13 15:45:22 +01:00 • committed by GitHub
commit 7afd80e55b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/views/dialogs/AddressPickerDialog.js
View file

@ -77,6 +77,12 @@ module.exports = createReactClass({
},
getInitialState: function() {
let validAddressTypes = this.props.validAddressTypes;
// Remove email from validAddressTypes if no IS is configured. It may be added at a later stage by the user
if (!MatrixClientPeg.get().getIdentityServerUrl() && validAddressTypes.includes("email")) {
validAddressTypes = validAddressTypes.splice(validAddressTypes.indexOf("email"), 1);
}
return {
// Whether to show an error message because of an invalid address
invalidAddressError: false,
@ -95,8 +101,8 @@ module.exports = createReactClass({
// auto-completion results for the current search query.
suggestedList: [],
// List of address types initialised from props, but may change while the
// dialog is open.
validAddressTypes: this.props.validAddressTypes,
// dialog is open and represents the supported list of address types at this time.
validAddressTypes,
};
},
@ -678,7 +684,9 @@ module.exports = createReactClass({
}
let identityServer;
if (this.props.pickerType === 'user' && !this.state.validAddressTypes.includes('email')) {
// If picker cannot currently accept e-mail but should be able to
if (this.props.pickerType === 'user' && !this.state.validAddressTypes.includes('email')
&& this.props.validAddressTypes.includes('email')) {
const defaultIdentityServerUrl = getDefaultIdentityServerUrl();
if (defaultIdentityServerUrl) {
identityServer = <div className="mx_AddressPickerDialog_identityServer">{_t(