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

Error handle the no QR verif case better

pull/21833/head
Michael Telatynski 2020-01-27 17:21:31 +00:00
parent ca5d4d88a2
commit db1d3c091e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/views/right_panel/VerificationPanel.js
View File

@ -31,15 +31,22 @@ export default class VerificationPanel extends React.PureComponent {
}
renderQRPhase() {
const {member, request} = this.props; // type req: VerificationRequest
const {member, request} = this.props;
// TODO change the button into a spinner when on click
const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
const cli = MatrixClientPeg.get();
const crossSigningInfo = cli.getStoredCrossSigningForUser(request.otherUserId);
if (!crossSigningInfo || !request.requestEvent || !request.requestEvent.getId()) {
// TODO handle this error case
return <p>request.requestEvent.getId()</p>;
// for whatever reason we can't generate a QR code, offer only SAS Verification
return <div className="mx_UserInfo_container">
<h3>Verify by emoji</h3>
<p>{_t("Verify by comparing unique emoji.")}</p>
<AccessibleButton kind="primary" className="mx_UserInfo_verify" onClick={this._startSAS}>
{_t("Verify by emoji")}
</AccessibleButton>
</div>;
}
const myKeyId = cli.getCrossSigningId();