Merge remote-tracking branch 'origin/develop' into develop

2017-10-24 10:03:49 +00:00 · 2017-10-24 10:03:49 +00:00 · 6e5ae0c664
commit 6e5ae0c664
parent d91c652590 ff5fbd4863
1 changed files with 4 additions and 1 deletions
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@ -318,7 +318,10 @@ module.exports = React.createClass({
        }

        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 } >
                    <div className="mx_RightPanel_icon" >
                        <TintableSvg src="img/icon-invite-people.svg" width="35" height="35" />