Travis Ralston
fde32f13a5
[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop
2020-01-09 14:15:09 -07:00
J. Ryan Stinnett
b8683462e8
Update backup creation paths for SSSS
...
This updates the various backup creation entry points to ensure they support
creating with secret storage if the feature flag is enabled.
2020-01-03 15:34:05 +00:00
J. Ryan Stinnett
99559c5121
Update backup restore paths for SSSS
...
This updates all the various key backup entry points to ensure they use a flow
that supports backups stored under secret storage.
2020-01-03 13:33:36 +00:00
Travis Ralston
042bd35d79
Fix MatrixClientPeg imports
2019-12-22 21:15:54 -07:00
Travis Ralston
d56f0f2a25
Convert many imports to handle ES6 exports
...
Reliant upon https://github.com/matrix-org/matrix-react-sdk/pull/3761
2019-12-22 21:04:42 -07:00
Travis Ralston
16a46be00f
Cache shouldLoadBackupStatus in state
2019-05-31 09:20:13 -06:00
Travis Ralston
1c84abae44
Fix logout dialog for low bandwidth
2019-05-31 09:14:49 -06:00
J. Ryan Stinnett
4784d5e9f2
Also say "Connect ..." on remaining key backup buttons
...
This updates the remaining buttons shown when a backup exists but is not trusted
so that they all now say "Connect this device to Key Backup" instead of "Use Key
Backup".
This is a follow up to https://github.com/matrix-org/matrix-react-sdk/pull/2917
and was agreed with Riot iOS team
https://github.com/vector-im/riot-ios/pull/2375#issuecomment-485788118 .
Fixes https://github.com/vector-im/riot-web/issues/9542
2019-04-24 11:05:27 +01:00
David Baker
98402e7eae
Fix backup button in logout dialog
...
We set the caption appropriately but forgot to actually do the
right thing depending on whether there was a key backup already.
Also fix the loadihng spinner which was never shown.
Fixes https://github.com/vector-im/riot-web/issues/8369
2019-02-27 11:45:00 +00:00
David Baker
9ec00f8d9b
Change text in e2e UX to new copy
2019-02-12 16:01:38 +00:00
David Baker
d74d5f1e27
Fix unused imports
2019-02-08 17:30:14 +00:00
Travis Ralston
e06a68501a
Typo
...
Co-Authored-By: dbkr <dbkr@users.noreply.github.com>
2019-02-08 17:23:18 +00:00
David Baker
043f1ab3f0
Remove key backup & sas from labs
2019-02-08 16:58:09 +00:00
David Baker
47c2ca3384
Tweak wording on logout warning
...
I further tweaked the wording from Tom's in the bug report to
put passphrases first since they are supposed to be the norm
(and the correct term is "recovery passphrase").
Fixes https://github.com/vector-im/riot-web/issues/8214
2019-01-25 18:01:40 +00:00
David Baker
8fbb0607ff
Re-write as full class component
...
So we can re-use the functions we pass to props
2019-01-07 12:09:19 +00:00
David Baker
522dddbd13
Lint
2019-01-07 10:13:02 +00:00
David Baker
47f303dc9d
Make logout warning nag about key backups
...
https://github.com/vector-im/riot-web/issues/7805
2019-01-07 10:08:57 +00:00
Bruno Windels
a31dacc4bc
allow logout dialog to be cancelled (can't see why not?)
2018-12-11 12:43:56 +01:00
Bruno Windels
48cfd08ea6
move logout dialog to own component so we can reuse it
2018-12-11 12:42:52 +01:00