PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

post merge fix

Browse source
This commit is contained in:
Michael Telatynski 2020-01-27 15:48:19 +00:00
parent ddb0f06005
commit 50b491d7e5
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,21 +35,18 @@ export default class VerificationPanel extends React.PureComponent {
// TODO change the button into a spinner when on click // TODO change the button into a spinner when on click
const AccessibleButton = sdk.getComponent('elements.AccessibleButton'); const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
if (!request.requestEvent || !request.requestEvent.getId()) { const cli = MatrixClientPeg.get();
const crossSigningInfo = cli.getStoredCrossSigningForUser(request.otherUserId);
if (!crossSigningInfo || !request.requestEvent || !request.requestEvent.getId()) {
// TODO handle this error case // TODO handle this error case
return <p>request.requestEvent.getId()</p>; return <p>request.requestEvent.getId()</p>;
} }
const myKeyId = cli.getCrossSigningId();
const qrCodeKeys = [ const qrCodeKeys = [
[MatrixClientPeg.get().getDeviceId(), MatrixClientPeg.get().getDeviceEd25519Key()], [cli.getDeviceId(), cli.getDeviceEd25519Key()],
[MatrixClientPeg.get().getCrossSigningId(), MatrixClientPeg.get().getCrossSigningId()], [myKeyId, myKeyId],
]; ];
const crossSigningInfo = MatrixClientPeg.get().getStoredCrossSigningForUser(request.otherUserId);
if (!crossSigningInfo) {
// TODO handle this error case
return <p>crossSigningInfo</p>;
}
return <React.Fragment> return <React.Fragment>
<div className="mx_UserInfo_container"> <div className="mx_UserInfo_container">