Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Move messages to a separate function

Browse Source 
[MAILPOET-2918]
This commit is contained in:
Pavel Dohnal
2020-06-08 14:35:16 +02:00
committed by Veljko V
parent b8f5754182
commit 4ee49ab71f
1 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
assets/js/src/settings/pages/key_activation/key_activation.tsx
View File

@@ -20,12 +20,56 @@ export default function KeyActivation() {
const [senderAddress, setSenderAddress] = useSetting('sender', 'address'); const [senderAddress, setSenderAddress] = useSetting('sender', 'address');
const [unauthorizedAddresses, setUnauthorizedAddresses] = useSetting('authorized_emails_addresses_check'); const [unauthorizedAddresses, setUnauthorizedAddresses] = useSetting('authorized_emails_addresses_check');
const [apiKeyState] = useSetting('mta', 'mailpoet_api_key_state', 'data'); const [apiKeyState] = useSetting('mta', 'mailpoet_api_key_state', 'data');
const setAuthorizedAddress = async (address: string) => { const setAuthorizedAddress = async (address: string) => {
await setSenderAddress(address); await setSenderAddress(address);
await setUnauthorizedAddresses(null); await setUnauthorizedAddresses(null);
}; };
function Messages() {
return (
<div className="key-activation-messages">
<KeyMessages />
{state.mssStatus !== null && (
<MssMessages
keyMessage={state.mssMessage}
activationCallback={async () => {
await verifyMssKey(state.key);
sendCongratulatoryMssEmail();
setState({ fromAddressModalCanBeShown: true });
}}
/>
)}
{state.congratulatoryMssEmailSentTo && (
<div className="mailpoet_success_item mailpoet_success">
{
t('premiumTabCongratulatoryMssEmailSent')
.replace('[email_address]', state.congratulatoryMssEmailSentTo)
}
</div>
)}
{state.premiumStatus !== null && (
<PremiumMessages
keyMessage={state.premiumMessage}
installationStatus={state.premiumInstallationStatus}
installationCallback={installPremiumPlugin}
activationCallback={() => activatePremiumPlugin(false)}
/>
)}
{showPendingApprovalNotice && (
<div className="mailpoet_success">
<div className="pending_approval_heading">
{t('premiumTabPendingApprovalHeading')}
</div>
<div>
{t('premiumTabPendingApprovalMessage')}
</div>
</div>
)}
</div>
)
}
const showFromAddressModal = state.fromAddressModalCanBeShown const showFromAddressModal = state.fromAddressModalCanBeShown
&& state.mssStatus === MssStatus.VALID_MSS_ACTIVE && state.mssStatus === MssStatus.VALID_MSS_ACTIVE
&& (!senderAddress || unauthorizedAddresses); && (!senderAddress || unauthorizedAddresses);
@@ -84,48 +128,7 @@ export default function KeyActivation() {
> >
{t('premiumTabVerifyButton')} {t('premiumTabVerifyButton')}
</button> </button>
{state.isKeyValid !== null && ( {state.isKeyValid !== null && Messages()}
<div className="key-activation-messages">
<KeyMessages />
{state.mssStatus !== null && (
<MssMessages
keyMessage={state.mssMessage}
activationCallback={async () => {
await verifyMssKey(state.key);
sendCongratulatoryMssEmail();
setState({ fromAddressModalCanBeShown: true });
}}
/>
)}
{state.congratulatoryMssEmailSentTo && (
<div className="mailpoet_success_item mailpoet_success">
{
t('premiumTabCongratulatoryMssEmailSent')
.replace('[email_address]', state.congratulatoryMssEmailSentTo)
}
</div>
)}
{state.premiumStatus !== null && (
<PremiumMessages
keyMessage={state.premiumMessage}
installationStatus={state.premiumInstallationStatus}
installationCallback={installPremiumPlugin}
activationCallback={() => activatePremiumPlugin(false)}
/>
)}
{showPendingApprovalNotice && (
<div className="mailpoet_success">
<div className="pending_approval_heading">
{t('premiumTabPendingApprovalHeading')}
</div>
<div>
{t('premiumTabPendingApprovalMessage')}
</div>
</div>
)}
</div>
)}
</Inputs> </Inputs>
{showFromAddressModal && ( {showFromAddressModal && (
<SetFromAddressModal <SetFromAddressModal