From a5f10c7137414b1ea13d051f560a6718a97b034a Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Fri, 21 Jul 2017 18:29:08 -0400 Subject: [PATCH] PLT-244/PLT-277 Made Delete Channel visibility always depend on policy setting (#771) * PLT-274 Fixed navigator not being passed into ChannelInfo Markdown * PLT-244/PLT-277 Changed Delete Channel visibility to always be based on policy settings --- app/screens/channel_info/channel_info.js | 4 +++- app/screens/channel_info/channel_info_header.js | 16 +++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app/screens/channel_info/channel_info.js b/app/screens/channel_info/channel_info.js index 26e572848..eccd69a52 100644 --- a/app/screens/channel_info/channel_info.js +++ b/app/screens/channel_info/channel_info.js @@ -233,6 +233,7 @@ class ChannelInfo extends PureComponent { currentChannelCreatorName, currentChannelMemberCount, canManageUsers, + navigator, status, theme } = this.props; @@ -264,6 +265,7 @@ class ChannelInfo extends PureComponent { creator={currentChannelCreatorName} displayName={currentChannel.display_name} header={currentChannel.header} + navigator={navigator} purpose={currentChannel.purpose} status={status} theme={theme} @@ -318,7 +320,7 @@ class ChannelInfo extends PureComponent { /> } - {this.renderLeaveOrDeleteChannelRow() && currentChannelMemberCount > 1 && + {this.renderLeaveOrDeleteChannelRow() &&