Refactor conditions for when Cancel button should be displayed

It is easier to check if we have a verified installer path
to determine when we should stop displaying Cancel button.

1 files changed, 7 insertions, 8 deletions

diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowCancelButton.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowCancelButton.ts
index 3b91d1abbc..7cf279e5c1 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowCancelButton.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowCancelButton.ts
@@ -1,14 +1,13 @@
-import { useAppUpgradeEventType, useIsAppUpgradeInProgress } from '../../../../hooks';
+import {
+  useHasAppUpgradeVerifiedInstallerPath,
+  useIsAppUpgradeInProgress,
+} from '../../../../hooks';
 
 export const useShowCancelButton = () => {
-  const appUpgradeEventType = useAppUpgradeEventType();
   const isAppUpgradeInProgress = useIsAppUpgradeInProgress();
+  const hasAppUpgradeVerifiedInstallerPath = useHasAppUpgradeVerifiedInstallerPath();
 
-  if (appUpgradeEventType !== 'APP_UPGRADE_STATUS_STARTED_INSTALLER') {
-    const showCancelButton = isAppUpgradeInProgress;
+  const showCancelButton = isAppUpgradeInProgress && !hasAppUpgradeVerifiedInstallerPath;
 
-    return showCancelButton;
-  }
-
-  return false;
+  return showCancelButton;
 };