Merge pull request #2787 from matrix-org/travis/forgot-password-e2e

Fix 'forgot password' warning to represent the reality of e2ee

src/components/structures/auth/ForgotPassword.js

@@ -20,7 +20,6 @@ import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import sdk from '../../../index';
 import Modal from "../../../Modal";
-import MatrixClientPeg from "../../../MatrixClientPeg";
 import SdkConfig from "../../../SdkConfig";
 
 import PasswordReset from "../../../PasswordReset";
@@ -124,20 +123,13 @@ module.exports = React.createClass({
                 description:
                     <div>
                         { _t(
-                            'Resetting password will currently reset any ' +
+                            "Changing your password will reset any end-to-end encryption keys " +
-                            'end-to-end encryption keys on all devices, ' +
+                            "on all of your devices, making encrypted chat history unreadable. Set up " +
-                            'making encrypted chat history unreadable, ' +
+                            "Key Backup or export your room keys from another device before resetting your " +
-                            'unless you first export your room keys and re-import ' +
+                            "password.",
-                            'them afterwards. In future this will be improved.',
                         ) }
                     </div>,
                 button: _t('Continue'),
-                extraButtons: [
-                    <button key="export_keys" className="mx_Dialog_primary"
-                            onClick={this._onExportE2eKeysClicked}>
-                        { _t('Export E2E room keys') }
-                    </button>,
-                ],
                 onFinished: (confirmed) => {
                     if (confirmed) {
                         this.submitPasswordReset(
@@ -150,15 +142,6 @@ module.exports = React.createClass({
         }
     },
 
-    _onExportE2eKeysClicked: function() {
-        Modal.createTrackedDialogAsync('Export E2E Keys', 'Forgot Password',
-            import('../../../async-components/views/dialogs/ExportE2eKeysDialog'),
-            {
-                matrixClient: MatrixClientPeg.get(),
-            },
-        );
-    },
-
     onInputChanged: function(stateKey, ev) {
         this.setState({
             [stateKey]: ev.target.value,

src/i18n/strings/en_EN.json

@@ -1423,7 +1423,7 @@
     "The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
     "A new password must be entered.": "A new password must be entered.",
     "New passwords must match each other.": "New passwords must match each other.",
-    "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.",
+    "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.": "Changing your password will reset any end-to-end encryption keys on all of your devices, making encrypted chat history unreadable. Set up Key Backup or export your room keys from another device before resetting your password.",
     "Your Matrix account": "Your Matrix account",
     "Your Matrix account on %(serverName)s": "Your Matrix account on %(serverName)s",
     "The homeserver URL %(hsUrl)s doesn't seem to be valid URL. Please enter a valid URL including the protocol prefix.": "The homeserver URL %(hsUrl)s doesn't seem to be valid URL. Please enter a valid URL including the protocol prefix.",