summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/components/device-list-item/components/confirm-dialog/hooks/use-handle-remove-device-error.ts14
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/components/device-list/hooks/use-get-devices.ts6
2 files changed, 7 insertions, 13 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/device-list-item/components/confirm-dialog/hooks/use-handle-remove-device-error.ts b/desktop/packages/mullvad-vpn/src/renderer/components/device-list-item/components/confirm-dialog/hooks/use-handle-remove-device-error.ts
index af2d93ceec..ed9fab49ff 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/device-list-item/components/confirm-dialog/hooks/use-handle-remove-device-error.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/device-list-item/components/confirm-dialog/hooks/use-handle-remove-device-error.ts
@@ -23,14 +23,12 @@ export const useHandleRemoveDeviceError = () => {
let devices: Array<IDevice> | undefined = undefined;
try {
devices = await fetchDevices(accountNumber);
- } catch {
- /* no-op */
- }
-
- if (devices === undefined || devices.some((device) => device.id === deviceId)) {
- hideConfirmDialog();
- resetDeleting();
- setError();
+ } finally {
+ if (devices === undefined || devices.some((device) => device.id === deviceId)) {
+ hideConfirmDialog();
+ resetDeleting();
+ setError();
+ }
}
},
[fetchDevices, accountNumber, deviceId, hideConfirmDialog, resetDeleting, setError],
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/device-list/hooks/use-get-devices.ts b/desktop/packages/mullvad-vpn/src/renderer/components/device-list/hooks/use-get-devices.ts
index c4bed93361..b48b458775 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/device-list/hooks/use-get-devices.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/device-list/hooks/use-get-devices.ts
@@ -10,11 +10,7 @@ export const useGetDevices = () => {
const devices = useSortedDevices();
React.useEffect(() => {
- try {
- void fetchDevices(accountNumber);
- } catch {
- /* no-op */
- }
+ void fetchDevices(accountNumber);
}, [accountNumber, fetchDevices]);
return devices;