From 3c5563b48ca45d43f1965152711ec662267b0c6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jakes=CC=8C?= Date: Mon, 6 Apr 2020 12:31:10 +0200 Subject: [PATCH] Fix keeping installation/activation process messages [MAILPOET-2681] --- .../key_activation/messages/premium_messages.tsx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/assets/js/src/settings/pages/key_activation/messages/premium_messages.tsx b/assets/js/src/settings/pages/key_activation/messages/premium_messages.tsx index dc45d68950..3066ceb851 100644 --- a/assets/js/src/settings/pages/key_activation/messages/premium_messages.tsx +++ b/assets/js/src/settings/pages/key_activation/messages/premium_messages.tsx @@ -62,7 +62,17 @@ type Props = { } export default function PremiumMessages(props: Props) { 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: return ( <>