From b1cde33d2c9f1057318f027a890d9c44617c01c8 Mon Sep 17 00:00:00 2001
From: Malay Kumar <91375797+Malay-dev@users.noreply.github.com>
Date: Thu, 17 Oct 2024 02:54:23 +0530
Subject: [PATCH] [MM-60807] Replace FormattedMarkdownMessage in
 'webapp/channels/src/components/admin_console/license_settings/renew_license_card/renew_license_card.tsx'
 with FormattedMessage (#28626)

* Replaced FormattedMarkdownMessage

* Fix: update message id and formatting

* Fix: Revert Classname - optimize translation

* Fix: update translation en.json

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 .../renew_license_card/renew_license_card.tsx | 29 +++++++++----------
 webapp/channels/src/i18n/en.json              |  4 +--
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/webapp/channels/src/components/admin_console/license_settings/renew_license_card/renew_license_card.tsx b/webapp/channels/src/components/admin_console/license_settings/renew_license_card/renew_license_card.tsx
index e779baa344..a0cc1eb816 100644
--- a/webapp/channels/src/components/admin_console/license_settings/renew_license_card/renew_license_card.tsx
+++ b/webapp/channels/src/components/admin_console/license_settings/renew_license_card/renew_license_card.tsx
@@ -9,7 +9,6 @@ import type {ClientLicense} from '@mattermost/types/config';
 
 import AlertBanner from 'components/alert_banner';
 import ContactUsButton from 'components/announcement_bar/contact_sales/contact_us';
-import FormattedMarkdownMessage from 'components/formatted_markdown_message';
 
 import {getSkuDisplayName} from 'utils/subscription';
 import {getRemainingDaysFromFutureTimestamp} from 'utils/utils';
@@ -75,22 +74,22 @@ const RenewLicenseCard: React.FC<RenewLicenseCardProps> = ({license, totalUsers,
                 />
             </div>
             <div className='RenewLicenseCard__licensedUsersNum'>
-                <FormattedMarkdownMessage
-                    id='admin.license.renewalCard.licensedUsersNum'
-                    defaultMessage='**Licensed Users:** {licensedUsersNum}'
-                    values={{
-                        licensedUsersNum: license.Users,
-                    }}
-                />
+                <strong>
+                    <FormattedMessage
+                        id='admin.license.renewalCard.usersNumbers_licensed'
+                        defaultMessage='Licensed Users: '
+                    />
+                </strong>
+                {license.Users}
             </div>
             <div className='RenewLicenseCard__activeUsersNum'>
-                <FormattedMarkdownMessage
-                    id='admin.license.renewalCard.usersNumbers'
-                    defaultMessage='**Active Users:** {activeUsersNum}'
-                    values={{
-                        activeUsersNum: totalUsers,
-                    }}
-                />
+                <strong>
+                    <FormattedMessage
+                        id='admin.license.renewalCard.usersNumbers_active'
+                        defaultMessage='Active Users: '
+                    />
+                </strong>
+                {totalUsers}
             </div>
             <div className='RenewLicenseCard__buttons'>
                 {contactSalesBtn}
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 11fda193af..ca5fde83ed 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -1384,11 +1384,11 @@
   "admin.license.remove": "Remove",
   "admin.license.removing": "Removing License...",
   "admin.license.renewalCard.description.contact_sales": "Renew your {licenseSku} license by contacting sales to avoid any disruption.",
-  "admin.license.renewalCard.licensedUsersNum": "**Licensed Users:** {licensedUsersNum}",
   "admin.license.renewalCard.licenseExpired": "License expired on {date, date, long}.",
   "admin.license.renewalCard.licenseExpiring": "License expires in {days} days on {date, date, long}.",
   "admin.license.renewalCard.reviewNumbers": "Review your numbers below to ensure you renew for the right number of users.",
-  "admin.license.renewalCard.usersNumbers": "**Active Users:** {activeUsersNum}",
+  "admin.license.renewalCard.usersNumbers_active": "Active Users: ",
+  "admin.license.renewalCard.usersNumbers_licensed": "Licensed Users: ",
   "admin.license.title": "Edition and License",
   "admin.license.Trial": "Trial",
   "admin.license.trial-request.accept-terms": "By clicking <strong>Start trial</strong>, I agree to the <linkEvaluation>Mattermost Software and Services License Agreement</linkEvaluation>, <linkPrivacy>Privacy Policy</linkPrivacy>, and receiving product emails.",