diff --git a/assets/apps/dashboard/src/Components/Content/Sidebar/LicenseCard.js b/assets/apps/dashboard/src/Components/Content/Sidebar/LicenseCard.js index 0e8b4e3152..91f9c3f202 100644 --- a/assets/apps/dashboard/src/Components/Content/Sidebar/LicenseCard.js +++ b/assets/apps/dashboard/src/Components/Content/Sidebar/LicenseCard.js @@ -28,9 +28,10 @@ const LicenseCard = () => { const { valid, expiration } = license; const { whiteLabel, strings } = neveDash; const { licenseCardHeading, licenseCardDescription } = strings; + const isValid = 'valid' === valid; const toggleLicense = () => { - const toDo = 'valid' === valid ? 'deactivate' : 'activate'; + const toDo = isValid ? 'deactivate' : 'activate'; setStatus('activate' === toDo ? 'activating' : 'deactivating'); send(proApi + '/toggle_license', { key, action: toDo }).then( (response) => { @@ -48,7 +49,7 @@ const LicenseCard = () => { ); }; - if (whiteLabel && whiteLabel.hideLicense) { + if (whiteLabel && whiteLabel.hideLicense && isValid) { return null; } @@ -63,9 +64,7 @@ const LicenseCard = () => { }; if (!status) { - return isOrWasValid - ? __('Deactivate', 'neve') - : __('Activate', 'neve'); + return isValid ? __('Deactivate', 'neve') : __('Activate', 'neve'); } return statusLabelMap[status]; @@ -94,13 +93,13 @@ const LicenseCard = () => { id="license-field" name="license-field" className="flex-grow rounded !border-gray-300 text-sm !py-1 !px-2" - disabled={isOrWasValid} + disabled={isValid} onChange={(e) => { const keyToSet = e.target.value.replace(/\s+/g, ''); setKey(keyToSet); }} value={ - isOrWasValid + isValid ? '******************************' + key.slice(-5) : key @@ -108,8 +107,8 @@ const LicenseCard = () => { placeholder={__('Enter License Key', 'neve')} />