From 53522e23716c546ee80bae39f90fc3410dcdc2fc Mon Sep 17 00:00:00 2001
From: Rita Anene <92169163+Camillarhi@users.noreply.github.com>
Date: Fri, 18 Oct 2024 16:22:12 +0100
Subject: [PATCH] [MM-60811] Replace FormattedMarkdownMessage in
 'webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_profile.tsx'
 with FormattedMessage (#28610)

* Fix: Replace FormattedMarkdownMessage in file

* fix: update snapshot

* Fix: wrap Formated message in b tag

* Fix: wrap Formated message in b tag

* Fix: Fix Linting in file

* Fix: update snapshot

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 .../channel_profile.test.tsx.snap             | 50 +++++++++++--------
 .../channel/details/channel_profile.tsx       | 31 +++++++-----
 webapp/channels/src/i18n/en.json              |  6 +--
 3 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/__snapshots__/channel_profile.test.tsx.snap b/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/__snapshots__/channel_profile.test.tsx.snap
index 4f5f18ebc9..1b50f86597 100644
--- a/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/__snapshots__/channel_profile.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/__snapshots__/channel_profile.test.tsx.snap
@@ -25,20 +25,24 @@ exports[`admin_console/team_channel_settings/channel/ChannelProfile should match
       <div
         className="channel-name"
       >
-        <FormattedMarkdownMessage
-          defaultMessage="**Name**"
-          id="admin.channel_settings.channel_detail.channelName"
-        />
+        <b>
+          <MemoizedFormattedMessage
+            defaultMessage="Name"
+            id="admin.channelSettings.channelDetail.channelName"
+          />
+        </b>
         <br />
         test
       </div>
       <div
         className="channel-team"
       >
-        <FormattedMarkdownMessage
-          defaultMessage="**Team**"
-          id="admin.channel_settings.channel_detail.channelTeam"
-        />
+        <b>
+          <MemoizedFormattedMessage
+            defaultMessage="Team"
+            id="admin.channelSettings.channelDetail.channelTeam"
+          />
+        </b>
         <br />
         test
       </div>
@@ -88,30 +92,36 @@ exports[`admin_console/team_channel_settings/channel/ChannelProfile should match
       <div
         className="channel-name"
       >
-        <FormattedMarkdownMessage
-          defaultMessage="**Name**"
-          id="admin.channel_settings.channel_detail.channelName"
-        />
+        <b>
+          <MemoizedFormattedMessage
+            defaultMessage="Name"
+            id="admin.channelSettings.channelDetail.channelName"
+          />
+        </b>
         <br />
         test
       </div>
       <div
         className="channel-team"
       >
-        <FormattedMarkdownMessage
-          defaultMessage="**Team**"
-          id="admin.channel_settings.channel_detail.channelTeam"
-        />
+        <b>
+          <MemoizedFormattedMessage
+            defaultMessage="Team"
+            id="admin.channelSettings.channelDetail.channelTeam"
+          />
+        </b>
         <br />
         test
       </div>
       <div
         className="channel-organizations"
       >
-        <FormattedMarkdownMessage
-          defaultMessage="**Organizations**"
-          id="admin.channel_settings.channel_detail.channelOrganizations"
-        />
+        <b>
+          <MemoizedFormattedMessage
+            defaultMessage="Organizations"
+            id="admin.channelSettings.channelDetail.channel_organizations"
+          />
+        </b>
         <br />
         <SharedChannelIndicator
           className="shared-channel-icon"
diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_profile.tsx b/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_profile.tsx
index 6677195e00..957ce4dfe2 100644
--- a/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_profile.tsx
+++ b/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_profile.tsx
@@ -8,7 +8,6 @@ import {FormattedMessage, defineMessage} from 'react-intl';
 import type {Channel} from '@mattermost/types/channels';
 import type {Team} from '@mattermost/types/teams';
 
-import FormattedMarkdownMessage from 'components/formatted_markdown_message';
 import SharedChannelIndicator from 'components/shared_channel_indicator';
 import AdminPanel from 'components/widgets/admin_console/admin_panel';
 
@@ -32,10 +31,12 @@ export const ChannelProfile = (props: ChannelProfileProps): JSX.Element => {
     if (channel.shared && channel.type) {
         sharedBlock = (
             <div className='channel-organizations'>
-                <FormattedMarkdownMessage
-                    id='admin.channel_settings.channel_detail.channelOrganizations'
-                    defaultMessage='**Organizations**'
-                />
+                <b>
+                    <FormattedMessage
+                        id='admin.channelSettings.channelDetail.channel_organizations'
+                        defaultMessage='Organizations'
+                    />
+                </b>
                 <br/>
                 <SharedChannelIndicator
                     className='shared-channel-icon'
@@ -57,18 +58,22 @@ export const ChannelProfile = (props: ChannelProfileProps): JSX.Element => {
             <div className='group-teams-and-channels AdminChannelDetails'>
                 <div className='group-teams-and-channels--body channel-desc-col'>
                     <div className='channel-name'>
-                        <FormattedMarkdownMessage
-                            id='admin.channel_settings.channel_detail.channelName'
-                            defaultMessage='**Name**'
-                        />
+                        <b>
+                            <FormattedMessage
+                                id='admin.channelSettings.channelDetail.channelName'
+                                defaultMessage='Name'
+                            />
+                        </b>
                         <br/>
                         {channel.display_name}
                     </div>
                     <div className='channel-team'>
-                        <FormattedMarkdownMessage
-                            id='admin.channel_settings.channel_detail.channelTeam'
-                            defaultMessage='**Team**'
-                        />
+                        <b>
+                            <FormattedMessage
+                                id='admin.channelSettings.channelDetail.channelTeam'
+                                defaultMessage='Team'
+                            />
+                        </b>
                         <br/>
                         {team?.display_name}
                     </div>
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index a698a867f6..369e491ca4 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -440,10 +440,7 @@
   "admin.channel_settings.channel_detail.archive_confirm.message": "Saving will archive the channel from the team and make it's contents inaccessible for all users. Are you sure you wish to save and archive this channel?",
   "admin.channel_settings.channel_detail.archive_confirm.title": "Save and Archive Channel",
   "admin.channel_settings.channel_detail.channel_configuration": "Channel Configuration",
-  "admin.channel_settings.channel_detail.channelName": "**Name**",
-  "admin.channel_settings.channel_detail.channelOrganizations": "**Organizations**",
   "admin.channel_settings.channel_detail.channelOrganizationsMessage": "Shared with trusted organizations",
-  "admin.channel_settings.channel_detail.channelTeam": "**Team**",
   "admin.channel_settings.channel_detail.groupsDescription": "Select groups to be added to this channel.",
   "admin.channel_settings.channel_detail.groupsTitle": "Groups",
   "admin.channel_settings.channel_detail.manageDescription": "Choose between inviting members manually or syncing members automatically from groups.",
@@ -514,6 +511,9 @@
   "admin.channels.filterBy.team.loading": "Loading teams",
   "admin.channels.filterBy.team.noTeams": "No teams found",
   "admin.channels.filterBy.team.placeholder": "Search and select teams",
+  "admin.channelSettings.channelDetail.channel_organizations": "Organizations",
+  "admin.channelSettings.channelDetail.channelName": "Name",
+  "admin.channelSettings.channelDetail.channelTeam": "Team",
   "admin.cluster.ClusterName": "Cluster Name:",
   "admin.cluster.ClusterNameDesc": "The cluster to join by name. Only nodes with the same cluster name will join together.  This is to support Blue-Green deployments or staging pointing to the same database.",
   "admin.cluster.ClusterNameEx": "E.g.: \"Production\" or \"Staging\"",