Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
6e5ae0c664
|
@ -318,7 +318,10 @@ module.exports = React.createClass({
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.props.groupId) {
|
if (this.props.groupId) {
|
||||||
inviteGroup = this.state.phase === this.Phase.GroupMemberList ? (
|
inviteGroup = [
|
||||||
|
this.Phase.GroupMemberInfo,
|
||||||
|
this.Phase.GroupMemberList,
|
||||||
|
].includes(this.state.phase) ? (
|
||||||
<AccessibleButton className="mx_RightPanel_invite" onClick={ this.onInviteButtonClick } >
|
<AccessibleButton className="mx_RightPanel_invite" onClick={ this.onInviteButtonClick } >
|
||||||
<div className="mx_RightPanel_icon" >
|
<div className="mx_RightPanel_icon" >
|
||||||
<TintableSvg src="img/icon-invite-people.svg" width="35" height="35" />
|
<TintableSvg src="img/icon-invite-people.svg" width="35" height="35" />
|
||||||
|
|
Loading…
Reference in New Issue