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

Merge pull request #4249 from matrix-org/bwindels/assumemethodswhentodevice

Browse source 
Fix: assume SAS is supported when starting request with .start
This commit is contained in:
Bruno Windels 2020-03-23 19:39:43 +00:00 • committed by GitHub
commit edd84ffd3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/right_panel/VerificationPanel.js
View file

@ -72,8 +72,8 @@ export default class VerificationPanel extends React.PureComponent {
renderQRPhase(pending) { renderQRPhase(pending) {
const {member, request} = this.props; const {member, request} = this.props;
const showSAS = request.methods.includes(verificationMethods.SAS); const showSAS = request.otherPartySupportsMethod(verificationMethods.SAS);
const showQR = this.props.request.otherPartySupportsMethod(SCAN_QR_CODE_METHOD); const showQR = request.otherPartySupportsMethod(SCAN_QR_CODE_METHOD);
const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
const noCommonMethodError = !showSAS && !showQR ? const noCommonMethodError = !showSAS && !showQR ?