From 51ce9733e2439c1bf47585bc35d236e3fc657671 Mon Sep 17 00:00:00 2001
From: Rohan Sharma <117426013+RS-labhub@users.noreply.github.com>
Date: Wed, 9 Oct 2024 14:34:54 +0530
Subject: [PATCH] [MM-60789] Replace FormattedMarkdownMessage in
 'webapp/channels/src/components/channel_selector_modal/channel_selector_modal.tsx'
 with FormattedMessage (#28464)

---
 .../channel_selector_modal.test.tsx.snap      | 22 ++++++++++++++-----
 .../channel_selector_modal.tsx                | 10 +++++----
 webapp/channels/src/i18n/en.json              |  2 +-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/webapp/channels/src/components/channel_selector_modal/__snapshots__/channel_selector_modal.test.tsx.snap b/webapp/channels/src/components/channel_selector_modal/__snapshots__/channel_selector_modal.test.tsx.snap
index 6042c64cea..2bb2d4530e 100644
--- a/webapp/channels/src/components/channel_selector_modal/__snapshots__/channel_selector_modal.test.tsx.snap
+++ b/webapp/channels/src/components/channel_selector_modal/__snapshots__/channel_selector_modal.test.tsx.snap
@@ -40,9 +40,14 @@ exports[`components/ChannelSelectorModal exclude already selected 1`] = `
       componentClass="h1"
       id="channelSelectorModalLabel"
     >
-      <FormattedMarkdownMessage
-        defaultMessage="Add Channels to **Channel Selection** List"
-        id="add_channels_to_scheme.title"
+      <MemoizedFormattedMessage
+        defaultMessage="Add Channels to <b>Channel Selection</b> List"
+        id="channelSelectorModal.title"
+        values={
+          Object {
+            "b": [Function],
+          }
+        }
       />
     </ModalTitle>
   </ModalHeader>
@@ -190,9 +195,14 @@ exports[`components/ChannelSelectorModal should match snapshot 1`] = `
       componentClass="h1"
       id="channelSelectorModalLabel"
     >
-      <FormattedMarkdownMessage
-        defaultMessage="Add Channels to **Channel Selection** List"
-        id="add_channels_to_scheme.title"
+      <MemoizedFormattedMessage
+        defaultMessage="Add Channels to <b>Channel Selection</b> List"
+        id="channelSelectorModal.title"
+        values={
+          Object {
+            "b": [Function],
+          }
+        }
       />
     </ModalTitle>
   </ModalHeader>
diff --git a/webapp/channels/src/components/channel_selector_modal/channel_selector_modal.tsx b/webapp/channels/src/components/channel_selector_modal/channel_selector_modal.tsx
index b5ac59f5cd..0b3c8b89df 100644
--- a/webapp/channels/src/components/channel_selector_modal/channel_selector_modal.tsx
+++ b/webapp/channels/src/components/channel_selector_modal/channel_selector_modal.tsx
@@ -10,7 +10,6 @@ import type {Channel, ChannelSearchOpts, ChannelWithTeamData} from '@mattermost/
 
 import type {ActionResult} from 'mattermost-redux/types/actions';
 
-import FormattedMarkdownMessage from 'components/formatted_markdown_message';
 import MultiSelect from 'components/multiselect/multiselect';
 import type {Value} from 'components/multiselect/multiselect';
 
@@ -236,9 +235,12 @@ export class ChannelSelectorModal extends React.PureComponent<Props, State> {
                         componentClass='h1'
                         id='channelSelectorModalLabel'
                     >
-                        <FormattedMarkdownMessage
-                            id='add_channels_to_scheme.title'
-                            defaultMessage='Add Channels to **Channel Selection** List'
+                        <FormattedMessage
+                            id='channelSelectorModal.title'
+                            defaultMessage='Add Channels to <b>Channel Selection</b> List'
+                            values={{
+                                b: (chunks: string) => <b>{chunks}</b>,
+                            }}
                         />
                     </Modal.Title>
                 </Modal.Header>
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 2212c91ef9..61c060abcc 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -66,7 +66,6 @@
   "activity_log.os": "OS: {os}",
   "activity_log.sessionId": "Session ID: {id}",
   "activity_log.sessionsDescription": "Sessions are created when you log in through a new browser on a device. Sessions let you use Mattermost without having to log in again for a time period specified by the System Admin. To end the session sooner, use the 'Log Out' button.",
-  "add_channels_to_scheme.title": "Add Channels to **Channel Selection** List",
   "add_command.autocomplete": "Autocomplete",
   "add_command.autocomplete.help": "(Optional) Show your slash command on the autocomplete list when someone types / in the input box.",
   "add_command.autocompleteDescription": "Autocomplete Description",
@@ -3236,6 +3235,7 @@
   "channelNotifications.mobileNotification.mention": "Mentions, direct messages, and keywords only {optionalDefault}",
   "channelNotifications.mobileNotification.newMessages": "All new messages {optionalDefault}",
   "channelNotifications.mobileNotification.nothing": "Nothing {optionalDefault}",
+  "channelSelectorModal.title": "Add Channels to <b>Channel Selection</b> List",
   "channelView.login.successfull": "Login Successful",
   "claim.email_to_ldap.enterLdapPwd": "Enter the ID and password for your AD/LDAP account",
   "claim.email_to_ldap.enterPwd": "Enter the password for your {site} email account",