summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorTobias Järvelöv <tobias.jarvelov@mullvad.net>2025-04-14 14:11:57 +0200
committerSebastian Holmin <sebastian.holmin@mullvad.net>2025-05-28 13:25:31 +0200
commit78afdd42873f97bdf7bb5d3e4b6760415aa98e70 (patch)
tree71c8933da3d9f86e36bd04e407aa22855c0d8d23
parent19e55d274c0ded000ae9133cfba44858283cea4d (diff)
downloadmullvadvpn-78afdd42873f97bdf7bb5d3e4b6760415aa98e70.tar.xz
mullvadvpn-78afdd42873f97bdf7bb5d3e4b6760415aa98e70.zip
Hide Install button on AppUpgrade for most errors
If we have an error we want to hide the install button until the error has been handled, however if the error is for failing to automatically start the installer then we can show the Install button.
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowInstallButton.ts29
1 files changed, 19 insertions, 10 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowInstallButton.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowInstallButton.ts
index 293f996763..eedb50bb33 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowInstallButton.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowInstallButton.ts
@@ -1,19 +1,28 @@
-import { useAppUpgradeEventType, useShouldAppUpgradeInstallManually } from '../../../../hooks';
+import {
+ useAppUpgradeEventType,
+ useHasAppUpgradeError,
+ useShouldAppUpgradeInstallManually,
+} from '../../../../hooks';
+import { useAppUpgradeError } from '../../../../redux/hooks';
import { useErrorCountExceeded } from './useErrorCountExceeded';
export const useShowInstallButton = () => {
+ const { error } = useAppUpgradeError();
+ const hasAppUpgradeError = useHasAppUpgradeError();
const appUpgradeEventType = useAppUpgradeEventType();
- const shouldAppUpgradeInstallManually = useShouldAppUpgradeInstallManually();
const errorCountExceeded = useErrorCountExceeded();
+ const shouldAppUpgradeInstallManually = useShouldAppUpgradeInstallManually();
- if (errorCountExceeded) {
- return false;
- }
+ if (!errorCountExceeded) {
+ if (!hasAppUpgradeError || error === 'START_INSTALLER_AUTOMATIC_FAILED') {
+ const showInstallButton =
+ shouldAppUpgradeInstallManually ||
+ appUpgradeEventType === 'APP_UPGRADE_STATUS_STARTING_INSTALLER' ||
+ appUpgradeEventType === 'APP_UPGRADE_STATUS_STARTED_INSTALLER';
- const showInstallButton =
- shouldAppUpgradeInstallManually ||
- appUpgradeEventType === 'APP_UPGRADE_STATUS_STARTING_INSTALLER' ||
- appUpgradeEventType === 'APP_UPGRADE_STATUS_STARTED_INSTALLER';
+ return showInstallButton;
+ }
+ }
- return showInstallButton;
+ return false;
};