Move account to views folder

5 files changed, 23 insertions, 21 deletions

diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx
index 6a476619bf..fbf2ba5588 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx
@@ -4,7 +4,6 @@ import { Route, Switch } from 'react-router';
 import { RoutePath } from '../../shared/routes';
 import SelectLocation from '../components/select-location/SelectLocationContainer';
 import { useViewTransitions } from '../lib/transition-hooks';
-import Account from './Account';
 import ApiAccessMethods from './ApiAccessMethods';
 import Debug from './Debug';
 import { DeviceRevokedView } from './DeviceRevokedView';
@@ -27,6 +26,7 @@ import StateTriggeredNavigation from './StateTriggeredNavigation';
 import Support from './Support';
 import UserInterfaceSettings from './UserInterfaceSettings';
 import {
+  Account,
   AppInfoView,
   AppUpgradeView,
   ChangelogView,
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/Account.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/account/Account.tsx
index b7c1f2354a..56ce60f216 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/Account.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/account/Account.tsx
@@ -1,17 +1,22 @@
 import { useCallback, useEffect } from 'react';
 
-import { formatDate, hasExpired } from '../../shared/account-expiry';
-import { urls } from '../../shared/constants';
-import { messages } from '../../shared/gettext';
-import { useAppContext } from '../context';
-import { Button, Flex } from '../lib/components';
-import { FlexColumn } from '../lib/components/flex-column';
-import { useHistory } from '../lib/history';
-import { useExclusiveTask } from '../lib/hooks/use-exclusive-task';
-import { useEffectEvent } from '../lib/utility-hooks';
-import { useSelector } from '../redux/store';
-import { AppNavigationHeader } from './';
-import AccountNumberLabel from './AccountNumberLabel';
+import { formatDate, hasExpired } from '../../../../shared/account-expiry';
+import { urls } from '../../../../shared/constants';
+import { messages } from '../../../../shared/gettext';
+import { useAppContext } from '../../../context';
+import { Button, Flex } from '../../../lib/components';
+import { FlexColumn } from '../../../lib/components/flex-column';
+import { useHistory } from '../../../lib/history';
+import { useExclusiveTask } from '../../../lib/hooks/use-exclusive-task';
+import { useEffectEvent } from '../../../lib/utility-hooks';
+import { useSelector } from '../../../redux/store';
+import { AppNavigationHeader } from '../..';
+import AccountNumberLabel from '../../AccountNumberLabel';
+import DeviceInfoButton from '../../DeviceInfoButton';
+import { BackAction } from '../../KeyboardNavigation';
+import { Footer, Layout, SettingsContainer } from '../../Layout';
+import { RedeemVoucherButton } from '../../RedeemVoucher';
+import SettingsHeader, { HeaderTitle } from '../../SettingsHeader';
 import {
   AccountContainer,
   AccountOutOfTime,
@@ -21,13 +26,8 @@ import {
   AccountRowValue,
   DeviceRowValue,
 } from './AccountStyles';
-import DeviceInfoButton from './DeviceInfoButton';
-import { BackAction } from './KeyboardNavigation';
-import { Footer, Layout, SettingsContainer } from './Layout';
-import { RedeemVoucherButton } from './RedeemVoucher';
-import SettingsHeader, { HeaderTitle } from './SettingsHeader';
 
-export default function Account() {
+export function Account() {
   const history = useHistory();
   const isOffline = useSelector((state) => state.connection.isBlocked);
   const { updateAccountData, openUrlWithAuth, logout } = useAppContext();
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/AccountStyles.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/account/AccountStyles.tsx
index aacef7f662..d968fb14b7 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/AccountStyles.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/account/AccountStyles.tsx
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
-import { colors } from '../lib/foundations';
-import { measurements, normalText, tinyText } from './common-styles';
+import { colors } from '../../../lib/foundations';
+import { measurements, normalText, tinyText } from '../../common-styles';
 
 export const AccountContainer = styled.div({
   display: 'flex',
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/account/index.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/account/index.ts
new file mode 100644
index 0000000000..4c71833ffe
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/account/index.ts
@@ -0,0 +1 @@
+export * from './Account';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/index.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/index.ts
index 902c5d609d..a377a09d12 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/views/index.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/index.ts
@@ -1,3 +1,4 @@
+export * from './account';
 export * from './app-info';
 export * from './app-upgrade';
 export * from './daita-settings';