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 33e7e93cf2..11caaaaa4a 100644
--- a/assets/js/src/settings/pages/key_activation/key_activation.tsx
+++ b/assets/js/src/settings/pages/key_activation/key_activation.tsx
@@ -20,12 +20,56 @@ export default function KeyActivation() {
const [senderAddress, setSenderAddress] = useSetting('sender', 'address');
const [unauthorizedAddresses, setUnauthorizedAddresses] = useSetting('authorized_emails_addresses_check');
const [apiKeyState] = useSetting('mta', 'mailpoet_api_key_state', 'data');
-
const setAuthorizedAddress = async (address: string) => {
await setSenderAddress(address);
await setUnauthorizedAddresses(null);
};
+ function Messages() {
+ return (
+
+
+ {state.mssStatus !== null && (
+
{
+ await verifyMssKey(state.key);
+ sendCongratulatoryMssEmail();
+ setState({ fromAddressModalCanBeShown: true });
+ }}
+ />
+ )}
+ {state.congratulatoryMssEmailSentTo && (
+
+ {
+ t('premiumTabCongratulatoryMssEmailSent')
+ .replace('[email_address]', state.congratulatoryMssEmailSentTo)
+ }
+
+ )}
+ {state.premiumStatus !== null && (
+ activatePremiumPlugin(false)}
+ />
+ )}
+
+ {showPendingApprovalNotice && (
+
+
+ {t('premiumTabPendingApprovalHeading')}
+
+
+ {t('premiumTabPendingApprovalMessage')}
+
+
+ )}
+
+ )
+ }
+
const showFromAddressModal = state.fromAddressModalCanBeShown
&& state.mssStatus === MssStatus.VALID_MSS_ACTIVE
&& (!senderAddress || unauthorizedAddresses);
@@ -84,48 +128,7 @@ export default function KeyActivation() {
>
{t('premiumTabVerifyButton')}
- {state.isKeyValid !== null && (
-
-
- {state.mssStatus !== null && (
-
{
- await verifyMssKey(state.key);
- sendCongratulatoryMssEmail();
- setState({ fromAddressModalCanBeShown: true });
- }}
- />
- )}
- {state.congratulatoryMssEmailSentTo && (
-
- {
- t('premiumTabCongratulatoryMssEmailSent')
- .replace('[email_address]', state.congratulatoryMssEmailSentTo)
- }
-
- )}
- {state.premiumStatus !== null && (
- activatePremiumPlugin(false)}
- />
- )}
-
- {showPendingApprovalNotice && (
-
-
- {t('premiumTabPendingApprovalHeading')}
-
-
- {t('premiumTabPendingApprovalMessage')}
-
-
- )}
-
- )}
+ {state.isKeyValid !== null && Messages()}
{showFromAddressModal && (