From 428b38efbb07d8cf82def150b05bc3f6e36778cd Mon Sep 17 00:00:00 2001 From: Zubair Imtiaz <106450046+ZubairImtiaz3@users.noreply.github.com> Date: Fri, 11 Oct 2024 18:15:20 +0500 Subject: [PATCH] [MM-60837] Replace FormattedMarkdownMessage in 'webapp/channels/src/components/user_settings/security/user_access_token_section/user_access_token_section.tsx' with FormattedMessage (#28623) --- .../user_access_token_section.tsx | 24 ++++++++++++------- webapp/channels/src/i18n/en.json | 3 ++- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/webapp/channels/src/components/user_settings/security/user_access_token_section/user_access_token_section.tsx b/webapp/channels/src/components/user_settings/security/user_access_token_section/user_access_token_section.tsx index 27db2cf738..6f22feccfd 100644 --- a/webapp/channels/src/components/user_settings/security/user_access_token_section/user_access_token_section.tsx +++ b/webapp/channels/src/components/user_settings/security/user_access_token_section/user_access_token_section.tsx @@ -13,7 +13,6 @@ import {trackEvent} from 'actions/telemetry_actions.jsx'; import ConfirmModal from 'components/confirm_modal'; import ExternalLink from 'components/external_link'; -import FormattedMarkdownMessage from 'components/formatted_markdown_message'; import SaveButton from 'components/save_button'; import SettingItemMax from 'components/setting_item_max'; import SettingItemMin from 'components/setting_item_min'; @@ -264,13 +263,22 @@ export default class UserAccessTokenSection extends React.PureComponent (
- +

+ +

+

+ {description} token?'} + values={{ + description: token.description, + b: (chunks: string) => {chunks}, + }} + /> +

), confirmButton: ( diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json index 84809dde92..04f6f0f06b 100644 --- a/webapp/channels/src/i18n/en.json +++ b/webapp/channels/src/i18n/en.json @@ -5774,8 +5774,9 @@ "user.settings.tokens.confirmCreateButton": "Yes, Create", "user.settings.tokens.confirmCreateMessage": "You are generating a personal access token with System Admin permissions. Are you sure want to create this token?", "user.settings.tokens.confirmCreateTitle": "Create System Admin Personal Access Token", + "user.settings.tokens.confirmDelete.confirmation": "Are you sure you want to delete the {description} token?", + "user.settings.tokens.confirmDelete.description": "Any integrations using this token will no longer be able to access the Mattermost API. You cannot undo this action.", "user.settings.tokens.confirmDeleteButton": "Yes, Delete", - "user.settings.tokens.confirmDeleteMessage": "Any integrations using this token will no longer be able to access the Mattermost API. You cannot undo this action. \n \nAre you sure want to delete the **{description}** token?", "user.settings.tokens.confirmDeleteTitle": "Delete Token?", "user.settings.tokens.copy": "Please copy the access token below. You won't be able to see it again!", "user.settings.tokens.create": "Create Token",