imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3835 from matrix-org/zip/11832-more-padlock-icons

Browse source 
Padlock icons in room header (behind feature_cross_signing)
This commit is contained in:
Zoe 2020-01-14 14:15:46 +00:00 • committed by GitHub
commit 1fd1e4b953
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/views/rooms/RoomHeader.js
View file

@ -159,6 +159,14 @@ module.exports = createReactClass({
<E2EIcon status={this.props.e2eStatus} /> :
undefined;
const joinRules = this.props.room && this.props.room.currentState.getStateEvents("m.room.join_rules", "");
const joinRule = joinRules && joinRules.getContent().join_rule;
const joinRuleClass = classNames("mx_RoomHeader_PrivateIcon",
{"mx_RoomHeader_isPrivate": joinRule === "invite"});
const privateIcon = SettingsStore.isFeatureEnabled("feature_cross_signing") ?
<div className={joinRuleClass} /> :
undefined;
if (this.props.onCancelClick) {
cancelButton = <CancelButton onClick={this.props.onCancelClick} />;
}
@ -303,6 +311,7 @@ module.exports = createReactClass({
<div className="mx_RoomHeader_wrapper">
<div className="mx_RoomHeader_avatar">{ roomAvatar }</div>
{ e2eIcon }
{ privateIcon }
{ name }
{ topicElement }
{ cancelButton }