Handle change to useAppUpgradeError selector return format

9 files changed, 27 insertions, 26 deletions

diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx
index 9c9265ace1..bae7df7ccb 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx
@@ -104,7 +104,7 @@ export default function NotificationArea(props: IProps) {
     (state) => state.settings.guiSettings.updateDismissedForVersion,
   );
   const hasAppUpgradeError = useHasAppUpgradeError();
-  const { appUpgradeError } = useAppUpgradeError();
+  const { error } = useAppUpgradeError();
 
   const restartAppUpgrade = useCallback(() => {
     appUpgrade();
@@ -127,7 +127,7 @@ export default function NotificationArea(props: IProps) {
     }),
     new AppUpgradeErrorNotificationProvider({
       hasAppUpgradeError,
-      appUpgradeError,
+      appUpgradeError: error,
       restartAppUpgrade,
     }),
     new AppUpgradeReadyNotificationProvider({
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/hooks/useMessage/hooks/useGetMessageError.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/hooks/useMessage/hooks/useGetMessageError.ts
index 40362deffa..8a0ef09ecb 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/hooks/useMessage/hooks/useGetMessageError.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/hooks/useMessage/hooks/useGetMessageError.ts
@@ -2,13 +2,13 @@ import { messages } from '../../../../../../../../../shared/gettext';
 import { useAppUpgradeError } from '../../../../../../../../redux/hooks';
 
 export const useGetMessageError = () => {
-  const { appUpgradeError } = useAppUpgradeError();
+  const { error } = useAppUpgradeError();
 
   const getMessageError = () => {
     if (
-      appUpgradeError === 'START_INSTALLER_FAILED' ||
-      appUpgradeError === 'START_INSTALLER_AUTOMATIC_FAILED' ||
-      appUpgradeError === 'VERIFICATION_FAILED'
+      error === 'START_INSTALLER_FAILED' ||
+      error === 'START_INSTALLER_AUTOMATIC_FAILED' ||
+      error === 'VERIFICATION_FAILED'
     ) {
       // TRANSLATORS: Status text displayed below a progress bar when the download of an update is complete
       return messages.pgettext('app-upgrade-view', 'Download complete!');
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/upgrade-label/components/upgrade-error/hooks/useMessage.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/upgrade-label/components/upgrade-error/hooks/useMessage.ts
index ffd4272244..5d7e4cc62c 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/upgrade-label/components/upgrade-error/hooks/useMessage.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/upgrade-label/components/upgrade-error/hooks/useMessage.ts
@@ -2,9 +2,9 @@ import { messages } from '../../../../../../../../../shared/gettext';
 import { useAppUpgradeError } from '../../../../../../../../redux/hooks';
 
 export const useMessage = () => {
-  const { appUpgradeError } = useAppUpgradeError();
+  const { error } = useAppUpgradeError();
 
-  switch (appUpgradeError) {
+  switch (error) {
     case 'DOWNLOAD_FAILED':
       return [
         // TRANSLATORS: Label displayed when an error occurred due to the download failing
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowDownloadProgress.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowDownloadProgress.ts
index 2af3f1b1e7..08b7438a14 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowDownloadProgress.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowDownloadProgress.ts
@@ -7,7 +7,7 @@ import { useAppUpgradeError, useConnectionIsBlocked } from '../../../../redux/ho
 
 export const useShowDownloadProgress = () => {
   const { isBlocked } = useConnectionIsBlocked();
-  const { appUpgradeError } = useAppUpgradeError();
+  const { error } = useAppUpgradeError();
   const hasAppUpgradeInitiated = useHasAppUpgradeInitiated();
   const hasAppUpgradeError = useHasAppUpgradeError();
   const isAppUpgradePending = useIsAppUpgradePending();
@@ -18,9 +18,9 @@ export const useShowDownloadProgress = () => {
 
   if (hasAppUpgradeError) {
     if (
-      appUpgradeError === 'START_INSTALLER_AUTOMATIC_FAILED' ||
-      appUpgradeError === 'START_INSTALLER_FAILED' ||
-      appUpgradeError === 'VERIFICATION_FAILED'
+      error === 'START_INSTALLER_AUTOMATIC_FAILED' ||
+      error === 'START_INSTALLER_FAILED' ||
+      error === 'VERIFICATION_FAILED'
     ) {
       return true;
     }
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowReportProblemButton.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowReportProblemButton.ts
index a03cdb1be7..062f0a8436 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowReportProblemButton.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowReportProblemButton.ts
@@ -1,11 +1,12 @@
 import { useAppUpgradeError } from '../../../../redux/hooks';
 
 export const useShowReportProblemButton = () => {
-  const { appUpgradeError } = useAppUpgradeError();
+  const { error } = useAppUpgradeError();
 
-  switch (appUpgradeError) {
+  switch (error) {
     case 'DOWNLOAD_FAILED':
     case 'GENERAL_ERROR':
+    case 'INSTALLER_FAILED':
     case 'START_INSTALLER_FAILED':
     case 'VERIFICATION_FAILED':
       return true;
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowRetryUpgradeButton.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowRetryUpgradeButton.ts
index e1f810e9f9..0896f5dfe2 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowRetryUpgradeButton.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/hooks/useShowRetryUpgradeButton.ts
@@ -1,9 +1,9 @@
 import { useAppUpgradeError } from '../../../../redux/hooks';
 
 export const useShowRetryUpgradeButton = () => {
-  const { appUpgradeError } = useAppUpgradeError();
+  const { error } = useAppUpgradeError();
 
-  switch (appUpgradeError) {
+  switch (error) {
     case 'DOWNLOAD_FAILED':
     case 'GENERAL_ERROR':
     case 'START_INSTALLER_FAILED':
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 af446bd926..77a3737e1f 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
@@ -5,24 +5,24 @@ import { DOWNLOAD_COMPLETE_VALUE, FALLBACK_VALUE } from '../constants';
 import { useGetValueDownloadProgress } from './useGetValueDownloadProgress';
 
 export const useGetValueError = () => {
-  const { appUpgradeError } = useAppUpgradeError();
+  const { error } = useAppUpgradeError();
   const getValueDownloadProgress = useGetValueDownloadProgress();
 
   const getValueError = useCallback(() => {
-    if (appUpgradeError === 'DOWNLOAD_FAILED' || appUpgradeError === 'GENERAL_ERROR') {
+    if (error === 'DOWNLOAD_FAILED' || error === 'GENERAL_ERROR') {
       return getValueDownloadProgress();
     }
 
     if (
-      appUpgradeError === 'START_INSTALLER_AUTOMATIC_FAILED' ||
-      appUpgradeError === 'START_INSTALLER_FAILED' ||
-      appUpgradeError === 'VERIFICATION_FAILED'
+      error === 'START_INSTALLER_AUTOMATIC_FAILED' ||
+      error === 'START_INSTALLER_FAILED' ||
+      error === 'VERIFICATION_FAILED'
     ) {
       return DOWNLOAD_COMPLETE_VALUE;
     }
 
     return FALLBACK_VALUE;
-  }, [appUpgradeError, getValueDownloadProgress]);
+  }, [error, getValueDownloadProgress]);
 
   return getValueError;
 };
diff --git a/desktop/packages/mullvad-vpn/src/renderer/hooks/useHasAppUpgradeError.ts b/desktop/packages/mullvad-vpn/src/renderer/hooks/useHasAppUpgradeError.ts
index a6ef89e5a3..f829ff3657 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/hooks/useHasAppUpgradeError.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/hooks/useHasAppUpgradeError.ts
@@ -1,9 +1,9 @@
 import { useAppUpgradeError } from '../redux/hooks';
 
 export const useHasAppUpgradeError = () => {
-  const { appUpgradeError } = useAppUpgradeError();
+  const { error } = useAppUpgradeError();
 
-  const hasAppUpgradeError = appUpgradeError !== undefined;
+  const hasAppUpgradeError = error !== undefined;
 
   return hasAppUpgradeError;
 };
diff --git a/desktop/packages/mullvad-vpn/src/renderer/hooks/useShouldAppUpgradeInstallManually.ts b/desktop/packages/mullvad-vpn/src/renderer/hooks/useShouldAppUpgradeInstallManually.ts
index 9f8c96e982..b8b745961c 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/hooks/useShouldAppUpgradeInstallManually.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/hooks/useShouldAppUpgradeInstallManually.ts
@@ -5,7 +5,7 @@ import { useHasAppUpgradeInitiated } from './useHasAppUpgradeInitiated';
 import { useHasAppUpgradeVerifiedInstallerPath } from './useHasAppUpgradeVerifiedInstallerPath';
 
 export const useShouldAppUpgradeInstallManually = () => {
-  const { appUpgradeError } = useAppUpgradeError();
+  const { error } = useAppUpgradeError();
   const appUpgradeEventType = useAppUpgradeEventType();
   const hasAppUpgradeError = useHasAppUpgradeError();
   const hasAppUpgradeVerifiedInstallerPath = useHasAppUpgradeVerifiedInstallerPath();
@@ -13,7 +13,7 @@ export const useShouldAppUpgradeInstallManually = () => {
 
   if (hasAppUpgradeVerifiedInstallerPath) {
     if (hasAppUpgradeError) {
-      if (appUpgradeError === 'START_INSTALLER_AUTOMATIC_FAILED') {
+      if (error === 'START_INSTALLER_AUTOMATIC_FAILED') {
         return true;
       }
     } else {