Fix references to @mullvad/components

17 files changed, 26 insertions, 25 deletions

diff --git a/gui/packages/desktop/src/renderer/components/Account.tsx b/gui/packages/desktop/src/renderer/components/Account.tsx
index 4906ab899d..aaa3b637c9 100644
--- a/gui/packages/desktop/src/renderer/components/Account.tsx
+++ b/gui/packages/desktop/src/renderer/components/Account.tsx
@@ -1,12 +1,13 @@
-import { ClipboardLabel, HeaderTitle, SettingsHeader } from '@mullvad/components';
 import moment from 'moment';
 import * as React from 'react';
 import { Component, Text, View } from 'reactxp';
 import { pgettext } from '../../shared/gettext';
 import styles from './AccountStyles';
 import * as AppButton from './AppButton';
+import ClipboardLabel from './ClipboardLabel';
 import { Container, Layout } from './Layout';
 import { BackBarItem, NavigationBar } from './NavigationBar';
+import SettingsHeader, { HeaderTitle } from './SettingsHeader';
 
 import { AccountToken } from '../../shared/daemon-rpc-types';
 
diff --git a/gui/packages/desktop/src/renderer/components/AdvancedSettings.tsx b/gui/packages/desktop/src/renderer/components/AdvancedSettings.tsx
index c60980444d..be1dd6b104 100644
--- a/gui/packages/desktop/src/renderer/components/AdvancedSettings.tsx
+++ b/gui/packages/desktop/src/renderer/components/AdvancedSettings.tsx
@@ -1,4 +1,3 @@
-import { HeaderTitle, SettingsHeader } from '@mullvad/components';
 import * as React from 'react';
 import { Component, View } from 'reactxp';
 import { sprintf } from 'sprintf-js';
@@ -15,6 +14,7 @@ import {
   NavigationScrollbars,
   TitleBarItem,
 } from './NavigationBar';
+import SettingsHeader, { HeaderTitle } from './SettingsHeader';
 import Switch from './Switch';
 
 const MIN_MSSFIX_VALUE = 1000;
diff --git a/gui/packages/desktop/src/renderer/components/AppButton.tsx b/gui/packages/desktop/src/renderer/components/AppButton.tsx
index 42e2205b77..17aafb7fc1 100644
--- a/gui/packages/desktop/src/renderer/components/AppButton.tsx
+++ b/gui/packages/desktop/src/renderer/components/AppButton.tsx
@@ -1,8 +1,8 @@
-import { ImageView } from '@mullvad/components';
 import * as React from 'react';
 import { Button, Component, Text, Types } from 'reactxp';
 import { colors } from '../../config.json';
 import styles from './AppButtonStyles';
