Merge pull request #3074 from matrix-org/dbkr/fix_email_invite_address_match_check

Fix email invites address-match checking
This commit is contained in:
David Baker 2019-06-06 15:06:36 +01:00 committed by GitHub
commit b365c9dfe6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions

View file

@ -1551,6 +1551,7 @@ module.exports = React.createClass({
joining={this.state.joining}
inviterName={inviterName}
invitedEmail={invitedEmail}
oobData={this.props.oobData}
room={this.state.room}
/>
</div>
@ -1681,6 +1682,7 @@ module.exports = React.createClass({
joining={this.state.joining}
inviterName={inviterName}
invitedEmail={invitedEmail}
oobData={this.props.oobData}
canPreview={this.state.canPeek}
room={this.state.room}
/>