diff --git a/mailpoet/assets/js/src/common/premium-key/key-messages/mss-messages.tsx b/mailpoet/assets/js/src/common/premium-key/key-messages/mss-messages.tsx index 31dc38ebfa..ac089dd7ee 100644 --- a/mailpoet/assets/js/src/common/premium-key/key-messages/mss-messages.tsx +++ b/mailpoet/assets/js/src/common/premium-key/key-messages/mss-messages.tsx @@ -1,9 +1,8 @@ import classnames from 'classnames'; import { __ } from '@wordpress/i18n'; -import ReactStringReplace from 'react-string-replace'; +import { createInterpolateElement } from '@wordpress/element'; import { useSelector } from 'settings/store/hooks'; import { MssStatus } from 'settings/store/types'; -import { getLinkRegex } from '../../utils'; type MssActiveMessageProps = { canUseSuccessClass: boolean }; @@ -25,17 +24,19 @@ function NotValidMessage({ message }: NotValidMessageProps) { return (
{message - ? ReactStringReplace(message, getLinkRegex(), (text) => ( - - {text} - - )) + ? createInterpolateElement(message, { + a: ( + +   + + ), + }) : __( 'Your key is not valid for the MailPoet Sending Service', 'mailpoet', diff --git a/mailpoet/assets/js/src/common/premium-key/key-messages/premium-messages.tsx b/mailpoet/assets/js/src/common/premium-key/key-messages/premium-messages.tsx index cd3355c936..a55d2496e8 100644 --- a/mailpoet/assets/js/src/common/premium-key/key-messages/premium-messages.tsx +++ b/mailpoet/assets/js/src/common/premium-key/key-messages/premium-messages.tsx @@ -1,13 +1,12 @@ import classnames from 'classnames'; import { __ } from '@wordpress/i18n'; -import ReactStringReplace from 'react-string-replace'; +import { createInterpolateElement } from '@wordpress/element'; import { useSelector } from 'settings/store/hooks'; import { PremiumStatus } from 'settings/store/types'; import { Button } from 'common/button/button'; import { PremiumModal } from 'common/premium-modal'; import { useState } from 'react'; import { Data } from '../../premium-modal/upgrade-info'; -import { getLinkRegex } from '../../utils'; type ActiveMessageProps = { canUseSuccessClass: boolean }; @@ -70,17 +69,19 @@ function NotValidMessage({ message }: NotValidMessageProps) { return (
{message - ? ReactStringReplace(message, getLinkRegex(), (text) => ( - - {text} - - )) + ? createInterpolateElement(message, { + a: ( + +   + + ), + }) : __('Your key is not valid for MailPoet Premium', 'mailpoet')}
); diff --git a/mailpoet/lib/API/JSON/v1/Services.php b/mailpoet/lib/API/JSON/v1/Services.php index 4d88020235..f518fea6d3 100644 --- a/mailpoet/lib/API/JSON/v1/Services.php +++ b/mailpoet/lib/API/JSON/v1/Services.php @@ -140,7 +140,7 @@ class Services extends APIEndpoint { $error = __('Your key is not valid for the MailPoet Sending Service', 'mailpoet'); break; case Bridge::KEY_ALREADY_USED: - $error = __('Your MailPoet Sending Service key is already [link]used on another site[/link]', 'mailpoet'); + $error = __('Your MailPoet Sending Service key is already used on another site', 'mailpoet'); // we will use createInterpolateElement to replace element break; default: $code = !empty($result['code']) ? $result['code'] : Bridge::CHECK_ERROR_UNKNOWN; @@ -209,7 +209,7 @@ class Services extends APIEndpoint { $error = __('Your key is not valid for MailPoet Premium', 'mailpoet'); break; case Bridge::KEY_ALREADY_USED: - $error = __('Your Premium key is already [link]used on another site[/link]', 'mailpoet'); + $error = __('Your Premium key is already used on another site', 'mailpoet'); // we will use createInterpolateElement to replace element break; default: $code = !empty($result['code']) ? $result['code'] : Bridge::CHECK_ERROR_UNKNOWN;