Disable app upgrade download progress if download is stopped

4 files changed, 18 insertions, 3 deletions

diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/DownloadProgress.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/DownloadProgress.tsx
index fd1a60a0fa..9b6d3cef45 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/DownloadProgress.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/DownloadProgress.tsx
@@ -1,13 +1,14 @@
 import { useAppUpgradeDownloadProgressValue } from '../../../../../hooks';
 import { Progress } from '../../../../../lib/components/progress';
-import { useMessage } from './hooks';
+import { useDisabled, useMessage } from './hooks';
 
 export function DownloadProgress() {
   const message = useMessage();
   const value = useAppUpgradeDownloadProgressValue();
+  const disabled = useDisabled();
 
   return (
-    <Progress value={value}>
+    <Progress value={value} disabled={disabled}>
       <Progress.Track>
         <Progress.Range />
       </Progress.Track>
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/hooks/index.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/hooks/index.ts
index 107ba71afc..a1469aafac 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/hooks/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/hooks/index.ts
@@ -1 +1,2 @@
 export * from './useMessage';
+export * from './useDisabled';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/hooks/useDisabled.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/hooks/useDisabled.ts
new file mode 100644
index 0000000000..2f692ad9cd
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/hooks/useDisabled.ts
@@ -0,0 +1,13 @@
+import { useAppUpgradeEventType, useHasAppUpgradeError } from '../../../../../../hooks';
+import { useConnectionIsBlocked } from '../../../../../../redux/hooks';
+
+export const useDisabled = () => {
+  const appUpgradeEventType = useAppUpgradeEventType();
+  const hasAppUpgradeError = useHasAppUpgradeError();
+  const { isBlocked } = useConnectionIsBlocked();
+  if (hasAppUpgradeError || isBlocked || appUpgradeEventType === 'APP_UPGRADE_STATUS_ABORTED') {
+    return true;
+  }
+
+  return false;
+};
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/hooks/useMessage/useMessage.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/hooks/useMessage/useMessage.ts
index b2ae58b5b6..eef8230447 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/hooks/useMessage/useMessage.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/hooks/useMessage/useMessage.ts
@@ -10,7 +10,7 @@ export const useMessage = () => {
   const getMessageTimeLeft = useGetMessageTimeLeft();
   const hasAppUpgradeError = useHasAppUpgradeError();
 
-  if (isBlocked) {
+  if (isBlocked || appUpgradeEventType === 'APP_UPGRADE_STATUS_ABORTED') {
     // TRANSLATORS: Status text displayed below a progress bar when the download of an update has been paused
     return messages.pgettext('app-upgrade-view', 'Download paused');
   }