From f8e0dcf26437c03c384ace261b53f06cb5a2293d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 24 Jan 2020 09:33:55 -0700
Subject: [PATCH] Add null check for cross-signing info in verification panel

---
 src/components/views/right_panel/VerificationPanel.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/right_panel/VerificationPanel.js b/src/components/views/right_panel/VerificationPanel.js
index a29546c8f7..70ef8486bd 100644
--- a/src/components/views/right_panel/VerificationPanel.js
+++ b/src/components/views/right_panel/VerificationPanel.js
@@ -49,12 +49,12 @@ export default class VerificationPanel extends React.PureComponent {
                 Verify by emoji
             </AccessibleButton>;
 
-            if (request.requestEvent && request.requestEvent.getId()) {
+            const crossSigningInfo = MatrixClientPeg.get().getStoredCrossSigningForUser(request.otherUserId);
+            if (request.requestEvent && request.requestEvent.getId() && crossSigningInfo) {
                 const qrCodeKeys = [
                     [MatrixClientPeg.get().getDeviceId(), MatrixClientPeg.get().getDeviceEd25519Key()],
                     [MatrixClientPeg.get().getCrossSigningId(), MatrixClientPeg.get().getCrossSigningId()],
                 ];
-                const crossSigningInfo = MatrixClientPeg.get().getStoredCrossSigningForUser(request.otherUserId);
                 const qrCode = <VerificationQRCode
                     keyholderUserId={MatrixClientPeg.get().getUserId()}
                     requestEventId={request.requestEvent.getId()}