Replace use of fallback value with last progress from Redux

4 files changed, 11 insertions, 11 deletions

diff --git a/desktop/packages/mullvad-vpn/src/renderer/hooks/useAppUpgradeDownloadProgressValue/constants.ts b/desktop/packages/mullvad-vpn/src/renderer/hooks/useAppUpgradeDownloadProgressValue/constants.ts
index ee890a78cf..cd027d4d3f 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/hooks/useAppUpgradeDownloadProgressValue/constants.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/hooks/useAppUpgradeDownloadProgressValue/constants.ts
@@ -1,2 +1 @@
 export const DOWNLOAD_COMPLETE_VALUE = 100;
-export const FALLBACK_VALUE = 0;
diff --git a/desktop/packages/mullvad-vpn/src/renderer/hooks/useAppUpgradeDownloadProgressValue/hooks/useGetValueDownloadProgress.ts b/desktop/packages/mullvad-vpn/src/renderer/hooks/useAppUpgradeDownloadProgressValue/hooks/useGetValueDownloadProgress.ts
index 714d3bbc9f..79da7afb9f 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/hooks/useAppUpgradeDownloadProgressValue/hooks/useGetValueDownloadProgress.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/hooks/useAppUpgradeDownloadProgressValue/hooks/useGetValueDownloadProgress.ts
@@ -1,10 +1,10 @@
 import { useCallback } from 'react';
 
-import { useAppUpgradeEvent } from '../../../redux/hooks';
-import { FALLBACK_VALUE } from '../constants';
+import { useAppUpgradeEvent, useAppUpgradeLastProgress } from '../../../redux/hooks';
 
 export const useGetValueDownloadProgress = () => {
   const { event } = useAppUpgradeEvent();
+  const { lastProgress } = useAppUpgradeLastProgress();
 
   const getValueDownloadProgress = useCallback(() => {
     if (event?.type === 'APP_UPGRADE_STATUS_DOWNLOAD_PROGRESS') {
@@ -13,8 +13,8 @@ export const useGetValueDownloadProgress = () => {
       return progress;
     }
 
-    return FALLBACK_VALUE;
-  }, [event]);
+    return lastProgress;
+  }, [event, lastProgress]);
 
   return getValueDownloadProgress;
 };
diff --git a/desktop/packages/mullvad-vpn/src/renderer/hooks/useAppUpgradeDownloadProgressValue/hooks/useGetValueError.ts b/desktop/packages/mullvad-vpn/src/renderer/hooks/useAppUpgradeDownloadProgressValue/hooks/useGetValueError.ts
index 499d0474aa..fe3076b0d7 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/hooks/useAppUpgradeDownloadProgressValue/hooks/useGetValueError.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/hooks/useAppUpgradeDownloadProgressValue/hooks/useGetValueError.ts
@@ -1,12 +1,13 @@
 import { useCallback } from 'react';
 
-import { useAppUpgradeError } from '../../../redux/hooks';
-import { DOWNLOAD_COMPLETE_VALUE, FALLBACK_VALUE } from '../constants';
+import { useAppUpgradeError, useAppUpgradeLastProgress } from '../../../redux/hooks';
+import { DOWNLOAD_COMPLETE_VALUE } from '../constants';
 import { useGetValueDownloadProgress } from './useGetValueDownloadProgress';
 
 export const useGetValueError = () => {
   const { error } = useAppUpgradeError();
   const getValueDownloadProgress = useGetValueDownloadProgress();
+  const { lastProgress } = useAppUpgradeLastProgress();
 
   const getValueError = useCallback(() => {
     if (error === 'DOWNLOAD_FAILED' || error === 'GENERAL_ERROR') {
@@ -21,8 +22,8 @@ export const useGetValueError = () => {
       return DOWNLOAD_COMPLETE_VALUE;
     }
 
-    return FALLBACK_VALUE;
-  }, [error, getValueDownloadProgress]);
+    return lastProgress;
+  }, [error, getValueDownloadProgress, lastProgress]);
 
   return getValueError;
 };
diff --git a/desktop/packages/mullvad-vpn/src/renderer/hooks/useAppUpgradeDownloadProgressValue/useAppUpgradeDownloadProgressValue.ts b/desktop/packages/mullvad-vpn/src/renderer/hooks/useAppUpgradeDownloadProgressValue/useAppUpgradeDownloadProgressValue.ts
index ebf860c9ef..43e52c4491 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/hooks/useAppUpgradeDownloadProgressValue/useAppUpgradeDownloadProgressValue.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/hooks/useAppUpgradeDownloadProgressValue/useAppUpgradeDownloadProgressValue.ts
@@ -2,7 +2,7 @@ import { useAppUpgradeLastProgress } from '../../redux/hooks';
 import { useAppUpgradeEventType } from '../useAppUpgradeEventType';
 import { useHasAppUpgradeError } from '../useHasAppUpgradeError';
 import { useHasAppUpgradeVerifiedInstallerPath } from '../useHasAppUpgradeVerifiedInstallerPath';
-import { DOWNLOAD_COMPLETE_VALUE, FALLBACK_VALUE } from './constants';
+import { DOWNLOAD_COMPLETE_VALUE } from './constants';
 import { useGetValueDownloadProgress, useGetValueError } from './hooks';
 
 export const useAppUpgradeDownloadProgressValue = () => {
@@ -36,5 +36,5 @@ export const useAppUpgradeDownloadProgressValue = () => {
       break;
   }
 
-  return lastProgress ?? FALLBACK_VALUE;
+  return lastProgress;
 };