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

Fix incorrect initial key state when no key set

Browse Source 
[MAILPOET-2806]
This commit is contained in:
Jan Jakeš
2020-04-06 17:23:58 +02:00
committed by Veljko V
parent f8fea21955
commit 37feeecd3f
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
assets/js/src/settings/store/make_default_state.ts
View File

@@ -15,18 +15,23 @@ export default function makeDefaultState(window: any): State {
membersPlugin: !!window.mailpoet_members_plugin_active, membersPlugin: !!window.mailpoet_members_plugin_active,
builtInCaptcha: window.mailpoet_built_in_captcha_supported, builtInCaptcha: window.mailpoet_built_in_captcha_supported,
}; };
const premiumStatus = getPremiumStatus(
window.mailpoet_premium_key_valid,
window.mailpoet_premium_plugin_installed
);
const mssStatus = getMssStatus(window.mailpoet_mss_key_valid, data);
let isKeyValid = null; let isKeyValid = null;
if (mssStatus !== null || premiumStatus !== null) { let mssStatus = null;
let premiumStatus = null;
if (data.premium.premium_key || data.mta.mailpoet_api_key) {
mssStatus = getMssStatus(window.mailpoet_mss_key_valid, data);
premiumStatus = getPremiumStatus(
window.mailpoet_premium_key_valid,
window.mailpoet_premium_plugin_installed
);
isKeyValid = mssStatus !== MssStatus.INVALID || premiumStatus !== PremiumStatus.INVALID; isKeyValid = mssStatus !== MssStatus.INVALID || premiumStatus !== PremiumStatus.INVALID;
} }
const keyActivation = { const keyActivation = {
mssStatus,
isKeyValid, isKeyValid,
mssStatus,
premiumStatus, premiumStatus,
mssMessage: null, mssMessage: null,
premiumMessage: null, premiumMessage: null,