From 80855cfc02e30b04d824656a9856d150187a2f2c Mon Sep 17 00:00:00 2001 From: goooov <64647858+gvarma28@users.noreply.github.com> Date: Fri, 11 Oct 2024 17:27:00 +0530 Subject: [PATCH] [MM-60823] Replace FormattedMarkdownMessage in 'webapp/channels/src/components/invitation_modal/add_to_channels.tsx' with FormattedMessage (#28519) --- .../invitation_modal/add_to_channels.tsx | 19 ++++++++++++------- webapp/channels/src/i18n/en.json | 4 ++-- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/webapp/channels/src/components/invitation_modal/add_to_channels.tsx b/webapp/channels/src/components/invitation_modal/add_to_channels.tsx index be7d77424b..96def4a3ca 100644 --- a/webapp/channels/src/components/invitation_modal/add_to_channels.tsx +++ b/webapp/channels/src/components/invitation_modal/add_to_channels.tsx @@ -8,7 +8,6 @@ import type {Channel} from '@mattermost/types/channels'; import deepFreeze from 'mattermost-redux/utils/deep_freeze'; -import FormattedMarkdownMessage from 'components/formatted_markdown_message'; import CloseCircleIcon from 'components/widgets/icons/close_circle_icon'; import ChannelsInput from 'components/widgets/inputs/channels_input'; @@ -88,14 +87,20 @@ export default function AddToChannels(props: Props) { {' '} {(props.channelToInvite && props.inviteType === InviteType.MEMBER) ? ( - {chunks}, + }} /> ) : ( - {chunks}, + }} /> )} diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json index 6ade99b79f..172b017f83 100644 --- a/webapp/channels/src/i18n/en.json +++ b/webapp/channels/src/i18n/en.json @@ -4064,8 +4064,8 @@ "invitation-modal.confirm.not-valid-user-or-email": "Does not match a valid user or email.", "invitation-modal.confirm.people-header": "People", "invite_modal.add_channels_title_a": "Add to channels", - "invite_modal.add_channels_title_b": "**(required)**", - "invite_modal.add_channels_title_c": "**(Optional)**", + "invite_modal.add_channels_title_member": "(optional)", + "invite_modal.add_channels_title_nonmember": "(required)", "invite_modal.add_invites": "Enter a name or email address", "invite_modal.as": "Invite as", "invite_modal.choose_guest_a": "Guest",