diff --git a/packages/desktop-client/src/components/App.js b/packages/desktop-client/src/components/App.js
index ae132e31a8ce0559c91281d89f5b815047b4b918..228038652f730da59a368617be29205ca588adf9 100644
--- a/packages/desktop-client/src/components/App.js
+++ b/packages/desktop-client/src/components/App.js
@@ -6,8 +6,8 @@ import {
init as initConnection,
send
} from 'loot-core/src/platform/client/fetch';
-import installPolyfills from '../polyfills';
import { styles, hasHiddenScrollbars } from 'loot-design/src/style';
+import installPolyfills from '../polyfills';
import FatalError from './FatalError';
import ManagementApp from './manager/ManagementApp';
import FinancesApp from './FinancesApp';
diff --git a/packages/desktop-client/src/components/AppBackground.js b/packages/desktop-client/src/components/AppBackground.js
index af3fe579296a010d6b05deb324a554d93863622d..f01ff69079a0ba46e632646dd8f10afbd5ec1bc5 100644
--- a/packages/desktop-client/src/components/AppBackground.js
+++ b/packages/desktop-client/src/components/AppBackground.js
@@ -1,9 +1,9 @@
import React from 'react';
import { View, Block } from 'loot-design/src/components/common';
import { css } from 'glamor';
-import Background from './Background';
import AnimatedLoading from 'loot-design/src/svg/v1/AnimatedLoading';
import { colors } from 'loot-design/src/style';
+import Background from './Background';
function AppBackground({ initializing, loadingText }) {
return (
diff --git a/packages/desktop-client/src/components/FinancesApp.js b/packages/desktop-client/src/components/FinancesApp.js
index 4f2be90d7c889d64d69f49da0442d379f136b76e..f28507d190072a5f977e2262b5e453bfd05ebec1 100644
--- a/packages/desktop-client/src/components/FinancesApp.js
+++ b/packages/desktop-client/src/components/FinancesApp.js
@@ -10,15 +10,15 @@ import { SpreadsheetProvider } from 'loot-core/src/client/SpreadsheetProvider';
import checkForUpgradeNotifications from 'loot-core/src/client/upgrade-notifications';
import { colors } from 'loot-design/src/style';
import { View } from 'loot-design/src/components/common';
-import BankSyncStatus from './BankSyncStatus';
import { BudgetMonthCountProvider } from 'loot-design/src/components/budget/BudgetMonthCountContext';
import * as undo from 'loot-core/src/platform/client/undo';
-import { PageTypeProvider } from './Page';
-import { getLocationState } from '../util/location-state';
-import { ActiveLocationProvider } from './ActiveLocation';
-import { makeLocationState } from '../util/location-state';
import { PayeesProvider } from 'loot-core/src/client/data-hooks/payees';
import { AccountsProvider } from 'loot-core/src/client/data-hooks/accounts';
+import { getLocationState } from '../util/location-state';
+import { makeLocationState } from '../util/location-state';
+import { PageTypeProvider } from './Page';
+import { ActiveLocationProvider } from './ActiveLocation';
+import BankSyncStatus from './BankSyncStatus';
import Titlebar, { TitlebarProvider } from './Titlebar';
import FloatableSidebar, { SidebarProvider } from './FloatableSidebar';
diff --git a/packages/desktop-client/src/components/Modals.js b/packages/desktop-client/src/components/Modals.js
index e9936e9a52a2ec65769000d0be874b76fae11293..5e756bbb3887345081ca2036a684ee89f7acb64f 100644
--- a/packages/desktop-client/src/components/Modals.js
+++ b/packages/desktop-client/src/components/Modals.js
@@ -7,23 +7,23 @@ import Component from '@reactions/component';
import * as actions from 'loot-core/src/client/actions';
import { send, listen, unlisten } from 'loot-core/src/platform/client/fetch';
-import CreateAccount from './modals/CreateAccount';
import CreateLocalAccount from 'loot-design/src/components/modals/CreateLocalAccount';
import CloseAccount from 'loot-design/src/components/modals/CloseAccount';
import SelectLinkedAccounts from 'loot-design/src/components/modals/SelectLinkedAccounts';
import ConfigureLinkedAccounts from 'loot-design/src/components/modals/ConfigureLinkedAccounts';
import LoadBackup from 'loot-design/src/components/modals/LoadBackup';
+import PlaidExternalMsg from 'loot-design/src/components/modals/PlaidExternalMsg';
+import ImportTransactions from 'loot-design/src/components/modals/ImportTransactions';
+import EditField from 'loot-design/src/components/modals/EditField';
+import CreateAccount from './modals/CreateAccount';
import ManagePayeesWithData from './payees/ManagePayeesWithData';
import ManageRules from './modals/ManageRules';
import EditRule from './modals/EditRule';
import MergeUnusedPayees from './modals/MergeUnusedPayees';
-import PlaidExternalMsg from 'loot-design/src/components/modals/PlaidExternalMsg';
import ConfirmCategoryDelete from './modals/ConfirmCategoryDelete';
import WelcomeScreen from './modals/WelcomeScreen';
-import ImportTransactions from 'loot-design/src/components/modals/ImportTransactions';
import CreateEncryptionKey from './modals/CreateEncryptionKey';
import FixEncryptionKey from './modals/FixEncryptionKey';
-import EditField from 'loot-design/src/components/modals/EditField';
function Modals({
history,
diff --git a/packages/desktop-client/src/components/Titlebar.js b/packages/desktop-client/src/components/Titlebar.js
index 4352dbcc79d682525e8b6b05fbd60cc6754fa014..b96d5a92a8f665784413c087b4b8b07063cfafa3 100644
--- a/packages/desktop-client/src/components/Titlebar.js
+++ b/packages/desktop-client/src/components/Titlebar.js
@@ -16,11 +16,11 @@ import {
P
} from 'loot-design/src/components/common';
import SheetValue from 'loot-design/src/components/spreadsheet/SheetValue';
-import { MonthCountSelector } from './budget/MonthCountSelector';
import ArrowButtonRight1 from 'loot-design/src/svg/v2/ArrowButtonRight1';
import NavigationMenu from 'loot-design/src/svg/v2/NavigationMenu';
import ArrowLeft from 'loot-design/src/svg/v1/ArrowLeft';
import AlertTriangle from 'loot-design/src/svg/v2/AlertTriangle';
+import { MonthCountSelector } from './budget/MonthCountSelector';
import AccountSyncCheck from './accounts/AccountSyncCheck';
import LoggedInUser from './LoggedInUser';
import AnimatedRefresh from './AnimatedRefresh';
diff --git a/packages/desktop-client/src/components/accounts/Account.js b/packages/desktop-client/src/components/accounts/Account.js
index add537bcf34ee83b83e0bd947e57758ffb6d5030..9702010a52cc9b8f12e790d5c9447946f1ada5db 100644
--- a/packages/desktop-client/src/components/accounts/Account.js
+++ b/packages/desktop-client/src/components/accounts/Account.js
@@ -25,7 +25,6 @@ import DotsHorizontalTriple from 'loot-design/src/svg/v1/DotsHorizontalTriple';
import Pencil1 from 'loot-design/src/svg/v2/Pencil1';
import SearchAlternate from 'loot-design/src/svg/v2/SearchAlternate';
import DownloadThickBottom from 'loot-design/src/svg/v2/DownloadThickBottom';
-import AnimatedRefresh from '../AnimatedRefresh';
import Add from 'loot-design/src/svg/v1/Add';
import format from 'loot-design/src/components/spreadsheet/format';
import useSheetValue from 'loot-design/src/components/spreadsheet/useSheetValue';
@@ -43,25 +42,26 @@ import {
updateTransaction,
ungroupTransactions
} from 'loot-core/src/shared/transactions';
-import {
- SplitsExpandedProvider,
- useSplitsExpanded,
- isPreviewId
-} from './TransactionsTable';
import { styles, colors } from 'loot-design/src/style';
-import TransactionList from './TransactionList';
-import { authorizeBank } from '../../plaid';
import {
SelectedProviderWithItems,
useSelectedItems
} from 'loot-design/src/components/useSelected';
import { KeyHandlers } from 'loot-design/src/components/KeyHandlers';
-import { FilterButton, AppliedFilters } from './Filters';
import {
SchedulesProvider,
useCachedSchedules
} from 'loot-core/src/client/data-hooks/schedules';
+import { authorizeBank } from '../../plaid';
+import AnimatedRefresh from '../AnimatedRefresh';
import { useActiveLocation } from '../ActiveLocation';
+import { FilterButton, AppliedFilters } from './Filters';
+import TransactionList from './TransactionList';
+import {
+ SplitsExpandedProvider,
+ useSplitsExpanded,
+ isPreviewId
+} from './TransactionsTable';
function EmptyMessage({ onAdd }) {
return (
diff --git a/packages/desktop-client/src/components/accounts/Filters.js b/packages/desktop-client/src/components/accounts/Filters.js
index 09b3dd19dc6edcaa221855254528ea5842010f16..e39a9cdeb474e282d8ac722af9e2f25ee09277fd 100644
--- a/packages/desktop-client/src/components/accounts/Filters.js
+++ b/packages/desktop-client/src/components/accounts/Filters.js
@@ -30,9 +30,9 @@ import {
} from 'loot-core/src/shared/rules';
import DeleteIcon from 'loot-design/src/svg/Delete';
import SettingsSliderAlternate from 'loot-design/src/svg/v2/SettingsSliderAlternate';
+import { colors } from 'loot-design/src/style';
import GenericInput from '../util/GenericInput';
import { Value } from '../modals/ManageRules';
-import { colors } from 'loot-design/src/style';
let filterFields = [
'date',
diff --git a/packages/desktop-client/src/components/accounts/TransactionList.js b/packages/desktop-client/src/components/accounts/TransactionList.js
index be5511ff795803121b2f9316fb5c6ee7a86bf3b1..a07c31f80302b3e18518c81e48167d738d9c02f7 100644
--- a/packages/desktop-client/src/components/accounts/TransactionList.js
+++ b/packages/desktop-client/src/components/accounts/TransactionList.js
@@ -1,6 +1,5 @@
import React, { useRef, useEffect, useCallback, useLayoutEffect } from 'react';
import { useDispatch } from 'react-redux';
-import { TransactionTable } from './TransactionsTable';
import {
splitTransaction,
updateTransaction,
@@ -10,6 +9,7 @@ import {
} from 'loot-core/src/shared/transactions';
import { send } from 'loot-core/src/platform/client/fetch';
import { getChangedValues, applyChanges } from 'loot-core/src/shared/util';
+import { TransactionTable } from './TransactionsTable';
const uuid = require('loot-core/src/platform/uuid');
// When data changes, there are two ways to update the UI:
diff --git a/packages/desktop-client/src/components/accounts/TransactionsTable.js b/packages/desktop-client/src/components/accounts/TransactionsTable.js
index d88f296392f95ffc09273d25e2a088a47203634c..9b678e7f1ee8531fec563cc4e6d832151193acd4 100644
--- a/packages/desktop-client/src/components/accounts/TransactionsTable.js
+++ b/packages/desktop-client/src/components/accounts/TransactionsTable.js
@@ -61,9 +61,9 @@ import {
useSelectedItems
} from 'loot-design/src/components/useSelected';
import { useMergedRefs } from 'loot-design/src/components/useMergedRefs';
-import { getStatusProps } from '../schedules/StatusBadge';
import { useCachedSchedules } from 'loot-core/src/client/data-hooks/schedules';
import { getScheduledAmount } from 'loot-core/src/shared/schedules';
+import { getStatusProps } from '../schedules/StatusBadge';
let TABLE_BACKGROUND_COLOR = colors.n11;
diff --git a/packages/desktop-client/src/components/budget/index.js b/packages/desktop-client/src/components/budget/index.js
index 1fb2d5135464d1a3f7d0811976a5c7dde979a604..b1d862d1d9c57332161cd1da4abb88a067fef270 100644
--- a/packages/desktop-client/src/components/budget/index.js
+++ b/packages/desktop-client/src/components/budget/index.js
@@ -4,7 +4,6 @@ import * as actions from 'loot-core/src/client/actions';
import { send, listen } from 'loot-core/src/platform/client/fetch';
import * as monthUtils from 'loot-core/src/shared/months';
import { getValidMonthBounds } from 'loot-design/src/components/budget/MonthsContext';
-import { TitlebarContext } from '../Titlebar';
import * as rollover from 'loot-design/src/components/budget/rollover/rollover-components';
import { RolloverContext } from 'loot-design/src/components/budget/rollover/RolloverContext';
@@ -26,6 +25,7 @@ import {
updateGroup,
deleteGroup
} from 'loot-core/src/shared/categories.js';
+import { TitlebarContext } from '../Titlebar';
let _initialBudgetMonth = null;
diff --git a/packages/desktop-client/src/components/manager/ManagementApp.js b/packages/desktop-client/src/components/manager/ManagementApp.js
index 82dcf68db6c59510c488f6e3228a3edbbf835b57..7d574c788e263ae7c1362cb0f90f5980e08929b9 100644
--- a/packages/desktop-client/src/components/manager/ManagementApp.js
+++ b/packages/desktop-client/src/components/manager/ManagementApp.js
@@ -5,9 +5,10 @@ import { Switch, Redirect, Router, Route } from 'react-router-dom';
import * as actions from 'loot-core/src/client/actions';
import { View, Text } from 'loot-design/src/components/common';
import { colors } from 'loot-design/src/style';
-import ServerURL from './ServerURL';
import LoggedInUser from '../LoggedInUser';
import Notifications from '../Notifications';
+import useServerVersion from '../../hooks/useServerVersion';
+import ServerURL from './ServerURL';
import Modals from './Modals';
import Login from './subscribe/Login';
@@ -15,7 +16,6 @@ import Bootstrap from './subscribe/Bootstrap';
import Error from './subscribe/Error';
import ChangePassword from './subscribe/ChangePassword';
import ConfigServer from './ConfigServer';
-import useServerVersion from '../../hooks/useServerVersion';
function Version() {
const version = useServerVersion();
diff --git a/packages/desktop-client/src/components/modals/EditRule.js b/packages/desktop-client/src/components/modals/EditRule.js
index cdfcd5d1deec4b41685cdaba434d898cd152f9dc..c55c2c353ded078519fcb78b882f3774b67ad99b 100644
--- a/packages/desktop-client/src/components/modals/EditRule.js
+++ b/packages/desktop-client/src/components/modals/EditRule.js
@@ -14,7 +14,6 @@ import {
CustomSelect,
Tooltip
} from 'loot-design/src/components/common';
-import GenericInput from '../util/GenericInput';
import { send } from 'loot-core/src/platform/client/fetch';
import { colors } from 'loot-design/src/style';
import SubtractIcon from 'loot-design/src/svg/Subtract';
@@ -33,9 +32,6 @@ import {
import useSelected, {
SelectedProvider
} from 'loot-design/src/components/useSelected';
-import SimpleTransactionsTable from '../accounts/SimpleTransactionsTable';
-import { StatusBadge } from '../schedules/StatusBadge';
-import DisplayId from '../util/DisplayId';
import { useSchedules } from 'loot-core/src/client/data-hooks/schedules';
import {
integerToCurrency,
@@ -43,6 +39,10 @@ import {
amountToInteger
} from 'loot-core/src/shared/util';
import * as monthUtils from 'loot-core/src/shared/months';
+import SimpleTransactionsTable from '../accounts/SimpleTransactionsTable';
+import { StatusBadge } from '../schedules/StatusBadge';
+import DisplayId from '../util/DisplayId';
+import GenericInput from '../util/GenericInput';
import { BetweenAmountInput } from '../util/AmountInput';
function updateValue(array, value, update) {
diff --git a/packages/desktop-client/src/components/reports/CashFlow.js b/packages/desktop-client/src/components/reports/CashFlow.js
index 10d9d46068b52d5bd8de696bb8660047ebb128cf..45b3ee4beeb7004273bc4ad61116a7ed643baba1 100644
--- a/packages/desktop-client/src/components/reports/CashFlow.js
+++ b/packages/desktop-client/src/components/reports/CashFlow.js
@@ -11,13 +11,13 @@ import { styles } from 'loot-design/src/style';
import { send } from 'loot-core/src/platform/client/fetch';
import * as monthUtils from 'loot-core/src/shared/months';
import { integerToCurrency } from 'loot-core/src/shared/util';
+import { colors } from 'loot-design/src/style';
import Header from './Header';
import Change from './Change';
import CashFlowGraph from './graphs/CashFlowGraph';
import { cashFlowByDate } from './graphs/cash-flow-spreadsheet';
import useReport from './useReport';
import { useArgsMemo } from './util';
-import { colors } from 'loot-design/src/style';
function CashFlow() {
const [earliestMonth, setEarliestMonth] = useState(null);
diff --git a/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.js b/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.js
index 725ae019f220d55f77854fbfe91ea476d75c3418..ea050ab54ed52aeb9758adc327e592e49022db47 100644
--- a/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.js
+++ b/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.js
@@ -8,10 +8,10 @@ import {
VictoryGroup
} from 'victory';
import * as d from 'date-fns';
+import { colors } from 'loot-design/src/style';
import Container from '../Container';
import Tooltip from '../Tooltip';
import theme from '../chart-theme';
-import { colors } from 'loot-design/src/style';
function CashFlowGraph({ style, start, end, graphData, isConcise, compact }) {
return (
diff --git a/packages/desktop-client/src/components/schedules/DiscoverSchedules.js b/packages/desktop-client/src/components/schedules/DiscoverSchedules.js
index 23550a9de8c0596eb851aeeb15475e043cfac62b..ae2602cfc505999b6bc78cae32392c022045bb94 100644
--- a/packages/desktop-client/src/components/schedules/DiscoverSchedules.js
+++ b/packages/desktop-client/src/components/schedules/DiscoverSchedules.js
@@ -25,8 +25,8 @@ import useSelected, {
SelectedProvider
} from 'loot-design/src/components/useSelected';
import { Page } from '../Page';
-import { ScheduleAmountCell } from './SchedulesTable';
import DisplayId from '../util/DisplayId';
+import { ScheduleAmountCell } from './SchedulesTable';
let ROW_HEIGHT = 43;
diff --git a/packages/desktop-client/src/components/schedules/EditSchedule.js b/packages/desktop-client/src/components/schedules/EditSchedule.js
index 236aa81d00d6c241f1294b33239e4aad1334eb27..0e25e3b078089bc05720618c0c33a93ed8690118 100644
--- a/packages/desktop-client/src/components/schedules/EditSchedule.js
+++ b/packages/desktop-client/src/components/schedules/EditSchedule.js
@@ -18,17 +18,16 @@ import AccountAutocomplete from 'loot-design/src/components/AccountAutocomplete'
import { Stack, View, Text, Button } from 'loot-design/src/components/common';
import DateSelect from 'loot-design/src/components/DateSelect';
import { SelectedItemsButton } from 'loot-design/src/components/table';
-import SimpleTransactionsTable from '../accounts/SimpleTransactionsTable';
-import { usePageType } from '../Page';
-import { Page } from '../Page';
import useSelected, {
SelectedProvider
} from 'loot-design/src/components/useSelected';
+import RecurringSchedulePicker from 'loot-design/src/components/RecurringSchedulePicker';
+import SimpleTransactionsTable from '../accounts/SimpleTransactionsTable';
+import { usePageType } from '../Page';
+import { Page } from '../Page';
import { OpSelect } from '../modals/EditRule';
import { AmountInput, BetweenAmountInput } from '../util/AmountInput';
-import RecurringSchedulePicker from 'loot-design/src/components/RecurringSchedulePicker';
-
function mergeFields(defaults, initial) {
let res = { ...defaults };
if (initial) {
diff --git a/packages/desktop-client/src/components/schedules/PostsOfflineNotification.js b/packages/desktop-client/src/components/schedules/PostsOfflineNotification.js
index ca37517d163d8f85d2e85d68348f63bbf0f7dafd..2d7cdcd787e9463cce3ed2c00db278ca1d3cf940 100644
--- a/packages/desktop-client/src/components/schedules/PostsOfflineNotification.js
+++ b/packages/desktop-client/src/components/schedules/PostsOfflineNotification.js
@@ -2,9 +2,9 @@ import React from 'react';
import { useLocation, useHistory } from 'react-router-dom';
import { send } from 'loot-core/src/platform/client/fetch';
import { Text, P, Button, Stack } from 'loot-design/src/components/common';
+import { colors } from 'loot-design/src/style';
import { Page } from '../Page';
import DisplayId from '../util/DisplayId';
-import { colors } from 'loot-design/src/style';
export default function PostsOfflineNotification() {
let location = useLocation();
diff --git a/packages/desktop-client/src/components/schedules/index.js b/packages/desktop-client/src/components/schedules/index.js
index 515763082d5c7fd72ed927d88419f524ad8391c5..ede1a8ce06bd417f770ee227ee21f343b245d631 100644
--- a/packages/desktop-client/src/components/schedules/index.js
+++ b/packages/desktop-client/src/components/schedules/index.js
@@ -2,8 +2,8 @@ import React from 'react';
import { useHistory } from 'react-router-dom';
import { View, Button } from 'loot-design/src/components/common';
import { send } from 'loot-core/src/platform/client/fetch';
-import { Page } from '../Page';
import { useSchedules } from 'loot-core/src/client/data-hooks/schedules';
+import { Page } from '../Page';
import { SchedulesTable, ROW_HEIGHT } from './SchedulesTable';
export default function Schedules() {
diff --git a/packages/desktop-client/src/components/tutorial/BudgetCategories.js b/packages/desktop-client/src/components/tutorial/BudgetCategories.js
index a120ee54d9b70cd340a5fcdffb74909d6b92e4a1..3efb8de24b446ff52cd37c7fc8ab0547f0aefbe3 100644
--- a/packages/desktop-client/src/components/tutorial/BudgetCategories.js
+++ b/packages/desktop-client/src/components/tutorial/BudgetCategories.js
@@ -1,7 +1,7 @@
import React from 'react';
import { Tooltip, Pointer, P } from 'loot-design/src/components/common';
-import Navigation from './Navigation';
import { colors } from 'loot-design/src/style';
+import Navigation from './Navigation';
import { Title } from './common';
function BudgetInitial({ targetRect, navigationProps }) {
diff --git a/packages/desktop-client/src/components/tutorial/BudgetNewIncome.js b/packages/desktop-client/src/components/tutorial/BudgetNewIncome.js
index cd9c3ed89a9abfd61c6f5367cae193e29453537e..ff1bf88e73009ea1de80be6f7dc488c864ba180c 100644
--- a/packages/desktop-client/src/components/tutorial/BudgetNewIncome.js
+++ b/packages/desktop-client/src/components/tutorial/BudgetNewIncome.js
@@ -1,7 +1,7 @@
import React from 'react';
import { Tooltip, Pointer, P } from 'loot-design/src/components/common';
-import Navigation from './Navigation';
import { colors } from 'loot-design/src/style';
+import Navigation from './Navigation';
import { Title } from './common';
function BudgetSummary({ targetRect, navigationProps }) {
diff --git a/packages/desktop-client/src/components/tutorial/BudgetSummary.js b/packages/desktop-client/src/components/tutorial/BudgetSummary.js
index cece55a63b9d496bcb0675325df830b9b0016ea4..0a3e4ab3a2d67284c50d55f3307f304e6455d9dd 100644
--- a/packages/desktop-client/src/components/tutorial/BudgetSummary.js
+++ b/packages/desktop-client/src/components/tutorial/BudgetSummary.js
@@ -1,7 +1,7 @@
import React from 'react';
import { Tooltip, Pointer, P } from 'loot-design/src/components/common';
-import Navigation from './Navigation';
import { colors } from 'loot-design/src/style';
+import Navigation from './Navigation';
import { Title } from './common';
function BudgetSummary({ fromYNAB, targetRect, navigationProps }) {
diff --git a/packages/desktop-client/src/components/tutorial/TransactionAdd.js b/packages/desktop-client/src/components/tutorial/TransactionAdd.js
index f4e2ddc1898d74921c484278d72ac2256fb1f219..5f2e9b04826ad1cdd9998663dcdf7ed80d108168 100644
--- a/packages/desktop-client/src/components/tutorial/TransactionAdd.js
+++ b/packages/desktop-client/src/components/tutorial/TransactionAdd.js
@@ -1,7 +1,7 @@
import React from 'react';
import { Tooltip, Pointer, P } from 'loot-design/src/components/common';
-import Navigation from './Navigation';
import { colors } from 'loot-design/src/style';
+import Navigation from './Navigation';
import { Title } from './common';
function TransactionAdd({ targetRect, navigationProps }) {
diff --git a/packages/desktop-client/src/components/tutorial/TransactionEnter.js b/packages/desktop-client/src/components/tutorial/TransactionEnter.js
index 50ce47baa8d67642d921dd3e259134ccd49f0cd5..f06ecc1722f2e99e1422663a2b4e19774c3f8872 100644
--- a/packages/desktop-client/src/components/tutorial/TransactionEnter.js
+++ b/packages/desktop-client/src/components/tutorial/TransactionEnter.js
@@ -1,7 +1,7 @@
import React from 'react';
import { P } from 'loot-design/src/components/common';
-import Navigation from './Navigation';
import * as monthUtils from 'loot-core/src/shared/months';
+import Navigation from './Navigation';
import { Standalone, Title } from './common';
function TransactionEnter({ fromYNAB, navigationProps }) {
diff --git a/packages/desktop-client/src/components/tutorial/common.js b/packages/desktop-client/src/components/tutorial/common.js
index 71f6bd3aa5b748dbfeeb1b97492f3c18cee2c8d4..8ec1f69062200d12d8d446e0b53fc84302924491 100644
--- a/packages/desktop-client/src/components/tutorial/common.js
+++ b/packages/desktop-client/src/components/tutorial/common.js
@@ -1,7 +1,7 @@
import React, { useState } from 'react';
import { View, AnchorLink } from 'loot-design/src/components/common';
-import AnimateIn from './AnimateIn';
import { colors } from 'loot-design/src/style';
+import AnimateIn from './AnimateIn';
export function Title({ children }) {
return (
diff --git a/packages/desktop-client/src/index.js b/packages/desktop-client/src/index.js
index 14597ab124f1ce1355500ae181823f1a39370d67..2134f6d9880a285a2e8df3b46f7a56d6f81bd1d8 100644
--- a/packages/desktop-client/src/index.js
+++ b/packages/desktop-client/src/index.js
@@ -7,7 +7,6 @@ import '@reach/listbox/styles.css';
import React from 'react';
import ReactDOM from 'react-dom';
-import App from './components/App';
import {
createStore,
combineReducers,
@@ -21,8 +20,9 @@ import { send } from 'loot-core/src/platform/client/fetch';
import q, { runQuery } from 'loot-core/src/client/query-helpers';
import * as actions from 'loot-core/src/client/actions';
import thunk from 'redux-thunk';
-import { handleGlobalEvents } from './global-events';
import { initialState as initialAppState } from 'loot-core/src/client/reducers/app';
+import { handleGlobalEvents } from './global-events';
+import App from './components/App';
// See https://github.com/WICG/focus-visible. Only makes the blue
// focus outline appear from keyboard events.