From cd43bac181fda88d30895d01f1e0158a99b90694 Mon Sep 17 00:00:00 2001
From: Michael <74271024+KvngMikey@users.noreply.github.com>
Date: Thu, 17 Oct 2024 07:45:18 +0100
Subject: [PATCH] [MM-60829] Replace FormattedMarkdownMessage in
 'webapp/channels/src/components/unarchive_channel_modal/unarchive_channel_modal.tsx'
 with FormattedMessage (#28730)

---
 .../__snapshots__/unarchive_channel_modal.test.tsx.snap  | 7 ++++---
 .../unarchive_channel_modal/unarchive_channel_modal.tsx  | 9 ++++-----
 webapp/channels/src/i18n/en.json                         | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/webapp/channels/src/components/unarchive_channel_modal/__snapshots__/unarchive_channel_modal.test.tsx.snap b/webapp/channels/src/components/unarchive_channel_modal/__snapshots__/unarchive_channel_modal.test.tsx.snap
index 0fc6e93bba..153470e12c 100644
--- a/webapp/channels/src/components/unarchive_channel_modal/__snapshots__/unarchive_channel_modal.test.tsx.snap
+++ b/webapp/channels/src/components/unarchive_channel_modal/__snapshots__/unarchive_channel_modal.test.tsx.snap
@@ -54,11 +54,12 @@ exports[`components/unarchive_channel_modal should match snapshot for unarchive_
     <div
       className="alert alert-danger"
     >
-      <FormattedMarkdownMessage
-        defaultMessage="Are you sure you wish to unarchive the **{display_name}** channel?"
-        id="unarchive_channel.viewArchived.question"
+      <MemoizedFormattedMessage
+        defaultMessage="Are you sure you wish to unarchive the <b>{display_name}</b> channel?"
+        id="unarchiveChannelModal.viewArchived.question"
         values={
           Object {
+            "b": [Function],
             "display_name": "testing",
           }
         }
diff --git a/webapp/channels/src/components/unarchive_channel_modal/unarchive_channel_modal.tsx b/webapp/channels/src/components/unarchive_channel_modal/unarchive_channel_modal.tsx
index 53161a8705..1b932a2807 100644
--- a/webapp/channels/src/components/unarchive_channel_modal/unarchive_channel_modal.tsx
+++ b/webapp/channels/src/components/unarchive_channel_modal/unarchive_channel_modal.tsx
@@ -9,8 +9,6 @@ import type {Channel} from '@mattermost/types/channels';
 
 import type {ActionResult} from 'mattermost-redux/types/actions';
 
-import FormattedMarkdownMessage from 'components/formatted_markdown_message';
-
 import Constants from 'utils/constants';
 
 type Props = {
@@ -70,11 +68,12 @@ export default class UnarchiveChannelModal extends React.PureComponent<Props, St
                 </Modal.Header>
                 <Modal.Body>
                     <div className='alert alert-danger'>
-                        <FormattedMarkdownMessage
-                            id='unarchive_channel.viewArchived.question'
-                            defaultMessage={'Are you sure you wish to unarchive the **{display_name}** channel?'}
+                        <FormattedMessage
+                            id='unarchiveChannelModal.viewArchived.question'
+                            defaultMessage={'Are you sure you wish to unarchive the <b>{display_name}</b> channel?'}
                             values={{
                                 display_name: this.props.channel.display_name,
+                                b: (chunks: string) => <b>{chunks}</b>,
                             }}
                         />
                     </div>
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index db0348e9c3..ccd8c4bbb0 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -5343,7 +5343,7 @@
   "unarchive_channel.cancel": "Cancel",
   "unarchive_channel.confirm": "Confirm UNARCHIVE Channel",
   "unarchive_channel.del": "Unarchive",
-  "unarchive_channel.viewArchived.question": "Are you sure you wish to unarchive the **{display_name}** channel?",
+  "unarchiveChannelModal.viewArchived.question": "Are you sure you wish to unarchive the <b>{display_name}</b> channel?",
   "update_command.confirm": "Edit Slash Command",
   "update_command.question": "Your changes may break the existing slash command. Are you sure you would like to update it?",
   "update_command.update": "Update",