From 6752d84b21ff34e4dccaf64f82349f20c7854c99 Mon Sep 17 00:00:00 2001
From: harshil Sharma <harshilsharma63@gmail.com>
Date: Fri, 27 Oct 2023 16:32:20 +0530
Subject: [PATCH] Handled case of no common team

---
 .../channel_name_input.tsx                    |  9 ++-
 .../convert_gm_to_channel.tsx                 |  3 +-
 .../convert_gm_to_channel_form.tsx            | 79 -------------------
 .../convert_gm_to_channel/team_selector.tsx   |  5 +-
 assets/base/i18n/en.json                      |  5 +-
 5 files changed, 16 insertions(+), 85 deletions(-)
 delete mode 100644 app/screens/convert_gm_to_channel/convert_gm_to_channel_form.tsx

diff --git a/app/screens/convert_gm_to_channel/channel_name_input.tsx b/app/screens/convert_gm_to_channel/channel_name_input.tsx
index 18a067b88..8d4a04bd4 100644
--- a/app/screens/convert_gm_to_channel/channel_name_input.tsx
+++ b/app/screens/convert_gm_to_channel/channel_name_input.tsx
@@ -10,7 +10,11 @@ import {useTheme} from '@app/context/theme';
 import {t} from '@app/i18n';
 import {getKeyboardAppearanceFromTheme} from '@app/utils/theme';
 
