From c872f7ca8d15070fb3fa8403046a810363eadca2 Mon Sep 17 00:00:00 2001
From: Jason Frerich <jason.frerich@mattermost.com>
Date: Tue, 27 Dec 2022 07:21:35 -0600
Subject: [PATCH] remove AddMembers and ManageMembers instances until PRs are
 merged (#6831)

---
 app/components/channel_actions/channel_actions.tsx          | 5 ++++-
 .../channel/channel_post_list/intro/options/index.tsx       | 6 ++++--
 app/screens/channel_info/options/index.tsx                  | 5 ++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/components/channel_actions/channel_actions.tsx b/app/components/channel_actions/channel_actions.tsx
index 16c31f576a..33af421f79 100644
--- a/app/components/channel_actions/channel_actions.tsx
+++ b/app/components/channel_actions/channel_actions.tsx
@@ -5,7 +5,6 @@ import React, {useCallback} from 'react';
 import {StyleSheet, View} from 'react-native';
 
 import ChannelInfoStartButton from '@calls/components/channel_info_start';
-import AddPeopleBox from '@components/channel_actions/add_people_box';
 import CopyChannelLinkBox from '@components/channel_actions/copy_channel_link_box';
 import FavoriteBox from '@components/channel_actions/favorite_box';
 import MutedBox from '@components/channel_actions/mute_box';
@@ -14,6 +13,8 @@ import {useServerUrl} from '@context/server';
 import {dismissBottomSheet} from '@screens/navigation';
 import {isTypeDMorGM} from '@utils/channel';
 
+// import AddPeopleBox from '@components/channel_actions/add_people_box';
+
 type Props = {
     channelId: string;
     channelType?: ChannelType;
@@ -69,6 +70,7 @@ const ChannelActions = ({channelId, channelType, inModal = false, dismissChannel
                     testID={`${testID}.set_header.action`}
                 />
             }
+            {/* Add back in after MM-47655 is resolved. https://mattermost.atlassian.net/browse/MM-47655
             {!isDM &&
                 <AddPeopleBox
                     channelId={channelId}
@@ -76,6 +78,7 @@ const ChannelActions = ({channelId, channelType, inModal = false, dismissChannel
                     testID={`${testID}.add_people.action`}
                 />
             }
+            */}
             {!isDM && !callsEnabled &&
                 <>
                     <View style={styles.separator}/>
diff --git a/app/screens/channel/channel_post_list/intro/options/index.tsx b/app/screens/channel/channel_post_list/intro/options/index.tsx
index 2d848eba1f..0e96eea36e 100644
--- a/app/screens/channel/channel_post_list/intro/options/index.tsx
+++ b/app/screens/channel/channel_post_list/intro/options/index.tsx
@@ -4,7 +4,7 @@
 import React from 'react';
 import {StyleSheet, View} from 'react-native';
 
-import AddPeopleBox from '@components/channel_actions/add_people_box';
+// import AddPeopleBox from '@components/channel_actions/add_people_box';
 import FavoriteBox from '@components/channel_actions/favorite_box';
 import InfoBox from '@components/channel_actions/info_box';
 import SetHeaderBox from '@components/channel_actions/set_header_box';
@@ -39,9 +39,10 @@ const styles = StyleSheet.create({
     },
 });
 
-const IntroOptions = ({channelId, header, favorite, people}: Props) => {
+const IntroOptions = ({channelId, header, favorite}: Props) => {
     return (
         <View style={styles.container}>
+            {/* Add back in after MM-47655 is resolved. https://mattermost.atlassian.net/browse/MM-47655
             {people &&
             <AddPeopleBox
                 channelId={channelId}
@@ -49,6 +50,7 @@ const IntroOptions = ({channelId, header, favorite, people}: Props) => {
                 testID='channel_post_list.intro_options.add_people.action'
             />
             }
+            */}
             {header &&
             <SetHeaderBox
                 channelId={channelId}
diff --git a/app/screens/channel_info/options/index.tsx b/app/screens/channel_info/options/index.tsx
index d2c856ec6f..ef47a4d7ef 100644
--- a/app/screens/channel_info/options/index.tsx
+++ b/app/screens/channel_info/options/index.tsx
@@ -9,9 +9,10 @@ import {isTypeDMorGM} from '@utils/channel';
 
 import EditChannel from './edit_channel';
 import IgnoreMentions from './ignore_mentions';
-import Members from './members';
 import PinnedMessages from './pinned_messages';
 
+// import Members from './members';
+
 type Props = {
     channelId: string;
     type?: ChannelType;
@@ -28,9 +29,11 @@ const Options = ({channelId, type, callsEnabled}: Props) => {
             }
             {/*<NotificationPreference channelId={channelId}/>*/}
             <PinnedMessages channelId={channelId}/>
+            {/* Add back in after MM-47653 is resolved. https://mattermost.atlassian.net/browse/MM-47653
             {type !== General.DM_CHANNEL &&
                 <Members channelId={channelId}/>
             }
+            */}
             {callsEnabled && !isDMorGM && // if calls is not enabled, copy link will show in the channel actions
                 <CopyChannelLinkOption
                     channelId={channelId}