diff options
5 files changed, 14 insertions, 14 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/hooks/useMessage/hooks/useGetMessageTimeLeft.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/hooks/useMessage/hooks/useGetMessageTimeLeft.ts index d1a3117344..81a36a42d9 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/hooks/useMessage/hooks/useGetMessageTimeLeft.ts +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/download-progress/hooks/useMessage/hooks/useGetMessageTimeLeft.ts @@ -5,11 +5,11 @@ import { isNumber } from '../../../../../../../../../shared/utils'; import { useAppUpgradeEvent } from '../../../../../../../../redux/hooks'; export const useGetMessageTimeLeft = () => { - const { appUpgradeEvent } = useAppUpgradeEvent(); + const { event } = useAppUpgradeEvent(); const getMessageTimeLeft = () => { - if (appUpgradeEvent?.type === 'APP_UPGRADE_STATUS_DOWNLOAD_PROGRESS') { - const { timeLeft } = appUpgradeEvent; + if (event?.type === 'APP_UPGRADE_STATUS_DOWNLOAD_PROGRESS') { + const { timeLeft } = event; const isTimeLeftNumeric = isNumber(timeLeft); if (isTimeLeftNumeric) { diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/upgrade-label/components/download-progress/hooks/useMessage.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/upgrade-label/components/download-progress/hooks/useMessage.ts index 2edfb8c81b..9da81085d8 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/upgrade-label/components/download-progress/hooks/useMessage.ts +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/upgrade-label/components/download-progress/hooks/useMessage.ts @@ -4,10 +4,10 @@ import { messages } from '../../../../../../../../../shared/gettext'; import { useAppUpgradeEvent } from '../../../../../../../../redux/hooks'; export const useMessage = () => { - const { appUpgradeEvent } = useAppUpgradeEvent(); + const { event } = useAppUpgradeEvent(); - if (appUpgradeEvent?.type === 'APP_UPGRADE_STATUS_DOWNLOAD_PROGRESS') { - const { server } = appUpgradeEvent; + if (event?.type === 'APP_UPGRADE_STATUS_DOWNLOAD_PROGRESS') { + const { server } = event; return sprintf( // TRANSLATORS: Label displayed above a progress bar informing the user which server 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 7be46dce97..714d3bbc9f 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 @@ -4,17 +4,17 @@ import { useAppUpgradeEvent } from '../../../redux/hooks'; import { FALLBACK_VALUE } from '../constants'; export const useGetValueDownloadProgress = () => { - const { appUpgradeEvent } = useAppUpgradeEvent(); + const { event } = useAppUpgradeEvent(); const getValueDownloadProgress = useCallback(() => { - if (appUpgradeEvent?.type === 'APP_UPGRADE_STATUS_DOWNLOAD_PROGRESS') { - const { progress } = appUpgradeEvent; + if (event?.type === 'APP_UPGRADE_STATUS_DOWNLOAD_PROGRESS') { + const { progress } = event; return progress; } return FALLBACK_VALUE; - }, [appUpgradeEvent]); + }, [event]); return getValueDownloadProgress; }; diff --git a/desktop/packages/mullvad-vpn/src/renderer/hooks/useAppUpgradeEventType.ts b/desktop/packages/mullvad-vpn/src/renderer/hooks/useAppUpgradeEventType.ts index 2646af68ae..238a38e9b1 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/hooks/useAppUpgradeEventType.ts +++ b/desktop/packages/mullvad-vpn/src/renderer/hooks/useAppUpgradeEventType.ts @@ -1,9 +1,9 @@ import { useAppUpgradeEvent } from '../redux/hooks'; export const useAppUpgradeEventType = () => { - const { appUpgradeEvent } = useAppUpgradeEvent(); + const { event } = useAppUpgradeEvent(); - const appUpgradeEventType = appUpgradeEvent?.type; + const appUpgradeEventType = event?.type; return appUpgradeEventType; }; diff --git a/desktop/packages/mullvad-vpn/src/renderer/hooks/useHasAppUpgradeEvent.ts b/desktop/packages/mullvad-vpn/src/renderer/hooks/useHasAppUpgradeEvent.ts index de1782c94b..2ed8aeb556 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/hooks/useHasAppUpgradeEvent.ts +++ b/desktop/packages/mullvad-vpn/src/renderer/hooks/useHasAppUpgradeEvent.ts @@ -1,9 +1,9 @@ import { useAppUpgradeEvent } from '../redux/hooks'; export const useHasAppUpgradeEvent = () => { - const { appUpgradeEvent } = useAppUpgradeEvent(); + const { event } = useAppUpgradeEvent(); - const hasAppUpgradeEvent = appUpgradeEvent !== undefined; + const hasAppUpgradeEvent = event !== undefined; return hasAppUpgradeEvent; }; |