From 0164c1b1f19f0d441603a63df1d32bab73b8610c Mon Sep 17 00:00:00 2001
From: harshil Sharma <harshilsharma63@gmail.com>
Date: Tue, 14 Nov 2023 15:33:19 +0530
Subject: [PATCH] Review fixes

---
 .../channel_name_input.tsx                    |  5 ++-
 .../convert_gm_to_channel.tsx                 |  4 ---
 assets/base/i18n/en.json                      | 31 ++++++++++---------
 3 files changed, 18 insertions(+), 22 deletions(-)

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 bb3258263..fb159819d 100644
--- a/app/screens/convert_gm_to_channel/channel_name_input.tsx
+++ b/app/screens/convert_gm_to_channel/channel_name_input.tsx
@@ -7,7 +7,6 @@ import {useIntl} from 'react-intl';
 import FloatingTextInput from '@components/floating_text_input_label';
 import {Channel} from '@constants';
 import {useTheme} from '@context/theme';
-import {t} from '@i18n';
 import {getKeyboardAppearanceFromTheme} from '@utils/theme';
 
 type Props = {
@@ -19,8 +18,8 @@ export const ChannelNameInput = ({error, onChange}: Props) => {
     const {formatMessage} = useIntl();
     const theme = useTheme();
 
-    const labelDisplayName = formatMessage({id: t('channel_modal.name'), defaultMessage: 'Name'});
-    const placeholder = formatMessage({id: t('"channel_modal.name": "Name",'), defaultMessage: 'Channel Name'});
+    const labelDisplayName = formatMessage({id: 'channel_modal.name', defaultMessage: 'Name'});
+    const placeholder = formatMessage({id: 'channel_modal.name', defaultMessage: 'Channel Name'});
 
     return (
         <FloatingTextInput
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 065f1901d..3b24bfd4c 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
@@ -14,10 +14,6 @@ import {useServerUrl} from '@context/server';
 
 import ConvertGMToChannelForm from './convert_gm_to_channel_form';
 
-// import {Loader} from './loader';
-
-import type UserProfile from '../user_profile/user_profile';
-
 type Props = {
     channelId: string;
     currentUserId?: string;
diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json
index 12b5bb4a8..f7c88f508 100644
--- a/assets/base/i18n/en.json
+++ b/assets/base/i18n/en.json
@@ -1,4 +1,5 @@
 {
+  "\"channel_modal.name\": \"Name\",": "",
   "about.date": "Build Date:",
   "about.enterpriseEditione1": "Enterprise Edition",
   "about.enterpriseEditionLearn": "Learn more about Enterprise Edition at ",
@@ -119,6 +120,17 @@
   "channel_info.close_gm": "Close group message",
   "channel_info.close_gm_channel": "Are you sure you want to close this group message? This will remove it from your home screen, but you can always open it again.",
   "channel_info.convert_failed": "We were unable to convert {displayName} to a private channel.",
+  "channel_info.convert_gm_to_channel": "Convert to a Private Channel",
+  "channel_info.convert_gm_to_channel.button_text": "Convert to Private Channel",
+  "channel_info.convert_gm_to_channel.conversion_error": "Something went wrong. Failed to convert Group Message to Private Channel.",
+  "channel_info.convert_gm_to_channel.loading.footer": "Fetching details...",
+  "channel_info.convert_gm_to_channel.screen_title": "Convert to Private Channel",
+  "channel_info.convert_gm_to_channel.team_selector_list.title": "Select Team",
+  "channel_info.convert_gm_to_channel.warning.body.yourself": "yourself",
+  "channel_info.convert_gm_to_channel.warning.bodyXXXX": "You are about to convert the Group Message with {memberNames} to a Channel. This cannot be undone.",
+  "channel_info.convert_gm_to_channel.warning.header": "Conversation history will be visible to any channel members",
+  "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.no_teams.header": "Unable to convert to a channel because group members are part of different teams",
   "channel_info.convert_private": "Convert to private channel",
   "channel_info.convert_private_description": "When you convert {displayName} to a private channel, history and membership are preserved. Publicly shared files remain accessible to anyone with the link. Membership in a private channel is by invitation only.\n\nThe change is permanent and cannot be undone.\n\nAre you sure you want to convert {displayName} to a private channel?",
   "channel_info.convert_private_success": "{displayName} is now a private channel.",
@@ -158,6 +170,8 @@
   "channel_info.unarchive_description": "Are you sure you want to unarchive the {term} {name}?",
   "channel_info.unarchive_failed": "An error occurred trying to unarchive the channel {displayName}",
   "channel_info.unarchive_title": "Unarchive {term}",
+  "channel_into.convert_gm_to_channel.team_selector.label": "Team",
+  "channel_into.convert_gm_to_channel.team_selector.placeholder": "Select a Team",
   "channel_intro.createdBy": "Created by {user} on {date}",
   "channel_intro.createdOn": "Created on {date}",
   "channel_list.channels_category": "Channels",
@@ -320,6 +334,7 @@
   "general_settings.help": "Help",
   "general_settings.notifications": "Notifications",
   "general_settings.report_problem": "Report a problem",
+  "generic.back": "Back",
   "get_post_link_modal.title": "Copy Link",
   "global_threads.allThreads": "All Your Threads",
   "global_threads.emptyThreads.message": "Any threads you are mentioned in or have participated in will show here along with any threads you have followed.",
@@ -1088,19 +1103,5 @@
   "video.download": "Download video",
   "video.download_description": "This video must be downloaded to play it.",
   "video.failed_description": "An error occurred while trying to play the video.",
-  "your.servers": "Your servers",
-  "channel_info.convert_gm_to_channel": "Convert to a Private Channel",
-  "channel_info.convert_gm_to_channel.screen_title": "Convert to 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.conversion_error": "Something went wrong. Failed to convert Group Message to Private Channel.",
-  "channel_info.convert_gm_to_channel.team_selector_list.title": "Select Team",
-  "channel_info.convert_gm_to_channel.loading.footer": "Fetching details...",
-  "generic.back": "Back"
+  "your.servers": "Your servers"
 }