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

Clarify that use backup means restore #2917

Merged
merged 3 commits into from
Apr 15, 2019

Conversation

jryans
Copy link
Collaborator

@jryans jryans commented Apr 12, 2019

"Use key backup" as button text feels like it's telling me I haven't set it up at all. This
changes to "Connect this device ..." which seems more reassuring and applies for both the "add to backup" and "restore from backup" use cases.

This also updates the backup status text for the case where a backup exists, but it's not being used by the current device so that it's much more clear that you have a backup at least.

2019-04-15 at 15 11

Fixes element-hq/element-web#9438
Fixes element-hq/element-web#9446

@jryans jryans requested a review from dbkr April 12, 2019 13:52
@dbkr dbkr requested a review from lampholder April 15, 2019 09:41
Copy link
Member

@dbkr dbkr left a comment

Choose a reason for hiding this comment

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

lgtm, but toml probably would like to review the wording

"Use key backup" feels like it's telling me I haven't set it up at all. This
changes to "Restore ..." which seems more reassuring.

Fixes element-hq/element-web#9438
This makes the key backup panel much more explicit about the case where an
existing backup does exist, but this device just isn't using it. You can join
the device to the backup and restore from it by going through the restore
workflow.

Fixes element-hq/element-web#9446
@jryans
Copy link
Collaborator Author

jryans commented Apr 15, 2019

Discussed with @lampholder IRL and changed to "Connect ..." wording.

@jryans jryans removed the request for review from lampholder April 15, 2019 14:28
@jryans jryans merged commit 1dc9e48 into matrix-org:develop Apr 15, 2019
jryans added a commit to jryans/riot-ios that referenced this pull request Apr 18, 2019
This ports the wording changes from Riot Web
matrix-org/matrix-react-sdk#2917.

"Use key backup" as button text feels like it's telling me I haven't set it up
at all. This changes to "Connect this device ..." which seems more reassuring
and applies for both the "add to backup" and "restore from backup" use cases.

This also updates the backup status text for the case where a backup exists, but
it's not being used by the current device so that it's much more clear that you
have a backup at least.
jryans added a commit to jryans/riot-ios that referenced this pull request Apr 18, 2019
This ports the wording changes from Riot Web
matrix-org/matrix-react-sdk#2917.

"Use key backup" as button text feels like it's telling me I haven't set it up
at all. This changes to "Connect this device ..." which seems more reassuring
and applies for both the "add to backup" and "restore from backup" use cases.

This also updates the backup status text for the case where a backup exists, but
it's not being used by the current device so that it's much more clear that you
have a backup at least.
jryans added a commit to jryans/matrix-react-sdk that referenced this pull request Apr 24, 2019
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 matrix-org#2917
and was agreed with Riot iOS team
element-hq/element-ios#2375 (comment).

Fixes element-hq/element-web#9542
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
2 participants