summaryrefslogtreecommitdiffhomepage
path: root/desktop
diff options
context:
space:
mode:
authorTobias Järvelöv <tobias.jarvelov@mullvad.net>2025-05-19 19:54:14 +0200
committerSebastian Holmin <sebastian.holmin@mullvad.net>2025-05-28 13:25:42 +0200
commit07c8859bd4fe20f01730e8ef02fa5ff47fb62758 (patch)
treea51b318b8064d61d7efb450180da6bcfb790a3d9 /desktop
parent2382c4ccc7b84591cc1b28547ed63de4b03e04ed (diff)
downloadmullvadvpn-07c8859bd4fe20f01730e8ef02fa5ff47fb62758.tar.xz
mullvadvpn-07c8859bd4fe20f01730e8ef02fa5ff47fb62758.zip
Use consistent variable name for invoked hook's return value
Diffstat (limited to 'desktop')
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/footer/components/download-footer/components/download-label/hooks/useMessage.ts4
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/footer/components/download-footer/hooks/useShowResumeDownloadButton.ts5
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/footer/components/launch-footer/hooks/useDisabled.ts8
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/footer/hooks/useStep.ts4
4 files changed, 11 insertions, 10 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/footer/components/download-footer/components/download-label/hooks/useMessage.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/footer/components/download-footer/components/download-label/hooks/useMessage.ts
index db66bc7179..02c1e50a8d 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/footer/components/download-footer/components/download-label/hooks/useMessage.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/footer/components/download-footer/components/download-label/hooks/useMessage.ts
@@ -3,10 +3,10 @@ import { useAppUpgradeEventType } from '../../../../../../../../../../hooks';
import { useGetDownloadProgressMessage } from './useGetDownloadProgressMessage';
export const useMessage = () => {
- const eventType = useAppUpgradeEventType();
+ const appUpgradeEventType = useAppUpgradeEventType();
const getDownloadProgressMessage = useGetDownloadProgressMessage();
- switch (eventType) {
+ switch (appUpgradeEventType) {
case 'APP_UPGRADE_STATUS_DOWNLOAD_INITIATED':
case 'APP_UPGRADE_STATUS_DOWNLOAD_STARTED':
// TRANSLATORS: Label displayed above a progress bar when a download is in progress
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/footer/components/download-footer/hooks/useShowResumeDownloadButton.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/footer/components/download-footer/hooks/useShowResumeDownloadButton.ts
index 54718cc684..3009d2235c 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/footer/components/download-footer/hooks/useShowResumeDownloadButton.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/footer/components/download-footer/hooks/useShowResumeDownloadButton.ts
@@ -3,9 +3,10 @@ import { useConnectionIsBlocked } from '../../../../../../../../redux/hooks';
export const useShowResumeDownloadButton = () => {
const { isBlocked } = useConnectionIsBlocked();
- const eventType = useAppUpgradeEventType();
+ const appUpgradeEventType = useAppUpgradeEventType();
- const showResumeDownloadButton = eventType === 'APP_UPGRADE_STATUS_ABORTED' || isBlocked;
+ const showResumeDownloadButton =
+ appUpgradeEventType === 'APP_UPGRADE_STATUS_ABORTED' || isBlocked;
return showResumeDownloadButton;
};
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/footer/components/launch-footer/hooks/useDisabled.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/footer/components/launch-footer/hooks/useDisabled.ts
index cca25cfe08..53c1385ff8 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/footer/components/launch-footer/hooks/useDisabled.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/footer/components/launch-footer/hooks/useDisabled.ts
@@ -1,12 +1,12 @@
import { useAppUpgradeEventType } from '../../../../../../../../hooks';
export const useDisabled = () => {
- const eventType = useAppUpgradeEventType();
+ const appUpgradeEventType = useAppUpgradeEventType();
const disabled =
- eventType === 'APP_UPGRADE_STATUS_AUTOMATIC_STARTING_INSTALLER' ||
- eventType === 'APP_UPGRADE_STATUS_MANUAL_STARTING_INSTALLER' ||
- eventType === 'APP_UPGRADE_STATUS_STARTED_INSTALLER';
+ appUpgradeEventType === 'APP_UPGRADE_STATUS_AUTOMATIC_STARTING_INSTALLER' ||
+ appUpgradeEventType === 'APP_UPGRADE_STATUS_MANUAL_STARTING_INSTALLER' ||
+ appUpgradeEventType === 'APP_UPGRADE_STATUS_STARTED_INSTALLER';
return disabled;
};
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/footer/hooks/useStep.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/footer/hooks/useStep.ts
index da4420e470..55c6659969 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/footer/hooks/useStep.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/app-upgrade/components/footer/hooks/useStep.ts
@@ -5,12 +5,12 @@ import { useConnectionIsBlocked } from '../../../../../../redux/hooks';
export const useStep = (): AppUpgradeStep => {
const { isBlocked } = useConnectionIsBlocked();
- const eventType = useAppUpgradeEventType();
+ const appUpgradeEventType = useAppUpgradeEventType();
const hasAppUpgradeError = useHasAppUpgradeError();
if (hasAppUpgradeError && !isBlocked) {
return 'error';
}
- return convertEventTypeToStep(eventType);
+ return convertEventTypeToStep(appUpgradeEventType);
};