+import ImageView from './ImageView';
 
 interface ILabelProps {
   children?: React.ReactText;
diff --git a/gui/packages/desktop/src/renderer/components/Cell.tsx b/gui/packages/desktop/src/renderer/components/Cell.tsx
index 501e51a0c7..b108708934 100644
--- a/gui/packages/desktop/src/renderer/components/Cell.tsx
+++ b/gui/packages/desktop/src/renderer/components/Cell.tsx
@@ -1,7 +1,7 @@
-import { ImageView } from '@mullvad/components';
 import * as React from 'react';
 import { Button, Component, Styles, Text, TextInput, Types, View } from 'reactxp';
 import { colors } from '../../config.json';
+import ImageView from './ImageView';
 
 const styles = {
   cellButton: {
diff --git a/gui/packages/desktop/src/renderer/components/CityRow.tsx b/gui/packages/desktop/src/renderer/components/CityRow.tsx
index 23efa17292..9f95aa2289 100644
--- a/gui/packages/desktop/src/renderer/components/CityRow.tsx
+++ b/gui/packages/desktop/src/renderer/components/CityRow.tsx
@@ -1,8 +1,8 @@
-import { Accordion } from '@mullvad/components';
 import * as React from 'react';
 import { Component, Styles, Types, View } from 'reactxp';
 import { colors } from '../../config.json';
 import { compareRelayLocation, RelayLocation } from '../../shared/daemon-rpc-types';
+import Accordion from './Accordion';
 import * as Cell from './Cell';
 import ChevronButton from './ChevronButton';
 import RelayRow from './RelayRow';
diff --git a/gui/packages/desktop/src/renderer/components/Connect.tsx b/gui/packages/desktop/src/renderer/components/Connect.tsx
index 0283450756..4d68c55897 100644
--- a/gui/packages/desktop/src/renderer/components/Connect.tsx
+++ b/gui/packages/desktop/src/renderer/components/Connect.tsx
@@ -1,4 +1,3 @@
-import { Brand, HeaderBarStyle, ImageView, SettingsBarButton } from '@mullvad/components';
 import * as React from 'react';
 import { Component, View } from 'reactxp';
 import { links } from '../../config.json';
@@ -7,6 +6,8 @@ import { ITunnelEndpoint, parseSocketAddress } from '../../shared/daemon-rpc-typ
 import { pgettext } from '../../shared/gettext';
 import * as AppButton from './AppButton';
 import styles from './ConnectStyles';
+import { Brand, HeaderBarStyle, SettingsBarButton } from './HeaderBar';
+import ImageView from './ImageView';
 import { Container, Header, Layout } from './Layout';
 import Map, { MarkerStyle, ZoomLevel } from './Map';
 import NotificationArea from './NotificationArea';
diff --git a/gui/packages/desktop/src/renderer/components/CountryRow.tsx b/gui/packages/desktop/src/renderer/components/CountryRow.tsx
index 0a52cd02b4..e468dea109 100644
--- a/gui/packages/desktop/src/renderer/components/CountryRow.tsx
+++ b/gui/packages/desktop/src/renderer/components/CountryRow.tsx
@@ -1,8 +1,8 @@
-import { Accordion } from '@mullvad/components';
 import * as React from 'react';
 import { Component, Styles, Types, View } from 'reactxp';
 import { colors } from '../../config.json';
 import { compareRelayLocation, RelayLocation } from '../../shared/daemon-rpc-types';
+import Accordion from './Accordion';
 import * as Cell from './Cell';
 import ChevronButton from './ChevronButton';
 import CityRow from './CityRow';
diff --git a/gui/packages/desktop/src/renderer/components/Launch.tsx b/gui/packages/desktop/src/renderer/components/Launch.tsx
index e1aab10a9f..72fdde9d2f 100644
--- a/gui/packages/desktop/src/renderer/components/Launch.tsx
+++ b/gui/packages/desktop/src/renderer/components/Launch.tsx
@@ -1,8 +1,9 @@
-import { ImageView, SettingsBarButton } from '@mullvad/components';
 import * as React from 'react';
 import { Component, Styles, Text, View } from 'reactxp';
 import { colors } from '../../config.json';
 import { pgettext } from '../../shared/gettext';
+import { SettingsBarButton } from './HeaderBar';
+import ImageView from './ImageView';
 import { Container, Header, Layout } from './Layout';
 
 const styles = {
diff --git a/gui/packages/desktop/src/renderer/components/Layout.tsx b/gui/packages/desktop/src/renderer/components/Layout.tsx
index e1e07bd072..01f4aa701d 100644
--- a/gui/packages/desktop/src/renderer/components/Layout.tsx
+++ b/gui/packages/desktop/src/renderer/components/Layout.tsx
@@ -1,6 +1,6 @@
-import { HeaderBar } from '@mullvad/components';
 import * as React from 'react';
 import { Component, View } from 'reactxp';
+import HeaderBar from './HeaderBar';
 import styles from './LayoutStyles';
 
 export class Header extends Component<HeaderBar['props']> {
diff --git a/gui/packages/desktop/src/renderer/components/Login.tsx b/gui/packages/desktop/src/renderer/components/Login.tsx
index 90e53ce9d7..81b9e6f838 100644
--- a/gui/packages/desktop/src/renderer/components/Login.tsx
+++ b/gui/packages/desktop/src/renderer/components/Login.tsx
@@ -1,10 +1,12 @@
-import { Accordion, Brand, ImageView, SettingsBarButton } from '@mullvad/components';
 import * as React from 'react';
 import { Animated, Component, Styles, Text, TextInput, Types, UserInterface, View } from 'reactxp';
 import { colors, links } from '../../config.json';
 import { pgettext } from '../../shared/gettext';
+import Accordion from './Accordion';
 import * as AppButton from './AppButton';
 import * as Cell from './Cell';
+import { Brand, SettingsBarButton } from './HeaderBar';
+import ImageView from './ImageView';
 import { Container, Header, Layout } from './Layout';
 import styles from './LoginStyles';
 
diff --git a/gui/packages/desktop/src/renderer/components/NavigationBar.tsx b/gui/packages/desktop/src/renderer/components/NavigationBar.tsx
index 98e2a367c7..6bec03ca80 100644
--- a/gui/packages/desktop/src/renderer/components/NavigationBar.tsx
+++ b/gui/packages/desktop/src/renderer/components/NavigationBar.tsx
@@ -1,8 +1,8 @@
-import { ImageView } from '@mullvad/components';
 import * as React from 'react';
 import { Animated, Button, Component, Styles, Text, Types, UserInterface, View } from 'reactxp';
 import { colors } from '../../config.json';
 import CustomScrollbars, { IScrollEvent } from './CustomScrollbars';
+import ImageView from './ImageView';
 
 const styles = {
   navigationBar: {
diff --git a/gui/packages/desktop/src/renderer/components/NotificationBanner.tsx b/gui/packages/desktop/src/renderer/components/NotificationBanner.tsx
index 7048cb0aa6..56efb41611 100644
--- a/gui/packages/desktop/src/renderer/components/NotificationBanner.tsx
+++ b/gui/packages/desktop/src/renderer/components/NotificationBanner.tsx
@@ -1,7 +1,7 @@
-import { ImageView } from '@mullvad/components';
 import * as React from 'react';
 import { Animated, Button, Component, Styles, Text, Types, UserInterface, View } from 'reactxp';
 import { colors } from '../../config.json';
+import ImageView from './ImageView';
 
 const styles = {
   collapsible: Styles.createViewStyle({
diff --git a/gui/packages/desktop/src/renderer/components/Preferences.tsx b/gui/packages/desktop/src/renderer/components/Preferences.tsx
index 1e61051e5c..9804a1c953 100644
--- a/gui/packages/desktop/src/renderer/components/Preferences.tsx
+++ b/gui/packages/desktop/src/renderer/components/Preferences.tsx
@@ -1,4 +1,3 @@
-import { HeaderTitle, SettingsHeader } from '@mullvad/components';
 import * as React from 'react';
 import { Component, View } from 'reactxp';
 import { pgettext } from '../../shared/gettext';
@@ -12,6 +11,7 @@ import {
   TitleBarItem,
 } from './NavigationBar';
 import styles from './PreferencesStyles';
+import SettingsHeader, { HeaderTitle } from './SettingsHeader';
 import Switch from './Switch';
 
 export interface IPreferencesProps {
diff --git a/gui/packages/desktop/src/renderer/components/SelectLocation.tsx b/gui/packages/desktop/src/renderer/components/SelectLocation.tsx
index 9c63e25464..c68893d314 100644
--- a/gui/packages/desktop/src/renderer/components/SelectLocation.tsx
+++ b/gui/packages/desktop/src/renderer/components/SelectLocation.tsx
@@ -1,4 +1,3 @@
-import { HeaderSubTitle, HeaderTitle, SettingsHeader } from '@mullvad/components';
 import * as React from 'react';
 import ReactDOM from 'react-dom';
 import { Component, View } from 'reactxp';
@@ -13,6 +12,7 @@ import {
   TitleBarItem,
 } from './NavigationBar';
 import styles from './SelectLocationStyles';
+import SettingsHeader, { HeaderSubTitle, HeaderTitle } from './SettingsHeader';
 
 import CityRow from './CityRow';
 import CountryRow from './CountryRow';
diff --git a/gui/packages/desktop/src/renderer/components/Settings.tsx b/gui/packages/desktop/src/renderer/components/Settings.tsx
index 1b1b88926a..5ad50e6e0d 100644
--- a/gui/packages/desktop/src/renderer/components/Settings.tsx
+++ b/gui/packages/desktop/src/renderer/components/Settings.tsx
@@ -1,4 +1,3 @@
-import { HeaderTitle, ImageView, SettingsHeader } from '@mullvad/components';
 import * as React from 'react';
 import { Component, Text, View } from 'reactxp';
 import { colors, links } from '../../config.json';
@@ -6,6 +5,7 @@ import { pgettext } from '../../shared/gettext';
 import AccountExpiry from '../lib/account-expiry';
 import * as AppButton from './AppButton';
 import * as Cell from './Cell';
+import ImageView from './ImageView';
 import { Container, Layout } from './Layout';
 import {
   CloseBarItem,
@@ -14,6 +14,7 @@ import {
   NavigationScrollbars,
   TitleBarItem,
 } from './NavigationBar';
+import SettingsHeader, { HeaderTitle } from './SettingsHeader';
 import styles from './SettingsStyles';
 
 import { LoginState } from '../redux/account/reducers';
diff --git a/gui/packages/desktop/src/renderer/components/Support.tsx b/gui/packages/desktop/src/renderer/components/Support.tsx
index b36c3cb154..782a28e89a 100644
--- a/gui/packages/desktop/src/renderer/components/Support.tsx
+++ b/gui/packages/desktop/src/renderer/components/Support.tsx
@@ -1,18 +1,12 @@
-import {
-  HeaderSubTitle,
-  HeaderTitle,
-  ImageView,
-  ModalAlert,
-  ModalContainer,
-  ModalContent,
-  SettingsHeader,
-} from '@mullvad/components';
 import * as React from 'react';
 import { Component, Text, TextInput, View } from 'reactxp';
 import { pgettext } from '../../shared/gettext';
 import * as AppButton from './AppButton';
+import ImageView from './ImageView';
 import { Container, Layout } from './Layout';
+import { ModalAlert, ModalContainer, ModalContent } from './Modal';
 import { BackBarItem, NavigationBar } from './NavigationBar';
+import SettingsHeader, { HeaderSubTitle, HeaderTitle } from './SettingsHeader';
 import styles from './SupportStyles';
 
 import { AccountToken } from '../../shared/daemon-rpc-types';
diff --git a/gui/packages/desktop/src/renderer/components/TunnelControl.tsx b/gui/packages/desktop/src/renderer/components/TunnelControl.tsx
index 436d896582..862b22cf05 100644
--- a/gui/packages/desktop/src/renderer/components/TunnelControl.tsx
+++ b/gui/packages/desktop/src/renderer/components/TunnelControl.tsx
@@ -1,9 +1,10 @@
-import { ConnectionInfo, SecuredDisplayStyle, SecuredLabel } from '@mullvad/components';
 import * as React from 'react';
 import { Component, Styles, Text, Types, View } from 'reactxp';
 import { colors } from '../../config.json';
 import { pgettext } from '../../shared/gettext';
 import * as AppButton from './AppButton';
+import ConnectionInfo from './ConnectionInfo';
+import SecuredLabel, { SecuredDisplayStyle } from './SecuredLabel';
 
 import { RelayProtocol, TunnelStateTransition } from '../../shared/daemon-rpc-types';