From a865cfb01362f550b62e10fb227bdc789d68e18c Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Sat, 1 Feb 2020 18:25:01 +0100
Subject: [PATCH] put encryption in a proper dialog with close button

---
 .../_VerificationQREmojiOptions.scss          |  5 -----
 .../dialogs/VerificationRequestDialog.js      | 20 +++++++++++++------
 src/i18n/strings/en_EN.json                   |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/res/css/views/verification/_VerificationQREmojiOptions.scss b/res/css/views/verification/_VerificationQREmojiOptions.scss
index ceaece8853..1f488cc758 100644
--- a/res/css/views/verification/_VerificationQREmojiOptions.scss
+++ b/res/css/views/verification/_VerificationQREmojiOptions.scss
@@ -68,11 +68,6 @@ limitations under the License.
 
 // Special case styling for EncryptionPanel in a Modal dialog
 .mx_Dialog {
-    // fixed with for when showing sas and once verified.
-    .mx_VerificationShowSas, .mx_VerificationPanel_verified_section {
-        width: 500px;
-    }
-
     // EncryptionPanel when verification is done
     .mx_VerificationPanel_verified_section {
         // center the big shield icon
diff --git a/src/components/views/dialogs/VerificationRequestDialog.js b/src/components/views/dialogs/VerificationRequestDialog.js
index f47d76ab94..baed79bd58 100644
--- a/src/components/views/dialogs/VerificationRequestDialog.js
+++ b/src/components/views/dialogs/VerificationRequestDialog.js
@@ -18,6 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import * as sdk from '../../../index';
+import { _t } from '../../../languageHandler';
 
 export default class VerificationRequestDialog extends React.Component {
     static propTypes = {
@@ -26,12 +27,19 @@ export default class VerificationRequestDialog extends React.Component {
     };
 
     render() {
+        const BaseDialog = sdk.getComponent("views.dialogs.BaseDialog");
         const EncryptionPanel = sdk.getComponent("views.right_panel.EncryptionPanel");
-        return <EncryptionPanel
-            layout="dialog"
-            verificationRequest={this.props.verificationRequest}
-            onClose={this.props.onFinished}
-            member={MatrixClientPeg.get().getUser(this.props.verificationRequest.otherUserId)}
-        />;
+        return <BaseDialog className="mx_InfoDialog" onFinished={this.props.onFinished}
+                contentId="mx_Dialog_content"
+                title={_t("Verification Request")}
+                hasCancel={true}
+            >
+            <EncryptionPanel
+                layout="dialog"
+                verificationRequest={this.props.verificationRequest}
+                onClose={this.props.onFinished}
+                member={MatrixClientPeg.get().getUser(this.props.verificationRequest.otherUserId)}
+            />
+        </BaseDialog>;
     }
 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3bff66f258..18df6dc70f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1644,6 +1644,7 @@
     "Upload %(count)s other files|one": "Upload %(count)s other file",
     "Cancel All": "Cancel All",
     "Upload Error": "Upload Error",
+    "Verification Request": "Verification Request",
     "A widget would like to verify your identity": "A widget would like to verify your identity",
     "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.",
     "Remember my selection for this widget": "Remember my selection for this widget",
@@ -1855,7 +1856,6 @@
     "Review terms and conditions": "Review terms and conditions",
     "Old cryptography data detected": "Old cryptography data detected",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.",
-    "Verification Request": "Verification Request",
     "Logout": "Logout",
     "%(creator)s created and configured the room.": "%(creator)s created and configured the room.",
     "Your Communities": "Your Communities",