You've already forked matrix-react-sdk
mirror of
https://github.com/matrix-org/matrix-react-sdk.git
synced 2025-11-04 11:51:45 +03:00
post-merge fix
This commit is contained in:
@@ -196,7 +196,7 @@ export default class RightPanel extends React.Component {
|
||||
});
|
||||
};
|
||||
panel = <UserInfo
|
||||
userId={this.state.member}
|
||||
user={this.state.member}
|
||||
roomId={this.props.roomId}
|
||||
key={this.props.roomId || this.state.member.userId}
|
||||
onClose={onClose}
|
||||
@@ -217,7 +217,7 @@ export default class RightPanel extends React.Component {
|
||||
});
|
||||
};
|
||||
panel = <UserInfo
|
||||
userId={this.state.member}
|
||||
user={this.state.member}
|
||||
groupId={this.props.groupId}
|
||||
key={this.state.member.userId}
|
||||
onClose={onClose} />;
|
||||
|
||||
Reference in New Issue
Block a user