Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Change soft logout rehydrate text if there's pending key backups #3187

Merged
merged 8 commits into from
Jul 9, 2019

Conversation

turt2live
Copy link
Member

Fixes element-hq/element-web#10263
Requires matrix-org/matrix-js-sdk#982
Based on #3182 (see commits after merge commit)

Fixes element-hq/element-web#10236

The changes to the MatrixClientPeg (assign/start) are to permit the SoftLogout page to access the MatrixClientPeg reliably. This is why assign() is called by Lifecycle as an alternative to start().

Minimal design work has been done here. The majority is deferred to element-hq/element-web#10262
Copy link
Contributor

@bwindels bwindels left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, just 2 small things

src/components/structures/auth/SoftLogout.js Show resolved Hide resolved
@turt2live turt2live requested a review from bwindels July 8, 2019 17:53
@turt2live turt2live merged commit 370fa27 into develop Jul 9, 2019
@turt2live turt2live deleted the travis/soft-logout-keys branch July 9, 2019 17:32
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Soft logout: Detect if all keys are backed up
2 participants