This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 831
Clarify that use backup means restore #2917
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dbkr
approved these changes
Apr 15, 2019
There was a problem hiding this 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
force-pushed
the
key-backup-restore-button
branch
from
April 15, 2019 14:12
41fd58f
to
2054d53
Compare
Discussed with @lampholder IRL and changed to "Connect ..." wording. |
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.
This was referenced Apr 18, 2019
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
This was referenced Apr 24, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
"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.
Fixes element-hq/element-web#9438
Fixes element-hq/element-web#9446