From 24552f567ece2a9bc1873e8cf913c5acbeb23735 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 14 Jan 2020 11:52:00 +0000
Subject: [PATCH] Add primary button to trigger restore flow

---
 .../secretstorage/CreateSecretStorageDialog.js    | 15 ++++++++++++---
 src/i18n/strings/en_EN.json                       |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
index 608fc964ab..b6d314aab1 100644
--- a/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
+++ b/src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
@@ -170,6 +170,14 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
         this.props.onFinished(true);
     }
 
+    _onRestoreKeyBackupClick = () => {
+        const RestoreKeyBackupDialog = sdk.getComponent('dialogs.keybackup.RestoreKeyBackupDialog');
+        Modal.createTrackedDialog(
+            'Restore Backup', '', RestoreKeyBackupDialog, null, null,
+            /* priority = */ false, /* static = */ true,
+        );
+    }
+
     _onOptOutClick = () => {
         this.setState({phase: PHASE_OPTOUT_CONFIRM});
     }
@@ -285,9 +293,10 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
                 "up from this session. To set up secret storage, " +
                 "restore your key backup.",
             )}</p>
-            <DialogButtons primaryButton={_t('Cancel')}
-                onPrimaryButtonClick={this._onCancel}
-                hasCancel={false}
+            <DialogButtons primaryButton={_t('Restore')}
+                onPrimaryButtonClick={this._onRestoreKeyBackupClick}
+                onCancel={this._onCancel}
+                hasCancel={true}
             >
             </DialogButtons>
         </div>;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b71f22f136..19c31d540a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1934,6 +1934,7 @@
     "File to import": "File to import",
     "Import": "Import",
     "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.": "Key Backup is enabled on your account but has not been set up from this session. To set up secret storage, restore your key backup.",
+    "Restore": "Restore",
     "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup": "Secret Storage will be set up using your existing key backup details. Your secret storage passphrase and recovery key will be the same as  they were for your key backup",
     "Great! This passphrase looks strong enough.": "Great! This passphrase looks strong enough.",
     "<b>Warning</b>: You should only set up secret storage from a trusted computer.": "<b>Warning</b>: You should only set up secret storage from a trusted computer.",