-export const ChannelNameInput = () => {
+type Props = {
+    error?: string;
+}
+
+export const ChannelNameInput = ({error}: Props) => {
     const {formatMessage} = useIntl();
     const theme = useTheme();
 
@@ -29,10 +33,11 @@ export const ChannelNameInput = () => {
             maxLength={Channel.MAX_CHANNEL_NAME_LENGTH}
             keyboardAppearance={getKeyboardAppearanceFromTheme(theme)}
             returnKeyType='next'
-            showErrorIcon={false}
+            showErrorIcon={true}
             spellCheck={false}
             testID='gonvert_gm_to_channel.channel_display_name.input'
             theme={theme}
+            error={error}
         />
     );
 };
diff --git a/app/screens/convert_gm_to_channel/convert_gm_to_channel.tsx b/app/screens/convert_gm_to_channel/convert_gm_to_channel.tsx
index 3d8680051..184bd6b9a 100644
--- a/app/screens/convert_gm_to_channel/convert_gm_to_channel.tsx
+++ b/app/screens/convert_gm_to_channel/convert_gm_to_channel.tsx
@@ -7,8 +7,9 @@ import {fetchChannelMemberships, getGroupMessageMembersCommonTeams} from '@actio
 import {PER_PAGE_DEFAULT} from '@app/client/rest/constants';
 import {useServerUrl} from '@app/context/server';
 
-import {ConvertGMToChannelForm} from './convert_gm_to_channel_form';
+import {ConvertGMToChannelForm} from './convert_gm_to_channel_form/convert_gm_to_channel_form';
 import {Loader} from './loader';
+import { logDebug } from '@app/utils/log';
 
 type Props = {
     channelId: string;
diff --git a/app/screens/convert_gm_to_channel/convert_gm_to_channel_form.tsx b/app/screens/convert_gm_to_channel/convert_gm_to_channel_form.tsx
deleted file mode 100644
index 2d1c3c3a6..000000000
--- a/app/screens/convert_gm_to_channel/convert_gm_to_channel_form.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-import React, { useCallback, useEffect, useRef, useState } from 'react';
-import {useIntl} from 'react-intl';
-import {View} from 'react-native';
-
-import {useTheme} from '@app/context/theme';
-import {makeStyleSheetFromTheme} from '@app/utils/theme';
-import Button from '@components/button';
-
-import {ChannelNameInput} from './channel_name_input';
-import MessageBox from './message_box';
-import {TeamSelector} from './team_selector';
-import { logDebug } from '@app/utils/log';
-
-const getStyleFromTheme = makeStyleSheetFromTheme((theme: Theme) => {
-    return {
-        container: {
-            paddingVertical: 24,
-            paddingHorizontal: 20,
-            display: 'flex',
-            flexDirection: 'column',
-            gap: 24,
-        },
-    };
-});
-
-type Props = {
-    commonTeams: Team[];
-    profiles: UserProfile[];
-}
-
-export const ConvertGMToChannelForm = ({commonTeams, profiles}: Props) => {
-    const theme = useTheme();
-    const styles = getStyleFromTheme(theme);
-
-    const team = useRef<Team>();
-
-    const {formatMessage} = useIntl();
-    const confirmButtonText = formatMessage({
-        id: 'channel_info.convert_gm_to_channel.button_text',
-        defaultMessage: 'Convert to Private Channel',
-    });
-
-    useEffect(() => {
-        if (commonTeams.length === 1) {
-            team.current = commonTeams[0];
-        }
-    }, [commonTeams]);
-
-    const handleOnSelectTeam = useCallback((selectedTeam: Team) => {
-        team.current = selectedTeam;
-    }, []);
-
-    return (
-        <View style={styles.container}>
-            <MessageBox
-                profiles={profiles}
-            />
-            {
-                commonTeams.length > 1 &&
-                <TeamSelector
-                    commonTeams={commonTeams}
-                    onSelectTeam={handleOnSelectTeam}
-                />
-            }
-            <ChannelNameInput/>
-            <Button
-                onPress={() => logDebug(`Selected team: ${team.current?.display_name}`)}
-                text={confirmButtonText}
-                theme={theme}
-                buttonType='destructive'
-                emphasis='primary'
-                size='lg'
-            />
-        </View>
-    );
-};
diff --git a/app/screens/convert_gm_to_channel/team_selector.tsx b/app/screens/convert_gm_to_channel/team_selector.tsx
index a660fe471..71ff7006f 100644
--- a/app/screens/convert_gm_to_channel/team_selector.tsx
+++ b/app/screens/convert_gm_to_channel/team_selector.tsx
@@ -25,9 +25,10 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme: Theme) => {
 type Props = {
     commonTeams: Team[];
     onSelectTeam: (team: Team) => void;
+    selectedTeamId?: string;
 }
 
-export const TeamSelector = ({commonTeams, onSelectTeam}: Props) => {
+export const TeamSelector = ({commonTeams, onSelectTeam, selectedTeamId}: Props) => {
     const {formatMessage} = useIntl();
     const theme = useTheme();
     const styles = getStyleFromTheme(theme);
@@ -49,7 +50,7 @@ export const TeamSelector = ({commonTeams, onSelectTeam}: Props) => {
         await dismissBottomSheet();
 
         const title = formatMessage({id: 'channel_info.convert_gm_to_channel.team_selector_list.title', defaultMessage: 'Select Team'});
-        goToScreen(Screens.TEAM_SELECTOR_LIST, title, {teams: commonTeams, selectTeam});
+        goToScreen(Screens.TEAM_SELECTOR_LIST, title, {teams: commonTeams, selectTeam, selectedTeamId});
     });
 
     return (
diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json
index 6554aa057..9434c16b5 100644
--- a/assets/base/i18n/en.json
+++ b/assets/base/i18n/en.json
@@ -1090,9 +1090,12 @@
   "channel_info.convert_gm_to_channel": "Convert to a Private Channel",
   "channel_info.convert_gm_to_channel.warning.header": "Conversation history will be visible to any channel members",
   "channel_info.convert_gm_to_channel.warning.body": "You are about to convert the Group Message with {memberNames} to a Channel. This cannot be undone.",
+  "channel_info.convert_gm_to_channel.warning.no_teams.header": "Unable to convert to a channel because group members are part of different teams",
+  "channel_info.convert_gm_to_channel.warning.no_teams.body": "Group Message cannot be converted to a channel because members are not a part of the same team. Add all members to a single team to convert this group message to a channel.",
   "channel_info.convert_gm_to_channel.warning.body.yourself": "yourself",
   "channel_into.convert_gm_to_channel.team_selector.label": "Team",
   "channel_into.convert_gm_to_channel.team_selector.placeholder": "Select a Team",
   "channel_info.convert_gm_to_channel.button_text": "Convert to Private Channel",
-  "channel_info.convert_gm_to_channel.team_selector_list.title": "Select Team"
+  "channel_info.convert_gm_to_channel.team_selector_list.title": "Select Team",
+  "generic.back": "Back"
 }