matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-11-29 21:23:11 +03:00
Code Activity

Merge branch 'develop' into revert-6752-revert-6682-gsouquet/compact-composer-18533

Browse Source
This commit is contained in:
Germain Souquet
2021-09-09 13:30:35 +01:00
parent aa53444267 e5bd863054
commit 07ebd85f7e
26 changed files with 302 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/RightPanel.tsx
View File

@@ -271,7 +271,7 @@ export default class RightPanel extends React.Component<IProps, IState> {
case RightPanelPhases.EncryptionPanel:
panel = <UserInfo
user={this.state.member}
room={this.state.phase === RightPanelPhases.SpaceMemberInfo ? this.state.space : this.props.room}
room={this.context.getRoom(this.state.member.roomId) ?? this.props.room}
key={roomId || this.state.member.userId}
onClose={this.onClose}
phase={this.state.phase}