summaryrefslogtreecommitdiffhomepage
path: root/gui/src/shared
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2022-04-04 14:46:13 +0200
committerOskar Nyberg <oskar@mullvad.net>2022-04-05 15:59:45 +0200
commit6d85d8b361e0487d8716330525b2703e43d08a6a (patch)
tree6811a180f7144694b1ffed3b8f7334ae39f82c0b /gui/src/shared
parent9efaf2d3e48190927824853bbc41e7e08d216d69 (diff)
downloadmullvadvpn-6d85d8b361e0487d8716330525b2703e43d08a6a.tar.xz
mullvadvpn-6d85d8b361e0487d8716330525b2703e43d08a6a.zip
Fix import ordering
Diffstat (limited to 'gui/src/shared')
-rw-r--r--gui/src/shared/account-expiry.ts2
-rw-r--r--gui/src/shared/date-helper.ts1
-rw-r--r--gui/src/shared/gettext.ts1
-rw-r--r--gui/src/shared/ipc-helpers.ts3
-rw-r--r--gui/src/shared/ipc-schema.ts5
-rw-r--r--gui/src/shared/notifications/close-to-account-expiry.ts1
-rw-r--r--gui/src/shared/notifications/connected.ts1
-rw-r--r--gui/src/shared/notifications/connecting.ts1
-rw-r--r--gui/src/shared/notifications/error.ts2
-rw-r--r--gui/src/shared/notifications/unsupported-version.ts2
-rw-r--r--gui/src/shared/notifications/update-available.ts1
11 files changed, 14 insertions, 6 deletions
diff --git a/gui/src/shared/account-expiry.ts b/gui/src/shared/account-expiry.ts
index 81c45fec07..c6fa0c6d07 100644
--- a/gui/src/shared/account-expiry.ts
+++ b/gui/src/shared/account-expiry.ts
@@ -1,4 +1,4 @@
-import { DateComponent, DateType, formatRelativeDate, dateByAddingComponent } from './date-helper';
+import { dateByAddingComponent, DateComponent, DateType, formatRelativeDate } from './date-helper';
import { capitalize } from './string-helpers';
export function hasExpired(expiry: DateType): boolean {
diff --git a/gui/src/shared/date-helper.ts b/gui/src/shared/date-helper.ts
index 36353c9b44..7f232552b3 100644
--- a/gui/src/shared/date-helper.ts
+++ b/gui/src/shared/date-helper.ts
@@ -1,4 +1,5 @@
import { sprintf } from 'sprintf-js';
+
import { messages } from './gettext';
export type DateType = Date | string | number;
diff --git a/gui/src/shared/gettext.ts b/gui/src/shared/gettext.ts
index 9acdd80a55..90391107e0 100644
--- a/gui/src/shared/gettext.ts
+++ b/gui/src/shared/gettext.ts
@@ -1,4 +1,5 @@
import Gettext from 'node-gettext';
+
import { LocalizationContexts } from './localization-contexts';
import log from './logging';
diff --git a/gui/src/shared/ipc-helpers.ts b/gui/src/shared/ipc-helpers.ts
index 31469ce88a..cde27bb32b 100644
--- a/gui/src/shared/ipc-helpers.ts
+++ b/gui/src/shared/ipc-helpers.ts
@@ -1,6 +1,7 @@
import { IpcMain as EIpcMain, IpcRenderer as EIpcRenderer, WebContents } from 'electron';
-import { capitalize } from './string-helpers';
+
import log from './logging';
+import { capitalize } from './string-helpers';
type Handler<T, R> = (callback: (arg: T) => R) => void;
type Sender<T, R> = (arg: T) => R;
diff --git a/gui/src/shared/ipc-schema.ts b/gui/src/shared/ipc-schema.ts
index 8f5d0d8d83..1700ddc606 100644
--- a/gui/src/shared/ipc-schema.ts
+++ b/gui/src/shared/ipc-schema.ts
@@ -1,5 +1,6 @@
import { GetTextTranslations } from 'gettext-parser';
-import { IWindowsApplication, ILinuxSplitTunnelingApplication } from './application-types';
+
+import { ILinuxSplitTunnelingApplication, IWindowsApplication } from './application-types';
import {
AccountToken,
BridgeSettings,
@@ -8,6 +9,7 @@ import {
IAppVersionInfo,
IDevice,
IDeviceConfig,
+ IDeviceEvent,
IDeviceRemoval,
IDnsOptions,
ILocation,
@@ -16,7 +18,6 @@ import {
RelaySettingsUpdate,
TunnelState,
VoucherResponse,
- IDeviceEvent,
} from './daemon-rpc-types';
import { IGuiSettingsState } from './gui-settings-state';
import { LogLevel } from './logging-types';
diff --git a/gui/src/shared/notifications/close-to-account-expiry.ts b/gui/src/shared/notifications/close-to-account-expiry.ts
index e0f13b33b3..82daf05562 100644
--- a/gui/src/shared/notifications/close-to-account-expiry.ts
+++ b/gui/src/shared/notifications/close-to-account-expiry.ts
@@ -1,4 +1,5 @@
import { sprintf } from 'sprintf-js';
+
import { links } from '../../config.json';
import { messages } from '../../shared/gettext';
import { closeToExpiry, formatRemainingTime } from '../account-expiry';
diff --git a/gui/src/shared/notifications/connected.ts b/gui/src/shared/notifications/connected.ts
index 0ce1dceeb5..5fc667b78c 100644
--- a/gui/src/shared/notifications/connected.ts
+++ b/gui/src/shared/notifications/connected.ts
@@ -1,4 +1,5 @@
import { sprintf } from 'sprintf-js';
+
import { messages } from '../../shared/gettext';
import { TunnelState } from '../daemon-rpc-types';
import { SystemNotificationProvider } from './notification';
diff --git a/gui/src/shared/notifications/connecting.ts b/gui/src/shared/notifications/connecting.ts
index 3b574dad18..b35d9ed3b6 100644
--- a/gui/src/shared/notifications/connecting.ts
+++ b/gui/src/shared/notifications/connecting.ts
@@ -1,4 +1,5 @@
import { sprintf } from 'sprintf-js';
+
import { messages } from '../../shared/gettext';
import { TunnelState } from '../daemon-rpc-types';
import {
diff --git a/gui/src/shared/notifications/error.ts b/gui/src/shared/notifications/error.ts
index d2a43ade8d..fa654b8291 100644
--- a/gui/src/shared/notifications/error.ts
+++ b/gui/src/shared/notifications/error.ts
@@ -1,6 +1,6 @@
import { hasExpired } from '../account-expiry';
import { AuthFailureKind, parseAuthFailure } from '../auth-failure';
-import { IErrorState, TunnelState, TunnelParameterError } from '../daemon-rpc-types';
+import { IErrorState, TunnelParameterError, TunnelState } from '../daemon-rpc-types';
import { messages } from '../gettext';
import {
InAppNotification,
diff --git a/gui/src/shared/notifications/unsupported-version.ts b/gui/src/shared/notifications/unsupported-version.ts
index 2560119c4c..3db1db9fc7 100644
--- a/gui/src/shared/notifications/unsupported-version.ts
+++ b/gui/src/shared/notifications/unsupported-version.ts
@@ -2,8 +2,8 @@ import { links } from '../../config.json';
import { messages } from '../../shared/gettext';
import {
InAppNotification,
- SystemNotification,
InAppNotificationProvider,
+ SystemNotification,
SystemNotificationProvider,
} from './notification';
diff --git a/gui/src/shared/notifications/update-available.ts b/gui/src/shared/notifications/update-available.ts
index 54dcc02ca8..61a2452138 100644
--- a/gui/src/shared/notifications/update-available.ts
+++ b/gui/src/shared/notifications/update-available.ts
@@ -1,4 +1,5 @@
import { sprintf } from 'sprintf-js';
+
import { links } from '../../config.json';
import { messages } from '../../shared/gettext';
import {