This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
Add 'send without verifying' to status bar #1695
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
Fixes other part of element-hq/element-web#5936
richvdh
reviewed
Jan 9, 2018
| @@ -24,7 +24,11 @@ import WhoIsTyping from '../../WhoIsTyping'; | |||
| import MatrixClientPeg from '../../MatrixClientPeg'; | |||
| import MemberAvatar from '../views/avatars/MemberAvatar'; | |||
| import Resend from '../../Resend'; | |||
| import { showUnknownDeviceDialogForMessages } from '../../cryptodevices'; | |||
| import { | |||
There was a problem hiding this comment.
should we import * as cryptodevices from '../../cryptodevices' rather than having a long list?
| @@ -289,10 +300,11 @@ module.exports = React.createClass({ | |||
| if (hasUDE) { | |||
| title = _t("Message not sent due to unknown devices being present"); | |||
| content = _t( | |||
| "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.", | |||
| "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send without verifying</sendAnywayText> or <cancelText>cancel all</cancelText>.", | |||
There was a problem hiding this comment.
it's not verifying we care about - it's the fact that they are unknown. I worry that this wording adds to the general confusion that you need to have verified devices before e2e will work.
We could try something like "mark devices known and send"
|
tests seem to be failing? |
|
Tests are failing because Travis is broken while they faff around shifting stuff between container based and non-container based infra or whatever they're doing |
richvdh
approved these changes
Jan 11, 2018
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.
Fixes other part of element-hq/element-web#5936