diff options
| author | Oliver <oliver@mohlin.dev> | 2025-04-17 16:10:20 +0200 |
|---|---|---|
| committer | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2025-05-28 13:25:31 +0200 |
| commit | 3dc1cec4e9f05c85a3cfeac67c24f108d241b499 (patch) | |
| tree | bc79066c5c78f076881bc8ef30c51d6d3733d5dd | |
| parent | a62daa58b6c3cbf93afa244a7a16ed7574b77590 (diff) | |
| download | mullvadvpn-3dc1cec4e9f05c85a3cfeac67c24f108d241b499.tar.xz mullvadvpn-3dc1cec4e9f05c85a3cfeac67c24f108d241b499.zip | |
Show download progress if upgrade has initiated
| -rw-r--r-- | desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowDownloadProgress.ts | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowDownloadProgress.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowDownloadProgress.ts index c120137dd0..37de7fa9aa 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowDownloadProgress.ts +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowDownloadProgress.ts @@ -1,22 +1,17 @@ import { useHasAppUpgradeError, useHasAppUpgradeInitiated, - useHasAppUpgradeVerifiedInstallerPath, - useIsAppUpgradePending, + useShouldAppUpgradeInstallManually, } from '../../../../hooks'; -import { useAppUpgradeError, useConnectionIsBlocked } from '../../../../redux/hooks'; +import { useAppUpgradeError } from '../../../../redux/hooks'; export const useShowDownloadProgress = () => { - const { isBlocked } = useConnectionIsBlocked(); const { error } = useAppUpgradeError(); const hasAppUpgradeInitiated = useHasAppUpgradeInitiated(); const hasAppUpgradeError = useHasAppUpgradeError(); - const isAppUpgradePending = useIsAppUpgradePending(); - const hasAppUpgradeVerifiedInstallerPath = useHasAppUpgradeVerifiedInstallerPath(); + const shouldUpgradeInstallManually = useShouldAppUpgradeInstallManually(); - if (isBlocked && hasAppUpgradeInitiated) { - return true; - } + if (shouldUpgradeInstallManually) return true; if (hasAppUpgradeError) { if ( @@ -30,7 +25,7 @@ export const useShowDownloadProgress = () => { return false; } - const showDownloadProgress = isAppUpgradePending || hasAppUpgradeVerifiedInstallerPath; + const showDownloadProgress = hasAppUpgradeInitiated; return showDownloadProgress; }; |
