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

Room header & message box shields now reflect cross-signing state #3850

Merged
merged 7 commits into from
Jan 17, 2020

Conversation

foldleft
Copy link
Contributor

@foldleft foldleft commented Jan 16, 2020

If the user has cross-signing enabled, the room header and input field shields now represent encryption state slightly differently:

  1. If any users do not trust their devices via cross-signing, warn (a red shield with exclamation point)
  2. If we have verified no users, show "normal" state (a black shield)
  3. If we have verified all users, show "verified" state (a green shield with tick)
  4. If we have verified some, but not all users, show "warn" state.

This addresses part, but not all, of element-hq/element-web#11225

Screenshot 2020-01-17 at 10 24 18

---

Screenshot 2020-01-17 at 10 24 42

---

Screenshot 2020-01-17 at 10 26 46

---

Screenshot 2020-01-17 at 10 26 53

---

Screenshot 2020-01-17 at 10 27 28

---

Screenshot 2020-01-17 at 10 27 38

@foldleft foldleft requested a review from a team January 16, 2020 11:15
@jryans
Copy link
Collaborator

jryans commented Jan 16, 2020

@foldleft, please add pictures in the PR body above 😄

src/components/structures/RoomView.js Show resolved Hide resolved
src/components/structures/RoomView.js Outdated Show resolved Hide resolved
src/components/structures/RoomView.js Outdated Show resolved Hide resolved
@foldleft foldleft requested a review from dbkr January 16, 2020 17:24
src/components/structures/RoomView.js Outdated Show resolved Hide resolved
src/components/structures/RoomView.js Outdated Show resolved Hide resolved
@foldleft foldleft requested a review from dbkr January 17, 2020 10:04
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.

just one last thing :)

src/components/structures/RoomView.js Outdated Show resolved Hide resolved
@foldleft foldleft requested a review from dbkr January 17, 2020 11:31
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.

Thanks!

@foldleft foldleft merged commit 264ca1e into develop Jan 17, 2020
@foldleft foldleft deleted the zip/11225-shields-distinguish-encrypt-from-verify branch January 17, 2020 13:50
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.

3 participants