Commit ade41885 authored by Martin Kraft's avatar Martin Kraft

Merge branch 'release-5.7' of github.com:mattermost/mattermost-webapp into release-5.7

parents bdfee015 ccfbc661
......@@ -20,6 +20,7 @@ export default class MobileChannelHeaderDropdown extends React.PureComponent {
isFavorite: PropTypes.bool.isRequired,
isReadonly: PropTypes.bool.isRequired,
isArchived: PropTypes.bool.isRequired,
isMuted: PropTypes.bool.isRequired,
teammateId: PropTypes.string,
teammateStatus: PropTypes.string,
}
......@@ -52,6 +53,7 @@ export default class MobileChannelHeaderDropdown extends React.PureComponent {
isFavorite,
isReadonly,
isArchived,
isMuted,
} = this.props;
return (
......@@ -84,6 +86,12 @@ export default class MobileChannelHeaderDropdown extends React.PureComponent {
channel={channel}
isArchived={isArchived}
/>
<MenuItem.ToggleMuteChannel
user={user}
channel={channel}
isMuted={isMuted}
isArchived={isArchived}
/>
<MenuItem.AddMembers
channel={channel}
isDefault={isDefault}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment