From ce412280000659b6ea9e7f3a23a7b79c4d06fc96 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 21 Jan 2019 19:20:11 +0000
Subject: [PATCH 1/2] Token encouragement if zxcvbn gives no feedback

zxcvbn is hardcoded to give no suggedtions if the score is greater
than 2, but our threshold is 4, so give some generic feedback.

Fixes https://github.com/vector-im/riot-web/issues/7860
---
 .../views/dialogs/keybackup/CreateKeyBackupDialog.js            | 2 +-
 src/i18n/strings/en_EN.json                                     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index 4fb5df214b..fd3d6776eb 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -254,7 +254,7 @@ export default React.createClass({
                 }
                 const suggestionBlock = suggestions.length > 0 ? <div>
                     {suggestions}
-                </div> : null;
+                </div> : <div>{_t("Keep going...")}</div>;
 
                 helpText = <div>
                     {this.state.zxcvbnResult.feedback.warning}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 16c40460e2..1c4dbeea65 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1381,6 +1381,7 @@
     "File to import": "File to import",
     "Import": "Import",
     "Great! This passphrase looks strong enough.": "Great! This passphrase looks strong enough.",
+    "Keep going...": "Keep going...",
     "Secure your encrypted message history with a Recovery Passphrase.": "Secure your encrypted message history with a Recovery Passphrase.",
     "You'll need it if you log out or lose access to this device.": "You'll need it if you log out or lose access to this device.",
     "Enter a passphrase...": "Enter a passphrase...",

From 9f5244fa8b646b7fec1d4da7781bd73714657540 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 22 Jan 2019 10:16:31 +0000
Subject: [PATCH 2/2] Deduplicate <div> tag

---
 .../views/dialogs/keybackup/CreateKeyBackupDialog.js          | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
index fd3d6776eb..2c54344a30 100644
--- a/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
+++ b/src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js
@@ -252,9 +252,7 @@ export default React.createClass({
                 for (let i = 0; i < this.state.zxcvbnResult.feedback.suggestions.length; ++i) {
                     suggestions.push(<div key={i}>{this.state.zxcvbnResult.feedback.suggestions[i]}</div>);
                 }
-                const suggestionBlock = suggestions.length > 0 ? <div>
-                    {suggestions}
-                </div> : <div>{_t("Keep going...")}</div>;
+                const suggestionBlock = <div>{suggestions.length > 0 ? suggestions : _t("Keep going...")}</div>;
 
                 helpText = <div>
                     {this.state.zxcvbnResult.feedback.warning}