diff --git a/assets/js/src/settings/pages/key_activation/key_activation.tsx b/assets/js/src/settings/pages/key_activation/key_activation.tsx index 4f60d2cd73..33e7e93cf2 100644 --- a/assets/js/src/settings/pages/key_activation/key_activation.tsx +++ b/assets/js/src/settings/pages/key_activation/key_activation.tsx @@ -40,7 +40,6 @@ export default function KeyActivation() { notices.error(

{t('premiumTabNoKeyNotice')}

, { scroll: true }); return; } - const isUserTriggered = event.isTrusted; await setState({ mssStatus: null, premiumStatus: null, @@ -48,14 +47,12 @@ export default function KeyActivation() { }); MailPoet.Modal.loading(true); setState({ inProgress: true }); - await verifyMssKey(state.key, isUserTriggered); + await verifyMssKey(state.key); await sendCongratulatoryMssEmail(); await verifyPremiumKey(state.key); setState({ inProgress: false }); MailPoet.Modal.loading(false); - if (isUserTriggered) { - setState({ fromAddressModalCanBeShown: true }); - } + setState({ fromAddressModalCanBeShown: true }); }; return ( @@ -94,7 +91,7 @@ export default function KeyActivation() { { - await verifyMssKey(state.key, true); + await verifyMssKey(state.key); sendCongratulatoryMssEmail(); setState({ fromAddressModalCanBeShown: true }); }} diff --git a/assets/js/src/settings/store/actions/mss_and_premium.ts b/assets/js/src/settings/store/actions/mss_and_premium.ts index 98748587ea..8b7fa72e34 100644 --- a/assets/js/src/settings/store/actions/mss_and_premium.ts +++ b/assets/js/src/settings/store/actions/mss_and_premium.ts @@ -9,7 +9,7 @@ export function updateKeyActivationState(fields: Partial): A return { type: 'UPDATE_KEY_ACTIVATION_STATE', fields }; } -export function* verifyMssKey(key: string, activateMssIfKeyValid: boolean) { +export function* verifyMssKey(key: string) { const { success, error, res } = yield { type: 'CALL_API', endpoint: 'services', @@ -25,25 +25,22 @@ export function* verifyMssKey(key: string, activateMssIfKeyValid: boolean) { const fields: Partial = { mssMessage: res.data.message || null, }; - if (activateMssIfKeyValid) { - const call = yield { - type: 'CALL_API', - endpoint: 'settings', - action: 'set', - data: { - mta_group: 'mailpoet', - mta: { method: 'MailPoet', mailpoet_api_key: key }, - signup_confirmation: { enabled: '1' }, - }, - }; - if (!call.success) { - fields.mssStatus = MssStatus.VALID_MSS_NOT_ACTIVE; - } else { - yield setSettings(call.res.data); - fields.mssStatus = MssStatus.VALID_MSS_ACTIVE; - } - } else { + + const call = yield { + type: 'CALL_API', + endpoint: 'settings', + action: 'set', + data: { + mta_group: 'mailpoet', + mta: { method: 'MailPoet', mailpoet_api_key: key }, + signup_confirmation: { enabled: '1' }, + }, + }; + if (!call.success) { fields.mssStatus = MssStatus.VALID_MSS_NOT_ACTIVE; + } else { + yield setSettings(call.res.data); + fields.mssStatus = MssStatus.VALID_MSS_ACTIVE; } return updateKeyActivationState(fields); }