From 199eae09bb6b9a52958609615c3d806530bb433e Mon Sep 17 00:00:00 2001
From: Rohan Sharma <117426013+RS-labhub@users.noreply.github.com>
Date: Fri, 11 Oct 2024 18:35:02 +0530
Subject: [PATCH] [MM-60852] Replace FormattedMarkdownMessage in
 'webapp/channels/src/components/tours/crt_tour/collapsed_reply_threads_modal.tsx'
 with FormattedMessage (#28631)

---
 .../tours/crt_tour/collapsed_reply_threads_modal.tsx   | 10 ++++++----
 webapp/channels/src/i18n/en.json                       |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/webapp/channels/src/components/tours/crt_tour/collapsed_reply_threads_modal.tsx b/webapp/channels/src/components/tours/crt_tour/collapsed_reply_threads_modal.tsx
index 277edf2519..4b7de7ed2b 100644
--- a/webapp/channels/src/components/tours/crt_tour/collapsed_reply_threads_modal.tsx
+++ b/webapp/channels/src/components/tours/crt_tour/collapsed_reply_threads_modal.tsx
@@ -12,7 +12,6 @@ import {getCurrentUserId} from 'mattermost-redux/selectors/entities/users';
 
 import {closeModal} from 'actions/views/modals';
 
-import FormattedMarkdownMessage from 'components/formatted_markdown_message';
 import NextIcon from 'components/widgets/icons/fa_next_icon';
 
 import crtInProductImg from 'images/crt-in-product.gif';
@@ -102,9 +101,12 @@ function CollapsedReplyThreadsModal(props: Props) {
         >
             <div>
                 <p className='productNotices__helpText'>
-                    <FormattedMarkdownMessage
-                        id={'collapsed_reply_threads_modal.description'}
-                        defaultMessage={'Threads have been revamped to help you create organized conversation around specific messages. Now, channels will appear less cluttered as replies are collapsed under the original message, and all the conversations you\'re following are available in your **Threads** view. Take the tour to see what\'s new.'}
+                    <FormattedMessage
+                        id={'collapsedReplyThreadsModal.helpText'}
+                        defaultMessage={'Threads have been revamped to help you create organized conversation around specific messages. Now, channels will appear less cluttered as replies are collapsed under the original message, and all the conversations you\'re following are available in your <b>Threads</b> view. Take the tour to see what\'s new.'}
+                        values={{
+                            b: (chunks: string) => <b>{chunks}</b>,
+                        }}
                     />
                 </p>
                 <img
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index f728c37625..012c93869a 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -3355,10 +3355,10 @@
   "cloud.fetch_error.retry": "Retry",
   "cloud.invoice_pdf_preview.download": "<downloadLink>Download</downloadLink> this page for your records",
   "collapsed_reply_threads_modal.confirm": "Got it",
-  "collapsed_reply_threads_modal.description": "Threads have been revamped to help you create organized conversation around specific messages. Now, channels will appear less cluttered as replies are collapsed under the original message, and all the conversations you're following are available in your **Threads** view. Take the tour to see what's new.",
   "collapsed_reply_threads_modal.skip_tour": "Skip Tour",
   "collapsed_reply_threads_modal.take_the_tour": "Take the Tour",
   "collapsed_reply_threads_modal.title": "A new way to view and follow threads",
+  "collapsedReplyThreadsModal.helpText": "Threads have been revamped to help you create organized conversation around specific messages. Now, channels will appear less cluttered as replies are collapsed under the original message, and all the conversations you're following are available in your <b>Threads</b> view. Take the tour to see what's new.",
   "combined_system_message.added_to_channel.many_expanded": "{users} and {lastUser} were **added to the channel** by {actor}.",
   "combined_system_message.added_to_channel.one": "{firstUser} **added to the channel** by {actor}.",
   "combined_system_message.added_to_channel.one_you": "You were **added to the channel** by {actor}.",