diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx
index 36bcb559ab..addd147fdd 100644
--- a/webapp/components/channel_header.jsx
+++ b/webapp/components/channel_header.jsx
@@ -474,43 +474,23 @@ export default class ChannelHeader extends React.Component {
);
- if (isAdmin) {
- dropdownContents.push(
-
+ this.setState({showMembersModal: true})}
>
- this.setState({showMembersModal: true})}
- >
-
-
-
- );
- } else {
- dropdownContents.push(
-
- this.setState({showMembersModal: true})}
- >
-
-
-
- );
- }
+
+
+
+ );
}
dropdownContents.push(
@@ -687,7 +667,6 @@ export default class ChannelHeader extends React.Component {
onModalDismissed={() => this.setState({showMembersModal: false})}
showInviteModal={() => this.refs.channelInviteModalButton.show()}
channel={channel}
- isAdmin={isAdmin}
/>
);
}
diff --git a/webapp/components/channel_members_modal.jsx b/webapp/components/channel_members_modal.jsx
index b5ca024f24..3722195b9e 100644
--- a/webapp/components/channel_members_modal.jsx
+++ b/webapp/components/channel_members_modal.jsx
@@ -143,11 +143,6 @@ export default class ChannelMembersModal extends React.Component {
if (this.state.loading) {
content = ();
} else {
- let removeButton = null;
- if (this.props.isAdmin) {
- removeButton = [this.createRemoveMemberButton];
- }
-
content = (
);
@@ -205,6 +200,5 @@ export default class ChannelMembersModal extends React.Component {
ChannelMembersModal.propTypes = {
onModalDismissed: React.PropTypes.func.isRequired,
showInviteModal: React.PropTypes.func.isRequired,
- channel: React.PropTypes.object.isRequired,
- isAdmin: React.PropTypes.bool.isRequired
+ channel: React.PropTypes.object.isRequired
};