Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases

2020-06-03 11:01:43 +01:00 · 2020-06-03 11:01:43 +01:00 · 6f3bfc96ca
commit 6f3bfc96ca
parent 5844a2dd9b 936445ab2d
43 changed files with 260 additions and 2977 deletions
--- a/src/components/views/settings/CrossSigningPanel.js
+++ b/src/components/views/settings/CrossSigningPanel.js
@ -194,6 +194,8 @@ export default class CrossSigningPanel extends React.PureComponent {
                </div>
            );
        }
+
+        // TODO: determine how better to expose this to users in addition to prompts at login/toast
        let bootstrapButton;
        if (
            (!enabledForAccount || !crossSigningPublicKeysOnDevice) &&