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

Fix keeping installation/activation process messages

Browse Source 
[MAILPOET-2681]
This commit is contained in:
Jan Jakeš
2020-04-06 12:31:10 +02:00
committed by Veljko V
parent bc26618f38
commit 3c5563b48c
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
assets/js/src/settings/pages/key_activation/messages/premium_messages.tsx
View File

@@ -62,7 +62,17 @@ type Props = {
} }
export default function PremiumMessages(props: Props) { export default function PremiumMessages(props: Props) {
const { premiumStatus: status } = useSelector('getKeyActivationState')(); const { premiumStatus: status } = useSelector('getKeyActivationState')();
switch (status) {
// when activity sub-messages shown, keep the top-level installing/activating messages
let displayStatus = status;
const premiumInstallationStatusName = PremiumInstallationStatus[props.installationStatus] ?? '';
if (premiumInstallationStatusName.startsWith('INSTALL_')) {
displayStatus = PremiumStatus.VALID_PREMIUM_PLUGIN_BEING_INSTALLED;
} else if (premiumInstallationStatusName.startsWith('ACTIVATE_')) {
displayStatus = PremiumStatus.VALID_PREMIUM_PLUGIN_BEING_ACTIVATED;
}
switch (displayStatus) {
case PremiumStatus.VALID_PREMIUM_PLUGIN_NOT_INSTALLED: case PremiumStatus.VALID_PREMIUM_PLUGIN_NOT_INSTALLED:
return ( return (
<> <>