SW/mattermost-mobile
2
0
Fork 0
forked from Ivasoft/mattermost-mobile
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove AddMembers and ManageMembers instances until PRs are merged (#6831)

Browse Source
This commit is contained in:
Jason Frerich
2022-12-27 07:21:35 -06:00
committed by GitHub
parent 471e7ff182
commit c872f7ca8d
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/components/channel_actions/channel_actions.tsx
View File

@@ -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}/>

6
app/screens/channel/channel_post_list/intro/options/index.tsx
View File

@@ -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}

5
app/screens/channel_info/options/index.tsx
View File

@@ -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}