From 3d91ff23ec88a87c0607c67d5eb87949cb6d6eb1 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Fri, 31 Jan 2020 12:20:48 +0100 Subject: [PATCH] cram the EncryptionPanel in CompleteSecurity instead of IncomingSasDialog so we get QR code support and support phases prior to STARTED --- src/components/structures/auth/CompleteSecurity.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js index 2126590736..18000be68e 100644 --- a/src/components/structures/auth/CompleteSecurity.js +++ b/src/components/structures/auth/CompleteSecurity.js @@ -138,9 +138,11 @@ export default class CompleteSecurity extends React.Component { let body; if (this.state.verificationRequest) { - const IncomingSasDialog = sdk.getComponent("views.dialogs.IncomingSasDialog"); - body = ; } else if (phase === PHASE_INTRO) { icon = ;