Evaluate AppUpgrade event type directly instead of using hook

2 files changed, 7 insertions, 5 deletions

diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx
index 30ef2892ed..64c82197eb 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx
@@ -19,7 +19,6 @@ import {
   useAppUpgradeDownloadProgressValue,
   useAppUpgradeEventType,
   useHasAppUpgradeError,
-  useShouldAppUpgradeInstallManually,
 } from '../hooks';
 import useActions from '../lib/actionsHook';
 import { Button } from '../lib/components';
@@ -114,7 +113,6 @@ export default function NotificationArea(props: IProps) {
     appUpgradeInstallerStart();
   }, [appUpgradeInstallerStart]);
 
-  const shouldAppUpgradeInstallManually = useShouldAppUpgradeInstallManually();
   const { suggestedUpgrade } = useVersionSuggestedUpgrade();
 
   const appUpgradeDownloadProgressValue = useAppUpgradeDownloadProgressValue();
@@ -136,7 +134,7 @@ export default function NotificationArea(props: IProps) {
       restartAppUpgradeInstaller,
     }),
     new AppUpgradeReadyNotificationProvider({
-      shouldAppUpgradeInstallManually,
+      appUpgradeEventType,
       suggestedUpgradeVersion: suggestedUpgrade?.version,
     }),
     new AppUpgradeProgressNotificationProvider({
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/notifications/app-upgrade-ready.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/notifications/app-upgrade-ready.ts
index 722b85ad2c..ab32b1a200 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/lib/notifications/app-upgrade-ready.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/notifications/app-upgrade-ready.ts
@@ -1,11 +1,12 @@
 import { sprintf } from 'sprintf-js';
 
+import { AppUpgradeEvent } from '../../../shared/app-upgrade';
 import { messages } from '../../../shared/gettext';
 import { InAppNotification, InAppNotificationProvider } from '../../../shared/notifications';
 import { RoutePath } from '../../../shared/routes';
 
 interface AppUpgradeReadyNotificationContext {
-  shouldAppUpgradeInstallManually: boolean;
+  appUpgradeEventType?: AppUpgradeEvent['type'];
   suggestedUpgradeVersion?: string;
 }
 
@@ -13,7 +14,10 @@ export class AppUpgradeReadyNotificationProvider implements InAppNotificationPro
   public constructor(private context: AppUpgradeReadyNotificationContext) {}
 
   public mayDisplay = () => {
-    return this.context.shouldAppUpgradeInstallManually;
+    return (
+      this.context.appUpgradeEventType === 'APP_UPGRADE_STATUS_EXITED_INSTALLER' ||
+      this.context.appUpgradeEventType === 'APP_UPGRADE_STATUS_MANUAL_START_INSTALLER'
+    );
   };
 
   public getInAppNotification(): InAppNotification {