From 5319ee4572aec3d26d0fc4b2d50c1073fa065b15 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 23 Jan 2020 18:14:08 +0000
Subject: [PATCH 1/4] Remove riot logo from the security setup screens

With a little faff to make the rounded borders consistent again
---
 res/css/views/auth/_AuthBody.scss              |  4 ++++
 .../structures/auth/CompleteSecurity.js        |  3 +--
 src/components/views/auth/AuthBody.js          | 18 +++++++++++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss
index b05629003e..d342de6d75 100644
--- a/res/css/views/auth/_AuthBody.scss
+++ b/res/css/views/auth/_AuthBody.scss
@@ -95,6 +95,10 @@ limitations under the License.
     }
 }
 
+.mx_AuthBody_noHeader {
+    border-radius: 4px;
+}
+
 .mx_AuthBody_editServerDetails {
     padding-left: 1em;
     font-size: 12px;
diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index b64f368908..982360e8c1 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -161,8 +161,7 @@ export default class CompleteSecurity extends React.Component {
 
         return (
             <AuthPage>
-                <AuthHeader />
-                <AuthBody>
+                <AuthBody header={false}>
                     <h2 className="mx_CompleteSecurity_header">
                         {icon}
                         {title}
diff --git a/src/components/views/auth/AuthBody.js b/src/components/views/auth/AuthBody.js
index 9a078efb52..db5c941b20 100644
--- a/src/components/views/auth/AuthBody.js
+++ b/src/components/views/auth/AuthBody.js
@@ -17,10 +17,26 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import PropTypes from 'prop-types';
+
+import classnames from 'classnames';
 
 export default class AuthBody extends React.PureComponent {
+    static PropTypes = {
+        header: PropTypes.bool,
+    };
+
+    static defaultProps = {
+        header: true,
+    };
+
     render() {
-        return <div className="mx_AuthBody">
+        const classes = {
+            'mx_AuthBody': true,
+            'mx_AuthBody_noHeader': !this.props.header,
+        };
+
+        return <div className={classnames(classes)}>
             { this.props.children }
         </div>;
     }

From a3026277c1c03a929f95308bcfd97b26cca83067 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 23 Jan 2020 18:24:03 +0000
Subject: [PATCH 2/4] Unused variable

---
 src/components/structures/auth/CompleteSecurity.js | 1 -
 src/components/views/settings/KeyBackupPanel.js    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/structures/auth/CompleteSecurity.js b/src/components/structures/auth/CompleteSecurity.js
index 982360e8c1..d2cea9b00a 100644
--- a/src/components/structures/auth/CompleteSecurity.js
+++ b/src/components/structures/auth/CompleteSecurity.js
@@ -74,7 +74,6 @@ export default class CompleteSecurity extends React.Component {
 
     render() {
         const AuthPage = sdk.getComponent("auth.AuthPage");
-        const AuthHeader = sdk.getComponent("auth.AuthHeader");
         const AuthBody = sdk.getComponent("auth.AuthBody");
         const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
 
diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index fd166782d8..cd8cdfa5d9 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -127,7 +127,7 @@ export default class KeyBackupPanel extends React.PureComponent {
         Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
             import('../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
             {
-                secureSecretStorage: SettingsStore.isFeatureEnabled("feature_cross_signing"),
+                secureSecretStorage: false,
                 onFinished: () => {
                     this._loadBackupStatus();
                 },

From cd4e75c378d748d6cf42acf2fb0b43e6328b1ed1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Jan 2020 09:36:22 +0000
Subject: [PATCH 3/4] Unnecessary blank line

---
 src/components/views/auth/AuthBody.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/auth/AuthBody.js b/src/components/views/auth/AuthBody.js
index db5c941b20..fe20d76afb 100644
--- a/src/components/views/auth/AuthBody.js
+++ b/src/components/views/auth/AuthBody.js
@@ -18,7 +18,6 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-
 import classnames from 'classnames';
 
 export default class AuthBody extends React.PureComponent {

From 99252e08b0eb3800b9aa79be9e000f803b04aeb0 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 24 Jan 2020 09:37:43 +0000
Subject: [PATCH 4/4] Unintentional commit

---
 src/components/views/settings/KeyBackupPanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index cd8cdfa5d9..fd166782d8 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -127,7 +127,7 @@ export default class KeyBackupPanel extends React.PureComponent {
         Modal.createTrackedDialogAsync('Key Backup', 'Key Backup',
             import('../../../async-components/views/dialogs/keybackup/CreateKeyBackupDialog'),
             {
-                secureSecretStorage: false,
+                secureSecretStorage: SettingsStore.isFeatureEnabled("feature_cross_signing"),
                 onFinished: () => {
                     this._loadBackupStatus();
                 },