diff --git a/assets/js/src/settings/premium_tab/messages/mss_messages.jsx b/assets/js/src/settings/premium_tab/messages/mss_messages.jsx
index 654d90d474..308e1d2c8e 100644
--- a/assets/js/src/settings/premium_tab/messages/mss_messages.jsx
+++ b/assets/js/src/settings/premium_tab/messages/mss_messages.jsx
@@ -3,7 +3,7 @@ import React from 'react';
import MailPoet from 'mailpoet';
const validMessage = (
-
+
{MailPoet.I18n.t('premiumTabMssValidMessage')}
);
diff --git a/assets/js/src/settings/premium_tab/premium_tab.jsx b/assets/js/src/settings/premium_tab/premium_tab.jsx
index 2b9282e83d..936f2d0973 100644
--- a/assets/js/src/settings/premium_tab/premium_tab.jsx
+++ b/assets/js/src/settings/premium_tab/premium_tab.jsx
@@ -125,13 +125,15 @@ const PremiumTab = (props) => {
}
};
- async function verifyMailPoetSendingServiceKey() {
+ async function verifyMailPoetSendingServiceKey(activateMssIfKeyValid) {
try {
const response = await requestServicesApi(key, 'checkMSSKey');
setMssKeyValid(true);
setMssKeyMessage(response.data.message || null);
- await activateMss(key);
+ if (activateMssIfKeyValid) {
+ await activateMss(key);
+ }
} catch (error) {
setMssKeyValid(false);
setMssKeyMessage(error.errors.map((e) => e.message).join(' ') || null);
@@ -171,7 +173,7 @@ const PremiumTab = (props) => {
type="button"
id="mailpoet_premium_key_verify"
className="button-secondary"
- onClick={async () => {
+ onClick={async (event) => {
if (!key) {
MailPoet.Notice.error(
MailPoet.I18n.t('premiumTabNoKeyNotice'),
@@ -185,7 +187,8 @@ const PremiumTab = (props) => {
setMssKeyValid(null);
MailPoet.Modal.loading(true);
- await verifyMailPoetSendingServiceKey();
+ const isUserTriggered = event.isTrusted;
+ await verifyMailPoetSendingServiceKey(isUserTriggered);
await verifyMailPoetPremiumKey();
MailPoet.Modal.loading(false);
}}
diff --git a/views/settings/mta.html b/views/settings/mta.html
index 1a26b804e6..0bc19e243e 100644
--- a/views/settings/mta.html
+++ b/views/settings/mta.html
@@ -1131,7 +1131,7 @@
function updateMSSActivationUI() {
var $ = jQuery;
var group = $('.mailpoet_sending_methods .mailpoet_active').data('group');
- var key_valid = !$('.mailpoet_mss_key_valid').hasClass('mailpoet_hidden');
+ var key_valid = !!$('.mailpoet_mss_key_valid');
if (group !== 'mailpoet') {
$('.mailpoet_actions .mailpoet_invalid_key').toggleClass('mailpoet_hidden', key_valid);