summaryrefslogtreecommitdiffhomepage
path: root/gui/src/renderer/components
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2020-02-11 09:11:27 +0100
committerOskar Nyberg <oskar@mullvad.net>2020-02-11 09:11:27 +0100
commita15f9a329564d0b6638c0b9923b3af7326f236e1 (patch)
tree2bf5396b4cd93baa1b551e74b60d8f9a4a5ce493 /gui/src/renderer/components
parentc9b3e7f007b0dd340ea810bca05abef36a325b7f (diff)
parent83a1b073c6616330fa48468deaa13ade13ed711c (diff)
downloadmullvadvpn-a15f9a329564d0b6638c0b9923b3af7326f236e1.tar.xz
mullvadvpn-a15f9a329564d0b6638c0b9923b3af7326f236e1.zip
Merge branch 'short-time-left-notification'
Diffstat (limited to 'gui/src/renderer/components')
-rw-r--r--gui/src/renderer/components/Account.tsx2
-rw-r--r--gui/src/renderer/components/Connect.tsx2
-rw-r--r--gui/src/renderer/components/NotificationArea.tsx2
-rw-r--r--gui/src/renderer/components/Settings.tsx2
4 files changed, 4 insertions, 4 deletions
diff --git a/gui/src/renderer/components/Account.tsx b/gui/src/renderer/components/Account.tsx
index 1390f78370..5b5a393f62 100644
--- a/gui/src/renderer/components/Account.tsx
+++ b/gui/src/renderer/components/Account.tsx
@@ -1,7 +1,7 @@
import * as React from 'react';
import { Component, Text, View } from 'reactxp';
+import AccountExpiry from '../../shared/account-expiry';
import { messages } from '../../shared/gettext';
-import AccountExpiry from '../lib/account-expiry';
import styles from './AccountStyles';
import * as AppButton from './AppButton';
import ClipboardLabel from './ClipboardLabel';
diff --git a/gui/src/renderer/components/Connect.tsx b/gui/src/renderer/components/Connect.tsx
index 4cb63c6a5b..2308a91dff 100644
--- a/gui/src/renderer/components/Connect.tsx
+++ b/gui/src/renderer/components/Connect.tsx
@@ -1,8 +1,8 @@
import * as React from 'react';
import { Component, Styles, View } from 'reactxp';
import { links } from '../../config.json';
+import AccountExpiry from '../../shared/account-expiry';
import NotificationAreaContainer from '../containers/NotificationAreaContainer';
-import AccountExpiry from '../lib/account-expiry';
import { AuthFailureKind, parseAuthFailure } from '../lib/auth-failure';
import { IConnectionReduxState } from '../redux/connection/reducers';
import { IVersionReduxState } from '../redux/version/reducers';
diff --git a/gui/src/renderer/components/NotificationArea.tsx b/gui/src/renderer/components/NotificationArea.tsx
index c459695a30..243b406518 100644
--- a/gui/src/renderer/components/NotificationArea.tsx
+++ b/gui/src/renderer/components/NotificationArea.tsx
@@ -13,8 +13,8 @@ import {
NotificationTitle,
} from './NotificationBanner';
+import AccountExpiry from '../../shared/account-expiry';
import { ErrorStateCause, TunnelParameterError, TunnelState } from '../../shared/daemon-rpc-types';
-import AccountExpiry from '../lib/account-expiry';
import { parseAuthFailure } from '../lib/auth-failure';
import { IVersionReduxState } from '../redux/version/reducers';
diff --git a/gui/src/renderer/components/Settings.tsx b/gui/src/renderer/components/Settings.tsx
index dc7f875529..ee5cc8c340 100644
--- a/gui/src/renderer/components/Settings.tsx
+++ b/gui/src/renderer/components/Settings.tsx
@@ -1,8 +1,8 @@
import * as React from 'react';
import { Component, Text, View } from 'reactxp';
import { colors, links } from '../../config.json';
+import AccountExpiry from '../../shared/account-expiry';
import { messages } from '../../shared/gettext';
-import AccountExpiry from '../lib/account-expiry';
import * as AppButton from './AppButton';
import * as Cell from './Cell';
import { Container, Layout } from './Layout';