diff options
| author | Tobias Järvelöv <tobias.jarvelov@mullvad.net> | 2025-04-08 13:49:21 +0200 |
|---|---|---|
| committer | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2025-05-28 13:25:25 +0200 |
| commit | 7420b231224bbf26548995a4d9498b514c3f87a7 (patch) | |
| tree | d3c9688bd1af277feadcd5585e6811e741c809b4 | |
| parent | f9d3f31c3f50ef465495477d090eb3a1f9d9a944 (diff) | |
| download | mullvadvpn-7420b231224bbf26548995a4d9498b514c3f87a7.tar.xz mullvadvpn-7420b231224bbf26548995a4d9498b514c3f87a7.zip | |
Ensure upgrade button is hidden if user should install upgrade manually
| -rw-r--r-- | desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowUpgradeButton.ts | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowUpgradeButton.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowUpgradeButton.ts index 2e8dad0a95..e592658f65 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowUpgradeButton.ts +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowUpgradeButton.ts @@ -2,18 +2,20 @@ import { useAppUpgradeEventType, useHasAppUpgradeError, useHasAppUpgradeInitiated, + useShouldAppUpgradeInstallManually, } from '../../../../hooks'; export const useShowUpgradeButton = () => { const appUpgradeEventType = useAppUpgradeEventType(); const hasAppUpgradeError = useHasAppUpgradeError(); const hasAppUpgradeInitiated = useHasAppUpgradeInitiated(); + const shouldAppUpgradeInstallManually = useShouldAppUpgradeInstallManually(); - if (!hasAppUpgradeError) { - // If we don't have an event type yet it is because the user has not attempted - // an upgrade yet. - if (!hasAppUpgradeInitiated || appUpgradeEventType === 'APP_UPGRADE_STATUS_ABORTED') { - return true; + if (!hasAppUpgradeError && !shouldAppUpgradeInstallManually) { + // If we don't have an event type yet it is because the user has not attempted + // an upgrade yet. + if (!hasAppUpgradeInitiated || appUpgradeEventType === 'APP_UPGRADE_STATUS_ABORTED') { + return true; } } |
