Merge branch 'develop' of https://github.com/vector-im/element-web into t3chguy/fix/20721
This commit is contained in:
commit
1bee3becfb
69 changed files with 1357 additions and 599 deletions
|
@ -757,6 +757,14 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
|
|||
case EventShieldReason.MISMATCHED_SENDER_KEY:
|
||||
shieldReasonMessage = _t("encryption|event_shield_reason_mismatched_sender_key");
|
||||
break;
|
||||
|
||||
case EventShieldReason.SENT_IN_CLEAR:
|
||||
shieldReasonMessage = _t("common|unencrypted");
|
||||
break;
|
||||
|
||||
case EventShieldReason.VERIFICATION_VIOLATION:
|
||||
shieldReasonMessage = _t("timeline|decryption_failure|sender_identity_previously_verified");
|
||||
break;
|
||||
}
|
||||
|
||||
if (this.state.shieldColour === EventShieldColour.GREY) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue