summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOliver <oliver@mohlin.dev>2025-01-31 10:58:45 +0100
committerMarkus Pettersson <markus.pettersson@mullvad.net>2025-02-03 08:56:15 +0100
commit99b30c41f7cbf2baf88615cacc34bc2cf666ddb9 (patch)
tree4fc44f625ba35fabf3a07e2dc38466afde70fad7
parente5dd6b271d1e8b253e2b93ee9076e01819d7ff79 (diff)
downloadmullvadvpn-99b30c41f7cbf2baf88615cacc34bc2cf666ddb9.tar.xz
mullvadvpn-99b30c41f7cbf2baf88615cacc34bc2cf666ddb9.zip
Rename open link functions to open url
-rw-r--r--desktop/packages/mullvad-vpn/src/main/index.ts2
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/app.tsx4
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/components/Account.tsx6
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/components/ExpiredAccountErrorView.tsx6
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx6
5 files changed, 12 insertions, 12 deletions
diff --git a/desktop/packages/mullvad-vpn/src/main/index.ts b/desktop/packages/mullvad-vpn/src/main/index.ts
index fbdd581a09..2186168379 100644
--- a/desktop/packages/mullvad-vpn/src/main/index.ts
+++ b/desktop/packages/mullvad-vpn/src/main/index.ts
@@ -855,7 +855,7 @@ class ApplicationMain
IpcMainEventChannel.app.handleQuit(() => this.disconnectAndQuit());
IpcMainEventChannel.app.handleOpenUrl(async (url) => {
- if (Object.values(urls).find((link) => url.startsWith(link))) {
+ if (Object.values(urls).find((allowedUrl) => url.startsWith(allowedUrl))) {
await shell.openExternal(url);
}
});
diff --git a/desktop/packages/mullvad-vpn/src/renderer/app.tsx b/desktop/packages/mullvad-vpn/src/renderer/app.tsx
index a90efd8037..14fdd537b0 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/app.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/app.tsx
@@ -463,7 +463,7 @@ export default class AppRenderer {
return devices;
};
- public openLinkWithAuth = async (link: Url): Promise<void> => {
+ public openUrlWithAuth = async (url: Url): Promise<void> => {
let token = '';
try {
token = await IpcRendererEventChannel.account.getWwwAuthToken();
@@ -471,7 +471,7 @@ export default class AppRenderer {
const error = e as Error;
log.error(`Failed to get the WWW auth token: ${error.message}`);
}
- void this.openUrl(`${link}?token=${token}`);
+ void this.openUrl(`${url}?token=${token}`);
};
public setAllowLan = async (allowLan: boolean) => {
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/Account.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/Account.tsx
index 6a7da779e7..204a77501c 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/Account.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/Account.tsx
@@ -30,11 +30,11 @@ import SettingsHeader, { HeaderTitle } from './SettingsHeader';
export default function Account() {
const history = useHistory();
const isOffline = useSelector((state) => state.connection.isBlocked);
- const { updateAccountData, openLinkWithAuth, logout } = useAppContext();
+ const { updateAccountData, openUrlWithAuth, logout } = useAppContext();
const onBuyMore = useCallback(async () => {
- await openLinkWithAuth(urls.purchase);
- }, [openLinkWithAuth]);
+ await openUrlWithAuth(urls.purchase);
+ }, [openUrlWithAuth]);
const onMount = useEffectEvent(() => updateAccountData());
useEffect(() => onMount(), []);
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/ExpiredAccountErrorView.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/ExpiredAccountErrorView.tsx
index cac8a07a8e..fa59ac7d76 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/ExpiredAccountErrorView.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/ExpiredAccountErrorView.tsx
@@ -177,7 +177,7 @@ function Content() {
function ExternalPaymentButton() {
const { setShowBlockWhenDisconnectedAlert } = useExpiredAccountContext();
const { recoveryAction } = useRecoveryAction();
- const { openLinkWithAuth } = useAppContext();
+ const { openUrlWithAuth } = useAppContext();
const isNewAccount = useIsNewAccount();
const buttonText = isNewAccount
@@ -188,9 +188,9 @@ function ExternalPaymentButton() {
if (recoveryAction === RecoveryAction.disableBlockedWhenDisconnected) {
setShowBlockWhenDisconnectedAlert(true);
} else {
- await openLinkWithAuth(urls.purchase);
+ await openUrlWithAuth(urls.purchase);
}
- }, [openLinkWithAuth, recoveryAction, setShowBlockWhenDisconnectedAlert]);
+ }, [openUrlWithAuth, recoveryAction, setShowBlockWhenDisconnectedAlert]);
return (
<AppButton.BlockingButton
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx
index 20b001f095..d9c6cbb666 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx
@@ -184,7 +184,7 @@ function NotificationActionWrapper({
setIsModalOpen,
}: NotificationActionWrapperProps) {
const { push } = useHistory();
- const { openLinkWithAuth, openUrl } = useAppContext();
+ const { openUrlWithAuth, openUrl } = useAppContext();
const closeTroubleshootModal = useCallback(() => setIsModalOpen(false), [setIsModalOpen]);
@@ -193,7 +193,7 @@ function NotificationActionWrapper({
switch (action.type) {
case 'open-url':
if (action.withAuth) {
- return openLinkWithAuth(action.url);
+ return openUrlWithAuth(action.url);
} else {
return openUrl(action.url);
}
@@ -207,7 +207,7 @@ function NotificationActionWrapper({
}
return Promise.resolve();
- }, [action, setIsModalOpen, openLinkWithAuth, openUrl]);
+ }, [action, setIsModalOpen, openUrlWithAuth, openUrl]);
const goToProblemReport = useCallback(() => {
closeTroubleshootModal();