post-merge fix

This commit is contained in:
Michael Telatynski 2020-01-24 16:41:43 +00:00
parent 342fcb09c4
commit b67256c7c2
2 changed files with 29 additions and 5 deletions

View file

@ -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} />;