Merge branch 'develop' into luke/fix-privileged-group-ui-1

2017-10-24 11:09:05 +01:00 · 2017-10-24 11:09:05 +01:00 · 6a0ecfba7f
parent f1a700ef99 ff5fbd4863
commit 6a0ecfba7f
1 changed files with 4 additions and 1 deletions
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@ -325,7 +325,10 @@ module.exports = React.createClass({
        if (this.props.groupId &&
            GroupStoreCache.getGroupStore(this.context.matrixClient, this.props.groupId).isUserPrivileged()
        ) {
-            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" />