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

Padlock icons in room header #3835

Merged
merged 5 commits into from
Jan 14, 2020
Merged

Padlock icons in room header #3835

merged 5 commits into from
Jan 14, 2020

Conversation

foldleft
Copy link
Contributor

@foldleft foldleft commented Jan 13, 2020

Fixes element-hq/element-web#11832

Encrypted, locked: Screenshot 2020-01-13 at 14 48 43
Unencrypted, locked: Screenshot 2020-01-13 at 15 04 37
Public room: Screenshot 2020-01-13 at 14 48 55

@jryans
Copy link
Collaborator

jryans commented Jan 13, 2020

@foldleft, since this is a UI change, it would be great to include a screenshot in the PR body. Then we can also get @nadonomy to review it from a design perspective.

@foldleft
Copy link
Contributor Author

@foldleft, since this is a UI change, it would be great to include a screenshot in the PR body. Then we can also get @nadonomy to review it from a design perspective.

oops, I totally took some

@foldleft foldleft requested a review from t3chguy January 13, 2020 15:11
@jryans jryans requested a review from nadonomy January 13, 2020 15:19
@jryans
Copy link
Collaborator

jryans commented Jan 13, 2020

oops, I totally took some

Great, I added @nadonomy as an extra reviewer for the design side.

Copy link
Member

@t3chguy t3chguy left a comment

Choose a reason for hiding this comment

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

Code-wise LGTM, deferring to Nad for design review

@foldleft foldleft requested a review from t3chguy January 14, 2020 10:52
@jryans
Copy link
Collaborator

jryans commented Jan 14, 2020

According to our new process experiment discussed yesterday, now that it's guarded by a labs flag, we have the option of skipping design review on the PR. (I'll leave it to @foldleft to decide whether to wait for it or not.)

@nadonomy
Copy link
Contributor

Is it guarded by the same labs flag as the general cross-signing one? If so then I don't see a problem with merging.

When we move cross-signing from /develop to production we'll be doing rounds of small visual polish and there'll be opportunity to action the required polish then.

@jryans
Copy link
Collaborator

jryans commented Jan 14, 2020

Is it guarded by the same labs flag as the general cross-signing one? If so then I don't see a problem with merging.

Yes, this and anything cross-signing related are all using a single labs flag. (The only outlier is the shield in the room header which already shipped for all in December, but going forward at least, all should be guarded.)

@foldleft foldleft merged commit 1fd1e4b into develop Jan 14, 2020
@foldleft foldleft deleted the zip/11832-more-padlock-icons branch January 14, 2020 14:15
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.

Private room icon should also appear in room header
4 participants