From 50b491d7e5ede07a2d23e91e0a8cb3ec0c3c7251 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 27 Jan 2020 15:48:19 +0000
Subject: [PATCH] post merge fix

---
 .../views/right_panel/VerificationPanel.js        | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index 0fdf16de65..b911824b4e 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -35,21 +35,18 @@ export default class VerificationPanel extends React.PureComponent {
         // TODO change the button into a spinner when on click
         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
             return <p>request.requestEvent.getId()</p>;
         }
 
+        const myKeyId = cli.getCrossSigningId();
         const qrCodeKeys = [
-            [MatrixClientPeg.get().getDeviceId(), MatrixClientPeg.get().getDeviceEd25519Key()],
-            [MatrixClientPeg.get().getCrossSigningId(), MatrixClientPeg.get().getCrossSigningId()],
+            [cli.getDeviceId(), cli.getDeviceEd25519Key()],
+            [myKeyId, myKeyId],
         ];
-        const crossSigningInfo = MatrixClientPeg.get().getStoredCrossSigningForUser(request.otherUserId);
-
-        if (!crossSigningInfo) {
-            // TODO handle this error case
-            return <p>crossSigningInfo</p>;
-        }
 
         return <React.Fragment>
             <div className="mx_UserInfo_container">