Skip to content

A local-first personal finance app

Move all loot-design code into desktop-client (#800)

Jed Foxe71d4dc680aa
diff --git a/packages/desktop-client/package.json b/packages/desktop-client/package.json
index 43321fc5a4..6d3ce64e9c 100644
--- a/packages/desktop-client/package.json
+++ b/packages/desktop-client/package.json
@@ -7,6 +7,7 @@
],
"devDependencies": {
"@jlongster/lively": "0.0.4",
+ "@juggle/resize-observer": "^3.1.2",
"@playwright/test": "^1.29.1",
"@reach/listbox": "^0.11.2",
"@react-aria/focus": "^3.8.0",
@@ -15,35 +16,49 @@
"@react-stately/collections": "^3.4.3",
"@react-stately/list": "^3.5.3",
"@reactions/component": "^2.0.2",
+ "@svgr/cli": "^6.5.1",
"@testing-library/react": "14.0.0",
"@testing-library/user-event": "14.4.3",
"chalk": "2.4.1",
+ "chroma-js": "^1.3.3",
"cross-env": "^7.0.3",
"customize-cra": "^1.0.0",
"date-fns": "2.0.0-alpha.27",
"debounce": "^1.2.0",
+ "downshift": "1.31.16",
"eslint": "^8.35.0",
"focus-visible": "^4.1.1",
+ "formik": "^0.11.10",
"glamor": "^2.20.40",
+ "hotkeys-js": "3.8.2",
"identity-obj-proxy": "3.0.0",
"inter-ui": "^3.19.3",
+ "jest": "^27.0.0",
"jest-watch-typeahead": "^2.2.2",
+ "memoize-one": "^4.0.0",
"mitt": "^3.0.0",
+ "node-noop": "1.0.0",
+ "pikaday": "1.8.0",
"prop-types": "15.6.0",
"react": "18.2.0",
"react-app-rewired": "^2.2.1",
"react-dnd": "^10.0.2",
+ "react-dnd-html5-backend": "^10.0.2",
"react-dom": "18.2.0",
+ "react-merge-refs": "^1.1.0",
+ "react-modal": "3.16.1",
"react-redux": "7.2.1",
"react-router": "5.2.0",
"react-router-dom": "5.2.0",
"react-router-dom-v5-compat": "^6.4.1",
"react-scripts": "^5.0.1",
+ "react-select": "^5.7.0",
"react-spring": "^8.0.27",
"react-virtualized-auto-sizer": "^1.0.2",
"redux": "^4.0.5",
"redux-thunk": "^2.3.0",
- "victory": "^36.6.8"
+ "victory": "^36.6.8",
+ "wobble": "^1.5.0"
},
"scripts": {
"start": "cross-env PORT=3001 react-app-rewired start",
@@ -57,8 +72,7 @@
},
"jest": {
"setupFilesAfterEnv": [
- "<rootDir>/src/setupTests.js",
- "<rootDir>/../loot-design/src/setupTests.js"
+ "<rootDir>/src/setupTests.js"
]
}
}
diff --git a/packages/desktop-client/src/components/AnimatedRefresh.js b/packages/desktop-client/src/components/AnimatedRefresh.js
index 8ea1d7000e..28f48446b3 100644
--- a/packages/desktop-client/src/components/AnimatedRefresh.js
+++ b/packages/desktop-client/src/components/AnimatedRefresh.js
@@ -2,8 +2,9 @@ import React from 'react';
import { css } from 'glamor';
-import { View } from 'loot-design/src/components/common';
-import Refresh from 'loot-design/src/svg/v1/Refresh';
+import Refresh from '../icons/v1/Refresh';
+
+import View from './View';
let spin = css.keyframes({
'0%': { transform: 'rotateZ(0deg)' },
diff --git a/packages/desktop-client/src/components/App.js b/packages/desktop-client/src/components/App.js
index 530a34f662..dd85f1474d 100644
--- a/packages/desktop-client/src/components/App.js
+++ b/packages/desktop-client/src/components/App.js
@@ -8,9 +8,9 @@ import {
init as initConnection,
send,
} from 'loot-core/src/platform/client/fetch';
-import { styles, hasHiddenScrollbars } from 'loot-design/src/style';
import installPolyfills from '../polyfills';
+import { styles, hasHiddenScrollbars } from '../style';
import AppBackground from './AppBackground';
import FatalError from './FatalError';
diff --git a/packages/desktop-client/src/components/AppBackground.js b/packages/desktop-client/src/components/AppBackground.js
index 5b4dfdd2d0..d0bcc8adcb 100644
--- a/packages/desktop-client/src/components/AppBackground.js
+++ b/packages/desktop-client/src/components/AppBackground.js
@@ -2,11 +2,11 @@ import React from 'react';
import { css } from 'glamor';
-import { View, Block } from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
-import AnimatedLoading from 'loot-design/src/svg/AnimatedLoading';
+import AnimatedLoading from '../icons/AnimatedLoading';
+import { colors } from '../style';
import Background from './Background';
+import { View, Block } from './common';
function AppBackground({ initializing, loadingText }) {
return (
diff --git a/packages/desktop-client/src/components/BankSyncStatus.js b/packages/desktop-client/src/components/BankSyncStatus.js
index 06565d2f38..467b097e50 100644
--- a/packages/desktop-client/src/components/BankSyncStatus.js
+++ b/packages/desktop-client/src/components/BankSyncStatus.js
@@ -3,10 +3,11 @@ import { connect } from 'react-redux';
import { useTransition, animated } from 'react-spring';
import * as actions from 'loot-core/src/client/actions';
-import { View, Text } from 'loot-design/src/components/common';
-import { colors, styles } from 'loot-design/src/style';
+
+import { colors, styles } from '../style';
import AnimatedRefresh from './AnimatedRefresh';
+import { View, Text } from './common';
function BankSyncStatus({ accountsSyncing }) {
let name = accountsSyncing
diff --git a/packages/desktop-client/src/components/FatalError.js b/packages/desktop-client/src/components/FatalError.js
index 1f48673945..1fdd59b7b2 100644
--- a/packages/desktop-client/src/components/FatalError.js
+++ b/packages/desktop-client/src/components/FatalError.js
@@ -1,17 +1,9 @@
import React, { useState } from 'react';
-import {
- View,
- Stack,
- Text,
- Block,
- Modal,
- P,
- Link,
- Button,
-} from 'loot-design/src/components/common';
-import { Checkbox } from 'loot-design/src/components/forms';
-import { colors } from 'loot-design/src/style';
+import { colors } from '../style';
+
+import { View, Stack, Text, Block, Modal, P, Link, Button } from './common';
+import { Checkbox } from './forms';
class FatalError extends React.Component {
state = { showError: false };
diff --git a/packages/desktop-client/src/components/FinancesApp.js b/packages/desktop-client/src/components/FinancesApp.js
index 76efc5cf2f..5036f07d6c 100644
--- a/packages/desktop-client/src/components/FinancesApp.js
+++ b/packages/desktop-client/src/components/FinancesApp.js
@@ -22,13 +22,11 @@ import { SpreadsheetProvider } from 'loot-core/src/client/SpreadsheetProvider';
import checkForUpdateNotification from 'loot-core/src/client/update-notification';
import checkForUpgradeNotifications from 'loot-core/src/client/upgrade-notifications';
import * as undo from 'loot-core/src/platform/client/undo';
-import { BudgetMonthCountProvider } from 'loot-design/src/components/budget/BudgetMonthCountContext';
-import { View } from 'loot-design/src/components/common';
-import { colors, styles } from 'loot-design/src/style';
-import Cog from 'loot-design/src/svg/v1/Cog';
-import PiggyBank from 'loot-design/src/svg/v1/PiggyBank';
-import Wallet from 'loot-design/src/svg/v1/Wallet';
+import Cog from '../icons/v1/Cog';
+import PiggyBank from '../icons/v1/PiggyBank';
+import Wallet from '../icons/v1/Wallet';
+import { colors, styles } from '../style';
import { isMobile } from '../util';
import { getLocationState, makeLocationState } from '../util/location-state';
import { getIsOutdated, getLatestVersion } from '../util/versions';
@@ -39,7 +37,9 @@ import { default as MobileAccounts } from './accounts/MobileAccounts';
import { ActiveLocationProvider } from './ActiveLocation';
import BankSyncStatus from './BankSyncStatus';
import Budget from './budget';
+import { BudgetMonthCountProvider } from './budget/BudgetMonthCountContext';
import { default as MobileBudget } from './budget/MobileBudget';
+import { View } from './common';
import FloatableSidebar, { SidebarProvider } from './FloatableSidebar';
import GlobalKeys from './GlobalKeys';
import { ManageRulesPage } from './ManageRulesPage';
diff --git a/packages/loot-design/src/components/FixedSizeList.js b/packages/desktop-client/src/components/FixedSizeList.js
similarity index 99%
rename from packages/loot-design/src/components/FixedSizeList.js
rename to packages/desktop-client/src/components/FixedSizeList.js
index ea96ab165c..0c39dd6d7a 100644
--- a/packages/loot-design/src/components/FixedSizeList.js
+++ b/packages/desktop-client/src/components/FixedSizeList.js
@@ -2,8 +2,9 @@ import React from 'react';
import memoizeOne from 'memoize-one';
+import useResizeObserver from '../hooks/useResizeObserver';
+
import { View } from './common';
-import useResizeObserver from './useResizeObserver';
const IS_SCROLLING_DEBOUNCE_INTERVAL = 150;
diff --git a/packages/desktop-client/src/components/FloatableSidebar.js b/packages/desktop-client/src/components/FloatableSidebar.js
index eaa3afa674..a14fedeff1 100644
--- a/packages/desktop-client/src/components/FloatableSidebar.js
+++ b/packages/desktop-client/src/components/FloatableSidebar.js
@@ -5,10 +5,11 @@ import { withRouter } from 'react-router-dom';
import mitt from 'mitt';
import * as actions from 'loot-core/src/client/actions';
-import { View } from 'loot-design/src/components/common';
-import { SIDEBAR_WIDTH } from 'loot-design/src/components/sidebar';
-import { colors } from 'loot-design/src/style';
+import { colors } from '../style';
+
+import { View } from './common';
+import { SIDEBAR_WIDTH } from './sidebar';
import SidebarWithData from './SidebarWithData';
const SidebarContext = React.createContext(null);
diff --git a/packages/loot-design/src/components/KeyHandlers.js b/packages/desktop-client/src/components/KeyHandlers.js
similarity index 100%
rename from packages/loot-design/src/components/KeyHandlers.js
rename to packages/desktop-client/src/components/KeyHandlers.js
diff --git a/packages/desktop-client/src/components/LoggedInUser.js b/packages/desktop-client/src/components/LoggedInUser.js
index b6f8a4298f..0ff1c7534a 100644
--- a/packages/desktop-client/src/components/LoggedInUser.js
+++ b/packages/desktop-client/src/components/LoggedInUser.js
@@ -3,15 +3,10 @@ import { connect } from 'react-redux';
import { withRouter } from 'react-router';
import * as actions from 'loot-core/src/client/actions';
-import {
- View,
- Text,
- Button,
- Tooltip,
- Menu,
-} from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
+import { colors } from '../style';
+
+import { View, Text, Button, Tooltip, Menu } from './common';
import { useServerURL } from './ServerContext';
function LoggedInUser({
diff --git a/packages/desktop-client/src/components/ManageRules.js b/packages/desktop-client/src/components/ManageRules.js
index 5dbf9d71ad..3f1d9bd018 100644
--- a/packages/desktop-client/src/components/ManageRules.js
+++ b/packages/desktop-client/src/components/ManageRules.js
@@ -21,14 +21,16 @@ import { getMonthYearFormat } from 'loot-core/src/shared/months';
import { mapField, friendlyOp } from 'loot-core/src/shared/rules';
import { getRecurringDescription } from 'loot-core/src/shared/schedules';
import { integerToCurrency } from 'loot-core/src/shared/util';
-import {
- View,
- Text,
- Button,
- Stack,
- ExternalLink,
- Input,
-} from 'loot-design/src/components/common';
+
+import useSelected, {
+ useSelectedDispatch,
+ useSelectedItems,
+ SelectedProvider,
+} from '../hooks/useSelected';
+import ArrowRight from '../icons/v0/RightArrow2';
+import { colors } from '../style';
+
+import { View, Text, Button, Stack, ExternalLink, Input } from './common';
import {
SelectCell,
Row,
@@ -37,14 +39,7 @@ import {
CellButton,
TableHeader,
useTableNavigator,
-} from 'loot-design/src/components/table';
-import useSelected, {
- useSelectedDispatch,
- useSelectedItems,
- SelectedProvider,
-} from 'loot-design/src/components/useSelected';
-import { colors } from 'loot-design/src/style';
-import ArrowRight from 'loot-design/src/svg/v0/RightArrow2';
+} from './table';
let SchedulesQuery = liveQueryContext(q('schedules').select('*'));
diff --git a/packages/desktop-client/src/components/MobileWebMessage.js b/packages/desktop-client/src/components/MobileWebMessage.js
index c1fcb1474e..e74a4637d2 100644
--- a/packages/desktop-client/src/components/MobileWebMessage.js
+++ b/packages/desktop-client/src/components/MobileWebMessage.js
@@ -2,12 +2,13 @@ import React, { useState } from 'react';
import { useDispatch, useSelector } from 'react-redux';
import { savePrefs } from 'loot-core/src/client/actions';
-import { View, Text, Button } from 'loot-design/src/components/common';
-import { Checkbox } from 'loot-design/src/components/forms';
-import { colors, styles } from 'loot-design/src/style';
+import { colors, styles } from '../style';
import { isMobile } from '../util';
+import { View, Text, Button } from './common';
+import { Checkbox } from './forms';
+
let buttonStyle = { border: 0, fontSize: 15, padding: '10px 13px' };
export default function MobileWebMessage() {
diff --git a/packages/desktop-client/src/components/Modals.js b/packages/desktop-client/src/components/Modals.js
index eae0f072cb..a70800ef71 100644
--- a/packages/desktop-client/src/components/Modals.js
+++ b/packages/desktop-client/src/components/Modals.js
@@ -8,27 +8,27 @@ import { bindActionCreators } from 'redux';
import * as actions from 'loot-core/src/client/actions';
import { send, listen, unlisten } from 'loot-core/src/platform/client/fetch';
-import BudgetSummary from 'loot-design/src/components/modals/BudgetSummary';
-import CloseAccount from 'loot-design/src/components/modals/CloseAccount';
-import ConfigureLinkedAccounts from 'loot-design/src/components/modals/ConfigureLinkedAccounts';
-import CreateLocalAccount from 'loot-design/src/components/modals/CreateLocalAccount';
-import EditField from 'loot-design/src/components/modals/EditField';
-import ImportTransactions from 'loot-design/src/components/modals/ImportTransactions';
-import LoadBackup from 'loot-design/src/components/modals/LoadBackup';
-import NordigenExternalMsg from 'loot-design/src/components/modals/NordigenExternalMsg';
-import PlaidExternalMsg from 'loot-design/src/components/modals/PlaidExternalMsg';
-import SelectLinkedAccounts from 'loot-design/src/components/modals/SelectLinkedAccounts';
import useFeatureFlag from '../hooks/useFeatureFlag';
import useSyncServerStatus from '../hooks/useSyncServerStatus';
+import BudgetSummary from './modals/BudgetSummary';
+import CloseAccount from './modals/CloseAccount';
+import ConfigureLinkedAccounts from './modals/ConfigureLinkedAccounts';
import ConfirmCategoryDelete from './modals/ConfirmCategoryDelete';
import CreateAccount from './modals/CreateAccount';
import CreateEncryptionKey from './modals/CreateEncryptionKey';
+import CreateLocalAccount from './modals/CreateLocalAccount';
+import EditField from './modals/EditField';
import EditRule from './modals/EditRule';
import FixEncryptionKey from './modals/FixEncryptionKey';
+import ImportTransactions from './modals/ImportTransactions';
+import LoadBackup from './modals/LoadBackup';
import ManageRulesModal from './modals/ManageRulesModal';
import MergeUnusedPayees from './modals/MergeUnusedPayees';
+import NordigenExternalMsg from './modals/NordigenExternalMsg';
+import PlaidExternalMsg from './modals/PlaidExternalMsg';
+import SelectLinkedAccounts from './modals/SelectLinkedAccounts';
function Modals({
history,
diff --git a/packages/loot-design/src/components/NotesButton.js b/packages/desktop-client/src/components/NotesButton.js
similarity index 98%
rename from packages/loot-design/src/components/NotesButton.js
rename to packages/desktop-client/src/components/NotesButton.js
index bca6ed5b41..b3d03e311e 100644
--- a/packages/loot-design/src/components/NotesButton.js
+++ b/packages/desktop-client/src/components/NotesButton.js
@@ -6,8 +6,8 @@ import q from 'loot-core/src/client/query-helpers';
import { useLiveQuery } from 'loot-core/src/client/query-hooks';
import { send } from 'loot-core/src/platform/client/fetch';
+import CustomNotesPaper from '../icons/v2/CustomNotesPaper';
import { colors } from '../style';
-import CustomNotesPaper from '../svg/v2/CustomNotesPaper';
import { View, Button, Tooltip, useTooltip, Text } from './common';
diff --git a/packages/desktop-client/src/components/Notifications.js b/packages/desktop-client/src/components/Notifications.js
index 2d62775fb4..841a37fb73 100644
--- a/packages/desktop-client/src/components/Notifications.js
+++ b/packages/desktop-client/src/components/Notifications.js
@@ -4,6 +4,11 @@ import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import * as actions from 'loot-core/src/client/actions';
+
+import Loading from '../icons/AnimatedLoading';
+import Delete from '../icons/v0/Delete';
+import { styles, colors } from '../style';
+
import {
View,
Text,
@@ -11,10 +16,7 @@ import {
ButtonWithLoading,
Stack,
ExternalLink,
-} from 'loot-design/src/components/common';
-import { styles, colors } from 'loot-design/src/style';
-import Loading from 'loot-design/src/svg/AnimatedLoading';
-import Delete from 'loot-design/src/svg/v0/Delete';
+} from './common';
function compileMessage(message, actions, setLoading, onRemove) {
return (
diff --git a/packages/desktop-client/src/components/Page.js b/packages/desktop-client/src/components/Page.js
index f18332df6e..acdc74ce54 100644
--- a/packages/desktop-client/src/components/Page.js
+++ b/packages/desktop-client/src/components/Page.js
@@ -1,8 +1,9 @@
import React from 'react';
import { useHistory } from 'react-router-dom';
-import { Modal, View, Text } from 'loot-design/src/components/common';
-import { styles } from 'loot-design/src/style';
+import { styles } from '../style';
+
+import { Modal, View, Text } from './common';
let PageTypeContext = React.createContext({ type: 'page' });
diff --git a/packages/desktop-client/src/components/SidebarWithData.js b/packages/desktop-client/src/components/SidebarWithData.js
index 1e848cb966..68fb96d3c4 100644
--- a/packages/desktop-client/src/components/SidebarWithData.js
+++ b/packages/desktop-client/src/components/SidebarWithData.js
@@ -10,19 +10,13 @@ import { closeBudget } from 'loot-core/src/client/actions/budgets';
import * as Platform from 'loot-core/src/client/platform';
import * as queries from 'loot-core/src/client/queries';
import { send } from 'loot-core/src/platform/client/fetch';
-import {
- Button,
- Input,
- InitialFocus,
- Text,
- Tooltip,
- Menu,
-} from 'loot-design/src/components/common';
-import { Sidebar } from 'loot-design/src/components/sidebar';
-import { styles, colors } from 'loot-design/src/style';
-import ExpandArrow from 'loot-design/src/svg/v0/ExpandArrow';
import useFeatureFlag from '../hooks/useFeatureFlag';
+import ExpandArrow from '../icons/v0/ExpandArrow';
+import { styles, colors } from '../style';
+
+import { Button, Input, InitialFocus, Text, Tooltip, Menu } from './common';
+import { Sidebar } from './sidebar';
function EditableBudgetName({ prefs, savePrefs }) {
let dispatch = useDispatch();
diff --git a/packages/loot-design/src/components/Stack.js b/packages/desktop-client/src/components/Stack.js
similarity index 100%
rename from packages/loot-design/src/components/Stack.js
rename to packages/desktop-client/src/components/Stack.js
diff --git a/packages/loot-design/src/components/Text.js b/packages/desktop-client/src/components/Text.js
similarity index 100%
rename from packages/loot-design/src/components/Text.js
rename to packages/desktop-client/src/components/Text.js
diff --git a/packages/desktop-client/src/components/Titlebar.js b/packages/desktop-client/src/components/Titlebar.js
index e6fb8c910c..ba095bb7ba 100644
--- a/packages/desktop-client/src/components/Titlebar.js
+++ b/packages/desktop-client/src/components/Titlebar.js
@@ -8,6 +8,18 @@ import * as actions from 'loot-core/src/client/actions';
import * as Platform from 'loot-core/src/client/platform';
import * as queries from 'loot-core/src/client/queries';
import { listen } from 'loot-core/src/platform/client/fetch';
+
+import useFeatureFlag from '../hooks/useFeatureFlag';
+import ArrowLeft from '../icons/v1/ArrowLeft';
+import AlertTriangle from '../icons/v2/AlertTriangle';
+import ArrowButtonRight1 from '../icons/v2/ArrowButtonRight1';
+import NavigationMenu from '../icons/v2/NavigationMenu';
+import { colors } from '../style';
+import tokens from '../tokens';
+
+import AccountSyncCheck from './accounts/AccountSyncCheck';
+import AnimatedRefresh from './AnimatedRefresh';
+import { MonthCountSelector } from './budget/MonthCountSelector';
import {
View,
Text,
@@ -16,23 +28,11 @@ import {
ButtonWithLoading,
Tooltip,
P,
-} from 'loot-design/src/components/common';
-import SheetValue from 'loot-design/src/components/spreadsheet/SheetValue';
-import { colors } from 'loot-design/src/style';
-import ArrowLeft from 'loot-design/src/svg/v1/ArrowLeft';
-import AlertTriangle from 'loot-design/src/svg/v2/AlertTriangle';
-import ArrowButtonRight1 from 'loot-design/src/svg/v2/ArrowButtonRight1';
-import NavigationMenu from 'loot-design/src/svg/v2/NavigationMenu';
-import tokens from 'loot-design/src/tokens';
-
-import useFeatureFlag from '../hooks/useFeatureFlag';
-
-import AccountSyncCheck from './accounts/AccountSyncCheck';
-import AnimatedRefresh from './AnimatedRefresh';
-import { MonthCountSelector } from './budget/MonthCountSelector';
+} from './common';
import { useSidebar } from './FloatableSidebar';
import LoggedInUser from './LoggedInUser';
import { useServerURL } from './ServerContext';
+import SheetValue from './spreadsheet/SheetValue';
export let TitlebarContext = React.createContext();
diff --git a/packages/desktop-client/src/components/UpdateNotification.js b/packages/desktop-client/src/components/UpdateNotification.js
index ed8acdfa97..4d0c3360d2 100644
--- a/packages/desktop-client/src/components/UpdateNotification.js
+++ b/packages/desktop-client/src/components/UpdateNotification.js
@@ -4,9 +4,11 @@ import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import * as actions from 'loot-core/src/client/actions';
-import { View, Text, Link, Button } from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
-import Close from 'loot-design/src/svg/v1/Close';
+
+import Close from '../icons/v1/Close';
+import { colors } from '../style';
+
+import { View, Text, Link, Button } from './common';
function closeNotification(setAppState) {
// Set a flag to never show an update notification again for this session
diff --git a/packages/loot-design/src/components/View.js b/packages/desktop-client/src/components/View.js
similarity index 100%
rename from packages/loot-design/src/components/View.js
rename to packages/desktop-client/src/components/View.js
diff --git a/packages/desktop-client/src/components/accounts/Account.js b/packages/desktop-client/src/components/accounts/Account.js
index 29af807012..28e364f9b5 100644
--- a/packages/desktop-client/src/components/accounts/Account.js
+++ b/packages/desktop-client/src/components/accounts/Account.js
@@ -26,6 +26,28 @@ import {
applyChanges,
groupById,
} from 'loot-core/src/shared/util';
+
+import useFeatureFlag from '../../hooks/useFeatureFlag';
+import {
+ SelectedProviderWithItems,
+ useSelectedItems,
+} from '../../hooks/useSelected';
+import useSyncServerStatus from '../../hooks/useSyncServerStatus';
+import Loading from '../../icons/AnimatedLoading';
+import Add from '../../icons/v1/Add';
+import DotsHorizontalTriple from '../../icons/v1/DotsHorizontalTriple';
+import ArrowButtonRight1 from '../../icons/v2/ArrowButtonRight1';
+import ArrowsExpand3 from '../../icons/v2/ArrowsExpand3';
+import ArrowsShrink3 from '../../icons/v2/ArrowsShrink3';
+import CheckCircle1 from '../../icons/v2/CheckCircle1';
+import DownloadThickBottom from '../../icons/v2/DownloadThickBottom';
+import Pencil1 from '../../icons/v2/Pencil1';
+import SvgRemove from '../../icons/v2/Remove';
+import SearchAlternate from '../../icons/v2/SearchAlternate';
+import { authorizeBank } from '../../nordigen';
+import { styles, colors } from '../../style';
+import { useActiveLocation } from '../ActiveLocation';
+import AnimatedRefresh from '../AnimatedRefresh';
import {
View,
Text,
@@ -36,35 +58,13 @@ import {
Tooltip,
Menu,
Stack,
-} from 'loot-design/src/components/common';
-import { KeyHandlers } from 'loot-design/src/components/KeyHandlers';
-import NotesButton from 'loot-design/src/components/NotesButton';
-import CellValue from 'loot-design/src/components/spreadsheet/CellValue';
-import format from 'loot-design/src/components/spreadsheet/format';
-import useSheetValue from 'loot-design/src/components/spreadsheet/useSheetValue';
-import { SelectedItemsButton } from 'loot-design/src/components/table';
-import {
- SelectedProviderWithItems,
- useSelectedItems,
-} from 'loot-design/src/components/useSelected';
-import { styles, colors } from 'loot-design/src/style';
-import Loading from 'loot-design/src/svg/AnimatedLoading';
-import Add from 'loot-design/src/svg/v1/Add';
-import DotsHorizontalTriple from 'loot-design/src/svg/v1/DotsHorizontalTriple';
-import ArrowButtonRight1 from 'loot-design/src/svg/v2/ArrowButtonRight1';
-import ArrowsExpand3 from 'loot-design/src/svg/v2/ArrowsExpand3';
-import ArrowsShrink3 from 'loot-design/src/svg/v2/ArrowsShrink3';
-import CheckCircle1 from 'loot-design/src/svg/v2/CheckCircle1';
-import DownloadThickBottom from 'loot-design/src/svg/v2/DownloadThickBottom';
-import Pencil1 from 'loot-design/src/svg/v2/Pencil1';
-import SvgRemove from 'loot-design/src/svg/v2/Remove';
-import SearchAlternate from 'loot-design/src/svg/v2/SearchAlternate';
-
-import useFeatureFlag from '../../hooks/useFeatureFlag';
-import useSyncServerStatus from '../../hooks/useSyncServerStatus';
-import { authorizeBank } from '../../nordigen';
-import { useActiveLocation } from '../ActiveLocation';
-import AnimatedRefresh from '../AnimatedRefresh';
+} from '../common';
+import { KeyHandlers } from '../KeyHandlers';
+import NotesButton from '../NotesButton';
+import CellValue from '../spreadsheet/CellValue';
+import format from '../spreadsheet/format';
+import useSheetValue from '../spreadsheet/useSheetValue';
+import { SelectedItemsButton } from '../table';
import { FilterButton, AppliedFilters } from './Filters';
import TransactionList from './TransactionList';
diff --git a/packages/desktop-client/src/components/accounts/AccountSyncCheck.js b/packages/desktop-client/src/components/accounts/AccountSyncCheck.js
index 9d601a2395..61b32573da 100644
--- a/packages/desktop-client/src/components/accounts/AccountSyncCheck.js
+++ b/packages/desktop-client/src/components/accounts/AccountSyncCheck.js
@@ -2,11 +2,11 @@ import React, { useState } from 'react';
import { connect } from 'react-redux';
import * as actions from 'loot-core/src/client/actions';
-import { View, Button, Tooltip } from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
-import ExclamationOutline from 'loot-design/src/svg/v1/ExclamationOutline';
+import ExclamationOutline from '../../icons/v1/ExclamationOutline';
import { authorizeBank } from '../../nordigen';
+import { colors } from '../../style';
+import { View, Button, Tooltip } from '../common';
function getErrorMessage(type, code) {
switch (type.toUpperCase()) {
diff --git a/packages/desktop-client/src/components/accounts/Filters.js b/packages/desktop-client/src/components/accounts/Filters.js
index 1fccb82a27..b0a552258c 100644
--- a/packages/desktop-client/src/components/accounts/Filters.js
+++ b/packages/desktop-client/src/components/accounts/Filters.js
@@ -21,6 +21,10 @@ import {
TYPE_INFO,
} from 'loot-core/src/shared/rules';
import { titleFirst } from 'loot-core/src/shared/util';
+
+import DeleteIcon from '../../icons/v0/Delete';
+import SettingsSliderAlternate from '../../icons/v2/SettingsSliderAlternate';
+import { colors } from '../../style';
import {
View,
Text,
@@ -29,11 +33,7 @@ import {
Button,
Menu,
CustomSelect,
-} from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
-import DeleteIcon from 'loot-design/src/svg/v0/Delete';
-import SettingsSliderAlternate from 'loot-design/src/svg/v2/SettingsSliderAlternate';
-
+} from '../common';
import { Value } from '../ManageRules';
import GenericInput from '../util/GenericInput';
diff --git a/packages/desktop-client/src/components/accounts/MobileAccount.js b/packages/desktop-client/src/components/accounts/MobileAccount.js
index cab2574d4c..45e636e475 100644
--- a/packages/desktop-client/src/components/accounts/MobileAccount.js
+++ b/packages/desktop-client/src/components/accounts/MobileAccount.js
@@ -19,9 +19,9 @@ import {
isPreviewId,
ungroupTransactions,
} from 'loot-core/src/shared/transactions';
-import { colors } from 'loot-design/src/style';
-import { withThemeColor } from 'loot-design/src/util/withThemeColor';
+import { colors } from '../../style';
+import { withThemeColor } from '../../util/withThemeColor';
import SyncRefresh from '../SyncRefresh';
import { default as AccountDetails } from './MobileAccountDetails';
diff --git a/packages/desktop-client/src/components/accounts/MobileAccountDetails.js b/packages/desktop-client/src/components/accounts/MobileAccountDetails.js
index be0e132b02..7c83a80cab 100644
--- a/packages/desktop-client/src/components/accounts/MobileAccountDetails.js
+++ b/packages/desktop-client/src/components/accounts/MobileAccountDetails.js
@@ -1,18 +1,13 @@
import React, { useState, useMemo } from 'react';
import { Link } from 'react-router-dom';
-import {
- Button,
- InputWithContent,
- Label,
- View,
-} from 'loot-design/src/components/common';
-import CellValue from 'loot-design/src/components/spreadsheet/CellValue';
-import Text from 'loot-design/src/components/Text';
-import { colors, styles } from 'loot-design/src/style';
-import Add from 'loot-design/src/svg/v1/Add';
-import CheveronLeft from 'loot-design/src/svg/v1/CheveronLeft';
-import SearchAlternate from 'loot-design/src/svg/v2/SearchAlternate';
+import Add from '../../icons/v1/Add';
+import CheveronLeft from '../../icons/v1/CheveronLeft';
+import SearchAlternate from '../../icons/v2/SearchAlternate';
+import { colors, styles } from '../../style';
+import { Button, InputWithContent, Label, View } from '../common';
+import CellValue from '../spreadsheet/CellValue';
+import Text from '../Text';
import { TransactionList } from './MobileTransaction';
diff --git a/packages/desktop-client/src/components/accounts/MobileAccounts.js b/packages/desktop-client/src/components/accounts/MobileAccounts.js
index b2c80aeb89..d0576d6cc4 100644
--- a/packages/desktop-client/src/components/accounts/MobileAccounts.js
+++ b/packages/desktop-client/src/components/accounts/MobileAccounts.js
@@ -5,16 +5,12 @@ import { useNavigate } from 'react-router-dom-v5-compat';
import * as actions from 'loot-core/src/client/actions';
import * as queries from 'loot-core/src/client/queries';
import { prettyAccountType } from 'loot-core/src/shared/accounts';
-import {
- Button,
- Text,
- TextOneLine,
- View,
-} from 'loot-design/src/components/common';
-import CellValue from 'loot-design/src/components/spreadsheet/CellValue';
-import { colors, styles } from 'loot-design/src/style';
-import Wallet from 'loot-design/src/svg/v1/Wallet';
-import { withThemeColor } from 'loot-design/src/util/withThemeColor';
+
+import Wallet from '../../icons/v1/Wallet';
+import { colors, styles } from '../../style';
+import { withThemeColor } from '../../util/withThemeColor';
+import { Button, Text, TextOneLine, View } from '../common';
+import CellValue from '../spreadsheet/CellValue';
export function AccountHeader({ name, amount }) {
return (
diff --git a/packages/desktop-client/src/components/accounts/MobileTransaction.js b/packages/desktop-client/src/components/accounts/MobileTransaction.js
index 4eb9385f2f..68d46cb4c1 100644
--- a/packages/desktop-client/src/components/accounts/MobileTransaction.js
+++ b/packages/desktop-client/src/components/accounts/MobileTransaction.js
@@ -11,10 +11,11 @@ import * as monthUtils from 'loot-core/src/shared/months';
import { getScheduledAmount } from 'loot-core/src/shared/schedules';
import { titleFirst } from 'loot-core/src/shared/util';
import { integerToCurrency, groupById } from 'loot-core/src/shared/util';
-import { Text, TextOneLine, View } from 'loot-design/src/components/common';
-import { styles, colors } from 'loot-design/src/style';
-import ArrowsSynchronize from 'loot-design/src/svg/v2/ArrowsSynchronize';
-import CheckCircle1 from 'loot-design/src/svg/v2/CheckCircle1';
+
+import ArrowsSynchronize from '../../icons/v2/ArrowsSynchronize';
+import CheckCircle1 from '../../icons/v2/CheckCircle1';
+import { styles, colors } from '../../style';
+import { Text, TextOneLine, View } from '../common';
const zIndices = { SECTION_HEADING: 10 };
diff --git a/packages/desktop-client/src/components/accounts/SimpleTransactionsTable.js b/packages/desktop-client/src/components/accounts/SimpleTransactionsTable.js
index 106a940e41..9252c57801 100644
--- a/packages/desktop-client/src/components/accounts/SimpleTransactionsTable.js
+++ b/packages/desktop-client/src/components/accounts/SimpleTransactionsTable.js
@@ -12,20 +12,11 @@ import {
getCategoriesById,
} from 'loot-core/src/client/reducers/queries';
import { integerToCurrency } from 'loot-core/src/shared/util';
-import {
- Table,
- Row,
- Field,
- Cell,
- SelectCell,
-} from 'loot-design/src/components/table';
-import {
- useSelectedItems,
- useSelectedDispatch,
-} from 'loot-design/src/components/useSelected';
-import { styles } from 'loot-design/src/style';
-import ArrowsSynchronize from 'loot-design/src/svg/v2/ArrowsSynchronize';
+import { useSelectedItems, useSelectedDispatch } from '../../hooks/useSelected';
+import ArrowsSynchronize from '../../icons/v2/ArrowsSynchronize';
+import { styles } from '../../style';
+import { Table, Row, Field, Cell, SelectCell } from '../table';
import DisplayId from '../util/DisplayId';
function serializeTransaction(transaction, dateFormat) {
diff --git a/packages/desktop-client/src/components/accounts/TransactionsTable.js b/packages/desktop-client/src/components/accounts/TransactionsTable.js
index ee6f85fe2f..bfb28bc783 100644
--- a/packages/desktop-client/src/components/accounts/TransactionsTable.js
+++ b/packages/desktop-client/src/components/accounts/TransactionsTable.js
@@ -36,14 +36,27 @@ import {
amountToInteger,
titleFirst,
} from 'loot-core/src/shared/util';
-import LegacyAccountAutocomplete from 'loot-design/src/components/AccountAutocomplete';
-import NewCategoryAutocomplete from 'loot-design/src/components/CategoryAutocomplete';
-import LegacyCategoryAutocomplete from 'loot-design/src/components/CategorySelect';
-import { View, Text, Tooltip, Button } from 'loot-design/src/components/common';
-import DateSelect from 'loot-design/src/components/DateSelect';
-import NewAccountAutocomplete from 'loot-design/src/components/NewAccountAutocomplete';
-import NewPayeeAutocomplete from 'loot-design/src/components/NewPayeeAutocomplete';
-import LegacyPayeeAutocomplete from 'loot-design/src/components/PayeeAutocomplete';
+
+import useFeatureFlag from '../../hooks/useFeatureFlag';
+import { useMergedRefs } from '../../hooks/useMergedRefs';
+import usePrevious from '../../hooks/usePrevious';
+import { useSelectedDispatch, useSelectedItems } from '../../hooks/useSelected';
+import LeftArrow2 from '../../icons/v0/LeftArrow2';
+import RightArrow2 from '../../icons/v0/RightArrow2';
+import CheveronDown from '../../icons/v1/CheveronDown';
+import ArrowsSynchronize from '../../icons/v2/ArrowsSynchronize';
+import CalendarIcon from '../../icons/v2/Calendar';
+import Hyperlink2 from '../../icons/v2/Hyperlink2';
+import { styles, colors } from '../../style';
+import LegacyAccountAutocomplete from '../autocomplete/AccountAutocomplete';
+import NewCategoryAutocomplete from '../autocomplete/CategoryAutocomplete';
+import LegacyCategoryAutocomplete from '../autocomplete/CategorySelect';
+import NewAccountAutocomplete from '../autocomplete/NewAccountAutocomplete';
+import NewPayeeAutocomplete from '../autocomplete/NewPayeeAutocomplete';
+import LegacyPayeeAutocomplete from '../autocomplete/PayeeAutocomplete';
+import { View, Text, Tooltip, Button } from '../common';
+import { getStatusProps } from '../schedules/StatusBadge';
+import DateSelect from '../select/DateSelect';
import {
Cell,
Field,
@@ -55,23 +68,7 @@ import {
CellButton,
useTableNavigator,
Table,
-} from 'loot-design/src/components/table';
-import { useMergedRefs } from 'loot-design/src/components/useMergedRefs';
-import {
- useSelectedDispatch,
- useSelectedItems,
-} from 'loot-design/src/components/useSelected';
-import { styles, colors } from 'loot-design/src/style';
-import LeftArrow2 from 'loot-design/src/svg/v0/LeftArrow2';
-import RightArrow2 from 'loot-design/src/svg/v0/RightArrow2';
-import CheveronDown from 'loot-design/src/svg/v1/CheveronDown';
-import ArrowsSynchronize from 'loot-design/src/svg/v2/ArrowsSynchronize';
-import CalendarIcon from 'loot-design/src/svg/v2/Calendar';
-import Hyperlink2 from 'loot-design/src/svg/v2/Hyperlink2';
-
-import useFeatureFlag from '../../hooks/useFeatureFlag';
-import usePrevious from '../../hooks/usePrevious';
-import { getStatusProps } from '../schedules/StatusBadge';
+} from '../table';
function getDisplayValue(obj, name) {
return obj ? obj[name] : '';
diff --git a/packages/desktop-client/src/components/accounts/TransactionsTable.test.js b/packages/desktop-client/src/components/accounts/TransactionsTable.test.js
index 790385cecf..9f64b80931 100644
--- a/packages/desktop-client/src/components/accounts/TransactionsTable.test.js
+++ b/packages/desktop-client/src/components/accounts/TransactionsTable.test.js
@@ -18,7 +18,8 @@ import {
updateTransaction,
} from 'loot-core/src/shared/transactions';
import { integerToCurrency } from 'loot-core/src/shared/util';
-import { SelectedProviderWithItems } from 'loot-design/src/components/useSelected';
+
+import { SelectedProviderWithItems } from '../../hooks/useSelected';
import { SplitsExpandedProvider, TransactionTable } from './TransactionsTable';
diff --git a/packages/loot-design/src/components/alerts.js b/packages/desktop-client/src/components/alerts.js
similarity index 92%
rename from packages/loot-design/src/components/alerts.js
rename to packages/desktop-client/src/components/alerts.js
index fa87b706c4..5856f1c007 100644
--- a/packages/loot-design/src/components/alerts.js
+++ b/packages/desktop-client/src/components/alerts.js
@@ -1,8 +1,8 @@
import React from 'react';
+import ExclamationOutline from '../icons/v1/ExclamationOutline';
+import InformationOutline from '../icons/v1/InformationOutline';
import { styles, colors } from '../style';
-import ExclamationOutline from '../svg/v1/ExclamationOutline';
-import InformationOutline from '../svg/v1/InformationOutline';
import { View, Text } from './common';
diff --git a/packages/loot-design/src/components/AccountAutocomplete.js b/packages/desktop-client/src/components/autocomplete/AccountAutocomplete.js
similarity index 96%
rename from packages/loot-design/src/components/AccountAutocomplete.js
rename to packages/desktop-client/src/components/autocomplete/AccountAutocomplete.js
index 77acf23c4f..067718e58a 100644
--- a/packages/loot-design/src/components/AccountAutocomplete.js
+++ b/packages/desktop-client/src/components/autocomplete/AccountAutocomplete.js
@@ -2,10 +2,10 @@ import React from 'react';
import { useCachedAccounts } from 'loot-core/src/client/data-hooks/accounts';
-import { colors } from '../style';
+import { colors } from '../../style';
+import { View } from '../common';
import Autocomplete from './Autocomplete';
-import { View } from './common';
export function AccountList({
items,
diff --git a/packages/loot-design/src/components/Autocomplete.js b/packages/desktop-client/src/components/autocomplete/Autocomplete.js
similarity index 99%
rename from packages/loot-design/src/components/Autocomplete.js
rename to packages/desktop-client/src/components/autocomplete/Autocomplete.js
index 299f0bc25a..7a9543630a 100644
--- a/packages/loot-design/src/components/Autocomplete.js
+++ b/packages/desktop-client/src/components/autocomplete/Autocomplete.js
@@ -4,10 +4,9 @@ import lively from '@jlongster/lively';
import Downshift from 'downshift';
import { css } from 'glamor';
-import { colors } from '../style';
-import Remove from '../svg/v2/Remove';
-
-import { View, Input, Tooltip, Button } from './common';
+import Remove from '../../icons/v2/Remove';
+import { colors } from '../../style';
+import { View, Input, Tooltip, Button } from '../common';
function findItem(strict, suggestions, value) {
if (strict) {
diff --git a/packages/loot-design/src/components/CategoryAutocomplete.js b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.js
similarity index 94%
rename from packages/loot-design/src/components/CategoryAutocomplete.js
rename to packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.js
index 77c8a70e26..d53c45639d 100644
--- a/packages/loot-design/src/components/CategoryAutocomplete.js
+++ b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.js
@@ -1,10 +1,10 @@
import React, { useMemo } from 'react';
import { components as SelectComponents } from 'react-select';
-import { colors } from '../style';
-import Split from '../svg/v0/Split';
+import Split from '../../icons/v0/Split';
+import { colors } from '../../style';
+import { View } from '../common';
-import { View } from './common';
import Autocomplete from './NewAutocomplete';
const SPLIT_TRANSACTION_KEY = 'split';
diff --git a/packages/loot-design/src/components/CategorySelect.js b/packages/desktop-client/src/components/autocomplete/CategorySelect.js
similarity index 97%
rename from packages/loot-design/src/components/CategorySelect.js
rename to packages/desktop-client/src/components/autocomplete/CategorySelect.js
index 35739b07b9..b692376a39 100644
--- a/packages/loot-design/src/components/CategorySelect.js
+++ b/packages/desktop-client/src/components/autocomplete/CategorySelect.js
@@ -1,10 +1,10 @@
import React, { useMemo } from 'react';
-import { colors } from '../style';
-import Split from '../svg/v0/Split';
+import Split from '../../icons/v0/Split';
+import { colors } from '../../style';
+import { View, Text, Select } from '../common';
import Autocomplete, { defaultFilterSuggestion } from './Autocomplete';
-import { View, Text, Select } from './common';
export const NativeCategorySelect = React.forwardRef(
({ categoryGroups, emptyLabel, ...nativeProps }, ref) => {
diff --git a/packages/loot-design/src/components/NewAccountAutocomplete.js b/packages/desktop-client/src/components/autocomplete/NewAccountAutocomplete.js
similarity index 100%
rename from packages/loot-design/src/components/NewAccountAutocomplete.js
rename to packages/desktop-client/src/components/autocomplete/NewAccountAutocomplete.js
diff --git a/packages/loot-design/src/components/NewAutocomplete.js b/packages/desktop-client/src/components/autocomplete/NewAutocomplete.js
similarity index 98%
rename from packages/loot-design/src/components/NewAutocomplete.js
rename to packages/desktop-client/src/components/autocomplete/NewAutocomplete.js
index 263160c790..d082c07b56 100644
--- a/packages/loot-design/src/components/NewAutocomplete.js
+++ b/packages/desktop-client/src/components/autocomplete/NewAutocomplete.js
@@ -3,8 +3,9 @@ import Select from 'react-select';
import CreatableSelect from 'react-select/creatable';
+import { NullComponent } from '../common';
+
import styles from './autocomplete-styles';
-import { NullComponent } from './common';
const Autocomplete = React.forwardRef(
(
diff --git a/packages/loot-design/src/components/NewPayeeAutocomplete.js b/packages/desktop-client/src/components/autocomplete/NewPayeeAutocomplete.js
similarity index 97%
rename from packages/loot-design/src/components/NewPayeeAutocomplete.js
rename to packages/desktop-client/src/components/autocomplete/NewPayeeAutocomplete.js
index 99af7faed9..930b138e66 100644
--- a/packages/loot-design/src/components/NewPayeeAutocomplete.js
+++ b/packages/desktop-client/src/components/autocomplete/NewPayeeAutocomplete.js
@@ -7,11 +7,11 @@ import { useCachedAccounts } from 'loot-core/src/client/data-hooks/accounts';
import { useCachedPayees } from 'loot-core/src/client/data-hooks/payees';
import { getActivePayees } from 'loot-core/src/client/reducers/queries';
-import { colors } from '../style';
-import Add from '../svg/v1/Add';
+import Add from '../../icons/v1/Add';
+import { colors } from '../../style';
+import { View } from '../common';
import { AutocompleteFooter, AutocompleteFooterButton } from './Autocomplete';
-import { View } from './common';
import Autocomplete from './NewAutocomplete';
function getPayeeSuggestions(payees, focusTransferPayees, accounts) {
diff --git a/packages/loot-design/src/components/PayeeAutocomplete.js b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.js
similarity index 98%
rename from packages/loot-design/src/components/PayeeAutocomplete.js
rename to packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.js
index 3f3027bce9..c9229fd159 100644
--- a/packages/loot-design/src/components/PayeeAutocomplete.js
+++ b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.js
@@ -6,15 +6,15 @@ import { useCachedAccounts } from 'loot-core/src/client/data-hooks/accounts';
import { useCachedPayees } from 'loot-core/src/client/data-hooks/payees';
import { getActivePayees } from 'loot-core/src/client/reducers/queries';
-import { colors } from '../style';
-import Add from '../svg/v1/Add';
+import Add from '../../icons/v1/Add';
+import { colors } from '../../style';
+import { View } from '../common';
import Autocomplete, {
defaultFilterSuggestion,
AutocompleteFooter,
AutocompleteFooterButton,
} from './Autocomplete';
-import { View } from './common';
function getPayeeSuggestions(payees, focusTransferPayees, accounts) {
let activePayees = accounts ? getActivePayees(payees, accounts) : payees;
diff --git a/packages/loot-design/src/components/autocomplete-styles.js b/packages/desktop-client/src/components/autocomplete/autocomplete-styles.js
similarity index 96%
rename from packages/loot-design/src/components/autocomplete-styles.js
rename to packages/desktop-client/src/components/autocomplete/autocomplete-styles.js
index 80de0915c3..165b414089 100644
--- a/packages/loot-design/src/components/autocomplete-styles.js
+++ b/packages/desktop-client/src/components/autocomplete/autocomplete-styles.js
@@ -1,4 +1,4 @@
-import { styles as actualStyles, colors } from '../style';
+import { styles as actualStyles, colors } from '../../style';
const colourStyles = {
...actualStyles.lightScrollbar,
diff --git a/packages/loot-design/src/components/budget/BalanceWithCarryover.js b/packages/desktop-client/src/components/budget/BalanceWithCarryover.js
similarity index 95%
rename from packages/loot-design/src/components/budget/BalanceWithCarryover.js
rename to packages/desktop-client/src/components/budget/BalanceWithCarryover.js
index e3e4d7f44b..1512596cf7 100644
--- a/packages/loot-design/src/components/budget/BalanceWithCarryover.js
+++ b/packages/desktop-client/src/components/budget/BalanceWithCarryover.js
@@ -1,6 +1,6 @@
import React from 'react';
-import ArrowThinRight from '../../svg/v1/ArrowThinRight';
+import ArrowThinRight from '../../icons/v1/ArrowThinRight';
import { View } from '../common';
import CellValue from '../spreadsheet/CellValue';
import useSheetValue from '../spreadsheet/useSheetValue';
diff --git a/packages/loot-design/src/components/budget/BudgetMonthCountContext.js b/packages/desktop-client/src/components/budget/BudgetMonthCountContext.js
similarity index 100%
rename from packages/loot-design/src/components/budget/BudgetMonthCountContext.js
rename to packages/desktop-client/src/components/budget/BudgetMonthCountContext.js
diff --git a/packages/loot-design/src/components/budget/BudgetSummaries.js b/packages/desktop-client/src/components/budget/BudgetSummaries.js
similarity index 97%
rename from packages/loot-design/src/components/budget/BudgetSummaries.js
rename to packages/desktop-client/src/components/budget/BudgetSummaries.js
index a901cbbeee..c280a3153a 100644
--- a/packages/loot-design/src/components/budget/BudgetSummaries.js
+++ b/packages/desktop-client/src/components/budget/BudgetSummaries.js
@@ -11,8 +11,8 @@ import { Spring } from 'wobble';
import * as monthUtils from 'loot-core/src/shared/months';
+import useResizeObserver from '../../hooks/useResizeObserver';
import { View } from '../common';
-import useResizeObserver from '../useResizeObserver';
import { MonthsContext } from './MonthsContext';
diff --git a/packages/loot-design/src/components/budget/DynamicBudgetTable.js b/packages/desktop-client/src/components/budget/DynamicBudgetTable.js
similarity index 97%
rename from packages/loot-design/src/components/budget/DynamicBudgetTable.js
rename to packages/desktop-client/src/components/budget/DynamicBudgetTable.js
index 1d55cd6b8d..98256999b6 100644
--- a/packages/loot-design/src/components/budget/DynamicBudgetTable.js
+++ b/packages/desktop-client/src/components/budget/DynamicBudgetTable.js
@@ -4,10 +4,9 @@ import AutoSizer from 'react-virtualized-auto-sizer';
import { View } from '../common';
import { useBudgetMonthCount } from './BudgetMonthCountContext';
+import { BudgetPageHeader, BudgetTable } from './misc';
import { CategoryGroupsContext } from './util';
-import { BudgetPageHeader, BudgetTable } from './index';
-
function getNumPossibleMonths(width) {
let estimatedTableWidth = width - 200;
diff --git a/packages/desktop-client/src/components/budget/MobileBudget.js b/packages/desktop-client/src/components/budget/MobileBudget.js
index 0f323d0edd..8351cae45e 100644
--- a/packages/desktop-client/src/components/budget/MobileBudget.js
+++ b/packages/desktop-client/src/components/budget/MobileBudget.js
@@ -1,7 +1,8 @@
-import React, { useContext } from 'react';
+import React from 'react';
import { connect } from 'react-redux';
import * as actions from 'loot-core/src/client/actions';
+import { useSpreadsheet } from 'loot-core/src/client/SpreadsheetProvider';
import { send, listen } from 'loot-core/src/platform/client/fetch';
import {
addCategory,
@@ -9,12 +10,11 @@ import {
moveCategoryGroup,
} from 'loot-core/src/shared/categories.js';
import * as monthUtils from 'loot-core/src/shared/months';
-import { View } from 'loot-design/src/components/common';
-import SpreadsheetContext from 'loot-design/src/components/spreadsheet/SpreadsheetContext';
-import { colors } from 'loot-design/src/style';
-import AnimatedLoading from 'loot-design/src/svg/AnimatedLoading';
-import { withThemeColor } from 'loot-design/src/util/withThemeColor';
+import AnimatedLoading from '../../icons/AnimatedLoading';
+import { colors } from '../../style';
+import { withThemeColor } from '../../util/withThemeColor';
+import { View } from '../common';
import SyncRefresh from '../SyncRefresh';
import { BudgetTable } from './MobileBudgetTable';
@@ -293,7 +293,7 @@ class Budget extends React.Component {
}
function BudgetWrapper(props) {
- let spreadsheet = useContext(SpreadsheetContext);
+ let spreadsheet = useSpreadsheet();
return <Budget {...props} spreadsheet={spreadsheet} />;
}
diff --git a/packages/desktop-client/src/components/budget/MobileBudgetTable.js b/packages/desktop-client/src/components/budget/MobileBudgetTable.js
index 58bf8ef4c8..183fd47760 100644
--- a/packages/desktop-client/src/components/budget/MobileBudgetTable.js
+++ b/packages/desktop-client/src/components/budget/MobileBudgetTable.js
@@ -14,32 +14,25 @@ import * as actions from 'loot-core/src/client/actions';
import { rolloverBudget, reportBudget } from 'loot-core/src/client/queries';
import * as monthUtils from 'loot-core/src/shared/months';
import { amountToInteger, integerToAmount } from 'loot-core/src/shared/util';
-import {
- Button,
- Card,
- Label,
- Text,
- View,
-} from 'loot-design/src/components/common';
-import CellValue from 'loot-design/src/components/spreadsheet/CellValue';
-import format from 'loot-design/src/components/spreadsheet/format';
-import NamespaceContext from 'loot-design/src/components/spreadsheet/NamespaceContext';
-import SheetValue from 'loot-design/src/components/spreadsheet/SheetValue';
-import useSheetValue from 'loot-design/src/components/spreadsheet/useSheetValue';
-import { colors, styles } from 'loot-design/src/style';
-import Add from 'loot-design/src/svg/v1/Add';
-import ArrowThinLeft from 'loot-design/src/svg/v1/ArrowThinLeft';
-import ArrowThinRight from 'loot-design/src/svg/v1/ArrowThinRight';
+
+import Add from '../../icons/v1/Add';
+import ArrowThinLeft from '../../icons/v1/ArrowThinLeft';
+import ArrowThinRight from '../../icons/v1/ArrowThinRight';
+import { colors, styles } from '../../style';
+import { Button, Card, Label, Text, View } from '../common';
+import CellValue from '../spreadsheet/CellValue';
+import format from '../spreadsheet/format';
+import NamespaceContext from '../spreadsheet/NamespaceContext';
+import SheetValue from '../spreadsheet/SheetValue';
+import useSheetValue from '../spreadsheet/useSheetValue';
+import { SyncButton } from '../Titlebar';
+import { AmountInput } from '../util/AmountInput';
// import {
// AmountAccessoryContext,
// MathOperations
-// } from 'loot-design/src/components/mobile/AmountInput';
+// } from '../mobile/AmountInput';
// import { DragDrop, Draggable, Droppable, DragDropHighlight } from './dragdrop';
-
-import { SyncButton } from '../Titlebar';
-import { AmountInput } from '../util/AmountInput';
-
import { ListItem, ROW_HEIGHT } from './MobileTable';
export function ToBudget({ toBudget, onClick }) {
diff --git a/packages/desktop-client/src/components/budget/MobileTable.js b/packages/desktop-client/src/components/budget/MobileTable.js
index aff17c0a8b..d4c131e1a2 100644
--- a/packages/desktop-client/src/components/budget/MobileTable.js
+++ b/packages/desktop-client/src/components/budget/MobileTable.js
@@ -1,7 +1,7 @@
import React from 'react';
-import { View } from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
+import { colors } from '../../style';
+import { View } from '../common';
export const ROW_HEIGHT = 50;
diff --git a/packages/desktop-client/src/components/budget/MonthCountSelector.js b/packages/desktop-client/src/components/budget/MonthCountSelector.js
index f82e7cfcf8..26db997c5e 100644
--- a/packages/desktop-client/src/components/budget/MonthCountSelector.js
+++ b/packages/desktop-client/src/components/budget/MonthCountSelector.js
@@ -1,9 +1,10 @@
import React from 'react';
-import { useBudgetMonthCount } from 'loot-design/src/components/budget/BudgetMonthCountContext';
-import { View } from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
-import CalendarIcon from 'loot-design/src/svg/v2/Calendar';
+import CalendarIcon from '../../icons/v2/Calendar';
+import { colors } from '../../style';
+import { View } from '../common';
+
+import { useBudgetMonthCount } from './BudgetMonthCountContext';
function Calendar({ color, onClick }) {
return (
diff --git a/packages/loot-design/src/components/budget/MonthsContext.js b/packages/desktop-client/src/components/budget/MonthsContext.js
similarity index 100%
rename from packages/loot-design/src/components/budget/MonthsContext.js
rename to packages/desktop-client/src/components/budget/MonthsContext.js
diff --git a/packages/loot-design/src/components/budget/constants.js b/packages/desktop-client/src/components/budget/constants.js
similarity index 100%
rename from packages/loot-design/src/components/budget/constants.js
rename to packages/desktop-client/src/components/budget/constants.js
diff --git a/packages/desktop-client/src/components/budget/index.js b/packages/desktop-client/src/components/budget/index.js
index a92db92b16..3bbc203196 100644
--- a/packages/desktop-client/src/components/budget/index.js
+++ b/packages/desktop-client/src/components/budget/index.js
@@ -2,6 +2,7 @@ import React, { useContext, useMemo } from 'react';
import { connect } from 'react-redux';
import * as actions from 'loot-core/src/client/actions';
+import { useSpreadsheet } from 'loot-core/src/client/SpreadsheetProvider';
import { send, listen } from 'loot-core/src/platform/client/fetch';
import {
addCategory,
@@ -14,19 +15,19 @@ import {
deleteGroup,
} from 'loot-core/src/shared/categories.js';
import * as monthUtils from 'loot-core/src/shared/months';
-import DynamicBudgetTable from 'loot-design/src/components/budget/DynamicBudgetTable';
-import { getValidMonthBounds } from 'loot-design/src/components/budget/MonthsContext';
-import * as report from 'loot-design/src/components/budget/report/components';
-import { ReportProvider } from 'loot-design/src/components/budget/report/ReportContext';
-import * as rollover from 'loot-design/src/components/budget/rollover/rollover-components';
-import { RolloverContext } from 'loot-design/src/components/budget/rollover/RolloverContext';
-import { View } from 'loot-design/src/components/common';
-import SpreadsheetContext from 'loot-design/src/components/spreadsheet/SpreadsheetContext';
-import { styles } from 'loot-design/src/style';
import useFeatureFlag from '../../hooks/useFeatureFlag';
+import { styles } from '../../style';
+import { View } from '../common';
import { TitlebarContext } from '../Titlebar';
+import DynamicBudgetTable from './DynamicBudgetTable';
+import { getValidMonthBounds } from './MonthsContext';
+import * as report from './report/components';
+import { ReportProvider } from './report/ReportContext';
+import * as rollover from './rollover/rollover-components';
+import { RolloverContext } from './rollover/RolloverContext';
+
let _initialBudgetMonth = null;
class Budget extends React.PureComponent {
@@ -509,7 +510,7 @@ const RolloverBudgetSummary = React.memo(props => {
});
function BudgetWrapper(props) {
- let spreadsheet = useContext(SpreadsheetContext);
+ let spreadsheet = useSpreadsheet();
let titlebar = useContext(TitlebarContext);
let reportComponents = useMemo(
diff --git a/packages/loot-design/src/components/budget/index.js b/packages/desktop-client/src/components/budget/misc.js
similarity index 99%
rename from packages/loot-design/src/components/budget/index.js
rename to packages/desktop-client/src/components/budget/misc.js
index 7bc0f7395f..6e0f752597 100644
--- a/packages/loot-design/src/components/budget/index.js
+++ b/packages/desktop-client/src/components/budget/misc.js
@@ -3,11 +3,12 @@ import { connect } from 'react-redux';
import * as monthUtils from 'loot-core/src/shared/months';
+import useResizeObserver from '../../hooks/useResizeObserver';
+import ExpandArrow from '../../icons/v0/ExpandArrow';
+import ArrowThinLeft from '../../icons/v1/ArrowThinLeft';
+import ArrowThinRight from '../../icons/v1/ArrowThinRight';
+import CheveronDown from '../../icons/v1/CheveronDown';
import { styles, colors } from '../../style';
-import ExpandArrow from '../../svg/v0/ExpandArrow';
-import ArrowThinLeft from '../../svg/v1/ArrowThinLeft';
-import ArrowThinRight from '../../svg/v1/ArrowThinRight';
-import CheveronDown from '../../svg/v1/CheveronDown';
import {
View,
Text,
@@ -25,7 +26,6 @@ import {
} from '../sort.js';
import NamespaceContext from '../spreadsheet/NamespaceContext';
import { Row, InputCell, ROW_HEIGHT } from '../table';
-import useResizeObserver from '../useResizeObserver';
import BudgetSummaries from './BudgetSummaries';
import { INCOME_HEADER_HEIGHT, MONTH_BOX_SHADOW } from './constants';
diff --git a/packages/loot-design/src/components/budget/report/BudgetSummary.js b/packages/desktop-client/src/components/budget/report/BudgetSummary.js
similarity index 98%
rename from packages/loot-design/src/components/budget/report/BudgetSummary.js
rename to packages/desktop-client/src/components/budget/report/BudgetSummary.js
index 7e5040234a..1b0e46f676 100644
--- a/packages/loot-design/src/components/budget/report/BudgetSummary.js
+++ b/packages/desktop-client/src/components/budget/report/BudgetSummary.js
@@ -5,10 +5,10 @@ import { css } from 'glamor';
import { reportBudget } from 'loot-core/src/client/queries';
import * as monthUtils from 'loot-core/src/shared/months';
+import DotsHorizontalTriple from '../../../icons/v1/DotsHorizontalTriple';
+import ArrowButtonDown1 from '../../../icons/v2/ArrowButtonDown1';
+import ArrowButtonUp1 from '../../../icons/v2/ArrowButtonUp1';
import { colors, styles } from '../../../style';
-import DotsHorizontalTriple from '../../../svg/v1/DotsHorizontalTriple';
-import ArrowButtonDown1 from '../../../svg/v2/ArrowButtonDown1';
-import ArrowButtonUp1 from '../../../svg/v2/ArrowButtonUp1';
import {
View,
Text,
diff --git a/packages/loot-design/src/components/budget/report/ReportContext.js b/packages/desktop-client/src/components/budget/report/ReportContext.js
similarity index 100%
rename from packages/loot-design/src/components/budget/report/ReportContext.js
rename to packages/desktop-client/src/components/budget/report/ReportContext.js
diff --git a/packages/loot-design/src/components/budget/report/components.js b/packages/desktop-client/src/components/budget/report/components.js
similarity index 100%
rename from packages/loot-design/src/components/budget/report/components.js
rename to packages/desktop-client/src/components/budget/report/components.js
diff --git a/packages/loot-design/src/components/budget/rollover/BudgetSummary.js b/packages/desktop-client/src/components/budget/rollover/BudgetSummary.js
similarity index 98%
rename from packages/loot-design/src/components/budget/rollover/BudgetSummary.js
rename to packages/desktop-client/src/components/budget/rollover/BudgetSummary.js
index 3ae6bc693c..1dff564dc5 100644
--- a/packages/loot-design/src/components/budget/rollover/BudgetSummary.js
+++ b/packages/desktop-client/src/components/budget/rollover/BudgetSummary.js
@@ -6,10 +6,10 @@ import { css } from 'glamor';
import { rolloverBudget } from 'loot-core/src/client/queries';
import * as monthUtils from 'loot-core/src/shared/months';
+import DotsHorizontalTriple from '../../../icons/v1/DotsHorizontalTriple';
+import ArrowButtonDown1 from '../../../icons/v2/ArrowButtonDown1';
+import ArrowButtonUp1 from '../../../icons/v2/ArrowButtonUp1';
import { colors, styles } from '../../../style';
-import DotsHorizontalTriple from '../../../svg/v1/DotsHorizontalTriple';
-import ArrowButtonDown1 from '../../../svg/v2/ArrowButtonDown1';
-import ArrowButtonUp1 from '../../../svg/v2/ArrowButtonUp1';
import {
View,
Block,
diff --git a/packages/loot-design/src/components/budget/rollover/HoldTooltip.js b/packages/desktop-client/src/components/budget/rollover/HoldTooltip.js
similarity index 93%
rename from packages/loot-design/src/components/budget/rollover/HoldTooltip.js
rename to packages/desktop-client/src/components/budget/rollover/HoldTooltip.js
index 1aed2ea810..64b2901116 100644
--- a/packages/loot-design/src/components/budget/rollover/HoldTooltip.js
+++ b/packages/desktop-client/src/components/budget/rollover/HoldTooltip.js
@@ -1,14 +1,14 @@
import React, { useState, useContext, useEffect } from 'react';
+import { useSpreadsheet } from 'loot-core/src/client/SpreadsheetProvider';
import evalArithmetic from 'loot-core/src/shared/arithmetic';
import { integerToCurrency, amountToInteger } from 'loot-core/src/shared/util';
import { View, Button, Tooltip, InitialFocus, Input } from '../../common';
import NamespaceContext from '../../spreadsheet/NamespaceContext';
-import SpreadsheetContext from '../../spreadsheet/SpreadsheetContext';
export default function HoldTooltip({ onSubmit, onClose }) {
- const spreadsheet = useContext(SpreadsheetContext);
+ const spreadsheet = useSpreadsheet();
const sheetName = useContext(NamespaceContext);
const [amount, setAmount] = useState(null);
diff --git a/packages/loot-design/src/components/budget/rollover/RolloverContext.js b/packages/desktop-client/src/components/budget/rollover/RolloverContext.js
similarity index 100%
rename from packages/loot-design/src/components/budget/rollover/RolloverContext.js
rename to packages/desktop-client/src/components/budget/rollover/RolloverContext.js
diff --git a/packages/loot-design/src/components/budget/rollover/TransferTooltip.js b/packages/desktop-client/src/components/budget/rollover/TransferTooltip.js
similarity index 91%
rename from packages/loot-design/src/components/budget/rollover/TransferTooltip.js
rename to packages/desktop-client/src/components/budget/rollover/TransferTooltip.js
index 8a22460f74..afedb001a3 100644
--- a/packages/loot-design/src/components/budget/rollover/TransferTooltip.js
+++ b/packages/desktop-client/src/components/budget/rollover/TransferTooltip.js
@@ -1,13 +1,13 @@
import React, { useState, useContext, useEffect } from 'react';
+import { useSpreadsheet } from 'loot-core/src/client/SpreadsheetProvider';
import evalArithmetic from 'loot-core/src/shared/arithmetic';
import { integerToCurrency, amountToInteger } from 'loot-core/src/shared/util';
-import NewCategoryAutocomplete from '../../CategoryAutocomplete';
-import LegacyCategoryAutocomplete from '../../CategorySelect';
+import NewCategoryAutocomplete from '../../autocomplete/CategoryAutocomplete';
+import LegacyCategoryAutocomplete from '../../autocomplete/CategorySelect';
import { View, Button, Tooltip, InitialFocus, Input } from '../../common';
import NamespaceContext from '../../spreadsheet/NamespaceContext';
-import SpreadsheetContext from '../../spreadsheet/SpreadsheetContext';
import { addToBeBudgetedGroup, CategoryGroupsContext } from '../util';
export default function TransferTooltip({
@@ -23,7 +23,7 @@ export default function TransferTooltip({
? NewCategoryAutocomplete
: LegacyCategoryAutocomplete;
- let spreadsheet = useContext(SpreadsheetContext);
+ let spreadsheet = useSpreadsheet();
let sheetName = useContext(NamespaceContext);
let categoryGroups = useContext(CategoryGroupsContext);
diff --git a/packages/loot-design/src/components/budget/rollover/rollover-components.js b/packages/desktop-client/src/components/budget/rollover/rollover-components.js
similarity index 98%
rename from packages/loot-design/src/components/budget/rollover/rollover-components.js
rename to packages/desktop-client/src/components/budget/rollover/rollover-components.js
index 333f0ef55c..15533501b2 100644
--- a/packages/loot-design/src/components/budget/rollover/rollover-components.js
+++ b/packages/desktop-client/src/components/budget/rollover/rollover-components.js
@@ -5,8 +5,8 @@ import evalArithmetic from 'loot-core/src/shared/arithmetic';
import { integerToCurrency, amountToInteger } from 'loot-core/src/shared/util';
import { styles, colors } from '../../../style';
-import NewCategoryAutocomplete from '../../CategoryAutocomplete';
-import LegacyCategoryAutocomplete from '../../CategorySelect';
+import NewCategoryAutocomplete from '../../autocomplete/CategoryAutocomplete';
+import LegacyCategoryAutocomplete from '../../autocomplete/CategorySelect';
import {
View,
Text,
diff --git a/packages/loot-design/src/components/budget/util.js b/packages/desktop-client/src/components/budget/util.js
similarity index 100%
rename from packages/loot-design/src/components/budget/util.js
rename to packages/desktop-client/src/components/budget/util.js
diff --git a/packages/loot-design/src/components/common.js b/packages/desktop-client/src/components/common.js
similarity index 99%
rename from packages/loot-design/src/components/common.js
rename to packages/desktop-client/src/components/common.js
index f7f99bee1b..9217df639a 100644
--- a/packages/loot-design/src/components/common.js
+++ b/packages/desktop-client/src/components/common.js
@@ -20,15 +20,15 @@ import { css } from 'glamor';
import hotkeys from 'hotkeys-js';
import { integerToCurrency } from 'loot-core/src/shared/util';
-import ExpandArrow from 'loot-design/src/svg/v0/ExpandArrow';
+import { useProperFocus } from '../hooks/useProperFocus';
+import Loading from '../icons/AnimatedLoading';
+import Delete from '../icons/v0/Delete';
+import ExpandArrow from '../icons/v0/ExpandArrow';
import { styles, colors } from '../style';
-import Loading from '../svg/AnimatedLoading';
-import Delete from '../svg/v0/Delete';
import tokens from '../tokens';
import Text from './Text';
-import { useProperFocus } from './useProperFocus';
import View from './View';
export { default as View } from './View';
diff --git a/packages/loot-design/src/components/forms.js b/packages/desktop-client/src/components/forms.js
similarity index 100%
rename from packages/loot-design/src/components/forms.js
rename to packages/desktop-client/src/components/forms.js
diff --git a/packages/loot-design/src/components/manager/BudgetList.js b/packages/desktop-client/src/components/manager/BudgetList.js
similarity index 93%
rename from packages/loot-design/src/components/manager/BudgetList.js
rename to packages/desktop-client/src/components/manager/BudgetList.js
index 99a4c5a7da..8957425fae 100644
--- a/packages/loot-design/src/components/manager/BudgetList.js
+++ b/packages/desktop-client/src/components/manager/BudgetList.js
@@ -2,18 +2,18 @@ import React, { useState, useRef } from 'react';
import { connect } from 'react-redux';
import * as actions from 'loot-core/src/client/actions';
-import Loading from 'loot-design/src/svg/AnimatedLoading';
-import Key from 'loot-design/src/svg/v2/Key';
-import RefreshArrow from 'loot-design/src/svg/v2/RefreshArrow';
-
+import { isNonProductionEnvironment } from 'loot-core/src/shared/environment';
+
+import Loading from '../../icons/AnimatedLoading';
+import CloudCheck from '../../icons/v1/CloudCheck';
+import CloudDownload from '../../icons/v1/CloudDownload';
+import DotsHorizontalTriple from '../../icons/v1/DotsHorizontalTriple';
+import FileDouble from '../../icons/v1/FileDouble';
+import CloudUnknown from '../../icons/v2/CloudUnknown';
+import Key from '../../icons/v2/Key';
+import RefreshArrow from '../../icons/v2/RefreshArrow';
import { styles, colors } from '../../style';
-import CloudCheck from '../../svg/v1/CloudCheck';
-import CloudDownload from '../../svg/v1/CloudDownload';
-import DotsHorizontalTriple from '../../svg/v1/DotsHorizontalTriple';
-import FileDouble from '../../svg/v1/FileDouble';
-import CloudUnknown from '../../svg/v2/CloudUnknown';
import tokens from '../../tokens';
-import { isNonProductionEnvironment } from '../../util/environment';
import { View, Text, Button, Tooltip, Menu } from '../common';
function getFileDescription(file) {
diff --git a/packages/desktop-client/src/components/manager/ConfigServer.js b/packages/desktop-client/src/components/manager/ConfigServer.js
index 8b67e0a6c7..75f6444980 100644
--- a/packages/desktop-client/src/components/manager/ConfigServer.js
+++ b/packages/desktop-client/src/components/manager/ConfigServer.js
@@ -4,16 +4,11 @@ import { useHistory } from 'react-router-dom';
import { createBudget } from 'loot-core/src/client/actions/budgets';
import { signOut, loggedIn } from 'loot-core/src/client/actions/user';
-import {
- View,
- Text,
- Button,
- ButtonWithLoading,
-} from 'loot-design/src/components/common';
-import { useSetThemeColor } from 'loot-design/src/components/hooks';
-import { colors } from 'loot-design/src/style';
-import { isNonProductionEnvironment } from 'loot-design/src/util/environment';
+import { isNonProductionEnvironment } from 'loot-core/src/shared/environment';
+import { useSetThemeColor } from '../../hooks';
+import { colors } from '../../style';
+import { View, Text, Button, ButtonWithLoading } from '../common';
import { useServerURL, useSetServerURL } from '../ServerContext';
import { Title, Input } from './subscribe/common';
diff --git a/packages/loot-design/src/components/manager/DeleteFile.js b/packages/desktop-client/src/components/manager/DeleteFile.js
similarity index 100%
rename from packages/loot-design/src/components/manager/DeleteFile.js
rename to packages/desktop-client/src/components/manager/DeleteFile.js
diff --git a/packages/loot-design/src/components/manager/Import.js b/packages/desktop-client/src/components/manager/Import.js
similarity index 100%
rename from packages/loot-design/src/components/manager/Import.js
rename to packages/desktop-client/src/components/manager/Import.js
diff --git a/packages/loot-design/src/components/manager/ImportActual.js b/packages/desktop-client/src/components/manager/ImportActual.js
similarity index 100%
rename from packages/loot-design/src/components/manager/ImportActual.js
rename to packages/desktop-client/src/components/manager/ImportActual.js
diff --git a/packages/loot-design/src/components/manager/ImportYNAB4.js b/packages/desktop-client/src/components/manager/ImportYNAB4.js
similarity index 100%
rename from packages/loot-design/src/components/manager/ImportYNAB4.js
rename to packages/desktop-client/src/components/manager/ImportYNAB4.js
diff --git a/packages/loot-design/src/components/manager/ImportYNAB5.js b/packages/desktop-client/src/components/manager/ImportYNAB5.js
similarity index 100%
rename from packages/loot-design/src/components/manager/ImportYNAB5.js
rename to packages/desktop-client/src/components/manager/ImportYNAB5.js
diff --git a/packages/desktop-client/src/components/manager/ManagementApp.js b/packages/desktop-client/src/components/manager/ManagementApp.js
index a5ff781e55..b7ed7bda6d 100644
--- a/packages/desktop-client/src/components/manager/ManagementApp.js
+++ b/packages/desktop-client/src/components/manager/ManagementApp.js
@@ -5,15 +5,15 @@ import { Switch, Redirect, Router, Route } from 'react-router-dom';
import { createBrowserHistory } from 'history';
import * as actions from 'loot-core/src/client/actions';
-import { View, Text } from 'loot-design/src/components/common';
-import BudgetList from 'loot-design/src/components/manager/BudgetList';
-import { colors } from 'loot-design/src/style';
-import tokens from 'loot-design/src/tokens';
+import { colors } from '../../style';
+import tokens from '../../tokens';
+import { View, Text } from '../common';
import LoggedInUser from '../LoggedInUser';
import Notifications from '../Notifications';
import { useServerVersion } from '../ServerContext';
+import BudgetList from './BudgetList';
import ConfigServer from './ConfigServer';
import Modals from './Modals';
import ServerURL from './ServerURL';
diff --git a/packages/desktop-client/src/components/manager/Modals.js b/packages/desktop-client/src/components/manager/Modals.js
index e8e9240a7d..ebd1bce5f5 100644
--- a/packages/desktop-client/src/components/manager/Modals.js
+++ b/packages/desktop-client/src/components/manager/Modals.js
@@ -6,16 +6,17 @@ import { bindActionCreators } from 'redux';
import * as actions from 'loot-core/src/client/actions';
import { send } from 'loot-core/src/platform/client/fetch';
-import { View } from 'loot-design/src/components/common';
-import DeleteFile from 'loot-design/src/components/manager/DeleteFile';
-import Import from 'loot-design/src/components/manager/Import';
-import ImportActual from 'loot-design/src/components/manager/ImportActual';
-import ImportYNAB4 from 'loot-design/src/components/manager/ImportYNAB4';
-import ImportYNAB5 from 'loot-design/src/components/manager/ImportYNAB5';
-import LoadBackup from 'loot-design/src/components/modals/LoadBackup';
+import { View } from '../common';
import CreateEncryptionKey from '../modals/CreateEncryptionKey';
import FixEncryptionKey from '../modals/FixEncryptionKey';
+import LoadBackup from '../modals/LoadBackup';
+
+import DeleteFile from './DeleteFile';
+import Import from './Import';
+import ImportActual from './ImportActual';
+import ImportYNAB4 from './ImportYNAB4';
+import ImportYNAB5 from './ImportYNAB5';
function Modals({
modalStack,
diff --git a/packages/desktop-client/src/components/manager/ServerURL.js b/packages/desktop-client/src/components/manager/ServerURL.js
index 6d35381355..e3c42702b2 100644
--- a/packages/desktop-client/src/components/manager/ServerURL.js
+++ b/packages/desktop-client/src/components/manager/ServerURL.js
@@ -1,7 +1,6 @@
import React from 'react';
-import { View, Text, AnchorLink } from 'loot-design/src/components/common';
-
+import { View, Text, AnchorLink } from '../common';
import { useServerURL } from '../ServerContext';
export default function ServerURL() {
diff --git a/packages/desktop-client/src/components/manager/WelcomeScreen.js b/packages/desktop-client/src/components/manager/WelcomeScreen.js
index 4c5a108cee..ffb74f2fdf 100644
--- a/packages/desktop-client/src/components/manager/WelcomeScreen.js
+++ b/packages/desktop-client/src/components/manager/WelcomeScreen.js
@@ -2,14 +2,9 @@ import React from 'react';
import { connect } from 'react-redux';
import * as actions from 'loot-core/src/client/actions';
-import {
- View,
- Button,
- Text,
- P,
- ExternalLink,
-} from 'loot-design/src/components/common';
-import { colors, styles } from 'loot-design/src/style';
+
+import { colors, styles } from '../../style';
+import { View, Button, Text, P, ExternalLink } from '../common';
function WelcomeScreen({ createBudget, pushModal }) {
return (
diff --git a/packages/desktop-client/src/components/manager/subscribe/Bootstrap.js b/packages/desktop-client/src/components/manager/subscribe/Bootstrap.js
index a08b205d28..8cb3488c26 100644
--- a/packages/desktop-client/src/components/manager/subscribe/Bootstrap.js
+++ b/packages/desktop-client/src/components/manager/subscribe/Bootstrap.js
@@ -4,8 +4,9 @@ import { useDispatch } from 'react-redux';
import { createBudget } from 'loot-core/src/client/actions/budgets';
import { loggedIn } from 'loot-core/src/client/actions/user';
import { send } from 'loot-core/src/platform/client/fetch';
-import { View, Text, Button, P } from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
+
+import { colors } from '../../../style';
+import { View, Text, Button, P } from '../../common';
import { useBootstrapped, Title } from './common';
import { ConfirmPasswordForm } from './ConfirmPasswordForm';
diff --git a/packages/desktop-client/src/components/manager/subscribe/ChangePassword.js b/packages/desktop-client/src/components/manager/subscribe/ChangePassword.js
index 2d4b4addae..14b3a915c7 100644
--- a/packages/desktop-client/src/components/manager/subscribe/ChangePassword.js
+++ b/packages/desktop-client/src/components/manager/subscribe/ChangePassword.js
@@ -2,8 +2,9 @@ import React, { useState } from 'react';
import { useHistory } from 'react-router-dom';
import { send } from 'loot-core/src/platform/client/fetch';
-import { View, Text, Button } from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
+
+import { colors } from '../../../style';
+import { View, Text, Button } from '../../common';
import { Title } from './common';
import { ConfirmPasswordForm } from './ConfirmPasswordForm';
diff --git a/packages/desktop-client/src/components/manager/subscribe/ConfirmPasswordForm.js b/packages/desktop-client/src/components/manager/subscribe/ConfirmPasswordForm.js
index 5a2605df32..d2540eadc9 100644
--- a/packages/desktop-client/src/components/manager/subscribe/ConfirmPasswordForm.js
+++ b/packages/desktop-client/src/components/manager/subscribe/ConfirmPasswordForm.js
@@ -1,6 +1,6 @@
import React, { useState } from 'react';
-import { View, ButtonWithLoading } from 'loot-design/src/components/common';
+import { View, ButtonWithLoading } from '../../common';
import { Input } from './common';
diff --git a/packages/desktop-client/src/components/manager/subscribe/Error.js b/packages/desktop-client/src/components/manager/subscribe/Error.js
index 2e7d5f35b0..d182b272bd 100644
--- a/packages/desktop-client/src/components/manager/subscribe/Error.js
+++ b/packages/desktop-client/src/components/manager/subscribe/Error.js
@@ -1,8 +1,8 @@
import React from 'react';
import { useHistory, useLocation } from 'react-router-dom';
-import { View, Text, Button } from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
+import { colors } from '../../../style';
+import { View, Text, Button } from '../../common';
function getErrorMessage(reason) {
switch (reason) {
diff --git a/packages/desktop-client/src/components/manager/subscribe/Login.js b/packages/desktop-client/src/components/manager/subscribe/Login.js
index d60c5d8d4c..29bddd4296 100644
--- a/packages/desktop-client/src/components/manager/subscribe/Login.js
+++ b/packages/desktop-client/src/components/manager/subscribe/Login.js
@@ -4,13 +4,9 @@ import { useDispatch } from 'react-redux';
import { createBudget } from 'loot-core/src/client/actions/budgets';
import { loggedIn } from 'loot-core/src/client/actions/user';
import { send } from 'loot-core/src/platform/client/fetch';
-import {
- View,
- Text,
- Button,
- ButtonWithLoading,
-} from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
+
+import { colors } from '../../../style';
+import { View, Text, Button, ButtonWithLoading } from '../../common';
import { useBootstrapped, Title, Input } from './common';
diff --git a/packages/desktop-client/src/components/manager/subscribe/common.js b/packages/desktop-client/src/components/manager/subscribe/common.js
index 16516e36d9..355929d58d 100644
--- a/packages/desktop-client/src/components/manager/subscribe/common.js
+++ b/packages/desktop-client/src/components/manager/subscribe/common.js
@@ -2,13 +2,9 @@ import React, { useEffect, useState } from 'react';
import { useHistory, useLocation } from 'react-router-dom';
import { send } from 'loot-core/src/platform/client/fetch';
-import {
- Text,
- Button,
- Input as BaseInput,
-} from 'loot-design/src/components/common';
-import { colors, styles } from 'loot-design/src/style';
+import { colors, styles } from '../../../style';
+import { Text, Button, Input as BaseInput } from '../../common';
import { useSetServerURL } from '../../ServerContext';
// There are two URLs that dance with each other: `/login` and
diff --git a/packages/loot-design/src/components/modals/BudgetSummary.js b/packages/desktop-client/src/components/modals/BudgetSummary.js
similarity index 91%
rename from packages/loot-design/src/components/modals/BudgetSummary.js
rename to packages/desktop-client/src/components/modals/BudgetSummary.js
index fe1c31ce3b..467872eeb5 100644
--- a/packages/loot-design/src/components/modals/BudgetSummary.js
+++ b/packages/desktop-client/src/components/modals/BudgetSummary.js
@@ -2,13 +2,13 @@ import React from 'react';
import { rolloverBudget } from 'loot-core/src/client/queries';
import * as monthUtils from 'loot-core/src/shared/months';
-import CellValue from 'loot-design/src/components/spreadsheet/CellValue';
-import format from 'loot-design/src/components/spreadsheet/format';
-import NamespaceContext from 'loot-design/src/components/spreadsheet/NamespaceContext';
-import SheetValue from 'loot-design/src/components/spreadsheet/SheetValue';
import { colors, styles } from '../../style';
import { View, Text, Modal, Button } from '../common';
+import CellValue from '../spreadsheet/CellValue';
+import format from '../spreadsheet/format';
+import NamespaceContext from '../spreadsheet/NamespaceContext';
+import SheetValue from '../spreadsheet/SheetValue';
function BudgetSummary({ month, modalProps }) {
const prevMonthName = monthUtils.format(monthUtils.prevMonth(month), 'MMM');
diff --git a/packages/loot-design/src/components/modals/CloseAccount.js b/packages/desktop-client/src/components/modals/CloseAccount.js
similarity index 100%
rename from packages/loot-design/src/components/modals/CloseAccount.js
rename to packages/desktop-client/src/components/modals/CloseAccount.js
diff --git a/packages/loot-design/src/components/modals/ConfigureLinkedAccounts.js b/packages/desktop-client/src/components/modals/ConfigureLinkedAccounts.js
similarity index 98%
rename from packages/loot-design/src/components/modals/ConfigureLinkedAccounts.js
rename to packages/desktop-client/src/components/modals/ConfigureLinkedAccounts.js
index 066c4fc560..f54c50c6c7 100644
--- a/packages/loot-design/src/components/modals/ConfigureLinkedAccounts.js
+++ b/packages/desktop-client/src/components/modals/ConfigureLinkedAccounts.js
@@ -5,8 +5,8 @@ import {
determineOffBudget,
prettyAccountType,
} from 'loot-core/src/shared/accounts';
-import Checkmark from 'loot-design/src/svg/v1/Checkmark';
+import Checkmark from '../../icons/v1/Checkmark';
import { styles, colors } from '../../style';
import { View, Text, Modal, Button } from '../common';
diff --git a/packages/desktop-client/src/components/modals/ConfirmCategoryDelete.js b/packages/desktop-client/src/components/modals/ConfirmCategoryDelete.js
index b187f54f3d..ea39f107de 100644
--- a/packages/desktop-client/src/components/modals/ConfirmCategoryDelete.js
+++ b/packages/desktop-client/src/components/modals/ConfirmCategoryDelete.js
@@ -1,14 +1,8 @@
import React, { useState, useEffect, useRef } from 'react';
-import { NativeCategorySelect } from 'loot-design/src/components/CategorySelect';
-import {
- View,
- Text,
- Block,
- Modal,
- Button,
-} from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
+import { colors } from '../../style';
+import { NativeCategorySelect } from '../autocomplete/CategorySelect';
+import { View, Text, Block, Modal, Button } from '../common';
export default function ConfirmCategoryDelete({
modalProps,
diff --git a/packages/desktop-client/src/components/modals/CreateAccount.js b/packages/desktop-client/src/components/modals/CreateAccount.js
index 5f56dd00e7..8fb8610e25 100644
--- a/packages/desktop-client/src/components/modals/CreateAccount.js
+++ b/packages/desktop-client/src/components/modals/CreateAccount.js
@@ -2,17 +2,10 @@ import React from 'react';
import { useDispatch } from 'react-redux';
import { pushModal } from 'loot-core/src/client/actions/modals';
-import {
- View,
- Text,
- Modal,
- P,
- Button,
- ButtonWithLoading,
-} from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
import { authorizeBank } from '../../nordigen';
+import { colors } from '../../style';
+import { View, Text, Modal, P, Button, ButtonWithLoading } from '../common';
export default function CreateAccount({ modalProps, syncServerStatus }) {
const dispatch = useDispatch();
diff --git a/packages/desktop-client/src/components/modals/CreateEncryptionKey.js b/packages/desktop-client/src/components/modals/CreateEncryptionKey.js
index fd7202d342..2ca47eb6ce 100644
--- a/packages/desktop-client/src/components/modals/CreateEncryptionKey.js
+++ b/packages/desktop-client/src/components/modals/CreateEncryptionKey.js
@@ -4,6 +4,8 @@ import { css } from 'glamor';
import { send } from 'loot-core/src/platform/client/fetch';
import { getCreateKeyError } from 'loot-core/src/shared/errors';
+
+import { colors } from '../../style';
import {
View,
Text,
@@ -14,8 +16,7 @@ import {
ModalButtons,
Input,
InitialFocus,
-} from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
+} from '../common';
export default function CreateEncryptionKey({
modalProps,
diff --git a/packages/loot-design/src/components/modals/CreateLocalAccount.js b/packages/desktop-client/src/components/modals/CreateLocalAccount.js
similarity index 99%
rename from packages/loot-design/src/components/modals/CreateLocalAccount.js
rename to packages/desktop-client/src/components/modals/CreateLocalAccount.js
index 51fbd4d96e..07d97666ef 100644
--- a/packages/loot-design/src/components/modals/CreateLocalAccount.js
+++ b/packages/desktop-client/src/components/modals/CreateLocalAccount.js
@@ -4,8 +4,8 @@ import { Formik } from 'formik';
import { determineOffBudget } from 'loot-core/src/shared/accounts';
import { toRelaxedNumber } from 'loot-core/src/shared/util';
-import { colors } from 'loot-design/src/style';
+import { colors } from '../../style';
import {
View,
Modal,
diff --git a/packages/loot-design/src/components/modals/EditField.js b/packages/desktop-client/src/components/modals/EditField.js
similarity index 90%
rename from packages/loot-design/src/components/modals/EditField.js
rename to packages/desktop-client/src/components/modals/EditField.js
index 53a4f6aca2..571c0c57fb 100644
--- a/packages/loot-design/src/components/modals/EditField.js
+++ b/packages/desktop-client/src/components/modals/EditField.js
@@ -8,15 +8,15 @@ import { currentDay, dayFromDate } from 'loot-core/src/shared/months';
import { amountToInteger } from 'loot-core/src/shared/util';
import { colors } from '../../style';
-import LegacyAccountAutocomplete from '../AccountAutocomplete';
-import NewCategoryAutocomplete from '../CategoryAutocomplete';
-import LegacyCategoryAutocomplete from '../CategorySelect';
+import LegacyAccountAutocomplete from '../autocomplete/AccountAutocomplete';
+import NewCategoryAutocomplete from '../autocomplete/CategoryAutocomplete';
+import LegacyCategoryAutocomplete from '../autocomplete/CategorySelect';
+import NewAccountAutocomplete from '../autocomplete/NewAccountAutocomplete';
+import NewPayeeAutocomplete from '../autocomplete/NewPayeeAutocomplete';
+import LegacyPayeeAutocomplete from '../autocomplete/PayeeAutocomplete';
import { View, Modal, Input } from '../common';
-import DateSelect from '../DateSelect';
import { SectionLabel } from '../forms';
-import NewAccountAutocomplete from '../NewAccountAutocomplete';
-import NewPayeeAutocomplete from '../NewPayeeAutocomplete';
-import LegacyPayeeAutocomplete from '../PayeeAutocomplete';
+import DateSelect from '../select/DateSelect';
function EditField({
actions,
diff --git a/packages/desktop-client/src/components/modals/EditRule.js b/packages/desktop-client/src/components/modals/EditRule.js
index 237b755676..b432c54fa2 100644
--- a/packages/desktop-client/src/components/modals/EditRule.js
+++ b/packages/desktop-client/src/components/modals/EditRule.js
@@ -24,6 +24,13 @@ import {
integerToAmount,
amountToInteger,
} from 'loot-core/src/shared/util';
+
+import useSelected, { SelectedProvider } from '../../hooks/useSelected';
+import AddIcon from '../../icons/v0/Add';
+import SubtractIcon from '../../icons/v0/Subtract';
+import InformationOutline from '../../icons/v1/InformationOutline';
+import { colors } from '../../style';
+import SimpleTransactionsTable from '../accounts/SimpleTransactionsTable';
import {
View,
Text,
@@ -32,16 +39,7 @@ import {
Stack,
CustomSelect,
Tooltip,
-} from 'loot-design/src/components/common';
-import useSelected, {
- SelectedProvider,
-} from 'loot-design/src/components/useSelected';
-import { colors } from 'loot-design/src/style';
-import AddIcon from 'loot-design/src/svg/v0/Add';
-import SubtractIcon from 'loot-design/src/svg/v0/Subtract';
-import InformationOutline from 'loot-design/src/svg/v1/InformationOutline';
-
-import SimpleTransactionsTable from '../accounts/SimpleTransactionsTable';
+} from '../common';
import { StatusBadge } from '../schedules/StatusBadge';
import { BetweenAmountInput } from '../util/AmountInput';
import DisplayId from '../util/DisplayId';
diff --git a/packages/desktop-client/src/components/modals/FixEncryptionKey.js b/packages/desktop-client/src/components/modals/FixEncryptionKey.js
index 9057f96885..9be801f51c 100644
--- a/packages/desktop-client/src/components/modals/FixEncryptionKey.js
+++ b/packages/desktop-client/src/components/modals/FixEncryptionKey.js
@@ -2,6 +2,8 @@ import React, { useState } from 'react';
import { send } from 'loot-core/src/platform/client/fetch';
import { getTestKeyError } from 'loot-core/src/shared/errors';
+
+import { colors } from '../../style';
import {
View,
Text,
@@ -13,8 +15,7 @@ import {
Input,
InitialFocus,
ExternalLink,
-} from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
+} from '../common';
export default function FixEncryptionKey({
modalProps,
diff --git a/packages/loot-design/src/components/modals/ImportTransactions.js b/packages/desktop-client/src/components/modals/ImportTransactions.js
similarity index 100%
rename from packages/loot-design/src/components/modals/ImportTransactions.js
rename to packages/desktop-client/src/components/modals/ImportTransactions.js
diff --git a/packages/loot-design/src/components/modals/ImportTransactions.test.js b/packages/desktop-client/src/components/modals/ImportTransactions.test.js
similarity index 100%
rename from packages/loot-design/src/components/modals/ImportTransactions.test.js
rename to packages/desktop-client/src/components/modals/ImportTransactions.test.js
diff --git a/packages/loot-design/src/components/modals/LoadBackup.js b/packages/desktop-client/src/components/modals/LoadBackup.js
similarity index 100%
rename from packages/loot-design/src/components/modals/LoadBackup.js
rename to packages/desktop-client/src/components/modals/LoadBackup.js
diff --git a/packages/desktop-client/src/components/modals/ManageRulesModal.js b/packages/desktop-client/src/components/modals/ManageRulesModal.js
index b87f3503bd..7595854547 100644
--- a/packages/desktop-client/src/components/modals/ManageRulesModal.js
+++ b/packages/desktop-client/src/components/modals/ManageRulesModal.js
@@ -1,9 +1,9 @@
import React, { useState } from 'react';
import { useLocation } from 'react-router-dom-v5-compat';
-import { Modal } from 'loot-design/src/components/common';
-import { isNonProductionEnvironment } from 'loot-design/src/util/environment';
+import { isNonProductionEnvironment } from 'loot-core/src/shared/environment';
+import { Modal } from '../common';
import ManageRules from '../ManageRules';
export default function ManageRulesModal({ modalProps, payeeId }) {
diff --git a/packages/desktop-client/src/components/modals/MergeUnusedPayees.js b/packages/desktop-client/src/components/modals/MergeUnusedPayees.js
index 48759e3d8e..bbccf33a97 100644
--- a/packages/desktop-client/src/components/modals/MergeUnusedPayees.js
+++ b/packages/desktop-client/src/components/modals/MergeUnusedPayees.js
@@ -3,16 +3,10 @@ import { useDispatch, useSelector } from 'react-redux';
import { replaceModal } from 'loot-core/src/client/actions/modals';
import { send } from 'loot-core/src/platform/client/fetch';
-import { Information } from 'loot-design/src/components/alerts';
-import {
- View,
- Text,
- Modal,
- ModalButtons,
- Button,
- P,
-} from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
+
+import { colors } from '../../style';
+import { Information } from '../alerts';
+import { View, Text, Modal, ModalButtons, Button, P } from '../common';
let highlightStyle = { color: colors.p5 };
diff --git a/packages/loot-design/src/components/modals/NordigenExternalMsg.js b/packages/desktop-client/src/components/modals/NordigenExternalMsg.js
similarity index 97%
rename from packages/loot-design/src/components/modals/NordigenExternalMsg.js
rename to packages/desktop-client/src/components/modals/NordigenExternalMsg.js
index 4dc81bbca8..d4a962db82 100644
--- a/packages/loot-design/src/components/modals/NordigenExternalMsg.js
+++ b/packages/desktop-client/src/components/modals/NordigenExternalMsg.js
@@ -1,14 +1,13 @@
import React, { useEffect, useState, useRef } from 'react';
import { send } from 'loot-core/src/platform/client/fetch';
-import { Warning } from 'loot-design/src/components/alerts';
+import AnimatedLoading from '../../icons/AnimatedLoading';
import { colors } from '../../style';
-import AnimatedLoading from '../../svg/AnimatedLoading';
-import { Error } from '../alerts';
+import { Error, Warning } from '../alerts';
+import Autocomplete from '../autocomplete/NewAutocomplete';
import { View, Modal, Button, P } from '../common';
import { FormField, FormLabel } from '../forms';
-import Autocomplete from '../NewAutocomplete';
import { COUNTRY_OPTIONS } from './countries';
diff --git a/packages/loot-design/src/components/modals/PlaidExternalMsg.js b/packages/desktop-client/src/components/modals/PlaidExternalMsg.js
similarity index 98%
rename from packages/loot-design/src/components/modals/PlaidExternalMsg.js
rename to packages/desktop-client/src/components/modals/PlaidExternalMsg.js
index 10cbce8684..be1b945b95 100644
--- a/packages/loot-design/src/components/modals/PlaidExternalMsg.js
+++ b/packages/desktop-client/src/components/modals/PlaidExternalMsg.js
@@ -1,7 +1,7 @@
import React, { useState, useRef } from 'react';
+import AnimatedLoading from '../../icons/AnimatedLoading';
import { colors } from '../../style';
-import AnimatedLoading from '../../svg/AnimatedLoading';
import { Error } from '../alerts';
import { View, Text, Modal, Button, P, ModalButtons } from '../common';
diff --git a/packages/loot-design/src/components/modals/SelectLinkedAccounts.js b/packages/desktop-client/src/components/modals/SelectLinkedAccounts.js
similarity index 100%
rename from packages/loot-design/src/components/modals/SelectLinkedAccounts.js
rename to packages/desktop-client/src/components/modals/SelectLinkedAccounts.js
diff --git a/packages/loot-design/src/components/modals/countries.js b/packages/desktop-client/src/components/modals/countries.js
similarity index 100%
rename from packages/loot-design/src/components/modals/countries.js
rename to packages/desktop-client/src/components/modals/countries.js
diff --git a/packages/desktop-client/src/components/nordigen/NordigenLink.js b/packages/desktop-client/src/components/nordigen/NordigenLink.js
index 815953cf39..82d60ff048 100644
--- a/packages/desktop-client/src/components/nordigen/NordigenLink.js
+++ b/packages/desktop-client/src/components/nordigen/NordigenLink.js
@@ -1,6 +1,6 @@
import React from 'react';
-import { Modal, P, View } from 'loot-design/src/components/common';
+import { Modal, P, View } from '../common';
export default function NordigenLink() {
window.close();
diff --git a/packages/desktop-client/src/components/payees/ManagePayeesWithData.js b/packages/desktop-client/src/components/payees/ManagePayeesWithData.js
index 3a812371b3..92fc6dda20 100644
--- a/packages/desktop-client/src/components/payees/ManagePayeesWithData.js
+++ b/packages/desktop-client/src/components/payees/ManagePayeesWithData.js
@@ -4,7 +4,8 @@ import { connect } from 'react-redux';
import * as actions from 'loot-core/src/client/actions';
import { send, listen } from 'loot-core/src/platform/client/fetch';
import { applyChanges } from 'loot-core/src/shared/util';
-import { ManagePayees } from 'loot-design/src/components/payees';
+
+import { ManagePayees } from '.';
function ManagePayeesWithData({
modalProps,
diff --git a/packages/loot-design/src/components/payees.js b/packages/desktop-client/src/components/payees/index.js
similarity index 97%
rename from packages/loot-design/src/components/payees.js
rename to packages/desktop-client/src/components/payees/index.js
index d51d04edf1..757fb607e0 100644
--- a/packages/loot-design/src/components/payees.js
+++ b/packages/desktop-client/src/components/payees/index.js
@@ -13,12 +13,16 @@ import memoizeOne from 'memoize-one';
import { groupById } from 'loot-core/src/shared/util';
-import { colors } from '../style';
-import Delete from '../svg/v0/Delete';
-import ExpandArrow from '../svg/v0/ExpandArrow';
-import Merge from '../svg/v0/Merge';
-import ArrowThinRight from '../svg/v1/ArrowThinRight';
-
+import useSelected, {
+ SelectedProvider,
+ useSelectedItems,
+ useSelectedDispatch,
+} from '../../hooks/useSelected';
+import Delete from '../../icons/v0/Delete';
+import ExpandArrow from '../../icons/v0/ExpandArrow';
+import Merge from '../../icons/v0/Merge';
+import ArrowThinRight from '../../icons/v1/ArrowThinRight';
+import { colors } from '../../style';
import {
useStableCallback,
View,
@@ -27,7 +31,7 @@ import {
Button,
Tooltip,
Menu,
-} from './common';
+} from '../common';
import {
Table,
TableHeader,
@@ -37,12 +41,7 @@ import {
SelectCell,
CellButton,
useTableNavigator,
-} from './table';
-import useSelected, {
- SelectedProvider,
- useSelectedItems,
- useSelectedDispatch,
-} from './useSelected';
+} from '../table';
let getPayeesById = memoizeOne(payees => groupById(payees));
diff --git a/packages/desktop-client/src/components/reports/CashFlow.js b/packages/desktop-client/src/components/reports/CashFlow.js
index d5326eeeaf..e931387088 100644
--- a/packages/desktop-client/src/components/reports/CashFlow.js
+++ b/packages/desktop-client/src/components/reports/CashFlow.js
@@ -5,14 +5,9 @@ import * as d from 'date-fns';
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 {
- View,
- Text,
- Block,
- P,
- AlignedText,
-} from 'loot-design/src/components/common';
-import { colors, styles } from 'loot-design/src/style';
+
+import { colors, styles } from '../../style';
+import { View, Text, Block, P, AlignedText } from '../common';
import Change from './Change';
import { cashFlowByDate } from './graphs/cash-flow-spreadsheet';
diff --git a/packages/desktop-client/src/components/reports/Change.js b/packages/desktop-client/src/components/reports/Change.js
index 14f81bb173..b344077e0b 100644
--- a/packages/desktop-client/src/components/reports/Change.js
+++ b/packages/desktop-client/src/components/reports/Change.js
@@ -1,8 +1,9 @@
import React from 'react';
import { integerToCurrency } from 'loot-core/src/shared/util';
-import { Block } from 'loot-design/src/components/common';
-import { colors, styles } from 'loot-design/src/style';
+
+import { colors, styles } from '../../style';
+import { Block } from '../common';
function Change({ amount }) {
return (
diff --git a/packages/desktop-client/src/components/reports/Container.js b/packages/desktop-client/src/components/reports/Container.js
index 31906cf5b8..e3850268bf 100644
--- a/packages/desktop-client/src/components/reports/Container.js
+++ b/packages/desktop-client/src/components/reports/Container.js
@@ -1,7 +1,7 @@
import React, { useRef } from 'react';
import AutoSizer from 'react-virtualized-auto-sizer';
-import { View } from 'loot-design/src/components/common';
+import { View } from '../common';
export default function Container({ style, children }) {
const portalHost = useRef(null);
diff --git a/packages/desktop-client/src/components/reports/DateRange.js b/packages/desktop-client/src/components/reports/DateRange.js
index e4c53dfa27..06ee410c7f 100644
--- a/packages/desktop-client/src/components/reports/DateRange.js
+++ b/packages/desktop-client/src/components/reports/DateRange.js
@@ -2,8 +2,8 @@ import React from 'react';
import * as d from 'date-fns';
-import { Block } from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
+import { colors } from '../../style';
+import { Block } from '../common';
function DateRange({ start, end }) {
start = d.parseISO(start);
diff --git a/packages/desktop-client/src/components/reports/Header.js b/packages/desktop-client/src/components/reports/Header.js
index bd84f0a535..855c560d0a 100644
--- a/packages/desktop-client/src/components/reports/Header.js
+++ b/packages/desktop-client/src/components/reports/Header.js
@@ -1,14 +1,10 @@
import React from 'react';
import * as monthUtils from 'loot-core/src/shared/months';
-import {
- View,
- Select,
- Button,
- ButtonLink,
-} from 'loot-design/src/components/common';
-import { styles } from 'loot-design/src/style';
-import ArrowLeft from 'loot-design/src/svg/v1/ArrowLeft';
+
+import ArrowLeft from '../../icons/v1/ArrowLeft';
+import { styles } from '../../style';
+import { View, Select, Button, ButtonLink } from '../common';
function validateStart(allMonths, start, end) {
const earliest = allMonths[allMonths.length - 1].name;
diff --git a/packages/desktop-client/src/components/reports/NetWorth.js b/packages/desktop-client/src/components/reports/NetWorth.js
index 17cdf64164..a7f36e44e9 100644
--- a/packages/desktop-client/src/components/reports/NetWorth.js
+++ b/packages/desktop-client/src/components/reports/NetWorth.js
@@ -8,8 +8,9 @@ import * as actions from 'loot-core/src/client/actions';
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 { View, P } from 'loot-design/src/components/common';
-import { styles } from 'loot-design/src/style';
+
+import { styles } from '../../style';
+import { View, P } from '../common';
import Change from './Change';
import netWorthSpreadsheet from './graphs/net-worth-spreadsheet';
diff --git a/packages/desktop-client/src/components/reports/Overview.js b/packages/desktop-client/src/components/reports/Overview.js
index a9e79c37a3..264180009d 100644
--- a/packages/desktop-client/src/components/reports/Overview.js
+++ b/packages/desktop-client/src/components/reports/Overview.js
@@ -7,8 +7,9 @@ import { VictoryBar, VictoryGroup, VictoryVoronoiContainer } from 'victory';
import * as actions from 'loot-core/src/client/actions';
import * as monthUtils from 'loot-core/src/shared/months';
import { integerToCurrency } from 'loot-core/src/shared/util';
-import { View, Block, AnchorLink } from 'loot-design/src/components/common';
-import { colors, styles } from 'loot-design/src/style';
+
+import { colors, styles } from '../../style';
+import { View, Block, AnchorLink } from '../common';
import Change from './Change';
import theme from './chart-theme';
diff --git a/packages/desktop-client/src/components/reports/Tooltip.js b/packages/desktop-client/src/components/reports/Tooltip.js
index a1fdd26cc2..829e1ffbc6 100644
--- a/packages/desktop-client/src/components/reports/Tooltip.js
+++ b/packages/desktop-client/src/components/reports/Tooltip.js
@@ -4,7 +4,7 @@ import ReactDOM from 'react-dom';
import { css, before } from 'glamor';
import { VictoryTooltip } from 'victory';
-import { colors } from 'loot-design/src/style';
+import { colors } from '../../style';
class Tooltip extends React.Component {
static defaultEvents = VictoryTooltip.defaultEvents;
diff --git a/packages/desktop-client/src/components/reports/chart-theme.js b/packages/desktop-client/src/components/reports/chart-theme.js
index d303f33fe1..fb30df44a4 100644
--- a/packages/desktop-client/src/components/reports/chart-theme.js
+++ b/packages/desktop-client/src/components/reports/chart-theme.js
@@ -1,4 +1,4 @@
-import { colors } from 'loot-design/src/style';
+import { colors } from '../../style';
let colorFades = {
blueFadeStart: 'rgba(229, 245, 255, 1)',
diff --git a/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.js b/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.js
index 41e2c8391b..f00b0b9f5f 100644
--- a/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.js
+++ b/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.js
@@ -10,8 +10,7 @@ import {
VictoryGroup,
} from 'victory';
-import { colors } from 'loot-design/src/style';
-
+import { colors } from '../../../style';
import theme from '../chart-theme';
import Container from '../Container';
import Tooltip from '../Tooltip';
diff --git a/packages/desktop-client/src/components/reports/graphs/cash-flow-spreadsheet.js b/packages/desktop-client/src/components/reports/graphs/cash-flow-spreadsheet.js
index d4971e107f..0605ceadce 100644
--- a/packages/desktop-client/src/components/reports/graphs/cash-flow-spreadsheet.js
+++ b/packages/desktop-client/src/components/reports/graphs/cash-flow-spreadsheet.js
@@ -5,8 +5,8 @@ import * as d from 'date-fns';
import q from 'loot-core/src/client/query-helpers';
import * as monthUtils from 'loot-core/src/shared/months';
import { integerToCurrency, integerToAmount } from 'loot-core/src/shared/util';
-import { AlignedText } from 'loot-design/src/components/common';
+import { AlignedText } from '../../common';
import { fromDateRepr, fromDateReprToDay, runAll, index } from '../util';
export function simpleCashFlow(start, end) {
diff --git a/packages/desktop-client/src/components/reports/graphs/net-worth-spreadsheet.js b/packages/desktop-client/src/components/reports/graphs/net-worth-spreadsheet.js
index 1616e83e95..cda519f54f 100644
--- a/packages/desktop-client/src/components/reports/graphs/net-worth-spreadsheet.js
+++ b/packages/desktop-client/src/components/reports/graphs/net-worth-spreadsheet.js
@@ -9,8 +9,8 @@ import {
integerToAmount,
amountToInteger,
} from 'loot-core/src/shared/util';
-import { AlignedText } from 'loot-design/src/components/common';
+import { AlignedText } from '../../common';
import { index } from '../util';
export default function createSpreadsheet(start, end, accounts) {
diff --git a/packages/desktop-client/src/components/reports/index.js b/packages/desktop-client/src/components/reports/index.js
index ba204ac8d6..08ef98347d 100644
--- a/packages/desktop-client/src/components/reports/index.js
+++ b/packages/desktop-client/src/components/reports/index.js
@@ -1,7 +1,7 @@
import React from 'react';
import { Route } from 'react-router-dom';
-import { View } from 'loot-design/src/components/common';
+import { View } from '../common';
import CashFlow from './CashFlow';
import NetWorth from './NetWorth';
diff --git a/packages/desktop-client/src/components/reports/useReport.js b/packages/desktop-client/src/components/reports/useReport.js
index 97fa58f2a6..77501e71bb 100644
--- a/packages/desktop-client/src/components/reports/useReport.js
+++ b/packages/desktop-client/src/components/reports/useReport.js
@@ -1,9 +1,9 @@
-import { useContext, useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
-import SpreadsheetContext from 'loot-design/src/components/spreadsheet/SpreadsheetContext';
+import { useSpreadsheet } from 'loot-core/src/client/SpreadsheetProvider';
function useReport(sheetName, getData) {
- const spreadsheet = useContext(SpreadsheetContext);
+ const spreadsheet = useSpreadsheet();
const [results, setResults] = useState(null);
useEffect(() => {
diff --git a/packages/desktop-client/src/components/schedules/DiscoverSchedules.js b/packages/desktop-client/src/components/schedules/DiscoverSchedules.js
index 1333fbcbd0..9e8965fb60 100644
--- a/packages/desktop-client/src/components/schedules/DiscoverSchedules.js
+++ b/packages/desktop-client/src/components/schedules/DiscoverSchedules.js
@@ -4,27 +4,16 @@ import { useHistory } from 'react-router-dom';
import q, { runQuery } from 'loot-core/src/client/query-helpers';
import { send } from 'loot-core/src/platform/client/fetch';
import { getRecurringDescription } from 'loot-core/src/shared/schedules';
-import {
- View,
- Stack,
- ButtonWithLoading,
- P,
-} from 'loot-design/src/components/common';
-import {
- Table,
- TableHeader,
- Row,
- Field,
- SelectCell,
-} from 'loot-design/src/components/table';
+
import useSelected, {
useSelectedDispatch,
useSelectedItems,
SelectedProvider,
-} from 'loot-design/src/components/useSelected';
-import { colors } from 'loot-design/src/style';
-
+} from '../../hooks/useSelected';
+import { colors } from '../../style';
+import { View, Stack, ButtonWithLoading, P } from '../common';
import { Page, usePageType } from '../Page';
+import { Table, TableHeader, Row, Field, SelectCell } from '../table';
import DisplayId from '../util/DisplayId';
import { ScheduleAmountCell } from './SchedulesTable';
diff --git a/packages/desktop-client/src/components/schedules/EditSchedule.js b/packages/desktop-client/src/components/schedules/EditSchedule.js
index 8b4d42782d..fa18ba4090 100644
--- a/packages/desktop-client/src/components/schedules/EditSchedule.js
+++ b/packages/desktop-client/src/components/schedules/EditSchedule.js
@@ -8,28 +8,22 @@ import q, { runQuery, liveQuery } from 'loot-core/src/client/query-helpers';
import { send, sendCatch } from 'loot-core/src/platform/client/fetch';
import * as monthUtils from 'loot-core/src/shared/months';
import { extractScheduleConds } from 'loot-core/src/shared/schedules';
-import LegacyAccountAutocomplete 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 {
- FormField,
- FormLabel,
- Checkbox,
-} from 'loot-design/src/components/forms';
-import NewAccountAutocomplete from 'loot-design/src/components/NewAccountAutocomplete';
-import NewPayeeAutocomplete from 'loot-design/src/components/NewPayeeAutocomplete';
-import LegacyPayeeAutocomplete from 'loot-design/src/components/PayeeAutocomplete';
-import RecurringSchedulePicker from 'loot-design/src/components/RecurringSchedulePicker';
-import { SelectedItemsButton } from 'loot-design/src/components/table';
-import useSelected, {
- SelectedProvider,
-} from 'loot-design/src/components/useSelected';
-import { colors } from 'loot-design/src/style';
import useFeatureFlag from '../../hooks/useFeatureFlag';
+import useSelected, { SelectedProvider } from '../../hooks/useSelected';
+import { colors } from '../../style';
import SimpleTransactionsTable from '../accounts/SimpleTransactionsTable';
+import LegacyAccountAutocomplete from '../autocomplete/AccountAutocomplete';
+import NewAccountAutocomplete from '../autocomplete/NewAccountAutocomplete';
+import NewPayeeAutocomplete from '../autocomplete/NewPayeeAutocomplete';
+import LegacyPayeeAutocomplete from '../autocomplete/PayeeAutocomplete';
+import { Stack, View, Text, Button } from '../common';
+import { FormField, FormLabel, Checkbox } from '../forms';
import { OpSelect } from '../modals/EditRule';
import { Page } from '../Page';
+import DateSelect from '../select/DateSelect';
+import RecurringSchedulePicker from '../select/RecurringSchedulePicker';
+import { SelectedItemsButton } from '../table';
import { AmountInput, BetweenAmountInput } from '../util/AmountInput';
function mergeFields(defaults, initial) {
diff --git a/packages/desktop-client/src/components/schedules/LinkSchedule.js b/packages/desktop-client/src/components/schedules/LinkSchedule.js
index 114876c003..e27d20df69 100644
--- a/packages/desktop-client/src/components/schedules/LinkSchedule.js
+++ b/packages/desktop-client/src/components/schedules/LinkSchedule.js
@@ -3,8 +3,8 @@ import { useLocation, useHistory } from 'react-router-dom';
import { useSchedules } from 'loot-core/src/client/data-hooks/schedules';
import { send } from 'loot-core/src/platform/client/fetch';
-import { Search, Text, View } from 'loot-design/src/components/common';
+import { Search, Text, View } from '../common';
import { Page } from '../Page';
import { SchedulesTable } from './SchedulesTable';
diff --git a/packages/desktop-client/src/components/schedules/PostsOfflineNotification.js b/packages/desktop-client/src/components/schedules/PostsOfflineNotification.js
index 3c77a86300..e770b0a185 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 { colors } from '../../style';
+import { Text, P, Button, Stack } from '../common';
import { Page } from '../Page';
import DisplayId from '../util/DisplayId';
diff --git a/packages/desktop-client/src/components/schedules/SchedulesTable.js b/packages/desktop-client/src/components/schedules/SchedulesTable.js
index 770504e6c6..16a47be92a 100644
--- a/packages/desktop-client/src/components/schedules/SchedulesTable.js
+++ b/packages/desktop-client/src/components/schedules/SchedulesTable.js
@@ -6,24 +6,12 @@ import { useCachedPayees } from 'loot-core/src/client/data-hooks/payees';
import * as monthUtils from 'loot-core/src/shared/months';
import { getScheduledAmount } from 'loot-core/src/shared/schedules';
import { integerToCurrency } from 'loot-core/src/shared/util';
-import {
- View,
- Text,
- Button,
- Tooltip,
- Menu,
-} from 'loot-design/src/components/common';
-import {
- Table,
- TableHeader,
- Row,
- Field,
- Cell,
-} from 'loot-design/src/components/table';
-import { colors } from 'loot-design/src/style';
-import DotsHorizontalTriple from 'loot-design/src/svg/v1/DotsHorizontalTriple';
-import Check from 'loot-design/src/svg/v2/Check';
+import DotsHorizontalTriple from '../../icons/v1/DotsHorizontalTriple';
+import Check from '../../icons/v2/Check';
+import { colors } from '../../style';
+import { View, Text, Button, Tooltip, Menu } from '../common';
+import { Table, TableHeader, Row, Field, Cell } from '../table';
import DisplayId from '../util/DisplayId';
import { StatusBadge } from './StatusBadge';
diff --git a/packages/desktop-client/src/components/schedules/StatusBadge.js b/packages/desktop-client/src/components/schedules/StatusBadge.js
index 8a09785d1a..636286c67d 100644
--- a/packages/desktop-client/src/components/schedules/StatusBadge.js
+++ b/packages/desktop-client/src/components/schedules/StatusBadge.js
@@ -1,15 +1,16 @@
import React from 'react';
import { titleFirst } from 'loot-core/src/shared/util';
-import { View, Text } from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
-import AlertTriangle from 'loot-design/src/svg/v2/AlertTriangle';
-import CalendarIcon from 'loot-design/src/svg/v2/Calendar';
-import CheckCircle1 from 'loot-design/src/svg/v2/CheckCircle1';
-import CheckCircleHollow from 'loot-design/src/svg/v2/CheckCircleHollow';
-import EditSkull1 from 'loot-design/src/svg/v2/EditSkull1';
-import FavoriteStar from 'loot-design/src/svg/v2/FavoriteStar';
-import ValidationCheck from 'loot-design/src/svg/v2/ValidationCheck';
+
+import AlertTriangle from '../../icons/v2/AlertTriangle';
+import CalendarIcon from '../../icons/v2/Calendar';
+import CheckCircle1 from '../../icons/v2/CheckCircle1';
+import CheckCircleHollow from '../../icons/v2/CheckCircleHollow';
+import EditSkull1 from '../../icons/v2/EditSkull1';
+import FavoriteStar from '../../icons/v2/FavoriteStar';
+import ValidationCheck from '../../icons/v2/ValidationCheck';
+import { colors } from '../../style';
+import { View, Text } from '../common';
export function getStatusProps(status) {
let color, backgroundColor, Icon;
diff --git a/packages/desktop-client/src/components/schedules/index.js b/packages/desktop-client/src/components/schedules/index.js
index 027170ec4b..e544908846 100644
--- a/packages/desktop-client/src/components/schedules/index.js
+++ b/packages/desktop-client/src/components/schedules/index.js
@@ -3,8 +3,8 @@ import { useHistory } from 'react-router-dom';
import { useSchedules } from 'loot-core/src/client/data-hooks/schedules';
import { send } from 'loot-core/src/platform/client/fetch';
-import { View, Button, Search } from 'loot-design/src/components/common';
+import { View, Button, Search } from '../common';
import { Page } from '../Page';
import { SchedulesTable, ROW_HEIGHT } from './SchedulesTable';
diff --git a/packages/loot-design/src/components/DateSelect.js b/packages/desktop-client/src/components/select/DateSelect.js
similarity index 99%
rename from packages/loot-design/src/components/DateSelect.js
rename to packages/desktop-client/src/components/select/DateSelect.js
index cb2c951916..adec9847a0 100644
--- a/packages/loot-design/src/components/DateSelect.js
+++ b/packages/desktop-client/src/components/select/DateSelect.js
@@ -18,9 +18,9 @@ import {
getShortYearRegex,
} from 'loot-core/src/shared/months';
-import { colors } from '../style';
+import { colors } from '../../style';
+import { View, Input, Tooltip } from '../common';
-import { View, Input, Tooltip } from './common';
import DateSelectLeft from './DateSelect.left.png';
import DateSelectRight from './DateSelect.right.png';
diff --git a/packages/loot-design/src/components/DateSelect.left.png b/packages/desktop-client/src/components/select/DateSelect.left.png
similarity index 100%
rename from packages/loot-design/src/components/DateSelect.left.png
rename to packages/desktop-client/src/components/select/DateSelect.left.png
diff --git a/packages/loot-design/src/components/DateSelect.right.png b/packages/desktop-client/src/components/select/DateSelect.right.png
similarity index 100%
rename from packages/loot-design/src/components/DateSelect.right.png
rename to packages/desktop-client/src/components/select/DateSelect.right.png
diff --git a/packages/loot-design/src/components/RecurringSchedulePicker.js b/packages/desktop-client/src/components/select/RecurringSchedulePicker.js
similarity index 97%
rename from packages/loot-design/src/components/RecurringSchedulePicker.js
rename to packages/desktop-client/src/components/select/RecurringSchedulePicker.js
index 67fdcc604b..c926f9e1e9 100644
--- a/packages/loot-design/src/components/RecurringSchedulePicker.js
+++ b/packages/desktop-client/src/components/select/RecurringSchedulePicker.js
@@ -4,12 +4,13 @@ import { useSelector } from 'react-redux';
import { sendCatch } from 'loot-core/src/platform/client/fetch';
import * as monthUtils from 'loot-core/src/shared/months';
import { getRecurringDescription } from 'loot-core/src/shared/schedules';
-import { useTooltip } from 'loot-design/src/components/tooltips';
-import { colors } from 'loot-design/src/style';
-import AddIcon from 'loot-design/src/svg/v0/Add';
-import SubtractIcon from 'loot-design/src/svg/v0/Subtract';
-import { Button, Select, Input, Tooltip, View, Text, Stack } from './common';
+import AddIcon from '../../icons/v0/Add';
+import SubtractIcon from '../../icons/v0/Subtract';
+import { colors } from '../../style';
+import { Button, Select, Input, Tooltip, View, Text, Stack } from '../common';
+import { useTooltip } from '../tooltips';
+
import DateSelect from './DateSelect';
// ex: There is no 6th Friday of the Month
diff --git a/packages/desktop-client/src/components/settings/Encryption.js b/packages/desktop-client/src/components/settings/Encryption.js
index 186c8f2462..185a04da79 100644
--- a/packages/desktop-client/src/components/settings/Encryption.js
+++ b/packages/desktop-client/src/components/settings/Encryption.js
@@ -1,8 +1,7 @@
import React from 'react';
-import { Text, Button } from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
-
+import { colors } from '../../style';
+import { Text, Button } from '../common';
import { useServerURL } from '../ServerContext';
import { Setting } from './UI';
diff --git a/packages/desktop-client/src/components/settings/Experimental.js b/packages/desktop-client/src/components/settings/Experimental.js
index ec17bbf8cb..0be483712b 100644
--- a/packages/desktop-client/src/components/settings/Experimental.js
+++ b/packages/desktop-client/src/components/settings/Experimental.js
@@ -1,10 +1,9 @@
import React from 'react';
-import { Link, Text, View } from 'loot-design/src/components/common';
-import { Checkbox } from 'loot-design/src/components/forms';
-import { colors } from 'loot-design/src/style';
-
import { useAllFeatureFlags } from '../../hooks/useFeatureFlag';
+import { colors } from '../../style';
+import { Link, Text, View } from '../common';
+import { Checkbox } from '../forms';
import { Setting } from './UI';
diff --git a/packages/desktop-client/src/components/settings/Export.js b/packages/desktop-client/src/components/settings/Export.js
index 0dfc619e3c..6f2bc9aa72 100644
--- a/packages/desktop-client/src/components/settings/Export.js
+++ b/packages/desktop-client/src/components/settings/Export.js
@@ -3,7 +3,8 @@ import React from 'react';
import { format } from 'date-fns';
import { send } from 'loot-core/src/platform/client/fetch';
-import { Text, Button } from 'loot-design/src/components/common';
+
+import { Text, Button } from '../common';
import { Setting } from './UI';
diff --git a/packages/desktop-client/src/components/settings/FixSplits.js b/packages/desktop-client/src/components/settings/FixSplits.js
index a0200bdca7..1b00d938d0 100644
--- a/packages/desktop-client/src/components/settings/FixSplits.js
+++ b/packages/desktop-client/src/components/settings/FixSplits.js
@@ -1,13 +1,9 @@
import React, { useState } from 'react';
import { send } from 'loot-core/src/platform/client/fetch';
-import {
- View,
- Text,
- P,
- ButtonWithLoading,
-} from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
+
+import { colors } from '../../style';
+import { View, Text, P, ButtonWithLoading } from '../common';
import { Setting } from './UI';
diff --git a/packages/desktop-client/src/components/settings/Format.js b/packages/desktop-client/src/components/settings/Format.js
index 621412bb0c..ead45fa84f 100644
--- a/packages/desktop-client/src/components/settings/Format.js
+++ b/packages/desktop-client/src/components/settings/Format.js
@@ -1,14 +1,10 @@
import React from 'react';
import { numberFormats } from 'loot-core/src/shared/util';
-import {
- Button,
- CustomSelect,
- Text,
- View,
-} from 'loot-design/src/components/common';
-import { Checkbox } from 'loot-design/src/components/forms';
-import tokens from 'loot-design/src/tokens';
+
+import tokens from '../../tokens';
+import { Button, CustomSelect, Text, View } from '../common';
+import { Checkbox } from '../forms';
import { Setting } from './UI';
diff --git a/packages/desktop-client/src/components/settings/Global.js b/packages/desktop-client/src/components/settings/Global.js
index e67df306c6..65f516a332 100644
--- a/packages/desktop-client/src/components/settings/Global.js
+++ b/packages/desktop-client/src/components/settings/Global.js
@@ -1,8 +1,8 @@
import React, { useState, useEffect, useRef } from 'react';
-import { Information } from 'loot-design/src/components/alerts';
-import { View, Text, Button } from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
+import { colors } from '../../style';
+import { Information } from '../alerts';
+import { View, Text, Button } from '../common';
import { Setting } from './UI';
diff --git a/packages/desktop-client/src/components/settings/Reset.js b/packages/desktop-client/src/components/settings/Reset.js
index e253f4601e..f17383cb45 100644
--- a/packages/desktop-client/src/components/settings/Reset.js
+++ b/packages/desktop-client/src/components/settings/Reset.js
@@ -1,7 +1,8 @@
import React, { useState } from 'react';
import { send } from 'loot-core/src/platform/client/fetch';
-import { Text, ButtonWithLoading } from 'loot-design/src/components/common';
+
+import { Text, ButtonWithLoading } from '../common';
import { Setting } from './UI';
diff --git a/packages/desktop-client/src/components/settings/UI.js b/packages/desktop-client/src/components/settings/UI.js
index 3eb49bd0db..eaa3aef485 100644
--- a/packages/desktop-client/src/components/settings/UI.js
+++ b/packages/desktop-client/src/components/settings/UI.js
@@ -3,9 +3,9 @@ import { useLocation } from 'react-router';
import { css, media } from 'glamor';
-import { View, Link } from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
-import tokens from 'loot-design/src/tokens';
+import { colors } from '../../style';
+import tokens from '../../tokens';
+import { View, Link } from '../common';
export function Setting({ primaryAction, style, children }) {
return (
diff --git a/packages/desktop-client/src/components/settings/index.js b/packages/desktop-client/src/components/settings/index.js
index 42acd21f70..b8f353c584 100644
--- a/packages/desktop-client/src/components/settings/index.js
+++ b/packages/desktop-client/src/components/settings/index.js
@@ -6,14 +6,14 @@ import { media } from 'glamor';
import * as actions from 'loot-core/src/client/actions';
import * as Platform from 'loot-core/src/client/platform';
import { listen } from 'loot-core/src/platform/client/fetch';
-import { View, Text, Button, Input } from 'loot-design/src/components/common';
-import { FormField, FormLabel } from 'loot-design/src/components/forms';
-import { colors } from 'loot-design/src/style';
-import tokens from 'loot-design/src/tokens';
-import { withThemeColor } from 'loot-design/src/util/withThemeColor';
import useLatestVersion, { useIsOutdated } from '../../hooks/useLatestVersion';
+import { colors } from '../../style';
+import tokens from '../../tokens';
import { isMobile } from '../../util';
+import { withThemeColor } from '../../util/withThemeColor';
+import { View, Text, Button, Input } from '../common';
+import { FormField, FormLabel } from '../forms';
import { Page } from '../Page';
import { useServerVersion } from '../ServerContext';
diff --git a/packages/loot-design/src/components/sidebar.js b/packages/desktop-client/src/components/sidebar.js
similarity index 96%
rename from packages/loot-design/src/components/sidebar.js
rename to packages/desktop-client/src/components/sidebar.js
index b751c73b5e..da6c61d8df 100644
--- a/packages/loot-design/src/components/sidebar.js
+++ b/packages/desktop-client/src/components/sidebar.js
@@ -5,17 +5,17 @@ import { css } from 'glamor';
import * as Platform from 'loot-core/src/client/platform';
+import Add from '../icons/v1/Add';
+import CheveronDown from '../icons/v1/CheveronDown';
+import CheveronRight from '../icons/v1/CheveronRight';
+import Cog from '../icons/v1/Cog';
+import Reports from '../icons/v1/Reports';
+import StoreFrontIcon from '../icons/v1/StoreFront';
+import TuningIcon from '../icons/v1/Tuning';
+import Wallet from '../icons/v1/Wallet';
+import ArrowButtonLeft1 from '../icons/v2/ArrowButtonLeft1';
+import CalendarIcon from '../icons/v2/Calendar';
import { styles, colors } from '../style';
-import Add from '../svg/v1/Add';
-import CheveronDown from '../svg/v1/CheveronDown';
-import CheveronRight from '../svg/v1/CheveronRight';
-import Cog from '../svg/v1/Cog';
-import Reports from '../svg/v1/Reports';
-import StoreFrontIcon from '../svg/v1/StoreFront';
-import TuningIcon from '../svg/v1/Tuning';
-import Wallet from '../svg/v1/Wallet';
-import ArrowButtonLeft1 from '../svg/v2/ArrowButtonLeft1';
-import CalendarIcon from '../svg/v2/Calendar';
import {
View,
diff --git a/packages/loot-design/src/components/sort.js b/packages/desktop-client/src/components/sort.js
similarity index 100%
rename from packages/loot-design/src/components/sort.js
rename to packages/desktop-client/src/components/sort.js
diff --git a/packages/loot-design/src/components/spreadsheet/CellValue.js b/packages/desktop-client/src/components/spreadsheet/CellValue.js
similarity index 100%
rename from packages/loot-design/src/components/spreadsheet/CellValue.js
rename to packages/desktop-client/src/components/spreadsheet/CellValue.js
diff --git a/packages/loot-design/src/components/spreadsheet/NamespaceContext.js b/packages/desktop-client/src/components/spreadsheet/NamespaceContext.js
similarity index 100%
rename from packages/loot-design/src/components/spreadsheet/NamespaceContext.js
rename to packages/desktop-client/src/components/spreadsheet/NamespaceContext.js
diff --git a/packages/loot-design/src/components/spreadsheet/SheetValue.js b/packages/desktop-client/src/components/spreadsheet/SheetValue.js
similarity index 94%
rename from packages/loot-design/src/components/spreadsheet/SheetValue.js
rename to packages/desktop-client/src/components/spreadsheet/SheetValue.js
index 93b72ba288..a0141db5a8 100644
--- a/packages/loot-design/src/components/spreadsheet/SheetValue.js
+++ b/packages/desktop-client/src/components/spreadsheet/SheetValue.js
@@ -1,7 +1,8 @@
import { useContext, useState, useRef, useLayoutEffect } from 'react';
+import { useSpreadsheet } from 'loot-core/src/client/SpreadsheetProvider';
+
import NamespaceContext from './NamespaceContext.js';
-import SpreadsheetContext from './SpreadsheetContext';
// !! Do not use this!! This is deprecated. Use the `useSheetValue`
// hook instead. The reason this hasn't been refactored on top of it
@@ -29,7 +30,7 @@ export default function SheetValue({
throw new Error('Binding name is now required');
}
- let spreadsheet = useContext(SpreadsheetContext);
+ let spreadsheet = useSpreadsheet();
let sheetName = useContext(NamespaceContext) || '__global';
let [result, setResult] = useState({
name: sheetName + '!' + binding.name,
diff --git a/packages/loot-design/src/components/spreadsheet/format.js b/packages/desktop-client/src/components/spreadsheet/format.js
similarity index 100%
rename from packages/loot-design/src/components/spreadsheet/format.js
rename to packages/desktop-client/src/components/spreadsheet/format.js
diff --git a/packages/loot-design/src/components/spreadsheet/useSheetValue.js b/packages/desktop-client/src/components/spreadsheet/useSheetValue.js
similarity index 94%
rename from packages/loot-design/src/components/spreadsheet/useSheetValue.js
rename to packages/desktop-client/src/components/spreadsheet/useSheetValue.js
index a90d89d15a..4050263b54 100644
--- a/packages/loot-design/src/components/spreadsheet/useSheetValue.js
+++ b/packages/desktop-client/src/components/spreadsheet/useSheetValue.js
@@ -1,7 +1,8 @@
import { useContext, useState, useRef, useLayoutEffect } from 'react';
+import { useSpreadsheet } from 'loot-core/src/client/SpreadsheetProvider';
+
import NamespaceContext from './NamespaceContext.js';
-import SpreadsheetContext from './SpreadsheetContext';
function unresolveName(name) {
let idx = name.indexOf('!');
@@ -38,7 +39,7 @@ export default function useSheetValue(binding, onChange) {
binding = { ...binding, name: unresolved.name };
}
- let spreadsheet = useContext(SpreadsheetContext);
+ let spreadsheet = useSpreadsheet();
let [result, setResult] = useState({
name: sheetName + '!' + binding.name,
value: binding.value === undefined ? null : binding.value,
diff --git a/packages/loot-design/src/components/table.js b/packages/desktop-client/src/components/table.js
similarity index 98%
rename from packages/loot-design/src/components/table.js
rename to packages/desktop-client/src/components/table.js
index 0add0198d9..3bb9901356 100644
--- a/packages/loot-design/src/components/table.js
+++ b/packages/desktop-client/src/components/table.js
@@ -11,11 +11,16 @@ import React, {
import { useStore } from 'react-redux';
import AutoSizer from 'react-virtualized-auto-sizer';
+import {
+ AvoidRefocusScrollProvider,
+ useProperFocus,
+} from '../hooks/useProperFocus';
+import { useSelectedItems } from '../hooks/useSelected';
+import AnimatedLoading from '../icons/AnimatedLoading';
+import DeleteIcon from '../icons/v0/Delete';
+import ExpandArrow from '../icons/v0/ExpandArrow';
+import Checkmark from '../icons/v1/Checkmark';
import { styles, colors } from '../style';
-import AnimatedLoading from '../svg/AnimatedLoading';
-import DeleteIcon from '../svg/v0/Delete';
-import ExpandArrow from '../svg/v0/ExpandArrow';
-import Checkmark from '../svg/v1/Checkmark';
import {
View,
@@ -30,8 +35,6 @@ import { FixedSizeList } from './FixedSizeList';
import { KeyHandlers } from './KeyHandlers';
import format from './spreadsheet/format';
import SheetValue from './spreadsheet/SheetValue';
-import { AvoidRefocusScrollProvider, useProperFocus } from './useProperFocus';
-import { useSelectedItems } from './useSelected';
export const ROW_HEIGHT = 32;
export const TABLE_BACKGROUND_COLOR = colors.n11;
diff --git a/packages/loot-design/src/components/tooltips.js b/packages/desktop-client/src/components/tooltips.js
similarity index 100%
rename from packages/loot-design/src/components/tooltips.js
rename to packages/desktop-client/src/components/tooltips.js
diff --git a/packages/desktop-client/src/components/tutorial/BudgetCategories.js b/packages/desktop-client/src/components/tutorial/BudgetCategories.js
index 24a0f26cac..c1ff56e303 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 { colors } from 'loot-design/src/style';
+import { colors } from '../../style';
+import { Tooltip, Pointer, P } from '../common';
import { Title } from './common';
import Navigation from './Navigation';
diff --git a/packages/desktop-client/src/components/tutorial/BudgetInitial.js b/packages/desktop-client/src/components/tutorial/BudgetInitial.js
index 78103baf5d..1adc4e80e2 100644
--- a/packages/desktop-client/src/components/tutorial/BudgetInitial.js
+++ b/packages/desktop-client/src/components/tutorial/BudgetInitial.js
@@ -4,7 +4,8 @@ import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import * as actions from 'loot-core/src/client/actions';
-import { P, Button } from 'loot-design/src/components/common';
+
+import { P, Button } from '../common';
import { Title, Standalone, useMinimized } from './common';
import Navigation from './Navigation';
diff --git a/packages/desktop-client/src/components/tutorial/BudgetNewIncome.js b/packages/desktop-client/src/components/tutorial/BudgetNewIncome.js
index ae04442c54..cf20b997a9 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 { colors } from 'loot-design/src/style';
+import { colors } from '../../style';
+import { Tooltip, Pointer, P } from '../common';
import { Title } from './common';
import Navigation from './Navigation';
diff --git a/packages/desktop-client/src/components/tutorial/BudgetNextMonth.js b/packages/desktop-client/src/components/tutorial/BudgetNextMonth.js
index b4a08ad3eb..65bf0418d5 100644
--- a/packages/desktop-client/src/components/tutorial/BudgetNextMonth.js
+++ b/packages/desktop-client/src/components/tutorial/BudgetNextMonth.js
@@ -4,7 +4,8 @@ import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import * as actions from 'loot-core/src/client/actions';
-import { View, P, Button } from 'loot-design/src/components/common';
+
+import { View, P, Button } from '../common';
import { Standalone, Title, useMinimized } from './common';
import Navigation from './Navigation';
diff --git a/packages/desktop-client/src/components/tutorial/BudgetSummary.js b/packages/desktop-client/src/components/tutorial/BudgetSummary.js
index fa67a9abe5..4c3c4551b6 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 { colors } from 'loot-design/src/style';
+import { colors } from '../../style';
+import { Tooltip, Pointer, P } from '../common';
import { Title } from './common';
import Navigation from './Navigation';
diff --git a/packages/desktop-client/src/components/tutorial/CategoryBalance.js b/packages/desktop-client/src/components/tutorial/CategoryBalance.js
index fcee158d40..198f0e0a5b 100644
--- a/packages/desktop-client/src/components/tutorial/CategoryBalance.js
+++ b/packages/desktop-client/src/components/tutorial/CategoryBalance.js
@@ -1,6 +1,6 @@
import React from 'react';
-import { P, Button } from 'loot-design/src/components/common';
+import { P, Button } from '../common';
import { Standalone, Title, useMinimized } from './common';
import Navigation from './Navigation';
diff --git a/packages/desktop-client/src/components/tutorial/DeleteTransactions.js b/packages/desktop-client/src/components/tutorial/DeleteTransactions.js
index 504628577c..5d68fb04b3 100644
--- a/packages/desktop-client/src/components/tutorial/DeleteTransactions.js
+++ b/packages/desktop-client/src/components/tutorial/DeleteTransactions.js
@@ -1,6 +1,6 @@
import React from 'react';
-import { P } from 'loot-design/src/components/common';
+import { P } from '../common';
import { Standalone, Title } from './common';
import Navigation from './Navigation';
diff --git a/packages/desktop-client/src/components/tutorial/Final.js b/packages/desktop-client/src/components/tutorial/Final.js
index 183be07965..5b43f6bed9 100644
--- a/packages/desktop-client/src/components/tutorial/Final.js
+++ b/packages/desktop-client/src/components/tutorial/Final.js
@@ -1,6 +1,6 @@
import React from 'react';
-import { P, ModalButtons, Button } from 'loot-design/src/components/common';
+import { P, ModalButtons, Button } from '../common';
import { Standalone, Title, ExternalLink } from './common';
diff --git a/packages/desktop-client/src/components/tutorial/Intro.js b/packages/desktop-client/src/components/tutorial/Intro.js
index 0524c04b99..ca3bc1023d 100644
--- a/packages/desktop-client/src/components/tutorial/Intro.js
+++ b/packages/desktop-client/src/components/tutorial/Intro.js
@@ -1,12 +1,6 @@
import React from 'react';
-import {
- View,
- Text,
- P,
- ModalButtons,
- Button,
-} from 'loot-design/src/components/common';
+import { View, Text, P, ModalButtons, Button } from '../common';
import { Standalone, Title, ExternalLink } from './common';
diff --git a/packages/desktop-client/src/components/tutorial/Navigation.js b/packages/desktop-client/src/components/tutorial/Navigation.js
index a3fe222369..f673d7cecb 100644
--- a/packages/desktop-client/src/components/tutorial/Navigation.js
+++ b/packages/desktop-client/src/components/tutorial/Navigation.js
@@ -1,6 +1,6 @@
import React from 'react';
-import { Button, ModalButtons } from 'loot-design/src/components/common';
+import { Button, ModalButtons } from '../common';
function Navigation({
nextTutorialStage,
diff --git a/packages/desktop-client/src/components/tutorial/Overspending.js b/packages/desktop-client/src/components/tutorial/Overspending.js
index a7d024ff51..6ad541dca0 100644
--- a/packages/desktop-client/src/components/tutorial/Overspending.js
+++ b/packages/desktop-client/src/components/tutorial/Overspending.js
@@ -6,9 +6,10 @@ import { bindActionCreators } from 'redux';
import * as actions from 'loot-core/src/client/actions';
import * as monthUtils from 'loot-core/src/shared/months';
import { integerToCurrency } from 'loot-core/src/shared/util';
-import { P, View, Text, Button } from 'loot-design/src/components/common';
-import NamespaceContext from 'loot-design/src/components/spreadsheet/NamespaceContext';
-import SheetValue from 'loot-design/src/components/spreadsheet/SheetValue';
+
+import { P, View, Text, Button } from '../common';
+import NamespaceContext from '../spreadsheet/NamespaceContext';
+import SheetValue from '../spreadsheet/SheetValue';
import { Standalone, Title, useMinimized } from './common';
import Navigation from './Navigation';
diff --git a/packages/desktop-client/src/components/tutorial/TransactionAdd.js b/packages/desktop-client/src/components/tutorial/TransactionAdd.js
index 42e0c3ad66..081ca6836d 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 { colors } from 'loot-design/src/style';
+import { colors } from '../../style';
+import { Tooltip, Pointer, P } from '../common';
import { Title } from './common';
import Navigation from './Navigation';
diff --git a/packages/desktop-client/src/components/tutorial/TransactionEnter.js b/packages/desktop-client/src/components/tutorial/TransactionEnter.js
index ce19c35096..6f4eae659e 100644
--- a/packages/desktop-client/src/components/tutorial/TransactionEnter.js
+++ b/packages/desktop-client/src/components/tutorial/TransactionEnter.js
@@ -1,6 +1,6 @@
import React from 'react';
-import { P } from 'loot-design/src/components/common';
+import { P } from '../common';
import { Standalone, Title } from './common';
import Navigation from './Navigation';
diff --git a/packages/desktop-client/src/components/tutorial/TransactionFinalize.js b/packages/desktop-client/src/components/tutorial/TransactionFinalize.js
index 847aa82631..71a9fb9982 100644
--- a/packages/desktop-client/src/components/tutorial/TransactionFinalize.js
+++ b/packages/desktop-client/src/components/tutorial/TransactionFinalize.js
@@ -2,7 +2,7 @@ import React from 'react';
import { css } from 'glamor';
-import { P } from 'loot-design/src/components/common';
+import { P } from '../common';
import { Standalone } from './common';
import Navigation from './Navigation';
diff --git a/packages/desktop-client/src/components/tutorial/common.js b/packages/desktop-client/src/components/tutorial/common.js
index 3558420c30..8ce32a4876 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 { colors } from 'loot-design/src/style';
+import { colors } from '../../style';
+import { View, AnchorLink } from '../common';
import AnimateIn from './AnimateIn';
diff --git a/packages/desktop-client/src/components/util/AmountInput.js b/packages/desktop-client/src/components/util/AmountInput.js
index d9849a78a7..1501f58bc6 100644
--- a/packages/desktop-client/src/components/util/AmountInput.js
+++ b/packages/desktop-client/src/components/util/AmountInput.js
@@ -4,13 +4,10 @@ import {
integerToCurrency,
currencyToInteger,
} from 'loot-core/src/shared/util';
-import {
- View,
- Button,
- InputWithContent,
-} from 'loot-design/src/components/common';
-import Add from 'loot-design/src/svg/v1/Add';
-import Subtract from 'loot-design/src/svg/v1/Subtract';
+
+import Add from '../../icons/v1/Add';
+import Subtract from '../../icons/v1/Subtract';
+import { View, Button, InputWithContent } from '../common';
export function AmountInput({ id, defaultValue = 0, onChange, style }) {
let [negative, setNegative] = useState(defaultValue <= 0);
diff --git a/packages/desktop-client/src/components/util/DisplayId.js b/packages/desktop-client/src/components/util/DisplayId.js
index 32750967cf..08741f5c85 100644
--- a/packages/desktop-client/src/components/util/DisplayId.js
+++ b/packages/desktop-client/src/components/util/DisplayId.js
@@ -2,8 +2,9 @@ import React from 'react';
import { CachedAccounts } from 'loot-core/src/client/data-hooks/accounts';
import { CachedPayees } from 'loot-core/src/client/data-hooks/payees';
-import { Text } from 'loot-design/src/components/common';
-import { colors } from 'loot-design/src/style';
+
+import { colors } from '../../style';
+import { Text } from '../common';
export default function DisplayId({ type, id, noneColor = colors.n8 }) {
let DataComponent;
diff --git a/packages/desktop-client/src/components/util/GenericInput.js b/packages/desktop-client/src/components/util/GenericInput.js
index 6646c47022..f0f4866317 100644
--- a/packages/desktop-client/src/components/util/GenericInput.js
+++ b/packages/desktop-client/src/components/util/GenericInput.js
@@ -2,20 +2,20 @@ import React from 'react';
import { useSelector } from 'react-redux';
import { getMonthYearFormat } from 'loot-core/src/shared/months';
-import LegacyAccountAutocomplete from 'loot-design/src/components/AccountAutocomplete';
-import LegacyAutocomplete from 'loot-design/src/components/Autocomplete';
-import NewCategoryAutocomplete from 'loot-design/src/components/CategoryAutocomplete';
-import LegacyCategoryAutocomplete from 'loot-design/src/components/CategorySelect';
-import { View, Input } from 'loot-design/src/components/common';
-import DateSelect from 'loot-design/src/components/DateSelect';
-import { Checkbox } from 'loot-design/src/components/forms';
-import NewAccountAutocomplete from 'loot-design/src/components/NewAccountAutocomplete';
-import NewAutocomplete from 'loot-design/src/components/NewAutocomplete';
-import NewPayeeAutocomplete from 'loot-design/src/components/NewPayeeAutocomplete';
-import LegacyPayeeAutocomplete from 'loot-design/src/components/PayeeAutocomplete';
-import RecurringSchedulePicker from 'loot-design/src/components/RecurringSchedulePicker';
import useFeatureFlag from '../../hooks/useFeatureFlag';
+import LegacyAccountAutocomplete from '../autocomplete/AccountAutocomplete';
+import LegacyAutocomplete from '../autocomplete/Autocomplete';
+import NewCategoryAutocomplete from '../autocomplete/CategoryAutocomplete';
+import LegacyCategoryAutocomplete from '../autocomplete/CategorySelect';
+import NewAccountAutocomplete from '../autocomplete/NewAccountAutocomplete';
+import NewAutocomplete from '../autocomplete/NewAutocomplete';
+import NewPayeeAutocomplete from '../autocomplete/NewPayeeAutocomplete';
+import LegacyPayeeAutocomplete from '../autocomplete/PayeeAutocomplete';
+import { View, Input } from '../common';
+import { Checkbox } from '../forms';
+import DateSelect from '../select/DateSelect';
+import RecurringSchedulePicker from '../select/RecurringSchedulePicker';
export default function GenericInput({
field,
diff --git a/packages/loot-design/src/components/hooks.js b/packages/desktop-client/src/hooks/index.js
similarity index 100%
rename from packages/loot-design/src/components/hooks.js
rename to packages/desktop-client/src/hooks/index.js
diff --git a/packages/desktop-client/src/hooks/useFeatureFlag.js b/packages/desktop-client/src/hooks/useFeatureFlag.js
index 702de577cc..47fd3cb3fd 100644
--- a/packages/desktop-client/src/hooks/useFeatureFlag.js
+++ b/packages/desktop-client/src/hooks/useFeatureFlag.js
@@ -1,6 +1,6 @@
import { useSelector } from 'react-redux';
-import { isNonProductionEnvironment } from 'loot-design/src/util/environment';
+import { isNonProductionEnvironment } from 'loot-core/src/shared/environment';
const DEFAULT_FEATURE_FLAG_STATE = {
newAutocomplete: isNonProductionEnvironment(),
diff --git a/packages/loot-design/src/components/useMergedRefs.js b/packages/desktop-client/src/hooks/useMergedRefs.js
similarity index 100%
rename from packages/loot-design/src/components/useMergedRefs.js
rename to packages/desktop-client/src/hooks/useMergedRefs.js
diff --git a/packages/loot-design/src/components/useProperFocus.js b/packages/desktop-client/src/hooks/useProperFocus.js
similarity index 100%
rename from packages/loot-design/src/components/useProperFocus.js
rename to packages/desktop-client/src/hooks/useProperFocus.js
diff --git a/packages/loot-design/src/components/useResizeObserver.js b/packages/desktop-client/src/hooks/useResizeObserver.js
similarity index 100%
rename from packages/loot-design/src/components/useResizeObserver.js
rename to packages/desktop-client/src/hooks/useResizeObserver.js
diff --git a/packages/loot-design/src/components/useSelected.js b/packages/desktop-client/src/hooks/useSelected.js
similarity index 100%
rename from packages/loot-design/src/components/useSelected.js
rename to packages/desktop-client/src/hooks/useSelected.js
diff --git a/packages/loot-design/src/svg/.gitignore b/packages/desktop-client/src/icons/.gitignore
similarity index 100%
rename from packages/loot-design/src/svg/.gitignore
rename to packages/desktop-client/src/icons/.gitignore
diff --git a/packages/loot-design/src/svg/.svgrrc.js b/packages/desktop-client/src/icons/.svgrrc.js
similarity index 100%
rename from packages/loot-design/src/svg/.svgrrc.js
rename to packages/desktop-client/src/icons/.svgrrc.js
diff --git a/packages/loot-design/src/svg/AnimatedLoading.js b/packages/desktop-client/src/icons/AnimatedLoading.js
similarity index 100%
rename from packages/loot-design/src/svg/AnimatedLoading.js
rename to packages/desktop-client/src/icons/AnimatedLoading.js
diff --git a/packages/loot-design/src/svg/Loading.js b/packages/desktop-client/src/icons/Loading.js
similarity index 100%
rename from packages/loot-design/src/svg/Loading.js
rename to packages/desktop-client/src/icons/Loading.js
diff --git a/packages/loot-design/src/svg/add-attribute.js b/packages/desktop-client/src/icons/add-attribute.js
similarity index 100%
rename from packages/loot-design/src/svg/add-attribute.js
rename to packages/desktop-client/src/icons/add-attribute.js
diff --git a/packages/loot-design/src/svg/generate-new.sh b/packages/desktop-client/src/icons/generate-new.sh
similarity index 100%
rename from packages/loot-design/src/svg/generate-new.sh
rename to packages/desktop-client/src/icons/generate-new.sh
diff --git a/packages/loot-design/src/svg/logo/Logo.js b/packages/desktop-client/src/icons/logo/Logo.js
similarity index 100%
rename from packages/loot-design/src/svg/logo/Logo.js
rename to packages/desktop-client/src/icons/logo/Logo.js
diff --git a/packages/loot-design/src/svg/logo/logo.svg b/packages/desktop-client/src/icons/logo/logo.svg
similarity index 100%
rename from packages/loot-design/src/svg/logo/logo.svg
rename to packages/desktop-client/src/icons/logo/logo.svg
diff --git a/packages/loot-design/src/svg/v0/Add.js b/packages/desktop-client/src/icons/v0/Add.js
similarity index 100%
rename from packages/loot-design/src/svg/v0/Add.js
rename to packages/desktop-client/src/icons/v0/Add.js
diff --git a/packages/loot-design/src/svg/v0/Add.svg b/packages/desktop-client/src/icons/v0/Add.svg
similarity index 100%
rename from packages/loot-design/src/svg/v0/Add.svg
rename to packages/desktop-client/src/icons/v0/Add.svg
diff --git a/packages/loot-design/src/svg/v0/Delete.js b/packages/desktop-client/src/icons/v0/Delete.js
similarity index 100%
rename from packages/loot-design/src/svg/v0/Delete.js
rename to packages/desktop-client/src/icons/v0/Delete.js
diff --git a/packages/loot-design/src/svg/v0/Delete.svg b/packages/desktop-client/src/icons/v0/Delete.svg
similarity index 100%
rename from packages/loot-design/src/svg/v0/Delete.svg
rename to packages/desktop-client/src/icons/v0/Delete.svg
diff --git a/packages/loot-design/src/svg/v0/ExpandArrow.js b/packages/desktop-client/src/icons/v0/ExpandArrow.js
similarity index 100%
rename from packages/loot-design/src/svg/v0/ExpandArrow.js
rename to packages/desktop-client/src/icons/v0/ExpandArrow.js
diff --git a/packages/loot-design/src/svg/v0/ExpandArrow.svg b/packages/desktop-client/src/icons/v0/ExpandArrow.svg
similarity index 100%
rename from packages/loot-design/src/svg/v0/ExpandArrow.svg
rename to packages/desktop-client/src/icons/v0/ExpandArrow.svg
diff --git a/packages/loot-design/src/svg/v0/LeftArrow2.js b/packages/desktop-client/src/icons/v0/LeftArrow2.js
similarity index 100%
rename from packages/loot-design/src/svg/v0/LeftArrow2.js
rename to packages/desktop-client/src/icons/v0/LeftArrow2.js
diff --git a/packages/loot-design/src/svg/v0/LeftArrow2.svg b/packages/desktop-client/src/icons/v0/LeftArrow2.svg
similarity index 100%
rename from packages/loot-design/src/svg/v0/LeftArrow2.svg
rename to packages/desktop-client/src/icons/v0/LeftArrow2.svg
diff --git a/packages/loot-design/src/svg/v0/Math.js b/packages/desktop-client/src/icons/v0/Math.js
similarity index 100%
rename from packages/loot-design/src/svg/v0/Math.js
rename to packages/desktop-client/src/icons/v0/Math.js
diff --git a/packages/loot-design/src/svg/v0/Math.svg b/packages/desktop-client/src/icons/v0/Math.svg
similarity index 100%
rename from packages/loot-design/src/svg/v0/Math.svg
rename to packages/desktop-client/src/icons/v0/Math.svg
diff --git a/packages/loot-design/src/svg/v0/Merge.js b/packages/desktop-client/src/icons/v0/Merge.js
similarity index 100%
rename from packages/loot-design/src/svg/v0/Merge.js
rename to packages/desktop-client/src/icons/v0/Merge.js
diff --git a/packages/loot-design/src/svg/v0/RightArrow2.js b/packages/desktop-client/src/icons/v0/RightArrow2.js
similarity index 100%
rename from packages/loot-design/src/svg/v0/RightArrow2.js
rename to packages/desktop-client/src/icons/v0/RightArrow2.js
diff --git a/packages/loot-design/src/svg/v0/RightArrow2.svg b/packages/desktop-client/src/icons/v0/RightArrow2.svg
similarity index 100%
rename from packages/loot-design/src/svg/v0/RightArrow2.svg
rename to packages/desktop-client/src/icons/v0/RightArrow2.svg
diff --git a/packages/loot-design/src/svg/v0/Split.js b/packages/desktop-client/src/icons/v0/Split.js
similarity index 100%
rename from packages/loot-design/src/svg/v0/Split.js
rename to packages/desktop-client/src/icons/v0/Split.js
diff --git a/packages/loot-design/src/svg/v0/Subtract.js b/packages/desktop-client/src/icons/v0/Subtract.js
similarity index 100%
rename from packages/loot-design/src/svg/v0/Subtract.js
rename to packages/desktop-client/src/icons/v0/Subtract.js
diff --git a/packages/loot-design/src/svg/v0/Subtract.svg b/packages/desktop-client/src/icons/v0/Subtract.svg
similarity index 100%
rename from packages/loot-design/src/svg/v0/Subtract.svg
rename to packages/desktop-client/src/icons/v0/Subtract.svg
diff --git a/packages/loot-design/src/svg/v0/merge.svg b/packages/desktop-client/src/icons/v0/merge.svg
similarity index 100%
rename from packages/loot-design/src/svg/v0/merge.svg
rename to packages/desktop-client/src/icons/v0/merge.svg
diff --git a/packages/loot-design/src/svg/v0/split.svg b/packages/desktop-client/src/icons/v0/split.svg
similarity index 100%
rename from packages/loot-design/src/svg/v0/split.svg
rename to packages/desktop-client/src/icons/v0/split.svg
diff --git a/packages/loot-design/src/svg/v1/Add.js b/packages/desktop-client/src/icons/v1/Add.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Add.js
rename to packages/desktop-client/src/icons/v1/Add.js
diff --git a/packages/loot-design/src/svg/v1/AddOutline.js b/packages/desktop-client/src/icons/v1/AddOutline.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/AddOutline.js
rename to packages/desktop-client/src/icons/v1/AddOutline.js
diff --git a/packages/loot-design/src/svg/v1/AddSolid.js b/packages/desktop-client/src/icons/v1/AddSolid.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/AddSolid.js
rename to packages/desktop-client/src/icons/v1/AddSolid.js
diff --git a/packages/loot-design/src/svg/v1/Adjust.js b/packages/desktop-client/src/icons/v1/Adjust.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Adjust.js
rename to packages/desktop-client/src/icons/v1/Adjust.js
diff --git a/packages/loot-design/src/svg/v1/Airplane.js b/packages/desktop-client/src/icons/v1/Airplane.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Airplane.js
rename to packages/desktop-client/src/icons/v1/Airplane.js
diff --git a/packages/loot-design/src/svg/v1/Album.js b/packages/desktop-client/src/icons/v1/Album.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Album.js
rename to packages/desktop-client/src/icons/v1/Album.js
diff --git a/packages/loot-design/src/svg/v1/AlignCenter.js b/packages/desktop-client/src/icons/v1/AlignCenter.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/AlignCenter.js
rename to packages/desktop-client/src/icons/v1/AlignCenter.js
diff --git a/packages/loot-design/src/svg/v1/AlignJustified.js b/packages/desktop-client/src/icons/v1/AlignJustified.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/AlignJustified.js
rename to packages/desktop-client/src/icons/v1/AlignJustified.js
diff --git a/packages/loot-design/src/svg/v1/AlignLeft.js b/packages/desktop-client/src/icons/v1/AlignLeft.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/AlignLeft.js
rename to packages/desktop-client/src/icons/v1/AlignLeft.js
diff --git a/packages/loot-design/src/svg/v1/AlignRight.js b/packages/desktop-client/src/icons/v1/AlignRight.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/AlignRight.js
rename to packages/desktop-client/src/icons/v1/AlignRight.js
diff --git a/packages/loot-design/src/svg/v1/Anchor.js b/packages/desktop-client/src/icons/v1/Anchor.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Anchor.js
rename to packages/desktop-client/src/icons/v1/Anchor.js
diff --git a/packages/loot-design/src/svg/v1/Announcement.js b/packages/desktop-client/src/icons/v1/Announcement.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Announcement.js
rename to packages/desktop-client/src/icons/v1/Announcement.js
diff --git a/packages/loot-design/src/svg/v1/Apparel.js b/packages/desktop-client/src/icons/v1/Apparel.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Apparel.js
rename to packages/desktop-client/src/icons/v1/Apparel.js
diff --git a/packages/loot-design/src/svg/v1/ArrowDown.js b/packages/desktop-client/src/icons/v1/ArrowDown.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ArrowDown.js
rename to packages/desktop-client/src/icons/v1/ArrowDown.js
diff --git a/packages/loot-design/src/svg/v1/ArrowLeft.js b/packages/desktop-client/src/icons/v1/ArrowLeft.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ArrowLeft.js
rename to packages/desktop-client/src/icons/v1/ArrowLeft.js
diff --git a/packages/loot-design/src/svg/v1/ArrowOutlineDown.js b/packages/desktop-client/src/icons/v1/ArrowOutlineDown.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ArrowOutlineDown.js
rename to packages/desktop-client/src/icons/v1/ArrowOutlineDown.js
diff --git a/packages/loot-design/src/svg/v1/ArrowOutlineLeft.js b/packages/desktop-client/src/icons/v1/ArrowOutlineLeft.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ArrowOutlineLeft.js
rename to packages/desktop-client/src/icons/v1/ArrowOutlineLeft.js
diff --git a/packages/loot-design/src/svg/v1/ArrowOutlineRight.js b/packages/desktop-client/src/icons/v1/ArrowOutlineRight.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ArrowOutlineRight.js
rename to packages/desktop-client/src/icons/v1/ArrowOutlineRight.js
diff --git a/packages/loot-design/src/svg/v1/ArrowOutlineUp.js b/packages/desktop-client/src/icons/v1/ArrowOutlineUp.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ArrowOutlineUp.js
rename to packages/desktop-client/src/icons/v1/ArrowOutlineUp.js
diff --git a/packages/loot-design/src/svg/v1/ArrowRight.js b/packages/desktop-client/src/icons/v1/ArrowRight.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ArrowRight.js
rename to packages/desktop-client/src/icons/v1/ArrowRight.js
diff --git a/packages/loot-design/src/svg/v1/ArrowThickDown.js b/packages/desktop-client/src/icons/v1/ArrowThickDown.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ArrowThickDown.js
rename to packages/desktop-client/src/icons/v1/ArrowThickDown.js
diff --git a/packages/loot-design/src/svg/v1/ArrowThickLeft.js b/packages/desktop-client/src/icons/v1/ArrowThickLeft.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ArrowThickLeft.js
rename to packages/desktop-client/src/icons/v1/ArrowThickLeft.js
diff --git a/packages/loot-design/src/svg/v1/ArrowThickRight.js b/packages/desktop-client/src/icons/v1/ArrowThickRight.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ArrowThickRight.js
rename to packages/desktop-client/src/icons/v1/ArrowThickRight.js
diff --git a/packages/loot-design/src/svg/v1/ArrowThickUp.js b/packages/desktop-client/src/icons/v1/ArrowThickUp.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ArrowThickUp.js
rename to packages/desktop-client/src/icons/v1/ArrowThickUp.js
diff --git a/packages/loot-design/src/svg/v1/ArrowThinDown.js b/packages/desktop-client/src/icons/v1/ArrowThinDown.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ArrowThinDown.js
rename to packages/desktop-client/src/icons/v1/ArrowThinDown.js
diff --git a/packages/loot-design/src/svg/v1/ArrowThinLeft.js b/packages/desktop-client/src/icons/v1/ArrowThinLeft.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ArrowThinLeft.js
rename to packages/desktop-client/src/icons/v1/ArrowThinLeft.js
diff --git a/packages/loot-design/src/svg/v1/ArrowThinRight.js b/packages/desktop-client/src/icons/v1/ArrowThinRight.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ArrowThinRight.js
rename to packages/desktop-client/src/icons/v1/ArrowThinRight.js
diff --git a/packages/loot-design/src/svg/v1/ArrowThinUp.js b/packages/desktop-client/src/icons/v1/ArrowThinUp.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ArrowThinUp.js
rename to packages/desktop-client/src/icons/v1/ArrowThinUp.js
diff --git a/packages/loot-design/src/svg/v1/ArrowUp.js b/packages/desktop-client/src/icons/v1/ArrowUp.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ArrowUp.js
rename to packages/desktop-client/src/icons/v1/ArrowUp.js
diff --git a/packages/loot-design/src/svg/v1/Artist.js b/packages/desktop-client/src/icons/v1/Artist.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Artist.js
rename to packages/desktop-client/src/icons/v1/Artist.js
diff --git a/packages/loot-design/src/svg/v1/AtSymbol.js b/packages/desktop-client/src/icons/v1/AtSymbol.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/AtSymbol.js
rename to packages/desktop-client/src/icons/v1/AtSymbol.js
diff --git a/packages/loot-design/src/svg/v1/Attachment.js b/packages/desktop-client/src/icons/v1/Attachment.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Attachment.js
rename to packages/desktop-client/src/icons/v1/Attachment.js
diff --git a/packages/loot-design/src/svg/v1/Backspace.js b/packages/desktop-client/src/icons/v1/Backspace.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Backspace.js
rename to packages/desktop-client/src/icons/v1/Backspace.js
diff --git a/packages/loot-design/src/svg/v1/Backward.js b/packages/desktop-client/src/icons/v1/Backward.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Backward.js
rename to packages/desktop-client/src/icons/v1/Backward.js
diff --git a/packages/loot-design/src/svg/v1/BackwardStep.js b/packages/desktop-client/src/icons/v1/BackwardStep.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BackwardStep.js
rename to packages/desktop-client/src/icons/v1/BackwardStep.js
diff --git a/packages/loot-design/src/svg/v1/Badge.js b/packages/desktop-client/src/icons/v1/Badge.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Badge.js
rename to packages/desktop-client/src/icons/v1/Badge.js
diff --git a/packages/loot-design/src/svg/v1/BatteryFull.js b/packages/desktop-client/src/icons/v1/BatteryFull.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BatteryFull.js
rename to packages/desktop-client/src/icons/v1/BatteryFull.js
diff --git a/packages/loot-design/src/svg/v1/BatteryHalf.js b/packages/desktop-client/src/icons/v1/BatteryHalf.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BatteryHalf.js
rename to packages/desktop-client/src/icons/v1/BatteryHalf.js
diff --git a/packages/loot-design/src/svg/v1/BatteryLow.js b/packages/desktop-client/src/icons/v1/BatteryLow.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BatteryLow.js
rename to packages/desktop-client/src/icons/v1/BatteryLow.js
diff --git a/packages/loot-design/src/svg/v1/Beverage.js b/packages/desktop-client/src/icons/v1/Beverage.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Beverage.js
rename to packages/desktop-client/src/icons/v1/Beverage.js
diff --git a/packages/loot-design/src/svg/v1/Block.js b/packages/desktop-client/src/icons/v1/Block.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Block.js
rename to packages/desktop-client/src/icons/v1/Block.js
diff --git a/packages/loot-design/src/svg/v1/Bluetooth.js b/packages/desktop-client/src/icons/v1/Bluetooth.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Bluetooth.js
rename to packages/desktop-client/src/icons/v1/Bluetooth.js
diff --git a/packages/loot-design/src/svg/v1/Bolt.js b/packages/desktop-client/src/icons/v1/Bolt.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Bolt.js
rename to packages/desktop-client/src/icons/v1/Bolt.js
diff --git a/packages/loot-design/src/svg/v1/BookReference.js b/packages/desktop-client/src/icons/v1/BookReference.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BookReference.js
rename to packages/desktop-client/src/icons/v1/BookReference.js
diff --git a/packages/loot-design/src/svg/v1/Bookmark.js b/packages/desktop-client/src/icons/v1/Bookmark.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Bookmark.js
rename to packages/desktop-client/src/icons/v1/Bookmark.js
diff --git a/packages/loot-design/src/svg/v1/BookmarkCopy2.js b/packages/desktop-client/src/icons/v1/BookmarkCopy2.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BookmarkCopy2.js
rename to packages/desktop-client/src/icons/v1/BookmarkCopy2.js
diff --git a/packages/loot-design/src/svg/v1/BookmarkCopy3.js b/packages/desktop-client/src/icons/v1/BookmarkCopy3.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BookmarkCopy3.js
rename to packages/desktop-client/src/icons/v1/BookmarkCopy3.js
diff --git a/packages/loot-design/src/svg/v1/BookmarkOutline.js b/packages/desktop-client/src/icons/v1/BookmarkOutline.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BookmarkOutline.js
rename to packages/desktop-client/src/icons/v1/BookmarkOutline.js
diff --git a/packages/loot-design/src/svg/v1/BookmarkOutlineAdd.js b/packages/desktop-client/src/icons/v1/BookmarkOutlineAdd.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BookmarkOutlineAdd.js
rename to packages/desktop-client/src/icons/v1/BookmarkOutlineAdd.js
diff --git a/packages/loot-design/src/svg/v1/BorderAll.js b/packages/desktop-client/src/icons/v1/BorderAll.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BorderAll.js
rename to packages/desktop-client/src/icons/v1/BorderAll.js
diff --git a/packages/loot-design/src/svg/v1/BorderBottom.js b/packages/desktop-client/src/icons/v1/BorderBottom.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BorderBottom.js
rename to packages/desktop-client/src/icons/v1/BorderBottom.js
diff --git a/packages/loot-design/src/svg/v1/BorderHorizontal.js b/packages/desktop-client/src/icons/v1/BorderHorizontal.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BorderHorizontal.js
rename to packages/desktop-client/src/icons/v1/BorderHorizontal.js
diff --git a/packages/loot-design/src/svg/v1/BorderInner.js b/packages/desktop-client/src/icons/v1/BorderInner.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BorderInner.js
rename to packages/desktop-client/src/icons/v1/BorderInner.js
diff --git a/packages/loot-design/src/svg/v1/BorderLeft.js b/packages/desktop-client/src/icons/v1/BorderLeft.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BorderLeft.js
rename to packages/desktop-client/src/icons/v1/BorderLeft.js
diff --git a/packages/loot-design/src/svg/v1/BorderNone.js b/packages/desktop-client/src/icons/v1/BorderNone.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BorderNone.js
rename to packages/desktop-client/src/icons/v1/BorderNone.js
diff --git a/packages/loot-design/src/svg/v1/BorderOuter.js b/packages/desktop-client/src/icons/v1/BorderOuter.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BorderOuter.js
rename to packages/desktop-client/src/icons/v1/BorderOuter.js
diff --git a/packages/loot-design/src/svg/v1/BorderRight.js b/packages/desktop-client/src/icons/v1/BorderRight.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BorderRight.js
rename to packages/desktop-client/src/icons/v1/BorderRight.js
diff --git a/packages/loot-design/src/svg/v1/BorderTop.js b/packages/desktop-client/src/icons/v1/BorderTop.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BorderTop.js
rename to packages/desktop-client/src/icons/v1/BorderTop.js
diff --git a/packages/loot-design/src/svg/v1/BorderVertical.js b/packages/desktop-client/src/icons/v1/BorderVertical.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BorderVertical.js
rename to packages/desktop-client/src/icons/v1/BorderVertical.js
diff --git a/packages/loot-design/src/svg/v1/Box.js b/packages/desktop-client/src/icons/v1/Box.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Box.js
rename to packages/desktop-client/src/icons/v1/Box.js
diff --git a/packages/loot-design/src/svg/v1/BrightnessDown.js b/packages/desktop-client/src/icons/v1/BrightnessDown.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BrightnessDown.js
rename to packages/desktop-client/src/icons/v1/BrightnessDown.js
diff --git a/packages/loot-design/src/svg/v1/BrightnessUp.js b/packages/desktop-client/src/icons/v1/BrightnessUp.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BrightnessUp.js
rename to packages/desktop-client/src/icons/v1/BrightnessUp.js
diff --git a/packages/loot-design/src/svg/v1/BrowserWindow.js b/packages/desktop-client/src/icons/v1/BrowserWindow.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BrowserWindow.js
rename to packages/desktop-client/src/icons/v1/BrowserWindow.js
diff --git a/packages/loot-design/src/svg/v1/BrowserWindowNew.js b/packages/desktop-client/src/icons/v1/BrowserWindowNew.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BrowserWindowNew.js
rename to packages/desktop-client/src/icons/v1/BrowserWindowNew.js
diff --git a/packages/loot-design/src/svg/v1/BrowserWindowOpen.js b/packages/desktop-client/src/icons/v1/BrowserWindowOpen.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/BrowserWindowOpen.js
rename to packages/desktop-client/src/icons/v1/BrowserWindowOpen.js
diff --git a/packages/loot-design/src/svg/v1/Bug.js b/packages/desktop-client/src/icons/v1/Bug.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Bug.js
rename to packages/desktop-client/src/icons/v1/Bug.js
diff --git a/packages/loot-design/src/svg/v1/Buoy.js b/packages/desktop-client/src/icons/v1/Buoy.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Buoy.js
rename to packages/desktop-client/src/icons/v1/Buoy.js
diff --git a/packages/loot-design/src/svg/v1/Calculator.js b/packages/desktop-client/src/icons/v1/Calculator.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Calculator.js
rename to packages/desktop-client/src/icons/v1/Calculator.js
diff --git a/packages/loot-design/src/svg/v1/Calendar.js b/packages/desktop-client/src/icons/v1/Calendar.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Calendar.js
rename to packages/desktop-client/src/icons/v1/Calendar.js
diff --git a/packages/loot-design/src/svg/v1/Camera.js b/packages/desktop-client/src/icons/v1/Camera.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Camera.js
rename to packages/desktop-client/src/icons/v1/Camera.js
diff --git a/packages/loot-design/src/svg/v1/Chart.js b/packages/desktop-client/src/icons/v1/Chart.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Chart.js
rename to packages/desktop-client/src/icons/v1/Chart.js
diff --git a/packages/loot-design/src/svg/v1/ChartBar.js b/packages/desktop-client/src/icons/v1/ChartBar.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ChartBar.js
rename to packages/desktop-client/src/icons/v1/ChartBar.js
diff --git a/packages/loot-design/src/svg/v1/ChartPie.js b/packages/desktop-client/src/icons/v1/ChartPie.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ChartPie.js
rename to packages/desktop-client/src/icons/v1/ChartPie.js
diff --git a/packages/loot-design/src/svg/v1/ChatBubbleDots.js b/packages/desktop-client/src/icons/v1/ChatBubbleDots.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ChatBubbleDots.js
rename to packages/desktop-client/src/icons/v1/ChatBubbleDots.js
diff --git a/packages/loot-design/src/svg/v1/CheckAlternative.js b/packages/desktop-client/src/icons/v1/CheckAlternative.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/CheckAlternative.js
rename to packages/desktop-client/src/icons/v1/CheckAlternative.js
diff --git a/packages/loot-design/src/svg/v1/Checkmark.js b/packages/desktop-client/src/icons/v1/Checkmark.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Checkmark.js
rename to packages/desktop-client/src/icons/v1/Checkmark.js
diff --git a/packages/loot-design/src/svg/v1/CheckmarkOutline.js b/packages/desktop-client/src/icons/v1/CheckmarkOutline.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/CheckmarkOutline.js
rename to packages/desktop-client/src/icons/v1/CheckmarkOutline.js
diff --git a/packages/loot-design/src/svg/v1/CheveronDown.js b/packages/desktop-client/src/icons/v1/CheveronDown.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/CheveronDown.js
rename to packages/desktop-client/src/icons/v1/CheveronDown.js
diff --git a/packages/loot-design/src/svg/v1/CheveronLeft.js b/packages/desktop-client/src/icons/v1/CheveronLeft.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/CheveronLeft.js
rename to packages/desktop-client/src/icons/v1/CheveronLeft.js
diff --git a/packages/loot-design/src/svg/v1/CheveronOutlineDown.js b/packages/desktop-client/src/icons/v1/CheveronOutlineDown.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/CheveronOutlineDown.js
rename to packages/desktop-client/src/icons/v1/CheveronOutlineDown.js
diff --git a/packages/loot-design/src/svg/v1/CheveronOutlineLeft.js b/packages/desktop-client/src/icons/v1/CheveronOutlineLeft.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/CheveronOutlineLeft.js
rename to packages/desktop-client/src/icons/v1/CheveronOutlineLeft.js
diff --git a/packages/loot-design/src/svg/v1/CheveronOutlineRight.js b/packages/desktop-client/src/icons/v1/CheveronOutlineRight.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/CheveronOutlineRight.js
rename to packages/desktop-client/src/icons/v1/CheveronOutlineRight.js
diff --git a/packages/loot-design/src/svg/v1/CheveronOutlineUp.js b/packages/desktop-client/src/icons/v1/CheveronOutlineUp.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/CheveronOutlineUp.js
rename to packages/desktop-client/src/icons/v1/CheveronOutlineUp.js
diff --git a/packages/loot-design/src/svg/v1/CheveronRight.js b/packages/desktop-client/src/icons/v1/CheveronRight.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/CheveronRight.js
rename to packages/desktop-client/src/icons/v1/CheveronRight.js
diff --git a/packages/loot-design/src/svg/v1/CheveronUp.js b/packages/desktop-client/src/icons/v1/CheveronUp.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/CheveronUp.js
rename to packages/desktop-client/src/icons/v1/CheveronUp.js
diff --git a/packages/loot-design/src/svg/v1/Clipboard.js b/packages/desktop-client/src/icons/v1/Clipboard.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Clipboard.js
rename to packages/desktop-client/src/icons/v1/Clipboard.js
diff --git a/packages/loot-design/src/svg/v1/Close.js b/packages/desktop-client/src/icons/v1/Close.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Close.js
rename to packages/desktop-client/src/icons/v1/Close.js
diff --git a/packages/loot-design/src/svg/v1/CloseOutline.js b/packages/desktop-client/src/icons/v1/CloseOutline.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/CloseOutline.js
rename to packages/desktop-client/src/icons/v1/CloseOutline.js
diff --git a/packages/loot-design/src/svg/v1/CloseSolid.js b/packages/desktop-client/src/icons/v1/CloseSolid.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/CloseSolid.js
rename to packages/desktop-client/src/icons/v1/CloseSolid.js
diff --git a/packages/loot-design/src/svg/v1/Cloud.js b/packages/desktop-client/src/icons/v1/Cloud.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Cloud.js
rename to packages/desktop-client/src/icons/v1/Cloud.js
diff --git a/packages/loot-design/src/svg/v1/CloudCheck.js b/packages/desktop-client/src/icons/v1/CloudCheck.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/CloudCheck.js
rename to packages/desktop-client/src/icons/v1/CloudCheck.js
diff --git a/packages/loot-design/src/svg/v1/CloudDownload.js b/packages/desktop-client/src/icons/v1/CloudDownload.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/CloudDownload.js
rename to packages/desktop-client/src/icons/v1/CloudDownload.js
diff --git a/packages/loot-design/src/svg/v1/CloudUpload.js b/packages/desktop-client/src/icons/v1/CloudUpload.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/CloudUpload.js
rename to packages/desktop-client/src/icons/v1/CloudUpload.js
diff --git a/packages/loot-design/src/svg/v1/CloudWarning.js b/packages/desktop-client/src/icons/v1/CloudWarning.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/CloudWarning.js
rename to packages/desktop-client/src/icons/v1/CloudWarning.js
diff --git a/packages/loot-design/src/svg/v1/Code.js b/packages/desktop-client/src/icons/v1/Code.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Code.js
rename to packages/desktop-client/src/icons/v1/Code.js
diff --git a/packages/loot-design/src/svg/v1/Coffee.js b/packages/desktop-client/src/icons/v1/Coffee.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Coffee.js
rename to packages/desktop-client/src/icons/v1/Coffee.js
diff --git a/packages/loot-design/src/svg/v1/Cog.js b/packages/desktop-client/src/icons/v1/Cog.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Cog.js
rename to packages/desktop-client/src/icons/v1/Cog.js
diff --git a/packages/loot-design/src/svg/v1/ColorPalette.js b/packages/desktop-client/src/icons/v1/ColorPalette.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ColorPalette.js
rename to packages/desktop-client/src/icons/v1/ColorPalette.js
diff --git a/packages/loot-design/src/svg/v1/Compose.js b/packages/desktop-client/src/icons/v1/Compose.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Compose.js
rename to packages/desktop-client/src/icons/v1/Compose.js
diff --git a/packages/loot-design/src/svg/v1/ComputerDesktop.js b/packages/desktop-client/src/icons/v1/ComputerDesktop.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ComputerDesktop.js
rename to packages/desktop-client/src/icons/v1/ComputerDesktop.js
diff --git a/packages/loot-design/src/svg/v1/ComputerLaptop.js b/packages/desktop-client/src/icons/v1/ComputerLaptop.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ComputerLaptop.js
rename to packages/desktop-client/src/icons/v1/ComputerLaptop.js
diff --git a/packages/loot-design/src/svg/v1/Conversation.js b/packages/desktop-client/src/icons/v1/Conversation.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Conversation.js
rename to packages/desktop-client/src/icons/v1/Conversation.js
diff --git a/packages/loot-design/src/svg/v1/Copy.js b/packages/desktop-client/src/icons/v1/Copy.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Copy.js
rename to packages/desktop-client/src/icons/v1/Copy.js
diff --git a/packages/loot-design/src/svg/v1/CreditCard.js b/packages/desktop-client/src/icons/v1/CreditCard.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/CreditCard.js
rename to packages/desktop-client/src/icons/v1/CreditCard.js
diff --git a/packages/loot-design/src/svg/v1/CurrencyDollar.js b/packages/desktop-client/src/icons/v1/CurrencyDollar.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/CurrencyDollar.js
rename to packages/desktop-client/src/icons/v1/CurrencyDollar.js
diff --git a/packages/loot-design/src/svg/v1/Dashboard.js b/packages/desktop-client/src/icons/v1/Dashboard.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Dashboard.js
rename to packages/desktop-client/src/icons/v1/Dashboard.js
diff --git a/packages/loot-design/src/svg/v1/DateAdd.js b/packages/desktop-client/src/icons/v1/DateAdd.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/DateAdd.js
rename to packages/desktop-client/src/icons/v1/DateAdd.js
diff --git a/packages/loot-design/src/svg/v1/DialPad.js b/packages/desktop-client/src/icons/v1/DialPad.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/DialPad.js
rename to packages/desktop-client/src/icons/v1/DialPad.js
diff --git a/packages/loot-design/src/svg/v1/Directions.js b/packages/desktop-client/src/icons/v1/Directions.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Directions.js
rename to packages/desktop-client/src/icons/v1/Directions.js
diff --git a/packages/loot-design/src/svg/v1/Document.js b/packages/desktop-client/src/icons/v1/Document.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Document.js
rename to packages/desktop-client/src/icons/v1/Document.js
diff --git a/packages/loot-design/src/svg/v1/DocumentAdd.js b/packages/desktop-client/src/icons/v1/DocumentAdd.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/DocumentAdd.js
rename to packages/desktop-client/src/icons/v1/DocumentAdd.js
diff --git a/packages/loot-design/src/svg/v1/DotsHorizontalDouble.js b/packages/desktop-client/src/icons/v1/DotsHorizontalDouble.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/DotsHorizontalDouble.js
rename to packages/desktop-client/src/icons/v1/DotsHorizontalDouble.js
diff --git a/packages/loot-design/src/svg/v1/DotsHorizontalTriple.js b/packages/desktop-client/src/icons/v1/DotsHorizontalTriple.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/DotsHorizontalTriple.js
rename to packages/desktop-client/src/icons/v1/DotsHorizontalTriple.js
diff --git a/packages/loot-design/src/svg/v1/Download.js b/packages/desktop-client/src/icons/v1/Download.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Download.js
rename to packages/desktop-client/src/icons/v1/Download.js
diff --git a/packages/loot-design/src/svg/v1/Duplicate.js b/packages/desktop-client/src/icons/v1/Duplicate.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Duplicate.js
rename to packages/desktop-client/src/icons/v1/Duplicate.js
diff --git a/packages/loot-design/src/svg/v1/EditCopy.js b/packages/desktop-client/src/icons/v1/EditCopy.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/EditCopy.js
rename to packages/desktop-client/src/icons/v1/EditCopy.js
diff --git a/packages/loot-design/src/svg/v1/EditCrop.js b/packages/desktop-client/src/icons/v1/EditCrop.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/EditCrop.js
rename to packages/desktop-client/src/icons/v1/EditCrop.js
diff --git a/packages/loot-design/src/svg/v1/EditCut.js b/packages/desktop-client/src/icons/v1/EditCut.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/EditCut.js
rename to packages/desktop-client/src/icons/v1/EditCut.js
diff --git a/packages/loot-design/src/svg/v1/EditPencil.js b/packages/desktop-client/src/icons/v1/EditPencil.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/EditPencil.js
rename to packages/desktop-client/src/icons/v1/EditPencil.js
diff --git a/packages/loot-design/src/svg/v1/Education.js b/packages/desktop-client/src/icons/v1/Education.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Education.js
rename to packages/desktop-client/src/icons/v1/Education.js
diff --git a/packages/loot-design/src/svg/v1/Envelope.js b/packages/desktop-client/src/icons/v1/Envelope.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Envelope.js
rename to packages/desktop-client/src/icons/v1/Envelope.js
diff --git a/packages/loot-design/src/svg/v1/Equals.js b/packages/desktop-client/src/icons/v1/Equals.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Equals.js
rename to packages/desktop-client/src/icons/v1/Equals.js
diff --git a/packages/loot-design/src/svg/v1/ExclamationOutline.js b/packages/desktop-client/src/icons/v1/ExclamationOutline.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ExclamationOutline.js
rename to packages/desktop-client/src/icons/v1/ExclamationOutline.js
diff --git a/packages/loot-design/src/svg/v1/ExclamationSolid.js b/packages/desktop-client/src/icons/v1/ExclamationSolid.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ExclamationSolid.js
rename to packages/desktop-client/src/icons/v1/ExclamationSolid.js
diff --git a/packages/loot-design/src/svg/v1/Explore.js b/packages/desktop-client/src/icons/v1/Explore.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Explore.js
rename to packages/desktop-client/src/icons/v1/Explore.js
diff --git a/packages/loot-design/src/svg/v1/Factory.js b/packages/desktop-client/src/icons/v1/Factory.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Factory.js
rename to packages/desktop-client/src/icons/v1/Factory.js
diff --git a/packages/loot-design/src/svg/v1/FastForward.js b/packages/desktop-client/src/icons/v1/FastForward.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/FastForward.js
rename to packages/desktop-client/src/icons/v1/FastForward.js
diff --git a/packages/loot-design/src/svg/v1/FastRewind.js b/packages/desktop-client/src/icons/v1/FastRewind.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/FastRewind.js
rename to packages/desktop-client/src/icons/v1/FastRewind.js
diff --git a/packages/loot-design/src/svg/v1/FileDouble.js b/packages/desktop-client/src/icons/v1/FileDouble.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/FileDouble.js
rename to packages/desktop-client/src/icons/v1/FileDouble.js
diff --git a/packages/loot-design/src/svg/v1/Film.js b/packages/desktop-client/src/icons/v1/Film.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Film.js
rename to packages/desktop-client/src/icons/v1/Film.js
diff --git a/packages/loot-design/src/svg/v1/Filter.js b/packages/desktop-client/src/icons/v1/Filter.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Filter.js
rename to packages/desktop-client/src/icons/v1/Filter.js
diff --git a/packages/loot-design/src/svg/v1/Flag.js b/packages/desktop-client/src/icons/v1/Flag.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Flag.js
rename to packages/desktop-client/src/icons/v1/Flag.js
diff --git a/packages/loot-design/src/svg/v1/Flashlight.js b/packages/desktop-client/src/icons/v1/Flashlight.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Flashlight.js
rename to packages/desktop-client/src/icons/v1/Flashlight.js
diff --git a/packages/loot-design/src/svg/v1/Folder.js b/packages/desktop-client/src/icons/v1/Folder.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Folder.js
rename to packages/desktop-client/src/icons/v1/Folder.js
diff --git a/packages/loot-design/src/svg/v1/FolderOutline.js b/packages/desktop-client/src/icons/v1/FolderOutline.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/FolderOutline.js
rename to packages/desktop-client/src/icons/v1/FolderOutline.js
diff --git a/packages/loot-design/src/svg/v1/FolderOutlineAdd.js b/packages/desktop-client/src/icons/v1/FolderOutlineAdd.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/FolderOutlineAdd.js
rename to packages/desktop-client/src/icons/v1/FolderOutlineAdd.js
diff --git a/packages/loot-design/src/svg/v1/FormatBold.js b/packages/desktop-client/src/icons/v1/FormatBold.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/FormatBold.js
rename to packages/desktop-client/src/icons/v1/FormatBold.js
diff --git a/packages/loot-design/src/svg/v1/FormatFontSize.js b/packages/desktop-client/src/icons/v1/FormatFontSize.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/FormatFontSize.js
rename to packages/desktop-client/src/icons/v1/FormatFontSize.js
diff --git a/packages/loot-design/src/svg/v1/FormatItalic.js b/packages/desktop-client/src/icons/v1/FormatItalic.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/FormatItalic.js
rename to packages/desktop-client/src/icons/v1/FormatItalic.js
diff --git a/packages/loot-design/src/svg/v1/FormatTextSize.js b/packages/desktop-client/src/icons/v1/FormatTextSize.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/FormatTextSize.js
rename to packages/desktop-client/src/icons/v1/FormatTextSize.js
diff --git a/packages/loot-design/src/svg/v1/FormatUnderline.js b/packages/desktop-client/src/icons/v1/FormatUnderline.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/FormatUnderline.js
rename to packages/desktop-client/src/icons/v1/FormatUnderline.js
diff --git a/packages/loot-design/src/svg/v1/Forward.js b/packages/desktop-client/src/icons/v1/Forward.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Forward.js
rename to packages/desktop-client/src/icons/v1/Forward.js
diff --git a/packages/loot-design/src/svg/v1/ForwardStep.js b/packages/desktop-client/src/icons/v1/ForwardStep.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ForwardStep.js
rename to packages/desktop-client/src/icons/v1/ForwardStep.js
diff --git a/packages/loot-design/src/svg/v1/Gift.js b/packages/desktop-client/src/icons/v1/Gift.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Gift.js
rename to packages/desktop-client/src/icons/v1/Gift.js
diff --git a/packages/loot-design/src/svg/v1/Globe.js b/packages/desktop-client/src/icons/v1/Globe.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Globe.js
rename to packages/desktop-client/src/icons/v1/Globe.js
diff --git a/packages/loot-design/src/svg/v1/HandStop.js b/packages/desktop-client/src/icons/v1/HandStop.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/HandStop.js
rename to packages/desktop-client/src/icons/v1/HandStop.js
diff --git a/packages/loot-design/src/svg/v1/HardDrive.js b/packages/desktop-client/src/icons/v1/HardDrive.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/HardDrive.js
rename to packages/desktop-client/src/icons/v1/HardDrive.js
diff --git a/packages/loot-design/src/svg/v1/Headphones.js b/packages/desktop-client/src/icons/v1/Headphones.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Headphones.js
rename to packages/desktop-client/src/icons/v1/Headphones.js
diff --git a/packages/loot-design/src/svg/v1/Heart.js b/packages/desktop-client/src/icons/v1/Heart.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Heart.js
rename to packages/desktop-client/src/icons/v1/Heart.js
diff --git a/packages/loot-design/src/svg/v1/Home.js b/packages/desktop-client/src/icons/v1/Home.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Home.js
rename to packages/desktop-client/src/icons/v1/Home.js
diff --git a/packages/loot-design/src/svg/v1/Hot.js b/packages/desktop-client/src/icons/v1/Hot.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Hot.js
rename to packages/desktop-client/src/icons/v1/Hot.js
diff --git a/packages/loot-design/src/svg/v1/HourGlass.js b/packages/desktop-client/src/icons/v1/HourGlass.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/HourGlass.js
rename to packages/desktop-client/src/icons/v1/HourGlass.js
diff --git a/packages/loot-design/src/svg/v1/Inbox.js b/packages/desktop-client/src/icons/v1/Inbox.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Inbox.js
rename to packages/desktop-client/src/icons/v1/Inbox.js
diff --git a/packages/loot-design/src/svg/v1/InboxCheck.js b/packages/desktop-client/src/icons/v1/InboxCheck.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/InboxCheck.js
rename to packages/desktop-client/src/icons/v1/InboxCheck.js
diff --git a/packages/loot-design/src/svg/v1/InboxDownload.js b/packages/desktop-client/src/icons/v1/InboxDownload.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/InboxDownload.js
rename to packages/desktop-client/src/icons/v1/InboxDownload.js
diff --git a/packages/loot-design/src/svg/v1/InboxFull.js b/packages/desktop-client/src/icons/v1/InboxFull.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/InboxFull.js
rename to packages/desktop-client/src/icons/v1/InboxFull.js
diff --git a/packages/loot-design/src/svg/v1/IndentDecrease.js b/packages/desktop-client/src/icons/v1/IndentDecrease.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/IndentDecrease.js
rename to packages/desktop-client/src/icons/v1/IndentDecrease.js
diff --git a/packages/loot-design/src/svg/v1/IndentIncrease.js b/packages/desktop-client/src/icons/v1/IndentIncrease.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/IndentIncrease.js
rename to packages/desktop-client/src/icons/v1/IndentIncrease.js
diff --git a/packages/loot-design/src/svg/v1/InformationOutline.js b/packages/desktop-client/src/icons/v1/InformationOutline.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/InformationOutline.js
rename to packages/desktop-client/src/icons/v1/InformationOutline.js
diff --git a/packages/loot-design/src/svg/v1/InformationSolid.js b/packages/desktop-client/src/icons/v1/InformationSolid.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/InformationSolid.js
rename to packages/desktop-client/src/icons/v1/InformationSolid.js
diff --git a/packages/loot-design/src/svg/v1/Key.js b/packages/desktop-client/src/icons/v1/Key.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Key.js
rename to packages/desktop-client/src/icons/v1/Key.js
diff --git a/packages/loot-design/src/svg/v1/Keyboard.js b/packages/desktop-client/src/icons/v1/Keyboard.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Keyboard.js
rename to packages/desktop-client/src/icons/v1/Keyboard.js
diff --git a/packages/loot-design/src/svg/v1/Layers.js b/packages/desktop-client/src/icons/v1/Layers.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Layers.js
rename to packages/desktop-client/src/icons/v1/Layers.js
diff --git a/packages/loot-design/src/svg/v1/Library.js b/packages/desktop-client/src/icons/v1/Library.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Library.js
rename to packages/desktop-client/src/icons/v1/Library.js
diff --git a/packages/loot-design/src/svg/v1/LightBulb.js b/packages/desktop-client/src/icons/v1/LightBulb.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/LightBulb.js
rename to packages/desktop-client/src/icons/v1/LightBulb.js
diff --git a/packages/loot-design/src/svg/v1/Link.js b/packages/desktop-client/src/icons/v1/Link.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Link.js
rename to packages/desktop-client/src/icons/v1/Link.js
diff --git a/packages/loot-design/src/svg/v1/List.js b/packages/desktop-client/src/icons/v1/List.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/List.js
rename to packages/desktop-client/src/icons/v1/List.js
diff --git a/packages/loot-design/src/svg/v1/ListAdd.js b/packages/desktop-client/src/icons/v1/ListAdd.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ListAdd.js
rename to packages/desktop-client/src/icons/v1/ListAdd.js
diff --git a/packages/loot-design/src/svg/v1/ListBullet.js b/packages/desktop-client/src/icons/v1/ListBullet.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ListBullet.js
rename to packages/desktop-client/src/icons/v1/ListBullet.js
diff --git a/packages/loot-design/src/svg/v1/LoadBalancer.js b/packages/desktop-client/src/icons/v1/LoadBalancer.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/LoadBalancer.js
rename to packages/desktop-client/src/icons/v1/LoadBalancer.js
diff --git a/packages/loot-design/src/svg/v1/Location.js b/packages/desktop-client/src/icons/v1/Location.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Location.js
rename to packages/desktop-client/src/icons/v1/Location.js
diff --git a/packages/loot-design/src/svg/v1/LocationCurrent.js b/packages/desktop-client/src/icons/v1/LocationCurrent.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/LocationCurrent.js
rename to packages/desktop-client/src/icons/v1/LocationCurrent.js
diff --git a/packages/loot-design/src/svg/v1/LocationFood.js b/packages/desktop-client/src/icons/v1/LocationFood.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/LocationFood.js
rename to packages/desktop-client/src/icons/v1/LocationFood.js
diff --git a/packages/loot-design/src/svg/v1/LocationGasStation.js b/packages/desktop-client/src/icons/v1/LocationGasStation.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/LocationGasStation.js
rename to packages/desktop-client/src/icons/v1/LocationGasStation.js
diff --git a/packages/loot-design/src/svg/v1/LocationHotel.js b/packages/desktop-client/src/icons/v1/LocationHotel.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/LocationHotel.js
rename to packages/desktop-client/src/icons/v1/LocationHotel.js
diff --git a/packages/loot-design/src/svg/v1/LocationMarina.js b/packages/desktop-client/src/icons/v1/LocationMarina.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/LocationMarina.js
rename to packages/desktop-client/src/icons/v1/LocationMarina.js
diff --git a/packages/loot-design/src/svg/v1/LocationPark.js b/packages/desktop-client/src/icons/v1/LocationPark.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/LocationPark.js
rename to packages/desktop-client/src/icons/v1/LocationPark.js
diff --git a/packages/loot-design/src/svg/v1/LocationRestroom.js b/packages/desktop-client/src/icons/v1/LocationRestroom.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/LocationRestroom.js
rename to packages/desktop-client/src/icons/v1/LocationRestroom.js
diff --git a/packages/loot-design/src/svg/v1/LocationShopping.js b/packages/desktop-client/src/icons/v1/LocationShopping.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/LocationShopping.js
rename to packages/desktop-client/src/icons/v1/LocationShopping.js
diff --git a/packages/loot-design/src/svg/v1/LockClosed.js b/packages/desktop-client/src/icons/v1/LockClosed.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/LockClosed.js
rename to packages/desktop-client/src/icons/v1/LockClosed.js
diff --git a/packages/loot-design/src/svg/v1/LockOpen.js b/packages/desktop-client/src/icons/v1/LockOpen.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/LockOpen.js
rename to packages/desktop-client/src/icons/v1/LockOpen.js
diff --git a/packages/loot-design/src/svg/v1/Map.js b/packages/desktop-client/src/icons/v1/Map.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Map.js
rename to packages/desktop-client/src/icons/v1/Map.js
diff --git a/packages/loot-design/src/svg/v1/Menu.js b/packages/desktop-client/src/icons/v1/Menu.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Menu.js
rename to packages/desktop-client/src/icons/v1/Menu.js
diff --git a/packages/loot-design/src/svg/v1/Mic.js b/packages/desktop-client/src/icons/v1/Mic.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Mic.js
rename to packages/desktop-client/src/icons/v1/Mic.js
diff --git a/packages/loot-design/src/svg/v1/MinusOutline.js b/packages/desktop-client/src/icons/v1/MinusOutline.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/MinusOutline.js
rename to packages/desktop-client/src/icons/v1/MinusOutline.js
diff --git a/packages/loot-design/src/svg/v1/MinusSolid.js b/packages/desktop-client/src/icons/v1/MinusSolid.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/MinusSolid.js
rename to packages/desktop-client/src/icons/v1/MinusSolid.js
diff --git a/packages/loot-design/src/svg/v1/MobileDevices.js b/packages/desktop-client/src/icons/v1/MobileDevices.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/MobileDevices.js
rename to packages/desktop-client/src/icons/v1/MobileDevices.js
diff --git a/packages/loot-design/src/svg/v1/MoneyBag.js b/packages/desktop-client/src/icons/v1/MoneyBag.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/MoneyBag.js
rename to packages/desktop-client/src/icons/v1/MoneyBag.js
diff --git a/packages/loot-design/src/svg/v1/MoodHappyOutline.js b/packages/desktop-client/src/icons/v1/MoodHappyOutline.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/MoodHappyOutline.js
rename to packages/desktop-client/src/icons/v1/MoodHappyOutline.js
diff --git a/packages/loot-design/src/svg/v1/MoodHappySolid.js b/packages/desktop-client/src/icons/v1/MoodHappySolid.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/MoodHappySolid.js
rename to packages/desktop-client/src/icons/v1/MoodHappySolid.js
diff --git a/packages/loot-design/src/svg/v1/MoodNeutralOutline.js b/packages/desktop-client/src/icons/v1/MoodNeutralOutline.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/MoodNeutralOutline.js
rename to packages/desktop-client/src/icons/v1/MoodNeutralOutline.js
diff --git a/packages/loot-design/src/svg/v1/MoodNeutralSolid.js b/packages/desktop-client/src/icons/v1/MoodNeutralSolid.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/MoodNeutralSolid.js
rename to packages/desktop-client/src/icons/v1/MoodNeutralSolid.js
diff --git a/packages/loot-design/src/svg/v1/MoodSadOutline.js b/packages/desktop-client/src/icons/v1/MoodSadOutline.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/MoodSadOutline.js
rename to packages/desktop-client/src/icons/v1/MoodSadOutline.js
diff --git a/packages/loot-design/src/svg/v1/MoodSadSolid.js b/packages/desktop-client/src/icons/v1/MoodSadSolid.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/MoodSadSolid.js
rename to packages/desktop-client/src/icons/v1/MoodSadSolid.js
diff --git a/packages/loot-design/src/svg/v1/Mouse.js b/packages/desktop-client/src/icons/v1/Mouse.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Mouse.js
rename to packages/desktop-client/src/icons/v1/Mouse.js
diff --git a/packages/loot-design/src/svg/v1/MoveBack.js b/packages/desktop-client/src/icons/v1/MoveBack.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/MoveBack.js
rename to packages/desktop-client/src/icons/v1/MoveBack.js
diff --git a/packages/loot-design/src/svg/v1/MusicAlbum.js b/packages/desktop-client/src/icons/v1/MusicAlbum.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/MusicAlbum.js
rename to packages/desktop-client/src/icons/v1/MusicAlbum.js
diff --git a/packages/loot-design/src/svg/v1/MusicArtist.js b/packages/desktop-client/src/icons/v1/MusicArtist.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/MusicArtist.js
rename to packages/desktop-client/src/icons/v1/MusicArtist.js
diff --git a/packages/loot-design/src/svg/v1/MusicNotes.js b/packages/desktop-client/src/icons/v1/MusicNotes.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/MusicNotes.js
rename to packages/desktop-client/src/icons/v1/MusicNotes.js
diff --git a/packages/loot-design/src/svg/v1/MusicPlaylist.js b/packages/desktop-client/src/icons/v1/MusicPlaylist.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/MusicPlaylist.js
rename to packages/desktop-client/src/icons/v1/MusicPlaylist.js
diff --git a/packages/loot-design/src/svg/v1/NavigationMore.js b/packages/desktop-client/src/icons/v1/NavigationMore.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/NavigationMore.js
rename to packages/desktop-client/src/icons/v1/NavigationMore.js
diff --git a/packages/loot-design/src/svg/v1/Network.js b/packages/desktop-client/src/icons/v1/Network.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Network.js
rename to packages/desktop-client/src/icons/v1/Network.js
diff --git a/packages/loot-design/src/svg/v1/NewsPaper.js b/packages/desktop-client/src/icons/v1/NewsPaper.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/NewsPaper.js
rename to packages/desktop-client/src/icons/v1/NewsPaper.js
diff --git a/packages/loot-design/src/svg/v1/Notification.js b/packages/desktop-client/src/icons/v1/Notification.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Notification.js
rename to packages/desktop-client/src/icons/v1/Notification.js
diff --git a/packages/loot-design/src/svg/v1/Notifications.js b/packages/desktop-client/src/icons/v1/Notifications.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Notifications.js
rename to packages/desktop-client/src/icons/v1/Notifications.js
diff --git a/packages/loot-design/src/svg/v1/NotificationsOutline.js b/packages/desktop-client/src/icons/v1/NotificationsOutline.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/NotificationsOutline.js
rename to packages/desktop-client/src/icons/v1/NotificationsOutline.js
diff --git a/packages/loot-design/src/svg/v1/Paste.js b/packages/desktop-client/src/icons/v1/Paste.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Paste.js
rename to packages/desktop-client/src/icons/v1/Paste.js
diff --git a/packages/loot-design/src/svg/v1/Pause.js b/packages/desktop-client/src/icons/v1/Pause.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Pause.js
rename to packages/desktop-client/src/icons/v1/Pause.js
diff --git a/packages/loot-design/src/svg/v1/PauseOutline.js b/packages/desktop-client/src/icons/v1/PauseOutline.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/PauseOutline.js
rename to packages/desktop-client/src/icons/v1/PauseOutline.js
diff --git a/packages/loot-design/src/svg/v1/PauseSolid.js b/packages/desktop-client/src/icons/v1/PauseSolid.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/PauseSolid.js
rename to packages/desktop-client/src/icons/v1/PauseSolid.js
diff --git a/packages/loot-design/src/svg/v1/PenTool.js b/packages/desktop-client/src/icons/v1/PenTool.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/PenTool.js
rename to packages/desktop-client/src/icons/v1/PenTool.js
diff --git a/packages/loot-design/src/svg/v1/PencilWrite.js b/packages/desktop-client/src/icons/v1/PencilWrite.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/PencilWrite.js
rename to packages/desktop-client/src/icons/v1/PencilWrite.js
diff --git a/packages/loot-design/src/svg/v1/Phone.js b/packages/desktop-client/src/icons/v1/Phone.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Phone.js
rename to packages/desktop-client/src/icons/v1/Phone.js
diff --git a/packages/loot-design/src/svg/v1/Photo.js b/packages/desktop-client/src/icons/v1/Photo.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Photo.js
rename to packages/desktop-client/src/icons/v1/Photo.js
diff --git a/packages/loot-design/src/svg/v1/PhpElephant.js b/packages/desktop-client/src/icons/v1/PhpElephant.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/PhpElephant.js
rename to packages/desktop-client/src/icons/v1/PhpElephant.js
diff --git a/packages/loot-design/src/svg/v1/PiggyBank.js b/packages/desktop-client/src/icons/v1/PiggyBank.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/PiggyBank.js
rename to packages/desktop-client/src/icons/v1/PiggyBank.js
diff --git a/packages/loot-design/src/svg/v1/Pin.js b/packages/desktop-client/src/icons/v1/Pin.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Pin.js
rename to packages/desktop-client/src/icons/v1/Pin.js
diff --git a/packages/loot-design/src/svg/v1/Play.js b/packages/desktop-client/src/icons/v1/Play.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Play.js
rename to packages/desktop-client/src/icons/v1/Play.js
diff --git a/packages/loot-design/src/svg/v1/PlayOutline.js b/packages/desktop-client/src/icons/v1/PlayOutline.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/PlayOutline.js
rename to packages/desktop-client/src/icons/v1/PlayOutline.js
diff --git a/packages/loot-design/src/svg/v1/Playlist.js b/packages/desktop-client/src/icons/v1/Playlist.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Playlist.js
rename to packages/desktop-client/src/icons/v1/Playlist.js
diff --git a/packages/loot-design/src/svg/v1/Plugin.js b/packages/desktop-client/src/icons/v1/Plugin.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Plugin.js
rename to packages/desktop-client/src/icons/v1/Plugin.js
diff --git a/packages/loot-design/src/svg/v1/Portfolio.js b/packages/desktop-client/src/icons/v1/Portfolio.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Portfolio.js
rename to packages/desktop-client/src/icons/v1/Portfolio.js
diff --git a/packages/loot-design/src/svg/v1/Printer.js b/packages/desktop-client/src/icons/v1/Printer.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Printer.js
rename to packages/desktop-client/src/icons/v1/Printer.js
diff --git a/packages/loot-design/src/svg/v1/Pylon.js b/packages/desktop-client/src/icons/v1/Pylon.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Pylon.js
rename to packages/desktop-client/src/icons/v1/Pylon.js
diff --git a/packages/loot-design/src/svg/v1/Question.js b/packages/desktop-client/src/icons/v1/Question.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Question.js
rename to packages/desktop-client/src/icons/v1/Question.js
diff --git a/packages/loot-design/src/svg/v1/Queue.js b/packages/desktop-client/src/icons/v1/Queue.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Queue.js
rename to packages/desktop-client/src/icons/v1/Queue.js
diff --git a/packages/loot-design/src/svg/v1/Radar.js b/packages/desktop-client/src/icons/v1/Radar.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Radar.js
rename to packages/desktop-client/src/icons/v1/Radar.js
diff --git a/packages/loot-design/src/svg/v1/RadarCopy2.js b/packages/desktop-client/src/icons/v1/RadarCopy2.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/RadarCopy2.js
rename to packages/desktop-client/src/icons/v1/RadarCopy2.js
diff --git a/packages/loot-design/src/svg/v1/Radio.js b/packages/desktop-client/src/icons/v1/Radio.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Radio.js
rename to packages/desktop-client/src/icons/v1/Radio.js
diff --git a/packages/loot-design/src/svg/v1/Refresh.js b/packages/desktop-client/src/icons/v1/Refresh.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Refresh.js
rename to packages/desktop-client/src/icons/v1/Refresh.js
diff --git a/packages/loot-design/src/svg/v1/Reload.js b/packages/desktop-client/src/icons/v1/Reload.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Reload.js
rename to packages/desktop-client/src/icons/v1/Reload.js
diff --git a/packages/loot-design/src/svg/v1/Reply.js b/packages/desktop-client/src/icons/v1/Reply.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Reply.js
rename to packages/desktop-client/src/icons/v1/Reply.js
diff --git a/packages/loot-design/src/svg/v1/ReplyAll.js b/packages/desktop-client/src/icons/v1/ReplyAll.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ReplyAll.js
rename to packages/desktop-client/src/icons/v1/ReplyAll.js
diff --git a/packages/loot-design/src/svg/v1/Reports.js b/packages/desktop-client/src/icons/v1/Reports.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Reports.js
rename to packages/desktop-client/src/icons/v1/Reports.js
diff --git a/packages/loot-design/src/svg/v1/Repost.js b/packages/desktop-client/src/icons/v1/Repost.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Repost.js
rename to packages/desktop-client/src/icons/v1/Repost.js
diff --git a/packages/loot-design/src/svg/v1/SaveDisk.js b/packages/desktop-client/src/icons/v1/SaveDisk.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/SaveDisk.js
rename to packages/desktop-client/src/icons/v1/SaveDisk.js
diff --git a/packages/loot-design/src/svg/v1/ScreenFull.js b/packages/desktop-client/src/icons/v1/ScreenFull.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ScreenFull.js
rename to packages/desktop-client/src/icons/v1/ScreenFull.js
diff --git a/packages/loot-design/src/svg/v1/Search.js b/packages/desktop-client/src/icons/v1/Search.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Search.js
rename to packages/desktop-client/src/icons/v1/Search.js
diff --git a/packages/loot-design/src/svg/v1/Send.js b/packages/desktop-client/src/icons/v1/Send.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Send.js
rename to packages/desktop-client/src/icons/v1/Send.js
diff --git a/packages/loot-design/src/svg/v1/Servers.js b/packages/desktop-client/src/icons/v1/Servers.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Servers.js
rename to packages/desktop-client/src/icons/v1/Servers.js
diff --git a/packages/loot-design/src/svg/v1/Share.js b/packages/desktop-client/src/icons/v1/Share.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Share.js
rename to packages/desktop-client/src/icons/v1/Share.js
diff --git a/packages/loot-design/src/svg/v1/Share01.js b/packages/desktop-client/src/icons/v1/Share01.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Share01.js
rename to packages/desktop-client/src/icons/v1/Share01.js
diff --git a/packages/loot-design/src/svg/v1/ShareAlt.js b/packages/desktop-client/src/icons/v1/ShareAlt.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ShareAlt.js
rename to packages/desktop-client/src/icons/v1/ShareAlt.js
diff --git a/packages/loot-design/src/svg/v1/Shield.js b/packages/desktop-client/src/icons/v1/Shield.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Shield.js
rename to packages/desktop-client/src/icons/v1/Shield.js
diff --git a/packages/loot-design/src/svg/v1/ShoppingCart.js b/packages/desktop-client/src/icons/v1/ShoppingCart.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ShoppingCart.js
rename to packages/desktop-client/src/icons/v1/ShoppingCart.js
diff --git a/packages/loot-design/src/svg/v1/ShowSidebar.js b/packages/desktop-client/src/icons/v1/ShowSidebar.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ShowSidebar.js
rename to packages/desktop-client/src/icons/v1/ShowSidebar.js
diff --git a/packages/loot-design/src/svg/v1/Shuffle.js b/packages/desktop-client/src/icons/v1/Shuffle.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Shuffle.js
rename to packages/desktop-client/src/icons/v1/Shuffle.js
diff --git a/packages/loot-design/src/svg/v1/StandBy.js b/packages/desktop-client/src/icons/v1/StandBy.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/StandBy.js
rename to packages/desktop-client/src/icons/v1/StandBy.js
diff --git a/packages/loot-design/src/svg/v1/StarFull.js b/packages/desktop-client/src/icons/v1/StarFull.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/StarFull.js
rename to packages/desktop-client/src/icons/v1/StarFull.js
diff --git a/packages/loot-design/src/svg/v1/Station.js b/packages/desktop-client/src/icons/v1/Station.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Station.js
rename to packages/desktop-client/src/icons/v1/Station.js
diff --git a/packages/loot-design/src/svg/v1/StepBackward.js b/packages/desktop-client/src/icons/v1/StepBackward.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/StepBackward.js
rename to packages/desktop-client/src/icons/v1/StepBackward.js
diff --git a/packages/loot-design/src/svg/v1/StepForward.js b/packages/desktop-client/src/icons/v1/StepForward.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/StepForward.js
rename to packages/desktop-client/src/icons/v1/StepForward.js
diff --git a/packages/loot-design/src/svg/v1/Stethoscope.js b/packages/desktop-client/src/icons/v1/Stethoscope.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Stethoscope.js
rename to packages/desktop-client/src/icons/v1/Stethoscope.js
diff --git a/packages/loot-design/src/svg/v1/StoreFront.js b/packages/desktop-client/src/icons/v1/StoreFront.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/StoreFront.js
rename to packages/desktop-client/src/icons/v1/StoreFront.js
diff --git a/packages/loot-design/src/svg/v1/StrokeWidth.js b/packages/desktop-client/src/icons/v1/StrokeWidth.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/StrokeWidth.js
rename to packages/desktop-client/src/icons/v1/StrokeWidth.js
diff --git a/packages/loot-design/src/svg/v1/SubdirectoryLeft.js b/packages/desktop-client/src/icons/v1/SubdirectoryLeft.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/SubdirectoryLeft.js
rename to packages/desktop-client/src/icons/v1/SubdirectoryLeft.js
diff --git a/packages/loot-design/src/svg/v1/SubdirectoryRight.js b/packages/desktop-client/src/icons/v1/SubdirectoryRight.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/SubdirectoryRight.js
rename to packages/desktop-client/src/icons/v1/SubdirectoryRight.js
diff --git a/packages/loot-design/src/svg/v1/Subtract.js b/packages/desktop-client/src/icons/v1/Subtract.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Subtract.js
rename to packages/desktop-client/src/icons/v1/Subtract.js
diff --git a/packages/loot-design/src/svg/v1/Swap.js b/packages/desktop-client/src/icons/v1/Swap.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Swap.js
rename to packages/desktop-client/src/icons/v1/Swap.js
diff --git a/packages/loot-design/src/svg/v1/Tablet.js b/packages/desktop-client/src/icons/v1/Tablet.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Tablet.js
rename to packages/desktop-client/src/icons/v1/Tablet.js
diff --git a/packages/loot-design/src/svg/v1/Tag.js b/packages/desktop-client/src/icons/v1/Tag.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Tag.js
rename to packages/desktop-client/src/icons/v1/Tag.js
diff --git a/packages/loot-design/src/svg/v1/Target.js b/packages/desktop-client/src/icons/v1/Target.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Target.js
rename to packages/desktop-client/src/icons/v1/Target.js
diff --git a/packages/loot-design/src/svg/v1/TextBox.js b/packages/desktop-client/src/icons/v1/TextBox.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/TextBox.js
rename to packages/desktop-client/src/icons/v1/TextBox.js
diff --git a/packages/loot-design/src/svg/v1/TextDecoration.js b/packages/desktop-client/src/icons/v1/TextDecoration.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/TextDecoration.js
rename to packages/desktop-client/src/icons/v1/TextDecoration.js
diff --git a/packages/loot-design/src/svg/v1/Thermometer.js b/packages/desktop-client/src/icons/v1/Thermometer.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Thermometer.js
rename to packages/desktop-client/src/icons/v1/Thermometer.js
diff --git a/packages/loot-design/src/svg/v1/ThumbsDown.js b/packages/desktop-client/src/icons/v1/ThumbsDown.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ThumbsDown.js
rename to packages/desktop-client/src/icons/v1/ThumbsDown.js
diff --git a/packages/loot-design/src/svg/v1/ThumbsUp.js b/packages/desktop-client/src/icons/v1/ThumbsUp.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ThumbsUp.js
rename to packages/desktop-client/src/icons/v1/ThumbsUp.js
diff --git a/packages/loot-design/src/svg/v1/Ticket.js b/packages/desktop-client/src/icons/v1/Ticket.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Ticket.js
rename to packages/desktop-client/src/icons/v1/Ticket.js
diff --git a/packages/loot-design/src/svg/v1/Time.js b/packages/desktop-client/src/icons/v1/Time.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Time.js
rename to packages/desktop-client/src/icons/v1/Time.js
diff --git a/packages/loot-design/src/svg/v1/Timer.js b/packages/desktop-client/src/icons/v1/Timer.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Timer.js
rename to packages/desktop-client/src/icons/v1/Timer.js
diff --git a/packages/loot-design/src/svg/v1/ToolsCopy.js b/packages/desktop-client/src/icons/v1/ToolsCopy.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ToolsCopy.js
rename to packages/desktop-client/src/icons/v1/ToolsCopy.js
diff --git a/packages/loot-design/src/svg/v1/Translate.js b/packages/desktop-client/src/icons/v1/Translate.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Translate.js
rename to packages/desktop-client/src/icons/v1/Translate.js
diff --git a/packages/loot-design/src/svg/v1/Trash.js b/packages/desktop-client/src/icons/v1/Trash.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Trash.js
rename to packages/desktop-client/src/icons/v1/Trash.js
diff --git a/packages/loot-design/src/svg/v1/Travel.js b/packages/desktop-client/src/icons/v1/Travel.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Travel.js
rename to packages/desktop-client/src/icons/v1/Travel.js
diff --git a/packages/loot-design/src/svg/v1/TravelBus.js b/packages/desktop-client/src/icons/v1/TravelBus.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/TravelBus.js
rename to packages/desktop-client/src/icons/v1/TravelBus.js
diff --git a/packages/loot-design/src/svg/v1/TravelCar.js b/packages/desktop-client/src/icons/v1/TravelCar.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/TravelCar.js
rename to packages/desktop-client/src/icons/v1/TravelCar.js
diff --git a/packages/loot-design/src/svg/v1/TravelCase.js b/packages/desktop-client/src/icons/v1/TravelCase.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/TravelCase.js
rename to packages/desktop-client/src/icons/v1/TravelCase.js
diff --git a/packages/loot-design/src/svg/v1/TravelTaxiCab.js b/packages/desktop-client/src/icons/v1/TravelTaxiCab.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/TravelTaxiCab.js
rename to packages/desktop-client/src/icons/v1/TravelTaxiCab.js
diff --git a/packages/loot-design/src/svg/v1/TravelTrain.js b/packages/desktop-client/src/icons/v1/TravelTrain.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/TravelTrain.js
rename to packages/desktop-client/src/icons/v1/TravelTrain.js
diff --git a/packages/loot-design/src/svg/v1/TravelWalk.js b/packages/desktop-client/src/icons/v1/TravelWalk.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/TravelWalk.js
rename to packages/desktop-client/src/icons/v1/TravelWalk.js
diff --git a/packages/loot-design/src/svg/v1/Trophy.js b/packages/desktop-client/src/icons/v1/Trophy.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Trophy.js
rename to packages/desktop-client/src/icons/v1/Trophy.js
diff --git a/packages/loot-design/src/svg/v1/Tuning.js b/packages/desktop-client/src/icons/v1/Tuning.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Tuning.js
rename to packages/desktop-client/src/icons/v1/Tuning.js
diff --git a/packages/loot-design/src/svg/v1/Upload.js b/packages/desktop-client/src/icons/v1/Upload.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Upload.js
rename to packages/desktop-client/src/icons/v1/Upload.js
diff --git a/packages/loot-design/src/svg/v1/Usb.js b/packages/desktop-client/src/icons/v1/Usb.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Usb.js
rename to packages/desktop-client/src/icons/v1/Usb.js
diff --git a/packages/loot-design/src/svg/v1/User.js b/packages/desktop-client/src/icons/v1/User.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/User.js
rename to packages/desktop-client/src/icons/v1/User.js
diff --git a/packages/loot-design/src/svg/v1/UserAdd.js b/packages/desktop-client/src/icons/v1/UserAdd.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/UserAdd.js
rename to packages/desktop-client/src/icons/v1/UserAdd.js
diff --git a/packages/loot-design/src/svg/v1/UserGroup.js b/packages/desktop-client/src/icons/v1/UserGroup.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/UserGroup.js
rename to packages/desktop-client/src/icons/v1/UserGroup.js
diff --git a/packages/loot-design/src/svg/v1/UserSolidCircle.js b/packages/desktop-client/src/icons/v1/UserSolidCircle.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/UserSolidCircle.js
rename to packages/desktop-client/src/icons/v1/UserSolidCircle.js
diff --git a/packages/loot-design/src/svg/v1/UserSolidSquare.js b/packages/desktop-client/src/icons/v1/UserSolidSquare.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/UserSolidSquare.js
rename to packages/desktop-client/src/icons/v1/UserSolidSquare.js
diff --git a/packages/loot-design/src/svg/v1/Vector.js b/packages/desktop-client/src/icons/v1/Vector.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Vector.js
rename to packages/desktop-client/src/icons/v1/Vector.js
diff --git a/packages/loot-design/src/svg/v1/VideoCamera.js b/packages/desktop-client/src/icons/v1/VideoCamera.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/VideoCamera.js
rename to packages/desktop-client/src/icons/v1/VideoCamera.js
diff --git a/packages/loot-design/src/svg/v1/ViewCarousel.js b/packages/desktop-client/src/icons/v1/ViewCarousel.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ViewCarousel.js
rename to packages/desktop-client/src/icons/v1/ViewCarousel.js
diff --git a/packages/loot-design/src/svg/v1/ViewColumn.js b/packages/desktop-client/src/icons/v1/ViewColumn.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ViewColumn.js
rename to packages/desktop-client/src/icons/v1/ViewColumn.js
diff --git a/packages/loot-design/src/svg/v1/ViewHide.js b/packages/desktop-client/src/icons/v1/ViewHide.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ViewHide.js
rename to packages/desktop-client/src/icons/v1/ViewHide.js
diff --git a/packages/loot-design/src/svg/v1/ViewList.js b/packages/desktop-client/src/icons/v1/ViewList.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ViewList.js
rename to packages/desktop-client/src/icons/v1/ViewList.js
diff --git a/packages/loot-design/src/svg/v1/ViewShow.js b/packages/desktop-client/src/icons/v1/ViewShow.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ViewShow.js
rename to packages/desktop-client/src/icons/v1/ViewShow.js
diff --git a/packages/loot-design/src/svg/v1/ViewTile.js b/packages/desktop-client/src/icons/v1/ViewTile.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ViewTile.js
rename to packages/desktop-client/src/icons/v1/ViewTile.js
diff --git a/packages/loot-design/src/svg/v1/VolumeDown.js b/packages/desktop-client/src/icons/v1/VolumeDown.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/VolumeDown.js
rename to packages/desktop-client/src/icons/v1/VolumeDown.js
diff --git a/packages/loot-design/src/svg/v1/VolumeMute.js b/packages/desktop-client/src/icons/v1/VolumeMute.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/VolumeMute.js
rename to packages/desktop-client/src/icons/v1/VolumeMute.js
diff --git a/packages/loot-design/src/svg/v1/VolumeOff.js b/packages/desktop-client/src/icons/v1/VolumeOff.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/VolumeOff.js
rename to packages/desktop-client/src/icons/v1/VolumeOff.js
diff --git a/packages/loot-design/src/svg/v1/VolumeUp.js b/packages/desktop-client/src/icons/v1/VolumeUp.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/VolumeUp.js
rename to packages/desktop-client/src/icons/v1/VolumeUp.js
diff --git a/packages/loot-design/src/svg/v1/Wallet.js b/packages/desktop-client/src/icons/v1/Wallet.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Wallet.js
rename to packages/desktop-client/src/icons/v1/Wallet.js
diff --git a/packages/loot-design/src/svg/v1/Watch.js b/packages/desktop-client/src/icons/v1/Watch.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Watch.js
rename to packages/desktop-client/src/icons/v1/Watch.js
diff --git a/packages/loot-design/src/svg/v1/Window.js b/packages/desktop-client/src/icons/v1/Window.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Window.js
rename to packages/desktop-client/src/icons/v1/Window.js
diff --git a/packages/loot-design/src/svg/v1/WindowNew.js b/packages/desktop-client/src/icons/v1/WindowNew.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/WindowNew.js
rename to packages/desktop-client/src/icons/v1/WindowNew.js
diff --git a/packages/loot-design/src/svg/v1/WindowOpen.js b/packages/desktop-client/src/icons/v1/WindowOpen.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/WindowOpen.js
rename to packages/desktop-client/src/icons/v1/WindowOpen.js
diff --git a/packages/loot-design/src/svg/v1/Wrench.js b/packages/desktop-client/src/icons/v1/Wrench.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/Wrench.js
rename to packages/desktop-client/src/icons/v1/Wrench.js
diff --git a/packages/loot-design/src/svg/v1/YinYang.js b/packages/desktop-client/src/icons/v1/YinYang.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/YinYang.js
rename to packages/desktop-client/src/icons/v1/YinYang.js
diff --git a/packages/loot-design/src/svg/v1/ZoomIn.js b/packages/desktop-client/src/icons/v1/ZoomIn.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ZoomIn.js
rename to packages/desktop-client/src/icons/v1/ZoomIn.js
diff --git a/packages/loot-design/src/svg/v1/ZoomOut.js b/packages/desktop-client/src/icons/v1/ZoomOut.js
similarity index 100%
rename from packages/loot-design/src/svg/v1/ZoomOut.js
rename to packages/desktop-client/src/icons/v1/ZoomOut.js
diff --git a/packages/loot-design/src/svg/v1/add-outline.svg b/packages/desktop-client/src/icons/v1/add-outline.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/add-outline.svg
rename to packages/desktop-client/src/icons/v1/add-outline.svg
diff --git a/packages/loot-design/src/svg/v1/add-solid.svg b/packages/desktop-client/src/icons/v1/add-solid.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/add-solid.svg
rename to packages/desktop-client/src/icons/v1/add-solid.svg
diff --git a/packages/loot-design/src/svg/v1/add.svg b/packages/desktop-client/src/icons/v1/add.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/add.svg
rename to packages/desktop-client/src/icons/v1/add.svg
diff --git a/packages/loot-design/src/svg/v1/adjust.svg b/packages/desktop-client/src/icons/v1/adjust.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/adjust.svg
rename to packages/desktop-client/src/icons/v1/adjust.svg
diff --git a/packages/loot-design/src/svg/v1/airplane.svg b/packages/desktop-client/src/icons/v1/airplane.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/airplane.svg
rename to packages/desktop-client/src/icons/v1/airplane.svg
diff --git a/packages/loot-design/src/svg/v1/album.svg b/packages/desktop-client/src/icons/v1/album.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/album.svg
rename to packages/desktop-client/src/icons/v1/album.svg
diff --git a/packages/loot-design/src/svg/v1/align-center.svg b/packages/desktop-client/src/icons/v1/align-center.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/align-center.svg
rename to packages/desktop-client/src/icons/v1/align-center.svg
diff --git a/packages/loot-design/src/svg/v1/align-justified.svg b/packages/desktop-client/src/icons/v1/align-justified.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/align-justified.svg
rename to packages/desktop-client/src/icons/v1/align-justified.svg
diff --git a/packages/loot-design/src/svg/v1/align-left.svg b/packages/desktop-client/src/icons/v1/align-left.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/align-left.svg
rename to packages/desktop-client/src/icons/v1/align-left.svg
diff --git a/packages/loot-design/src/svg/v1/align-right.svg b/packages/desktop-client/src/icons/v1/align-right.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/align-right.svg
rename to packages/desktop-client/src/icons/v1/align-right.svg
diff --git a/packages/loot-design/src/svg/v1/anchor.svg b/packages/desktop-client/src/icons/v1/anchor.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/anchor.svg
rename to packages/desktop-client/src/icons/v1/anchor.svg
diff --git a/packages/loot-design/src/svg/v1/announcement.svg b/packages/desktop-client/src/icons/v1/announcement.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/announcement.svg
rename to packages/desktop-client/src/icons/v1/announcement.svg
diff --git a/packages/loot-design/src/svg/v1/apparel.svg b/packages/desktop-client/src/icons/v1/apparel.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/apparel.svg
rename to packages/desktop-client/src/icons/v1/apparel.svg
diff --git a/packages/loot-design/src/svg/v1/arrow-down.svg b/packages/desktop-client/src/icons/v1/arrow-down.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/arrow-down.svg
rename to packages/desktop-client/src/icons/v1/arrow-down.svg
diff --git a/packages/loot-design/src/svg/v1/arrow-left.svg b/packages/desktop-client/src/icons/v1/arrow-left.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/arrow-left.svg
rename to packages/desktop-client/src/icons/v1/arrow-left.svg
diff --git a/packages/loot-design/src/svg/v1/arrow-outline-down.svg b/packages/desktop-client/src/icons/v1/arrow-outline-down.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/arrow-outline-down.svg
rename to packages/desktop-client/src/icons/v1/arrow-outline-down.svg
diff --git a/packages/loot-design/src/svg/v1/arrow-outline-left.svg b/packages/desktop-client/src/icons/v1/arrow-outline-left.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/arrow-outline-left.svg
rename to packages/desktop-client/src/icons/v1/arrow-outline-left.svg
diff --git a/packages/loot-design/src/svg/v1/arrow-outline-right.svg b/packages/desktop-client/src/icons/v1/arrow-outline-right.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/arrow-outline-right.svg
rename to packages/desktop-client/src/icons/v1/arrow-outline-right.svg
diff --git a/packages/loot-design/src/svg/v1/arrow-outline-up.svg b/packages/desktop-client/src/icons/v1/arrow-outline-up.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/arrow-outline-up.svg
rename to packages/desktop-client/src/icons/v1/arrow-outline-up.svg
diff --git a/packages/loot-design/src/svg/v1/arrow-right.svg b/packages/desktop-client/src/icons/v1/arrow-right.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/arrow-right.svg
rename to packages/desktop-client/src/icons/v1/arrow-right.svg
diff --git a/packages/loot-design/src/svg/v1/arrow-thick-down.svg b/packages/desktop-client/src/icons/v1/arrow-thick-down.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/arrow-thick-down.svg
rename to packages/desktop-client/src/icons/v1/arrow-thick-down.svg
diff --git a/packages/loot-design/src/svg/v1/arrow-thick-left.svg b/packages/desktop-client/src/icons/v1/arrow-thick-left.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/arrow-thick-left.svg
rename to packages/desktop-client/src/icons/v1/arrow-thick-left.svg
diff --git a/packages/loot-design/src/svg/v1/arrow-thick-right.svg b/packages/desktop-client/src/icons/v1/arrow-thick-right.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/arrow-thick-right.svg
rename to packages/desktop-client/src/icons/v1/arrow-thick-right.svg
diff --git a/packages/loot-design/src/svg/v1/arrow-thick-up.svg b/packages/desktop-client/src/icons/v1/arrow-thick-up.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/arrow-thick-up.svg
rename to packages/desktop-client/src/icons/v1/arrow-thick-up.svg
diff --git a/packages/loot-design/src/svg/v1/arrow-thin-down.svg b/packages/desktop-client/src/icons/v1/arrow-thin-down.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/arrow-thin-down.svg
rename to packages/desktop-client/src/icons/v1/arrow-thin-down.svg
diff --git a/packages/loot-design/src/svg/v1/arrow-thin-left.svg b/packages/desktop-client/src/icons/v1/arrow-thin-left.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/arrow-thin-left.svg
rename to packages/desktop-client/src/icons/v1/arrow-thin-left.svg
diff --git a/packages/loot-design/src/svg/v1/arrow-thin-right.svg b/packages/desktop-client/src/icons/v1/arrow-thin-right.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/arrow-thin-right.svg
rename to packages/desktop-client/src/icons/v1/arrow-thin-right.svg
diff --git a/packages/loot-design/src/svg/v1/arrow-thin-up.svg b/packages/desktop-client/src/icons/v1/arrow-thin-up.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/arrow-thin-up.svg
rename to packages/desktop-client/src/icons/v1/arrow-thin-up.svg
diff --git a/packages/loot-design/src/svg/v1/arrow-up.svg b/packages/desktop-client/src/icons/v1/arrow-up.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/arrow-up.svg
rename to packages/desktop-client/src/icons/v1/arrow-up.svg
diff --git a/packages/loot-design/src/svg/v1/artist.svg b/packages/desktop-client/src/icons/v1/artist.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/artist.svg
rename to packages/desktop-client/src/icons/v1/artist.svg
diff --git a/packages/loot-design/src/svg/v1/at-symbol.svg b/packages/desktop-client/src/icons/v1/at-symbol.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/at-symbol.svg
rename to packages/desktop-client/src/icons/v1/at-symbol.svg
diff --git a/packages/loot-design/src/svg/v1/attachment.svg b/packages/desktop-client/src/icons/v1/attachment.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/attachment.svg
rename to packages/desktop-client/src/icons/v1/attachment.svg
diff --git a/packages/loot-design/src/svg/v1/backspace.svg b/packages/desktop-client/src/icons/v1/backspace.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/backspace.svg
rename to packages/desktop-client/src/icons/v1/backspace.svg
diff --git a/packages/loot-design/src/svg/v1/backward-step.svg b/packages/desktop-client/src/icons/v1/backward-step.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/backward-step.svg
rename to packages/desktop-client/src/icons/v1/backward-step.svg
diff --git a/packages/loot-design/src/svg/v1/backward.svg b/packages/desktop-client/src/icons/v1/backward.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/backward.svg
rename to packages/desktop-client/src/icons/v1/backward.svg
diff --git a/packages/loot-design/src/svg/v1/badge.svg b/packages/desktop-client/src/icons/v1/badge.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/badge.svg
rename to packages/desktop-client/src/icons/v1/badge.svg
diff --git a/packages/loot-design/src/svg/v1/battery-full.svg b/packages/desktop-client/src/icons/v1/battery-full.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/battery-full.svg
rename to packages/desktop-client/src/icons/v1/battery-full.svg
diff --git a/packages/loot-design/src/svg/v1/battery-half.svg b/packages/desktop-client/src/icons/v1/battery-half.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/battery-half.svg
rename to packages/desktop-client/src/icons/v1/battery-half.svg
diff --git a/packages/loot-design/src/svg/v1/battery-low.svg b/packages/desktop-client/src/icons/v1/battery-low.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/battery-low.svg
rename to packages/desktop-client/src/icons/v1/battery-low.svg
diff --git a/packages/loot-design/src/svg/v1/beverage.svg b/packages/desktop-client/src/icons/v1/beverage.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/beverage.svg
rename to packages/desktop-client/src/icons/v1/beverage.svg
diff --git a/packages/loot-design/src/svg/v1/block.svg b/packages/desktop-client/src/icons/v1/block.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/block.svg
rename to packages/desktop-client/src/icons/v1/block.svg
diff --git a/packages/loot-design/src/svg/v1/bluetooth.svg b/packages/desktop-client/src/icons/v1/bluetooth.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/bluetooth.svg
rename to packages/desktop-client/src/icons/v1/bluetooth.svg
diff --git a/packages/loot-design/src/svg/v1/bolt.svg b/packages/desktop-client/src/icons/v1/bolt.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/bolt.svg
rename to packages/desktop-client/src/icons/v1/bolt.svg
diff --git a/packages/loot-design/src/svg/v1/book-reference.svg b/packages/desktop-client/src/icons/v1/book-reference.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/book-reference.svg
rename to packages/desktop-client/src/icons/v1/book-reference.svg
diff --git a/packages/loot-design/src/svg/v1/bookmark copy 2.svg b/packages/desktop-client/src/icons/v1/bookmark copy 2.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/bookmark copy 2.svg
rename to packages/desktop-client/src/icons/v1/bookmark copy 2.svg
diff --git a/packages/loot-design/src/svg/v1/bookmark copy 3.svg b/packages/desktop-client/src/icons/v1/bookmark copy 3.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/bookmark copy 3.svg
rename to packages/desktop-client/src/icons/v1/bookmark copy 3.svg
diff --git a/packages/loot-design/src/svg/v1/bookmark-outline-add.svg b/packages/desktop-client/src/icons/v1/bookmark-outline-add.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/bookmark-outline-add.svg
rename to packages/desktop-client/src/icons/v1/bookmark-outline-add.svg
diff --git a/packages/loot-design/src/svg/v1/bookmark-outline.svg b/packages/desktop-client/src/icons/v1/bookmark-outline.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/bookmark-outline.svg
rename to packages/desktop-client/src/icons/v1/bookmark-outline.svg
diff --git a/packages/loot-design/src/svg/v1/bookmark.svg b/packages/desktop-client/src/icons/v1/bookmark.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/bookmark.svg
rename to packages/desktop-client/src/icons/v1/bookmark.svg
diff --git a/packages/loot-design/src/svg/v1/border-all.svg b/packages/desktop-client/src/icons/v1/border-all.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/border-all.svg
rename to packages/desktop-client/src/icons/v1/border-all.svg
diff --git a/packages/loot-design/src/svg/v1/border-bottom.svg b/packages/desktop-client/src/icons/v1/border-bottom.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/border-bottom.svg
rename to packages/desktop-client/src/icons/v1/border-bottom.svg
diff --git a/packages/loot-design/src/svg/v1/border-horizontal.svg b/packages/desktop-client/src/icons/v1/border-horizontal.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/border-horizontal.svg
rename to packages/desktop-client/src/icons/v1/border-horizontal.svg
diff --git a/packages/loot-design/src/svg/v1/border-inner.svg b/packages/desktop-client/src/icons/v1/border-inner.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/border-inner.svg
rename to packages/desktop-client/src/icons/v1/border-inner.svg
diff --git a/packages/loot-design/src/svg/v1/border-left.svg b/packages/desktop-client/src/icons/v1/border-left.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/border-left.svg
rename to packages/desktop-client/src/icons/v1/border-left.svg
diff --git a/packages/loot-design/src/svg/v1/border-none.svg b/packages/desktop-client/src/icons/v1/border-none.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/border-none.svg
rename to packages/desktop-client/src/icons/v1/border-none.svg
diff --git a/packages/loot-design/src/svg/v1/border-outer.svg b/packages/desktop-client/src/icons/v1/border-outer.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/border-outer.svg
rename to packages/desktop-client/src/icons/v1/border-outer.svg
diff --git a/packages/loot-design/src/svg/v1/border-right.svg b/packages/desktop-client/src/icons/v1/border-right.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/border-right.svg
rename to packages/desktop-client/src/icons/v1/border-right.svg
diff --git a/packages/loot-design/src/svg/v1/border-top.svg b/packages/desktop-client/src/icons/v1/border-top.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/border-top.svg
rename to packages/desktop-client/src/icons/v1/border-top.svg
diff --git a/packages/loot-design/src/svg/v1/border-vertical.svg b/packages/desktop-client/src/icons/v1/border-vertical.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/border-vertical.svg
rename to packages/desktop-client/src/icons/v1/border-vertical.svg
diff --git a/packages/loot-design/src/svg/v1/box.svg b/packages/desktop-client/src/icons/v1/box.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/box.svg
rename to packages/desktop-client/src/icons/v1/box.svg
diff --git a/packages/loot-design/src/svg/v1/brightness-down.svg b/packages/desktop-client/src/icons/v1/brightness-down.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/brightness-down.svg
rename to packages/desktop-client/src/icons/v1/brightness-down.svg
diff --git a/packages/loot-design/src/svg/v1/brightness-up.svg b/packages/desktop-client/src/icons/v1/brightness-up.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/brightness-up.svg
rename to packages/desktop-client/src/icons/v1/brightness-up.svg
diff --git a/packages/loot-design/src/svg/v1/browser-window-new.svg b/packages/desktop-client/src/icons/v1/browser-window-new.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/browser-window-new.svg
rename to packages/desktop-client/src/icons/v1/browser-window-new.svg
diff --git a/packages/loot-design/src/svg/v1/browser-window-open.svg b/packages/desktop-client/src/icons/v1/browser-window-open.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/browser-window-open.svg
rename to packages/desktop-client/src/icons/v1/browser-window-open.svg
diff --git a/packages/loot-design/src/svg/v1/browser-window.svg b/packages/desktop-client/src/icons/v1/browser-window.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/browser-window.svg
rename to packages/desktop-client/src/icons/v1/browser-window.svg
diff --git a/packages/loot-design/src/svg/v1/bug.svg b/packages/desktop-client/src/icons/v1/bug.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/bug.svg
rename to packages/desktop-client/src/icons/v1/bug.svg
diff --git a/packages/loot-design/src/svg/v1/buoy.svg b/packages/desktop-client/src/icons/v1/buoy.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/buoy.svg
rename to packages/desktop-client/src/icons/v1/buoy.svg
diff --git a/packages/loot-design/src/svg/v1/calculator.svg b/packages/desktop-client/src/icons/v1/calculator.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/calculator.svg
rename to packages/desktop-client/src/icons/v1/calculator.svg
diff --git a/packages/loot-design/src/svg/v1/calendar.svg b/packages/desktop-client/src/icons/v1/calendar.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/calendar.svg
rename to packages/desktop-client/src/icons/v1/calendar.svg
diff --git a/packages/loot-design/src/svg/v1/camera.svg b/packages/desktop-client/src/icons/v1/camera.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/camera.svg
rename to packages/desktop-client/src/icons/v1/camera.svg
diff --git a/packages/loot-design/src/svg/v1/chart-bar.svg b/packages/desktop-client/src/icons/v1/chart-bar.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/chart-bar.svg
rename to packages/desktop-client/src/icons/v1/chart-bar.svg
diff --git a/packages/loot-design/src/svg/v1/chart-pie.svg b/packages/desktop-client/src/icons/v1/chart-pie.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/chart-pie.svg
rename to packages/desktop-client/src/icons/v1/chart-pie.svg
diff --git a/packages/loot-design/src/svg/v1/chart.svg b/packages/desktop-client/src/icons/v1/chart.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/chart.svg
rename to packages/desktop-client/src/icons/v1/chart.svg
diff --git a/packages/loot-design/src/svg/v1/chat-bubble-dots.svg b/packages/desktop-client/src/icons/v1/chat-bubble-dots.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/chat-bubble-dots.svg
rename to packages/desktop-client/src/icons/v1/chat-bubble-dots.svg
diff --git a/packages/loot-design/src/svg/v1/check-alternative.svg b/packages/desktop-client/src/icons/v1/check-alternative.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/check-alternative.svg
rename to packages/desktop-client/src/icons/v1/check-alternative.svg
diff --git a/packages/loot-design/src/svg/v1/checkmark-outline.svg b/packages/desktop-client/src/icons/v1/checkmark-outline.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/checkmark-outline.svg
rename to packages/desktop-client/src/icons/v1/checkmark-outline.svg
diff --git a/packages/loot-design/src/svg/v1/checkmark.svg b/packages/desktop-client/src/icons/v1/checkmark.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/checkmark.svg
rename to packages/desktop-client/src/icons/v1/checkmark.svg
diff --git a/packages/loot-design/src/svg/v1/cheveron-down.svg b/packages/desktop-client/src/icons/v1/cheveron-down.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/cheveron-down.svg
rename to packages/desktop-client/src/icons/v1/cheveron-down.svg
diff --git a/packages/loot-design/src/svg/v1/cheveron-left.svg b/packages/desktop-client/src/icons/v1/cheveron-left.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/cheveron-left.svg
rename to packages/desktop-client/src/icons/v1/cheveron-left.svg
diff --git a/packages/loot-design/src/svg/v1/cheveron-outline-down.svg b/packages/desktop-client/src/icons/v1/cheveron-outline-down.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/cheveron-outline-down.svg
rename to packages/desktop-client/src/icons/v1/cheveron-outline-down.svg
diff --git a/packages/loot-design/src/svg/v1/cheveron-outline-left.svg b/packages/desktop-client/src/icons/v1/cheveron-outline-left.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/cheveron-outline-left.svg
rename to packages/desktop-client/src/icons/v1/cheveron-outline-left.svg
diff --git a/packages/loot-design/src/svg/v1/cheveron-outline-right.svg b/packages/desktop-client/src/icons/v1/cheveron-outline-right.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/cheveron-outline-right.svg
rename to packages/desktop-client/src/icons/v1/cheveron-outline-right.svg
diff --git a/packages/loot-design/src/svg/v1/cheveron-outline-up.svg b/packages/desktop-client/src/icons/v1/cheveron-outline-up.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/cheveron-outline-up.svg
rename to packages/desktop-client/src/icons/v1/cheveron-outline-up.svg
diff --git a/packages/loot-design/src/svg/v1/cheveron-right.svg b/packages/desktop-client/src/icons/v1/cheveron-right.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/cheveron-right.svg
rename to packages/desktop-client/src/icons/v1/cheveron-right.svg
diff --git a/packages/loot-design/src/svg/v1/cheveron-up.svg b/packages/desktop-client/src/icons/v1/cheveron-up.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/cheveron-up.svg
rename to packages/desktop-client/src/icons/v1/cheveron-up.svg
diff --git a/packages/loot-design/src/svg/v1/clipboard.svg b/packages/desktop-client/src/icons/v1/clipboard.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/clipboard.svg
rename to packages/desktop-client/src/icons/v1/clipboard.svg
diff --git a/packages/loot-design/src/svg/v1/close-outline.svg b/packages/desktop-client/src/icons/v1/close-outline.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/close-outline.svg
rename to packages/desktop-client/src/icons/v1/close-outline.svg
diff --git a/packages/loot-design/src/svg/v1/close-solid.svg b/packages/desktop-client/src/icons/v1/close-solid.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/close-solid.svg
rename to packages/desktop-client/src/icons/v1/close-solid.svg
diff --git a/packages/loot-design/src/svg/v1/close.svg b/packages/desktop-client/src/icons/v1/close.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/close.svg
rename to packages/desktop-client/src/icons/v1/close.svg
diff --git a/packages/loot-design/src/svg/v1/cloud-check.svg b/packages/desktop-client/src/icons/v1/cloud-check.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/cloud-check.svg
rename to packages/desktop-client/src/icons/v1/cloud-check.svg
diff --git a/packages/loot-design/src/svg/v1/cloud-download.svg b/packages/desktop-client/src/icons/v1/cloud-download.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/cloud-download.svg
rename to packages/desktop-client/src/icons/v1/cloud-download.svg
diff --git a/packages/loot-design/src/svg/v1/cloud-upload.svg b/packages/desktop-client/src/icons/v1/cloud-upload.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/cloud-upload.svg
rename to packages/desktop-client/src/icons/v1/cloud-upload.svg
diff --git a/packages/loot-design/src/svg/v1/cloud-warning.svg b/packages/desktop-client/src/icons/v1/cloud-warning.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/cloud-warning.svg
rename to packages/desktop-client/src/icons/v1/cloud-warning.svg
diff --git a/packages/loot-design/src/svg/v1/cloud.svg b/packages/desktop-client/src/icons/v1/cloud.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/cloud.svg
rename to packages/desktop-client/src/icons/v1/cloud.svg
diff --git a/packages/loot-design/src/svg/v1/code.svg b/packages/desktop-client/src/icons/v1/code.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/code.svg
rename to packages/desktop-client/src/icons/v1/code.svg
diff --git a/packages/loot-design/src/svg/v1/coffee.svg b/packages/desktop-client/src/icons/v1/coffee.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/coffee.svg
rename to packages/desktop-client/src/icons/v1/coffee.svg
diff --git a/packages/loot-design/src/svg/v1/cog.svg b/packages/desktop-client/src/icons/v1/cog.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/cog.svg
rename to packages/desktop-client/src/icons/v1/cog.svg
diff --git a/packages/loot-design/src/svg/v1/color-palette.svg b/packages/desktop-client/src/icons/v1/color-palette.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/color-palette.svg
rename to packages/desktop-client/src/icons/v1/color-palette.svg
diff --git a/packages/loot-design/src/svg/v1/compose.svg b/packages/desktop-client/src/icons/v1/compose.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/compose.svg
rename to packages/desktop-client/src/icons/v1/compose.svg
diff --git a/packages/loot-design/src/svg/v1/computer-desktop.svg b/packages/desktop-client/src/icons/v1/computer-desktop.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/computer-desktop.svg
rename to packages/desktop-client/src/icons/v1/computer-desktop.svg
diff --git a/packages/loot-design/src/svg/v1/computer-laptop.svg b/packages/desktop-client/src/icons/v1/computer-laptop.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/computer-laptop.svg
rename to packages/desktop-client/src/icons/v1/computer-laptop.svg
diff --git a/packages/loot-design/src/svg/v1/conversation.svg b/packages/desktop-client/src/icons/v1/conversation.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/conversation.svg
rename to packages/desktop-client/src/icons/v1/conversation.svg
diff --git a/packages/loot-design/src/svg/v1/copy.svg b/packages/desktop-client/src/icons/v1/copy.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/copy.svg
rename to packages/desktop-client/src/icons/v1/copy.svg
diff --git a/packages/loot-design/src/svg/v1/credit-card.svg b/packages/desktop-client/src/icons/v1/credit-card.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/credit-card.svg
rename to packages/desktop-client/src/icons/v1/credit-card.svg
diff --git a/packages/loot-design/src/svg/v1/currency-dollar.svg b/packages/desktop-client/src/icons/v1/currency-dollar.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/currency-dollar.svg
rename to packages/desktop-client/src/icons/v1/currency-dollar.svg
diff --git a/packages/loot-design/src/svg/v1/dashboard.svg b/packages/desktop-client/src/icons/v1/dashboard.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/dashboard.svg
rename to packages/desktop-client/src/icons/v1/dashboard.svg
diff --git a/packages/loot-design/src/svg/v1/date-add.svg b/packages/desktop-client/src/icons/v1/date-add.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/date-add.svg
rename to packages/desktop-client/src/icons/v1/date-add.svg
diff --git a/packages/loot-design/src/svg/v1/dial-pad.svg b/packages/desktop-client/src/icons/v1/dial-pad.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/dial-pad.svg
rename to packages/desktop-client/src/icons/v1/dial-pad.svg
diff --git a/packages/loot-design/src/svg/v1/directions.svg b/packages/desktop-client/src/icons/v1/directions.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/directions.svg
rename to packages/desktop-client/src/icons/v1/directions.svg
diff --git a/packages/loot-design/src/svg/v1/document-add.svg b/packages/desktop-client/src/icons/v1/document-add.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/document-add.svg
rename to packages/desktop-client/src/icons/v1/document-add.svg
diff --git a/packages/loot-design/src/svg/v1/document.svg b/packages/desktop-client/src/icons/v1/document.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/document.svg
rename to packages/desktop-client/src/icons/v1/document.svg
diff --git a/packages/loot-design/src/svg/v1/dots-horizontal-double.svg b/packages/desktop-client/src/icons/v1/dots-horizontal-double.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/dots-horizontal-double.svg
rename to packages/desktop-client/src/icons/v1/dots-horizontal-double.svg
diff --git a/packages/loot-design/src/svg/v1/dots-horizontal-triple.svg b/packages/desktop-client/src/icons/v1/dots-horizontal-triple.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/dots-horizontal-triple.svg
rename to packages/desktop-client/src/icons/v1/dots-horizontal-triple.svg
diff --git a/packages/loot-design/src/svg/v1/download.svg b/packages/desktop-client/src/icons/v1/download.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/download.svg
rename to packages/desktop-client/src/icons/v1/download.svg
diff --git a/packages/loot-design/src/svg/v1/duplicate.svg b/packages/desktop-client/src/icons/v1/duplicate.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/duplicate.svg
rename to packages/desktop-client/src/icons/v1/duplicate.svg
diff --git a/packages/loot-design/src/svg/v1/edit-copy.svg b/packages/desktop-client/src/icons/v1/edit-copy.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/edit-copy.svg
rename to packages/desktop-client/src/icons/v1/edit-copy.svg
diff --git a/packages/loot-design/src/svg/v1/edit-crop.svg b/packages/desktop-client/src/icons/v1/edit-crop.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/edit-crop.svg
rename to packages/desktop-client/src/icons/v1/edit-crop.svg
diff --git a/packages/loot-design/src/svg/v1/edit-cut.svg b/packages/desktop-client/src/icons/v1/edit-cut.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/edit-cut.svg
rename to packages/desktop-client/src/icons/v1/edit-cut.svg
diff --git a/packages/loot-design/src/svg/v1/edit-pencil.svg b/packages/desktop-client/src/icons/v1/edit-pencil.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/edit-pencil.svg
rename to packages/desktop-client/src/icons/v1/edit-pencil.svg
diff --git a/packages/loot-design/src/svg/v1/education.svg b/packages/desktop-client/src/icons/v1/education.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/education.svg
rename to packages/desktop-client/src/icons/v1/education.svg
diff --git a/packages/loot-design/src/svg/v1/envelope.svg b/packages/desktop-client/src/icons/v1/envelope.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/envelope.svg
rename to packages/desktop-client/src/icons/v1/envelope.svg
diff --git a/packages/loot-design/src/svg/v1/equals.svg b/packages/desktop-client/src/icons/v1/equals.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/equals.svg
rename to packages/desktop-client/src/icons/v1/equals.svg
diff --git a/packages/loot-design/src/svg/v1/exclamation-outline.svg b/packages/desktop-client/src/icons/v1/exclamation-outline.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/exclamation-outline.svg
rename to packages/desktop-client/src/icons/v1/exclamation-outline.svg
diff --git a/packages/loot-design/src/svg/v1/exclamation-solid.svg b/packages/desktop-client/src/icons/v1/exclamation-solid.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/exclamation-solid.svg
rename to packages/desktop-client/src/icons/v1/exclamation-solid.svg
diff --git a/packages/loot-design/src/svg/v1/explore.svg b/packages/desktop-client/src/icons/v1/explore.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/explore.svg
rename to packages/desktop-client/src/icons/v1/explore.svg
diff --git a/packages/loot-design/src/svg/v1/factory.svg b/packages/desktop-client/src/icons/v1/factory.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/factory.svg
rename to packages/desktop-client/src/icons/v1/factory.svg
diff --git a/packages/loot-design/src/svg/v1/fast-forward.svg b/packages/desktop-client/src/icons/v1/fast-forward.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/fast-forward.svg
rename to packages/desktop-client/src/icons/v1/fast-forward.svg
diff --git a/packages/loot-design/src/svg/v1/fast-rewind.svg b/packages/desktop-client/src/icons/v1/fast-rewind.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/fast-rewind.svg
rename to packages/desktop-client/src/icons/v1/fast-rewind.svg
diff --git a/packages/loot-design/src/svg/v1/file-double.svg b/packages/desktop-client/src/icons/v1/file-double.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/file-double.svg
rename to packages/desktop-client/src/icons/v1/file-double.svg
diff --git a/packages/loot-design/src/svg/v1/film.svg b/packages/desktop-client/src/icons/v1/film.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/film.svg
rename to packages/desktop-client/src/icons/v1/film.svg
diff --git a/packages/loot-design/src/svg/v1/filter.svg b/packages/desktop-client/src/icons/v1/filter.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/filter.svg
rename to packages/desktop-client/src/icons/v1/filter.svg
diff --git a/packages/loot-design/src/svg/v1/flag.svg b/packages/desktop-client/src/icons/v1/flag.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/flag.svg
rename to packages/desktop-client/src/icons/v1/flag.svg
diff --git a/packages/loot-design/src/svg/v1/flashlight.svg b/packages/desktop-client/src/icons/v1/flashlight.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/flashlight.svg
rename to packages/desktop-client/src/icons/v1/flashlight.svg
diff --git a/packages/loot-design/src/svg/v1/folder-outline-add.svg b/packages/desktop-client/src/icons/v1/folder-outline-add.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/folder-outline-add.svg
rename to packages/desktop-client/src/icons/v1/folder-outline-add.svg
diff --git a/packages/loot-design/src/svg/v1/folder-outline.svg b/packages/desktop-client/src/icons/v1/folder-outline.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/folder-outline.svg
rename to packages/desktop-client/src/icons/v1/folder-outline.svg
diff --git a/packages/loot-design/src/svg/v1/folder.svg b/packages/desktop-client/src/icons/v1/folder.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/folder.svg
rename to packages/desktop-client/src/icons/v1/folder.svg
diff --git a/packages/loot-design/src/svg/v1/format-bold.svg b/packages/desktop-client/src/icons/v1/format-bold.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/format-bold.svg
rename to packages/desktop-client/src/icons/v1/format-bold.svg
diff --git a/packages/loot-design/src/svg/v1/format-font-size.svg b/packages/desktop-client/src/icons/v1/format-font-size.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/format-font-size.svg
rename to packages/desktop-client/src/icons/v1/format-font-size.svg
diff --git a/packages/loot-design/src/svg/v1/format-italic.svg b/packages/desktop-client/src/icons/v1/format-italic.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/format-italic.svg
rename to packages/desktop-client/src/icons/v1/format-italic.svg
diff --git a/packages/loot-design/src/svg/v1/format-text-size.svg b/packages/desktop-client/src/icons/v1/format-text-size.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/format-text-size.svg
rename to packages/desktop-client/src/icons/v1/format-text-size.svg
diff --git a/packages/loot-design/src/svg/v1/format-underline.svg b/packages/desktop-client/src/icons/v1/format-underline.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/format-underline.svg
rename to packages/desktop-client/src/icons/v1/format-underline.svg
diff --git a/packages/loot-design/src/svg/v1/forward-step.svg b/packages/desktop-client/src/icons/v1/forward-step.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/forward-step.svg
rename to packages/desktop-client/src/icons/v1/forward-step.svg
diff --git a/packages/loot-design/src/svg/v1/forward.svg b/packages/desktop-client/src/icons/v1/forward.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/forward.svg
rename to packages/desktop-client/src/icons/v1/forward.svg
diff --git a/packages/loot-design/src/svg/v1/gift.svg b/packages/desktop-client/src/icons/v1/gift.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/gift.svg
rename to packages/desktop-client/src/icons/v1/gift.svg
diff --git a/packages/loot-design/src/svg/v1/globe.svg b/packages/desktop-client/src/icons/v1/globe.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/globe.svg
rename to packages/desktop-client/src/icons/v1/globe.svg
diff --git a/packages/loot-design/src/svg/v1/hand-stop.svg b/packages/desktop-client/src/icons/v1/hand-stop.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/hand-stop.svg
rename to packages/desktop-client/src/icons/v1/hand-stop.svg
diff --git a/packages/loot-design/src/svg/v1/hard-drive.svg b/packages/desktop-client/src/icons/v1/hard-drive.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/hard-drive.svg
rename to packages/desktop-client/src/icons/v1/hard-drive.svg
diff --git a/packages/loot-design/src/svg/v1/headphones.svg b/packages/desktop-client/src/icons/v1/headphones.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/headphones.svg
rename to packages/desktop-client/src/icons/v1/headphones.svg
diff --git a/packages/loot-design/src/svg/v1/heart.svg b/packages/desktop-client/src/icons/v1/heart.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/heart.svg
rename to packages/desktop-client/src/icons/v1/heart.svg
diff --git a/packages/loot-design/src/svg/v1/home.svg b/packages/desktop-client/src/icons/v1/home.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/home.svg
rename to packages/desktop-client/src/icons/v1/home.svg
diff --git a/packages/loot-design/src/svg/v1/hot.svg b/packages/desktop-client/src/icons/v1/hot.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/hot.svg
rename to packages/desktop-client/src/icons/v1/hot.svg
diff --git a/packages/loot-design/src/svg/v1/hour-glass.svg b/packages/desktop-client/src/icons/v1/hour-glass.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/hour-glass.svg
rename to packages/desktop-client/src/icons/v1/hour-glass.svg
diff --git a/packages/loot-design/src/svg/v1/inbox-check.svg b/packages/desktop-client/src/icons/v1/inbox-check.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/inbox-check.svg
rename to packages/desktop-client/src/icons/v1/inbox-check.svg
diff --git a/packages/loot-design/src/svg/v1/inbox-download.svg b/packages/desktop-client/src/icons/v1/inbox-download.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/inbox-download.svg
rename to packages/desktop-client/src/icons/v1/inbox-download.svg
diff --git a/packages/loot-design/src/svg/v1/inbox-full.svg b/packages/desktop-client/src/icons/v1/inbox-full.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/inbox-full.svg
rename to packages/desktop-client/src/icons/v1/inbox-full.svg
diff --git a/packages/loot-design/src/svg/v1/inbox.svg b/packages/desktop-client/src/icons/v1/inbox.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/inbox.svg
rename to packages/desktop-client/src/icons/v1/inbox.svg
diff --git a/packages/loot-design/src/svg/v1/indent-decrease.svg b/packages/desktop-client/src/icons/v1/indent-decrease.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/indent-decrease.svg
rename to packages/desktop-client/src/icons/v1/indent-decrease.svg
diff --git a/packages/loot-design/src/svg/v1/indent-increase.svg b/packages/desktop-client/src/icons/v1/indent-increase.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/indent-increase.svg
rename to packages/desktop-client/src/icons/v1/indent-increase.svg
diff --git a/packages/loot-design/src/svg/v1/information-outline.svg b/packages/desktop-client/src/icons/v1/information-outline.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/information-outline.svg
rename to packages/desktop-client/src/icons/v1/information-outline.svg
diff --git a/packages/loot-design/src/svg/v1/information-solid.svg b/packages/desktop-client/src/icons/v1/information-solid.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/information-solid.svg
rename to packages/desktop-client/src/icons/v1/information-solid.svg
diff --git a/packages/loot-design/src/svg/v1/key.svg b/packages/desktop-client/src/icons/v1/key.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/key.svg
rename to packages/desktop-client/src/icons/v1/key.svg
diff --git a/packages/loot-design/src/svg/v1/keyboard.svg b/packages/desktop-client/src/icons/v1/keyboard.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/keyboard.svg
rename to packages/desktop-client/src/icons/v1/keyboard.svg
diff --git a/packages/loot-design/src/svg/v1/layers.svg b/packages/desktop-client/src/icons/v1/layers.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/layers.svg
rename to packages/desktop-client/src/icons/v1/layers.svg
diff --git a/packages/loot-design/src/svg/v1/library.svg b/packages/desktop-client/src/icons/v1/library.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/library.svg
rename to packages/desktop-client/src/icons/v1/library.svg
diff --git a/packages/loot-design/src/svg/v1/light-bulb.svg b/packages/desktop-client/src/icons/v1/light-bulb.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/light-bulb.svg
rename to packages/desktop-client/src/icons/v1/light-bulb.svg
diff --git a/packages/loot-design/src/svg/v1/link.svg b/packages/desktop-client/src/icons/v1/link.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/link.svg
rename to packages/desktop-client/src/icons/v1/link.svg
diff --git a/packages/loot-design/src/svg/v1/list-add.svg b/packages/desktop-client/src/icons/v1/list-add.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/list-add.svg
rename to packages/desktop-client/src/icons/v1/list-add.svg
diff --git a/packages/loot-design/src/svg/v1/list-bullet.svg b/packages/desktop-client/src/icons/v1/list-bullet.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/list-bullet.svg
rename to packages/desktop-client/src/icons/v1/list-bullet.svg
diff --git a/packages/loot-design/src/svg/v1/list.svg b/packages/desktop-client/src/icons/v1/list.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/list.svg
rename to packages/desktop-client/src/icons/v1/list.svg
diff --git a/packages/loot-design/src/svg/v1/load-balancer.svg b/packages/desktop-client/src/icons/v1/load-balancer.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/load-balancer.svg
rename to packages/desktop-client/src/icons/v1/load-balancer.svg
diff --git a/packages/loot-design/src/svg/v1/location-current.svg b/packages/desktop-client/src/icons/v1/location-current.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/location-current.svg
rename to packages/desktop-client/src/icons/v1/location-current.svg
diff --git a/packages/loot-design/src/svg/v1/location-food.svg b/packages/desktop-client/src/icons/v1/location-food.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/location-food.svg
rename to packages/desktop-client/src/icons/v1/location-food.svg
diff --git a/packages/loot-design/src/svg/v1/location-gas-station.svg b/packages/desktop-client/src/icons/v1/location-gas-station.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/location-gas-station.svg
rename to packages/desktop-client/src/icons/v1/location-gas-station.svg
diff --git a/packages/loot-design/src/svg/v1/location-hotel.svg b/packages/desktop-client/src/icons/v1/location-hotel.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/location-hotel.svg
rename to packages/desktop-client/src/icons/v1/location-hotel.svg
diff --git a/packages/loot-design/src/svg/v1/location-marina.svg b/packages/desktop-client/src/icons/v1/location-marina.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/location-marina.svg
rename to packages/desktop-client/src/icons/v1/location-marina.svg
diff --git a/packages/loot-design/src/svg/v1/location-park.svg b/packages/desktop-client/src/icons/v1/location-park.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/location-park.svg
rename to packages/desktop-client/src/icons/v1/location-park.svg
diff --git a/packages/loot-design/src/svg/v1/location-restroom.svg b/packages/desktop-client/src/icons/v1/location-restroom.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/location-restroom.svg
rename to packages/desktop-client/src/icons/v1/location-restroom.svg
diff --git a/packages/loot-design/src/svg/v1/location-shopping.svg b/packages/desktop-client/src/icons/v1/location-shopping.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/location-shopping.svg
rename to packages/desktop-client/src/icons/v1/location-shopping.svg
diff --git a/packages/loot-design/src/svg/v1/location.svg b/packages/desktop-client/src/icons/v1/location.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/location.svg
rename to packages/desktop-client/src/icons/v1/location.svg
diff --git a/packages/loot-design/src/svg/v1/lock-closed.svg b/packages/desktop-client/src/icons/v1/lock-closed.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/lock-closed.svg
rename to packages/desktop-client/src/icons/v1/lock-closed.svg
diff --git a/packages/loot-design/src/svg/v1/lock-open.svg b/packages/desktop-client/src/icons/v1/lock-open.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/lock-open.svg
rename to packages/desktop-client/src/icons/v1/lock-open.svg
diff --git a/packages/loot-design/src/svg/v1/map.svg b/packages/desktop-client/src/icons/v1/map.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/map.svg
rename to packages/desktop-client/src/icons/v1/map.svg
diff --git a/packages/loot-design/src/svg/v1/menu.svg b/packages/desktop-client/src/icons/v1/menu.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/menu.svg
rename to packages/desktop-client/src/icons/v1/menu.svg
diff --git a/packages/loot-design/src/svg/v1/mic.svg b/packages/desktop-client/src/icons/v1/mic.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/mic.svg
rename to packages/desktop-client/src/icons/v1/mic.svg
diff --git a/packages/loot-design/src/svg/v1/minus-outline.svg b/packages/desktop-client/src/icons/v1/minus-outline.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/minus-outline.svg
rename to packages/desktop-client/src/icons/v1/minus-outline.svg
diff --git a/packages/loot-design/src/svg/v1/minus-solid.svg b/packages/desktop-client/src/icons/v1/minus-solid.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/minus-solid.svg
rename to packages/desktop-client/src/icons/v1/minus-solid.svg
diff --git a/packages/loot-design/src/svg/v1/mobile-devices.svg b/packages/desktop-client/src/icons/v1/mobile-devices.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/mobile-devices.svg
rename to packages/desktop-client/src/icons/v1/mobile-devices.svg
diff --git a/packages/loot-design/src/svg/v1/money-bag.svg b/packages/desktop-client/src/icons/v1/money-bag.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/money-bag.svg
rename to packages/desktop-client/src/icons/v1/money-bag.svg
diff --git a/packages/loot-design/src/svg/v1/mood-happy-outline.svg b/packages/desktop-client/src/icons/v1/mood-happy-outline.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/mood-happy-outline.svg
rename to packages/desktop-client/src/icons/v1/mood-happy-outline.svg
diff --git a/packages/loot-design/src/svg/v1/mood-happy-solid.svg b/packages/desktop-client/src/icons/v1/mood-happy-solid.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/mood-happy-solid.svg
rename to packages/desktop-client/src/icons/v1/mood-happy-solid.svg
diff --git a/packages/loot-design/src/svg/v1/mood-neutral-outline.svg b/packages/desktop-client/src/icons/v1/mood-neutral-outline.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/mood-neutral-outline.svg
rename to packages/desktop-client/src/icons/v1/mood-neutral-outline.svg
diff --git a/packages/loot-design/src/svg/v1/mood-neutral-solid.svg b/packages/desktop-client/src/icons/v1/mood-neutral-solid.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/mood-neutral-solid.svg
rename to packages/desktop-client/src/icons/v1/mood-neutral-solid.svg
diff --git a/packages/loot-design/src/svg/v1/mood-sad-outline.svg b/packages/desktop-client/src/icons/v1/mood-sad-outline.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/mood-sad-outline.svg
rename to packages/desktop-client/src/icons/v1/mood-sad-outline.svg
diff --git a/packages/loot-design/src/svg/v1/mood-sad-solid.svg b/packages/desktop-client/src/icons/v1/mood-sad-solid.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/mood-sad-solid.svg
rename to packages/desktop-client/src/icons/v1/mood-sad-solid.svg
diff --git a/packages/loot-design/src/svg/v1/mouse.svg b/packages/desktop-client/src/icons/v1/mouse.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/mouse.svg
rename to packages/desktop-client/src/icons/v1/mouse.svg
diff --git a/packages/loot-design/src/svg/v1/move-back.svg b/packages/desktop-client/src/icons/v1/move-back.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/move-back.svg
rename to packages/desktop-client/src/icons/v1/move-back.svg
diff --git a/packages/loot-design/src/svg/v1/music-album.svg b/packages/desktop-client/src/icons/v1/music-album.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/music-album.svg
rename to packages/desktop-client/src/icons/v1/music-album.svg
diff --git a/packages/loot-design/src/svg/v1/music-artist.svg b/packages/desktop-client/src/icons/v1/music-artist.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/music-artist.svg
rename to packages/desktop-client/src/icons/v1/music-artist.svg
diff --git a/packages/loot-design/src/svg/v1/music-notes.svg b/packages/desktop-client/src/icons/v1/music-notes.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/music-notes.svg
rename to packages/desktop-client/src/icons/v1/music-notes.svg
diff --git a/packages/loot-design/src/svg/v1/music-playlist.svg b/packages/desktop-client/src/icons/v1/music-playlist.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/music-playlist.svg
rename to packages/desktop-client/src/icons/v1/music-playlist.svg
diff --git a/packages/loot-design/src/svg/v1/navigation-more.svg b/packages/desktop-client/src/icons/v1/navigation-more.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/navigation-more.svg
rename to packages/desktop-client/src/icons/v1/navigation-more.svg
diff --git a/packages/loot-design/src/svg/v1/network.svg b/packages/desktop-client/src/icons/v1/network.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/network.svg
rename to packages/desktop-client/src/icons/v1/network.svg
diff --git a/packages/loot-design/src/svg/v1/news-paper.svg b/packages/desktop-client/src/icons/v1/news-paper.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/news-paper.svg
rename to packages/desktop-client/src/icons/v1/news-paper.svg
diff --git a/packages/loot-design/src/svg/v1/notification.svg b/packages/desktop-client/src/icons/v1/notification.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/notification.svg
rename to packages/desktop-client/src/icons/v1/notification.svg
diff --git a/packages/loot-design/src/svg/v1/notifications-outline.svg b/packages/desktop-client/src/icons/v1/notifications-outline.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/notifications-outline.svg
rename to packages/desktop-client/src/icons/v1/notifications-outline.svg
diff --git a/packages/loot-design/src/svg/v1/notifications.svg b/packages/desktop-client/src/icons/v1/notifications.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/notifications.svg
rename to packages/desktop-client/src/icons/v1/notifications.svg
diff --git a/packages/loot-design/src/svg/v1/paste.svg b/packages/desktop-client/src/icons/v1/paste.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/paste.svg
rename to packages/desktop-client/src/icons/v1/paste.svg
diff --git a/packages/loot-design/src/svg/v1/pause-outline.svg b/packages/desktop-client/src/icons/v1/pause-outline.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/pause-outline.svg
rename to packages/desktop-client/src/icons/v1/pause-outline.svg
diff --git a/packages/loot-design/src/svg/v1/pause-solid.svg b/packages/desktop-client/src/icons/v1/pause-solid.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/pause-solid.svg
rename to packages/desktop-client/src/icons/v1/pause-solid.svg
diff --git a/packages/loot-design/src/svg/v1/pause.svg b/packages/desktop-client/src/icons/v1/pause.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/pause.svg
rename to packages/desktop-client/src/icons/v1/pause.svg
diff --git a/packages/loot-design/src/svg/v1/pen-tool.svg b/packages/desktop-client/src/icons/v1/pen-tool.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/pen-tool.svg
rename to packages/desktop-client/src/icons/v1/pen-tool.svg
diff --git a/packages/loot-design/src/svg/v1/pencil-write.svg b/packages/desktop-client/src/icons/v1/pencil-write.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/pencil-write.svg
rename to packages/desktop-client/src/icons/v1/pencil-write.svg
diff --git a/packages/loot-design/src/svg/v1/phone.svg b/packages/desktop-client/src/icons/v1/phone.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/phone.svg
rename to packages/desktop-client/src/icons/v1/phone.svg
diff --git a/packages/loot-design/src/svg/v1/photo.svg b/packages/desktop-client/src/icons/v1/photo.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/photo.svg
rename to packages/desktop-client/src/icons/v1/photo.svg
diff --git a/packages/loot-design/src/svg/v1/php-elephant.svg b/packages/desktop-client/src/icons/v1/php-elephant.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/php-elephant.svg
rename to packages/desktop-client/src/icons/v1/php-elephant.svg
diff --git a/packages/loot-design/src/svg/v1/piggy-bank.svg b/packages/desktop-client/src/icons/v1/piggy-bank.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/piggy-bank.svg
rename to packages/desktop-client/src/icons/v1/piggy-bank.svg
diff --git a/packages/loot-design/src/svg/v1/pin.svg b/packages/desktop-client/src/icons/v1/pin.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/pin.svg
rename to packages/desktop-client/src/icons/v1/pin.svg
diff --git a/packages/loot-design/src/svg/v1/play-outline.svg b/packages/desktop-client/src/icons/v1/play-outline.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/play-outline.svg
rename to packages/desktop-client/src/icons/v1/play-outline.svg
diff --git a/packages/loot-design/src/svg/v1/play.svg b/packages/desktop-client/src/icons/v1/play.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/play.svg
rename to packages/desktop-client/src/icons/v1/play.svg
diff --git a/packages/loot-design/src/svg/v1/playlist.svg b/packages/desktop-client/src/icons/v1/playlist.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/playlist.svg
rename to packages/desktop-client/src/icons/v1/playlist.svg
diff --git a/packages/loot-design/src/svg/v1/plugin.svg b/packages/desktop-client/src/icons/v1/plugin.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/plugin.svg
rename to packages/desktop-client/src/icons/v1/plugin.svg
diff --git a/packages/loot-design/src/svg/v1/portfolio.svg b/packages/desktop-client/src/icons/v1/portfolio.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/portfolio.svg
rename to packages/desktop-client/src/icons/v1/portfolio.svg
diff --git a/packages/loot-design/src/svg/v1/printer.svg b/packages/desktop-client/src/icons/v1/printer.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/printer.svg
rename to packages/desktop-client/src/icons/v1/printer.svg
diff --git a/packages/loot-design/src/svg/v1/pylon.svg b/packages/desktop-client/src/icons/v1/pylon.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/pylon.svg
rename to packages/desktop-client/src/icons/v1/pylon.svg
diff --git a/packages/loot-design/src/svg/v1/question.svg b/packages/desktop-client/src/icons/v1/question.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/question.svg
rename to packages/desktop-client/src/icons/v1/question.svg
diff --git a/packages/loot-design/src/svg/v1/queue.svg b/packages/desktop-client/src/icons/v1/queue.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/queue.svg
rename to packages/desktop-client/src/icons/v1/queue.svg
diff --git a/packages/loot-design/src/svg/v1/radar copy 2.svg b/packages/desktop-client/src/icons/v1/radar copy 2.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/radar copy 2.svg
rename to packages/desktop-client/src/icons/v1/radar copy 2.svg
diff --git a/packages/loot-design/src/svg/v1/radar.svg b/packages/desktop-client/src/icons/v1/radar.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/radar.svg
rename to packages/desktop-client/src/icons/v1/radar.svg
diff --git a/packages/loot-design/src/svg/v1/radio.svg b/packages/desktop-client/src/icons/v1/radio.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/radio.svg
rename to packages/desktop-client/src/icons/v1/radio.svg
diff --git a/packages/loot-design/src/svg/v1/refresh.svg b/packages/desktop-client/src/icons/v1/refresh.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/refresh.svg
rename to packages/desktop-client/src/icons/v1/refresh.svg
diff --git a/packages/loot-design/src/svg/v1/reload.svg b/packages/desktop-client/src/icons/v1/reload.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/reload.svg
rename to packages/desktop-client/src/icons/v1/reload.svg
diff --git a/packages/loot-design/src/svg/v1/reply-all.svg b/packages/desktop-client/src/icons/v1/reply-all.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/reply-all.svg
rename to packages/desktop-client/src/icons/v1/reply-all.svg
diff --git a/packages/loot-design/src/svg/v1/reply.svg b/packages/desktop-client/src/icons/v1/reply.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/reply.svg
rename to packages/desktop-client/src/icons/v1/reply.svg
diff --git a/packages/loot-design/src/svg/v1/reports.svg b/packages/desktop-client/src/icons/v1/reports.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/reports.svg
rename to packages/desktop-client/src/icons/v1/reports.svg
diff --git a/packages/loot-design/src/svg/v1/repost.svg b/packages/desktop-client/src/icons/v1/repost.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/repost.svg
rename to packages/desktop-client/src/icons/v1/repost.svg
diff --git a/packages/loot-design/src/svg/v1/save-disk.svg b/packages/desktop-client/src/icons/v1/save-disk.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/save-disk.svg
rename to packages/desktop-client/src/icons/v1/save-disk.svg
diff --git a/packages/loot-design/src/svg/v1/screen-full.svg b/packages/desktop-client/src/icons/v1/screen-full.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/screen-full.svg
rename to packages/desktop-client/src/icons/v1/screen-full.svg
diff --git a/packages/loot-design/src/svg/v1/search.svg b/packages/desktop-client/src/icons/v1/search.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/search.svg
rename to packages/desktop-client/src/icons/v1/search.svg
diff --git a/packages/loot-design/src/svg/v1/send.svg b/packages/desktop-client/src/icons/v1/send.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/send.svg
rename to packages/desktop-client/src/icons/v1/send.svg
diff --git a/packages/loot-design/src/svg/v1/servers.svg b/packages/desktop-client/src/icons/v1/servers.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/servers.svg
rename to packages/desktop-client/src/icons/v1/servers.svg
diff --git a/packages/loot-design/src/svg/v1/share-01.svg b/packages/desktop-client/src/icons/v1/share-01.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/share-01.svg
rename to packages/desktop-client/src/icons/v1/share-01.svg
diff --git a/packages/loot-design/src/svg/v1/share-alt.svg b/packages/desktop-client/src/icons/v1/share-alt.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/share-alt.svg
rename to packages/desktop-client/src/icons/v1/share-alt.svg
diff --git a/packages/loot-design/src/svg/v1/share.svg b/packages/desktop-client/src/icons/v1/share.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/share.svg
rename to packages/desktop-client/src/icons/v1/share.svg
diff --git a/packages/loot-design/src/svg/v1/shield.svg b/packages/desktop-client/src/icons/v1/shield.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/shield.svg
rename to packages/desktop-client/src/icons/v1/shield.svg
diff --git a/packages/loot-design/src/svg/v1/shopping-cart.svg b/packages/desktop-client/src/icons/v1/shopping-cart.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/shopping-cart.svg
rename to packages/desktop-client/src/icons/v1/shopping-cart.svg
diff --git a/packages/loot-design/src/svg/v1/show-sidebar.svg b/packages/desktop-client/src/icons/v1/show-sidebar.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/show-sidebar.svg
rename to packages/desktop-client/src/icons/v1/show-sidebar.svg
diff --git a/packages/loot-design/src/svg/v1/shuffle.svg b/packages/desktop-client/src/icons/v1/shuffle.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/shuffle.svg
rename to packages/desktop-client/src/icons/v1/shuffle.svg
diff --git a/packages/loot-design/src/svg/v1/stand-by.svg b/packages/desktop-client/src/icons/v1/stand-by.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/stand-by.svg
rename to packages/desktop-client/src/icons/v1/stand-by.svg
diff --git a/packages/loot-design/src/svg/v1/star-full.svg b/packages/desktop-client/src/icons/v1/star-full.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/star-full.svg
rename to packages/desktop-client/src/icons/v1/star-full.svg
diff --git a/packages/loot-design/src/svg/v1/station.svg b/packages/desktop-client/src/icons/v1/station.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/station.svg
rename to packages/desktop-client/src/icons/v1/station.svg
diff --git a/packages/loot-design/src/svg/v1/step-backward.svg b/packages/desktop-client/src/icons/v1/step-backward.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/step-backward.svg
rename to packages/desktop-client/src/icons/v1/step-backward.svg
diff --git a/packages/loot-design/src/svg/v1/step-forward.svg b/packages/desktop-client/src/icons/v1/step-forward.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/step-forward.svg
rename to packages/desktop-client/src/icons/v1/step-forward.svg
diff --git a/packages/loot-design/src/svg/v1/stethoscope.svg b/packages/desktop-client/src/icons/v1/stethoscope.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/stethoscope.svg
rename to packages/desktop-client/src/icons/v1/stethoscope.svg
diff --git a/packages/loot-design/src/svg/v1/store-front.svg b/packages/desktop-client/src/icons/v1/store-front.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/store-front.svg
rename to packages/desktop-client/src/icons/v1/store-front.svg
diff --git a/packages/loot-design/src/svg/v1/stroke-width.svg b/packages/desktop-client/src/icons/v1/stroke-width.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/stroke-width.svg
rename to packages/desktop-client/src/icons/v1/stroke-width.svg
diff --git a/packages/loot-design/src/svg/v1/subdirectory-left.svg b/packages/desktop-client/src/icons/v1/subdirectory-left.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/subdirectory-left.svg
rename to packages/desktop-client/src/icons/v1/subdirectory-left.svg
diff --git a/packages/loot-design/src/svg/v1/subdirectory-right.svg b/packages/desktop-client/src/icons/v1/subdirectory-right.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/subdirectory-right.svg
rename to packages/desktop-client/src/icons/v1/subdirectory-right.svg
diff --git a/packages/loot-design/src/svg/v1/subtract.svg b/packages/desktop-client/src/icons/v1/subtract.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/subtract.svg
rename to packages/desktop-client/src/icons/v1/subtract.svg
diff --git a/packages/loot-design/src/svg/v1/swap.svg b/packages/desktop-client/src/icons/v1/swap.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/swap.svg
rename to packages/desktop-client/src/icons/v1/swap.svg
diff --git a/packages/loot-design/src/svg/v1/tablet.svg b/packages/desktop-client/src/icons/v1/tablet.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/tablet.svg
rename to packages/desktop-client/src/icons/v1/tablet.svg
diff --git a/packages/loot-design/src/svg/v1/tag.svg b/packages/desktop-client/src/icons/v1/tag.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/tag.svg
rename to packages/desktop-client/src/icons/v1/tag.svg
diff --git a/packages/loot-design/src/svg/v1/target.svg b/packages/desktop-client/src/icons/v1/target.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/target.svg
rename to packages/desktop-client/src/icons/v1/target.svg
diff --git a/packages/loot-design/src/svg/v1/text-box.svg b/packages/desktop-client/src/icons/v1/text-box.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/text-box.svg
rename to packages/desktop-client/src/icons/v1/text-box.svg
diff --git a/packages/loot-design/src/svg/v1/text-decoration.svg b/packages/desktop-client/src/icons/v1/text-decoration.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/text-decoration.svg
rename to packages/desktop-client/src/icons/v1/text-decoration.svg
diff --git a/packages/loot-design/src/svg/v1/thermometer.svg b/packages/desktop-client/src/icons/v1/thermometer.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/thermometer.svg
rename to packages/desktop-client/src/icons/v1/thermometer.svg
diff --git a/packages/loot-design/src/svg/v1/thumbs-down.svg b/packages/desktop-client/src/icons/v1/thumbs-down.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/thumbs-down.svg
rename to packages/desktop-client/src/icons/v1/thumbs-down.svg
diff --git a/packages/loot-design/src/svg/v1/thumbs-up.svg b/packages/desktop-client/src/icons/v1/thumbs-up.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/thumbs-up.svg
rename to packages/desktop-client/src/icons/v1/thumbs-up.svg
diff --git a/packages/loot-design/src/svg/v1/ticket.svg b/packages/desktop-client/src/icons/v1/ticket.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/ticket.svg
rename to packages/desktop-client/src/icons/v1/ticket.svg
diff --git a/packages/loot-design/src/svg/v1/time.svg b/packages/desktop-client/src/icons/v1/time.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/time.svg
rename to packages/desktop-client/src/icons/v1/time.svg
diff --git a/packages/loot-design/src/svg/v1/timer.svg b/packages/desktop-client/src/icons/v1/timer.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/timer.svg
rename to packages/desktop-client/src/icons/v1/timer.svg
diff --git a/packages/loot-design/src/svg/v1/tools copy.svg b/packages/desktop-client/src/icons/v1/tools copy.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/tools copy.svg
rename to packages/desktop-client/src/icons/v1/tools copy.svg
diff --git a/packages/loot-design/src/svg/v1/translate.svg b/packages/desktop-client/src/icons/v1/translate.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/translate.svg
rename to packages/desktop-client/src/icons/v1/translate.svg
diff --git a/packages/loot-design/src/svg/v1/trash.svg b/packages/desktop-client/src/icons/v1/trash.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/trash.svg
rename to packages/desktop-client/src/icons/v1/trash.svg
diff --git a/packages/loot-design/src/svg/v1/travel-bus.svg b/packages/desktop-client/src/icons/v1/travel-bus.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/travel-bus.svg
rename to packages/desktop-client/src/icons/v1/travel-bus.svg
diff --git a/packages/loot-design/src/svg/v1/travel-car.svg b/packages/desktop-client/src/icons/v1/travel-car.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/travel-car.svg
rename to packages/desktop-client/src/icons/v1/travel-car.svg
diff --git a/packages/loot-design/src/svg/v1/travel-case.svg b/packages/desktop-client/src/icons/v1/travel-case.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/travel-case.svg
rename to packages/desktop-client/src/icons/v1/travel-case.svg
diff --git a/packages/loot-design/src/svg/v1/travel-taxi-cab.svg b/packages/desktop-client/src/icons/v1/travel-taxi-cab.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/travel-taxi-cab.svg
rename to packages/desktop-client/src/icons/v1/travel-taxi-cab.svg
diff --git a/packages/loot-design/src/svg/v1/travel-train.svg b/packages/desktop-client/src/icons/v1/travel-train.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/travel-train.svg
rename to packages/desktop-client/src/icons/v1/travel-train.svg
diff --git a/packages/loot-design/src/svg/v1/travel-walk.svg b/packages/desktop-client/src/icons/v1/travel-walk.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/travel-walk.svg
rename to packages/desktop-client/src/icons/v1/travel-walk.svg
diff --git a/packages/loot-design/src/svg/v1/travel.svg b/packages/desktop-client/src/icons/v1/travel.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/travel.svg
rename to packages/desktop-client/src/icons/v1/travel.svg
diff --git a/packages/loot-design/src/svg/v1/trophy.svg b/packages/desktop-client/src/icons/v1/trophy.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/trophy.svg
rename to packages/desktop-client/src/icons/v1/trophy.svg
diff --git a/packages/loot-design/src/svg/v1/tuning.svg b/packages/desktop-client/src/icons/v1/tuning.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/tuning.svg
rename to packages/desktop-client/src/icons/v1/tuning.svg
diff --git a/packages/loot-design/src/svg/v1/upload.svg b/packages/desktop-client/src/icons/v1/upload.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/upload.svg
rename to packages/desktop-client/src/icons/v1/upload.svg
diff --git a/packages/loot-design/src/svg/v1/usb.svg b/packages/desktop-client/src/icons/v1/usb.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/usb.svg
rename to packages/desktop-client/src/icons/v1/usb.svg
diff --git a/packages/loot-design/src/svg/v1/user-add.svg b/packages/desktop-client/src/icons/v1/user-add.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/user-add.svg
rename to packages/desktop-client/src/icons/v1/user-add.svg
diff --git a/packages/loot-design/src/svg/v1/user-group.svg b/packages/desktop-client/src/icons/v1/user-group.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/user-group.svg
rename to packages/desktop-client/src/icons/v1/user-group.svg
diff --git a/packages/loot-design/src/svg/v1/user-solid-circle.svg b/packages/desktop-client/src/icons/v1/user-solid-circle.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/user-solid-circle.svg
rename to packages/desktop-client/src/icons/v1/user-solid-circle.svg
diff --git a/packages/loot-design/src/svg/v1/user-solid-square.svg b/packages/desktop-client/src/icons/v1/user-solid-square.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/user-solid-square.svg
rename to packages/desktop-client/src/icons/v1/user-solid-square.svg
diff --git a/packages/loot-design/src/svg/v1/user.svg b/packages/desktop-client/src/icons/v1/user.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/user.svg
rename to packages/desktop-client/src/icons/v1/user.svg
diff --git a/packages/loot-design/src/svg/v1/vector.svg b/packages/desktop-client/src/icons/v1/vector.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/vector.svg
rename to packages/desktop-client/src/icons/v1/vector.svg
diff --git a/packages/loot-design/src/svg/v1/video-camera.svg b/packages/desktop-client/src/icons/v1/video-camera.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/video-camera.svg
rename to packages/desktop-client/src/icons/v1/video-camera.svg
diff --git a/packages/loot-design/src/svg/v1/view-carousel.svg b/packages/desktop-client/src/icons/v1/view-carousel.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/view-carousel.svg
rename to packages/desktop-client/src/icons/v1/view-carousel.svg
diff --git a/packages/loot-design/src/svg/v1/view-column.svg b/packages/desktop-client/src/icons/v1/view-column.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/view-column.svg
rename to packages/desktop-client/src/icons/v1/view-column.svg
diff --git a/packages/loot-design/src/svg/v1/view-hide.svg b/packages/desktop-client/src/icons/v1/view-hide.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/view-hide.svg
rename to packages/desktop-client/src/icons/v1/view-hide.svg
diff --git a/packages/loot-design/src/svg/v1/view-list.svg b/packages/desktop-client/src/icons/v1/view-list.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/view-list.svg
rename to packages/desktop-client/src/icons/v1/view-list.svg
diff --git a/packages/loot-design/src/svg/v1/view-show.svg b/packages/desktop-client/src/icons/v1/view-show.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/view-show.svg
rename to packages/desktop-client/src/icons/v1/view-show.svg
diff --git a/packages/loot-design/src/svg/v1/view-tile.svg b/packages/desktop-client/src/icons/v1/view-tile.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/view-tile.svg
rename to packages/desktop-client/src/icons/v1/view-tile.svg
diff --git a/packages/loot-design/src/svg/v1/volume-down.svg b/packages/desktop-client/src/icons/v1/volume-down.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/volume-down.svg
rename to packages/desktop-client/src/icons/v1/volume-down.svg
diff --git a/packages/loot-design/src/svg/v1/volume-mute.svg b/packages/desktop-client/src/icons/v1/volume-mute.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/volume-mute.svg
rename to packages/desktop-client/src/icons/v1/volume-mute.svg
diff --git a/packages/loot-design/src/svg/v1/volume-off.svg b/packages/desktop-client/src/icons/v1/volume-off.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/volume-off.svg
rename to packages/desktop-client/src/icons/v1/volume-off.svg
diff --git a/packages/loot-design/src/svg/v1/volume-up.svg b/packages/desktop-client/src/icons/v1/volume-up.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/volume-up.svg
rename to packages/desktop-client/src/icons/v1/volume-up.svg
diff --git a/packages/loot-design/src/svg/v1/wallet.svg b/packages/desktop-client/src/icons/v1/wallet.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/wallet.svg
rename to packages/desktop-client/src/icons/v1/wallet.svg
diff --git a/packages/loot-design/src/svg/v1/watch.svg b/packages/desktop-client/src/icons/v1/watch.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/watch.svg
rename to packages/desktop-client/src/icons/v1/watch.svg
diff --git a/packages/loot-design/src/svg/v1/window-new.svg b/packages/desktop-client/src/icons/v1/window-new.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/window-new.svg
rename to packages/desktop-client/src/icons/v1/window-new.svg
diff --git a/packages/loot-design/src/svg/v1/window-open.svg b/packages/desktop-client/src/icons/v1/window-open.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/window-open.svg
rename to packages/desktop-client/src/icons/v1/window-open.svg
diff --git a/packages/loot-design/src/svg/v1/window.svg b/packages/desktop-client/src/icons/v1/window.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/window.svg
rename to packages/desktop-client/src/icons/v1/window.svg
diff --git a/packages/loot-design/src/svg/v1/wrench.svg b/packages/desktop-client/src/icons/v1/wrench.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/wrench.svg
rename to packages/desktop-client/src/icons/v1/wrench.svg
diff --git a/packages/loot-design/src/svg/v1/yin-yang.svg b/packages/desktop-client/src/icons/v1/yin-yang.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/yin-yang.svg
rename to packages/desktop-client/src/icons/v1/yin-yang.svg
diff --git a/packages/loot-design/src/svg/v1/zoom-in.svg b/packages/desktop-client/src/icons/v1/zoom-in.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/zoom-in.svg
rename to packages/desktop-client/src/icons/v1/zoom-in.svg
diff --git a/packages/loot-design/src/svg/v1/zoom-out.svg b/packages/desktop-client/src/icons/v1/zoom-out.svg
similarity index 100%
rename from packages/loot-design/src/svg/v1/zoom-out.svg
rename to packages/desktop-client/src/icons/v1/zoom-out.svg
diff --git a/packages/loot-design/src/svg/v2/AlertTriangle.js b/packages/desktop-client/src/icons/v2/AlertTriangle.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/AlertTriangle.js
rename to packages/desktop-client/src/icons/v2/AlertTriangle.js
diff --git a/packages/loot-design/src/svg/v2/ArrowButtonDown1.js b/packages/desktop-client/src/icons/v2/ArrowButtonDown1.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/ArrowButtonDown1.js
rename to packages/desktop-client/src/icons/v2/ArrowButtonDown1.js
diff --git a/packages/loot-design/src/svg/v2/ArrowButtonLeft1.js b/packages/desktop-client/src/icons/v2/ArrowButtonLeft1.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/ArrowButtonLeft1.js
rename to packages/desktop-client/src/icons/v2/ArrowButtonLeft1.js
diff --git a/packages/loot-design/src/svg/v2/ArrowButtonRight1.js b/packages/desktop-client/src/icons/v2/ArrowButtonRight1.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/ArrowButtonRight1.js
rename to packages/desktop-client/src/icons/v2/ArrowButtonRight1.js
diff --git a/packages/loot-design/src/svg/v2/ArrowButtonUp1.js b/packages/desktop-client/src/icons/v2/ArrowButtonUp1.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/ArrowButtonUp1.js
rename to packages/desktop-client/src/icons/v2/ArrowButtonUp1.js
diff --git a/packages/loot-design/src/svg/v2/ArrowsExpand3.js b/packages/desktop-client/src/icons/v2/ArrowsExpand3.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/ArrowsExpand3.js
rename to packages/desktop-client/src/icons/v2/ArrowsExpand3.js
diff --git a/packages/loot-design/src/svg/v2/ArrowsShrink3.js b/packages/desktop-client/src/icons/v2/ArrowsShrink3.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/ArrowsShrink3.js
rename to packages/desktop-client/src/icons/v2/ArrowsShrink3.js
diff --git a/packages/loot-design/src/svg/v2/ArrowsSynchronize.js b/packages/desktop-client/src/icons/v2/ArrowsSynchronize.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/ArrowsSynchronize.js
rename to packages/desktop-client/src/icons/v2/ArrowsSynchronize.js
diff --git a/packages/loot-design/src/svg/v2/Calendar.js b/packages/desktop-client/src/icons/v2/Calendar.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/Calendar.js
rename to packages/desktop-client/src/icons/v2/Calendar.js
diff --git a/packages/loot-design/src/svg/v2/Calendar3.js b/packages/desktop-client/src/icons/v2/Calendar3.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/Calendar3.js
rename to packages/desktop-client/src/icons/v2/Calendar3.js
diff --git a/packages/loot-design/src/svg/v2/Check.js b/packages/desktop-client/src/icons/v2/Check.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/Check.js
rename to packages/desktop-client/src/icons/v2/Check.js
diff --git a/packages/loot-design/src/svg/v2/CheckCircle1.js b/packages/desktop-client/src/icons/v2/CheckCircle1.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/CheckCircle1.js
rename to packages/desktop-client/src/icons/v2/CheckCircle1.js
diff --git a/packages/loot-design/src/svg/v2/CheckCircleHollow.js b/packages/desktop-client/src/icons/v2/CheckCircleHollow.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/CheckCircleHollow.js
rename to packages/desktop-client/src/icons/v2/CheckCircleHollow.js
diff --git a/packages/loot-design/src/svg/v2/CloudUnknown.js b/packages/desktop-client/src/icons/v2/CloudUnknown.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/CloudUnknown.js
rename to packages/desktop-client/src/icons/v2/CloudUnknown.js
diff --git a/packages/loot-design/src/svg/v2/CloudUpload.js b/packages/desktop-client/src/icons/v2/CloudUpload.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/CloudUpload.js
rename to packages/desktop-client/src/icons/v2/CloudUpload.js
diff --git a/packages/loot-design/src/svg/v2/CustomNotesPaper.js b/packages/desktop-client/src/icons/v2/CustomNotesPaper.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/CustomNotesPaper.js
rename to packages/desktop-client/src/icons/v2/CustomNotesPaper.js
diff --git a/packages/loot-design/src/svg/v2/DownloadThickBottom.js b/packages/desktop-client/src/icons/v2/DownloadThickBottom.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/DownloadThickBottom.js
rename to packages/desktop-client/src/icons/v2/DownloadThickBottom.js
diff --git a/packages/loot-design/src/svg/v2/EditSkull1.js b/packages/desktop-client/src/icons/v2/EditSkull1.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/EditSkull1.js
rename to packages/desktop-client/src/icons/v2/EditSkull1.js
diff --git a/packages/loot-design/src/svg/v2/FavoriteStar.js b/packages/desktop-client/src/icons/v2/FavoriteStar.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/FavoriteStar.js
rename to packages/desktop-client/src/icons/v2/FavoriteStar.js
diff --git a/packages/loot-design/src/svg/v2/Filter2.js b/packages/desktop-client/src/icons/v2/Filter2.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/Filter2.js
rename to packages/desktop-client/src/icons/v2/Filter2.js
diff --git a/packages/loot-design/src/svg/v2/Hyperlink2.js b/packages/desktop-client/src/icons/v2/Hyperlink2.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/Hyperlink2.js
rename to packages/desktop-client/src/icons/v2/Hyperlink2.js
diff --git a/packages/loot-design/src/svg/v2/Hyperlink3.js b/packages/desktop-client/src/icons/v2/Hyperlink3.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/Hyperlink3.js
rename to packages/desktop-client/src/icons/v2/Hyperlink3.js
diff --git a/packages/loot-design/src/svg/v2/InformationCircle.js b/packages/desktop-client/src/icons/v2/InformationCircle.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/InformationCircle.js
rename to packages/desktop-client/src/icons/v2/InformationCircle.js
diff --git a/packages/loot-design/src/svg/v2/Key.js b/packages/desktop-client/src/icons/v2/Key.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/Key.js
rename to packages/desktop-client/src/icons/v2/Key.js
diff --git a/packages/loot-design/src/svg/v2/NavigationMenu.js b/packages/desktop-client/src/icons/v2/NavigationMenu.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/NavigationMenu.js
rename to packages/desktop-client/src/icons/v2/NavigationMenu.js
diff --git a/packages/loot-design/src/svg/v2/NotesPaper.js b/packages/desktop-client/src/icons/v2/NotesPaper.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/NotesPaper.js
rename to packages/desktop-client/src/icons/v2/NotesPaper.js
diff --git a/packages/loot-design/src/svg/v2/NotesPaperText.js b/packages/desktop-client/src/icons/v2/NotesPaperText.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/NotesPaperText.js
rename to packages/desktop-client/src/icons/v2/NotesPaperText.js
diff --git a/packages/loot-design/src/svg/v2/Pencil1.js b/packages/desktop-client/src/icons/v2/Pencil1.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/Pencil1.js
rename to packages/desktop-client/src/icons/v2/Pencil1.js
diff --git a/packages/loot-design/src/svg/v2/PencilWriteAlternate.js b/packages/desktop-client/src/icons/v2/PencilWriteAlternate.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/PencilWriteAlternate.js
rename to packages/desktop-client/src/icons/v2/PencilWriteAlternate.js
diff --git a/packages/loot-design/src/svg/v2/RefreshArrow.js b/packages/desktop-client/src/icons/v2/RefreshArrow.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/RefreshArrow.js
rename to packages/desktop-client/src/icons/v2/RefreshArrow.js
diff --git a/packages/loot-design/src/svg/v2/Remove.js b/packages/desktop-client/src/icons/v2/Remove.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/Remove.js
rename to packages/desktop-client/src/icons/v2/Remove.js
diff --git a/packages/loot-design/src/svg/v2/RemoveAlternate.js b/packages/desktop-client/src/icons/v2/RemoveAlternate.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/RemoveAlternate.js
rename to packages/desktop-client/src/icons/v2/RemoveAlternate.js
diff --git a/packages/loot-design/src/svg/v2/Search1.js b/packages/desktop-client/src/icons/v2/Search1.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/Search1.js
rename to packages/desktop-client/src/icons/v2/Search1.js
diff --git a/packages/loot-design/src/svg/v2/SearchAlternate.js b/packages/desktop-client/src/icons/v2/SearchAlternate.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/SearchAlternate.js
rename to packages/desktop-client/src/icons/v2/SearchAlternate.js
diff --git a/packages/loot-design/src/svg/v2/SettingsSliderAlternate.js b/packages/desktop-client/src/icons/v2/SettingsSliderAlternate.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/SettingsSliderAlternate.js
rename to packages/desktop-client/src/icons/v2/SettingsSliderAlternate.js
diff --git a/packages/loot-design/src/svg/v2/Subtract.js b/packages/desktop-client/src/icons/v2/Subtract.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/Subtract.js
rename to packages/desktop-client/src/icons/v2/Subtract.js
diff --git a/packages/loot-design/src/svg/v2/UploadThickBottom.js b/packages/desktop-client/src/icons/v2/UploadThickBottom.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/UploadThickBottom.js
rename to packages/desktop-client/src/icons/v2/UploadThickBottom.js
diff --git a/packages/loot-design/src/svg/v2/ValidationCheck.js b/packages/desktop-client/src/icons/v2/ValidationCheck.js
similarity index 100%
rename from packages/loot-design/src/svg/v2/ValidationCheck.js
rename to packages/desktop-client/src/icons/v2/ValidationCheck.js
diff --git a/packages/loot-design/src/svg/v2/alert-triangle.svg b/packages/desktop-client/src/icons/v2/alert-triangle.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/alert-triangle.svg
rename to packages/desktop-client/src/icons/v2/alert-triangle.svg
diff --git a/packages/loot-design/src/svg/v2/arrow-button-down-1.svg b/packages/desktop-client/src/icons/v2/arrow-button-down-1.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/arrow-button-down-1.svg
rename to packages/desktop-client/src/icons/v2/arrow-button-down-1.svg
diff --git a/packages/loot-design/src/svg/v2/arrow-button-left-1.svg b/packages/desktop-client/src/icons/v2/arrow-button-left-1.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/arrow-button-left-1.svg
rename to packages/desktop-client/src/icons/v2/arrow-button-left-1.svg
diff --git a/packages/loot-design/src/svg/v2/arrow-button-right-1.svg b/packages/desktop-client/src/icons/v2/arrow-button-right-1.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/arrow-button-right-1.svg
rename to packages/desktop-client/src/icons/v2/arrow-button-right-1.svg
diff --git a/packages/loot-design/src/svg/v2/arrow-button-up-1.svg b/packages/desktop-client/src/icons/v2/arrow-button-up-1.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/arrow-button-up-1.svg
rename to packages/desktop-client/src/icons/v2/arrow-button-up-1.svg
diff --git a/packages/loot-design/src/svg/v2/arrows-expand-3.svg b/packages/desktop-client/src/icons/v2/arrows-expand-3.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/arrows-expand-3.svg
rename to packages/desktop-client/src/icons/v2/arrows-expand-3.svg
diff --git a/packages/loot-design/src/svg/v2/arrows-shrink-3.svg b/packages/desktop-client/src/icons/v2/arrows-shrink-3.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/arrows-shrink-3.svg
rename to packages/desktop-client/src/icons/v2/arrows-shrink-3.svg
diff --git a/packages/loot-design/src/svg/v2/arrows-synchronize.svg b/packages/desktop-client/src/icons/v2/arrows-synchronize.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/arrows-synchronize.svg
rename to packages/desktop-client/src/icons/v2/arrows-synchronize.svg
diff --git a/packages/loot-design/src/svg/v2/calendar-3.svg b/packages/desktop-client/src/icons/v2/calendar-3.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/calendar-3.svg
rename to packages/desktop-client/src/icons/v2/calendar-3.svg
diff --git a/packages/loot-design/src/svg/v2/calendar.svg b/packages/desktop-client/src/icons/v2/calendar.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/calendar.svg
rename to packages/desktop-client/src/icons/v2/calendar.svg
diff --git a/packages/loot-design/src/svg/v2/check-circle-1.svg b/packages/desktop-client/src/icons/v2/check-circle-1.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/check-circle-1.svg
rename to packages/desktop-client/src/icons/v2/check-circle-1.svg
diff --git a/packages/loot-design/src/svg/v2/check-circle-hollow.svg b/packages/desktop-client/src/icons/v2/check-circle-hollow.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/check-circle-hollow.svg
rename to packages/desktop-client/src/icons/v2/check-circle-hollow.svg
diff --git a/packages/loot-design/src/svg/v2/check.svg b/packages/desktop-client/src/icons/v2/check.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/check.svg
rename to packages/desktop-client/src/icons/v2/check.svg
diff --git a/packages/loot-design/src/svg/v2/cloud-unknown.svg b/packages/desktop-client/src/icons/v2/cloud-unknown.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/cloud-unknown.svg
rename to packages/desktop-client/src/icons/v2/cloud-unknown.svg
diff --git a/packages/loot-design/src/svg/v2/cloud-upload.svg b/packages/desktop-client/src/icons/v2/cloud-upload.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/cloud-upload.svg
rename to packages/desktop-client/src/icons/v2/cloud-upload.svg
diff --git a/packages/loot-design/src/svg/v2/custom-notes-paper.svg b/packages/desktop-client/src/icons/v2/custom-notes-paper.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/custom-notes-paper.svg
rename to packages/desktop-client/src/icons/v2/custom-notes-paper.svg
diff --git a/packages/loot-design/src/svg/v2/download-thick-bottom.svg b/packages/desktop-client/src/icons/v2/download-thick-bottom.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/download-thick-bottom.svg
rename to packages/desktop-client/src/icons/v2/download-thick-bottom.svg
diff --git a/packages/loot-design/src/svg/v2/edit-skull-1.svg b/packages/desktop-client/src/icons/v2/edit-skull-1.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/edit-skull-1.svg
rename to packages/desktop-client/src/icons/v2/edit-skull-1.svg
diff --git a/packages/loot-design/src/svg/v2/favorite-star.svg b/packages/desktop-client/src/icons/v2/favorite-star.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/favorite-star.svg
rename to packages/desktop-client/src/icons/v2/favorite-star.svg
diff --git a/packages/loot-design/src/svg/v2/filter-2.svg b/packages/desktop-client/src/icons/v2/filter-2.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/filter-2.svg
rename to packages/desktop-client/src/icons/v2/filter-2.svg
diff --git a/packages/loot-design/src/svg/v2/hyperlink-2.svg b/packages/desktop-client/src/icons/v2/hyperlink-2.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/hyperlink-2.svg
rename to packages/desktop-client/src/icons/v2/hyperlink-2.svg
diff --git a/packages/loot-design/src/svg/v2/hyperlink-3.svg b/packages/desktop-client/src/icons/v2/hyperlink-3.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/hyperlink-3.svg
rename to packages/desktop-client/src/icons/v2/hyperlink-3.svg
diff --git a/packages/loot-design/src/svg/v2/information-circle.svg b/packages/desktop-client/src/icons/v2/information-circle.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/information-circle.svg
rename to packages/desktop-client/src/icons/v2/information-circle.svg
diff --git a/packages/loot-design/src/svg/v2/key.svg b/packages/desktop-client/src/icons/v2/key.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/key.svg
rename to packages/desktop-client/src/icons/v2/key.svg
diff --git a/packages/loot-design/src/svg/v2/navigation-menu.svg b/packages/desktop-client/src/icons/v2/navigation-menu.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/navigation-menu.svg
rename to packages/desktop-client/src/icons/v2/navigation-menu.svg
diff --git a/packages/loot-design/src/svg/v2/notes-paper-text.svg b/packages/desktop-client/src/icons/v2/notes-paper-text.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/notes-paper-text.svg
rename to packages/desktop-client/src/icons/v2/notes-paper-text.svg
diff --git a/packages/loot-design/src/svg/v2/notes-paper.svg b/packages/desktop-client/src/icons/v2/notes-paper.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/notes-paper.svg
rename to packages/desktop-client/src/icons/v2/notes-paper.svg
diff --git a/packages/loot-design/src/svg/v2/pencil-1.svg b/packages/desktop-client/src/icons/v2/pencil-1.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/pencil-1.svg
rename to packages/desktop-client/src/icons/v2/pencil-1.svg
diff --git a/packages/loot-design/src/svg/v2/pencil-write-alternate.svg b/packages/desktop-client/src/icons/v2/pencil-write-alternate.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/pencil-write-alternate.svg
rename to packages/desktop-client/src/icons/v2/pencil-write-alternate.svg
diff --git a/packages/loot-design/src/svg/v2/refresh-arrow.svg b/packages/desktop-client/src/icons/v2/refresh-arrow.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/refresh-arrow.svg
rename to packages/desktop-client/src/icons/v2/refresh-arrow.svg
diff --git a/packages/loot-design/src/svg/v2/remove-alternate.svg b/packages/desktop-client/src/icons/v2/remove-alternate.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/remove-alternate.svg
rename to packages/desktop-client/src/icons/v2/remove-alternate.svg
diff --git a/packages/loot-design/src/svg/v2/remove.svg b/packages/desktop-client/src/icons/v2/remove.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/remove.svg
rename to packages/desktop-client/src/icons/v2/remove.svg
diff --git a/packages/loot-design/src/svg/v2/search-1.svg b/packages/desktop-client/src/icons/v2/search-1.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/search-1.svg
rename to packages/desktop-client/src/icons/v2/search-1.svg
diff --git a/packages/loot-design/src/svg/v2/search-alternate.svg b/packages/desktop-client/src/icons/v2/search-alternate.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/search-alternate.svg
rename to packages/desktop-client/src/icons/v2/search-alternate.svg
diff --git a/packages/loot-design/src/svg/v2/settings-slider-alternate.svg b/packages/desktop-client/src/icons/v2/settings-slider-alternate.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/settings-slider-alternate.svg
rename to packages/desktop-client/src/icons/v2/settings-slider-alternate.svg
diff --git a/packages/loot-design/src/svg/v2/subtract.svg b/packages/desktop-client/src/icons/v2/subtract.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/subtract.svg
rename to packages/desktop-client/src/icons/v2/subtract.svg
diff --git a/packages/loot-design/src/svg/v2/upload-thick-bottom.svg b/packages/desktop-client/src/icons/v2/upload-thick-bottom.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/upload-thick-bottom.svg
rename to packages/desktop-client/src/icons/v2/upload-thick-bottom.svg
diff --git a/packages/loot-design/src/svg/v2/validation-check.svg b/packages/desktop-client/src/icons/v2/validation-check.svg
similarity index 100%
rename from packages/loot-design/src/svg/v2/validation-check.svg
rename to packages/desktop-client/src/icons/v2/validation-check.svg
diff --git a/packages/desktop-client/src/setupTests.js b/packages/desktop-client/src/setupTests.js
index 8ced6d001c..59b095c1e0 100644
--- a/packages/desktop-client/src/setupTests.js
+++ b/packages/desktop-client/src/setupTests.js
@@ -1,3 +1,29 @@
+import { resetStore } from 'loot-core/src/mocks/redux';
+
import installPolyfills from './polyfills';
installPolyfills();
+
+global.IS_TESTING = true;
+global.Actual = {};
+
+jest.mock(
+ 'react-virtualized-auto-sizer',
+ () =>
+ ({ children }) =>
+ children({ height: 1000, width: 600 }),
+);
+
+global.Date.now = () => 123456789;
+
+global.__resetWorld = () => {
+ resetStore();
+};
+
+process.on('unhandledRejection', reason => {
+ console.log('REJECTION', reason);
+});
+
+global.afterEach(() => {
+ global.__resetWorld();
+});
diff --git a/packages/loot-design/src/style.js b/packages/desktop-client/src/style.js
similarity index 100%
rename from packages/loot-design/src/style.js
rename to packages/desktop-client/src/style.js
diff --git a/packages/loot-design/src/tokens.js b/packages/desktop-client/src/tokens.js
similarity index 100%
rename from packages/loot-design/src/tokens.js
rename to packages/desktop-client/src/tokens.js
diff --git a/packages/loot-design/src/util/keys.js b/packages/desktop-client/src/util/keys.js
similarity index 100%
rename from packages/loot-design/src/util/keys.js
rename to packages/desktop-client/src/util/keys.js
diff --git a/packages/loot-design/src/util/withThemeColor.js b/packages/desktop-client/src/util/withThemeColor.js
similarity index 100%
rename from packages/loot-design/src/util/withThemeColor.js
rename to packages/desktop-client/src/util/withThemeColor.js
diff --git a/packages/loot-core/src/client/SpreadsheetProvider.js b/packages/loot-core/src/client/SpreadsheetProvider.js
index 9101f1006b..36d3cb9a28 100644
--- a/packages/loot-core/src/client/SpreadsheetProvider.js
+++ b/packages/loot-core/src/client/SpreadsheetProvider.js
@@ -1,11 +1,15 @@
-import React, { useEffect, useMemo } from 'react';
+import React, { useEffect, useMemo, useContext } from 'react';
import LRU from 'lru-cache';
-import SpreadsheetContext from 'loot-design/src/components/spreadsheet/SpreadsheetContext';
-
import { listen, send } from '../platform/client/fetch';
+const SpreadsheetContext = React.createContext(undefined);
+
+export function useSpreadsheet() {
+ return useContext(SpreadsheetContext);
+}
+
function makeSpreadsheet() {
const cellObservers = {};
const LRUValueCache = new LRU({ max: 1200 });
diff --git a/packages/loot-core/src/server/main.js b/packages/loot-core/src/server/main.js
index 1eafa3d757..333ea6026b 100644
--- a/packages/loot-core/src/server/main.js
+++ b/packages/loot-core/src/server/main.js
@@ -1,8 +1,6 @@
import './polyfills';
import injectAPI from '@actual-app/api/injected';
-import { isNonProductionEnvironment } from 'loot-design/src/util/environment';
-
import { createTestBudget } from '../mocks/budget';
import { captureException, captureBreadcrumb } from '../platform/exceptions';
import asyncStorage from '../platform/server/asyncStorage';
@@ -10,6 +8,7 @@ import fs from '../platform/server/fs';
import logger from '../platform/server/log';
import * as sqlite from '../platform/server/sqlite';
import { fromPlaidAccountType } from '../shared/accounts';
+import { isNonProductionEnvironment } from '../shared/environment';
import * as monthUtils from '../shared/months';
import q, { Query } from '../shared/query';
import { FIELD_TYPES as ruleFieldTypes } from '../shared/rules';
diff --git a/packages/loot-design/src/util/environment.js b/packages/loot-core/src/shared/environment.js
similarity index 100%
rename from packages/loot-design/src/util/environment.js
rename to packages/loot-core/src/shared/environment.js
diff --git a/packages/loot-design/.env b/packages/loot-design/.env
deleted file mode 100644
index 64841b64a6..0000000000
--- a/packages/loot-design/.env
+++ /dev/null
@@ -1 +0,0 @@
-NODE_PATH=".."
diff --git a/packages/loot-design/.gitignore b/packages/loot-design/.gitignore
deleted file mode 100644
index a76bc1497b..0000000000
--- a/packages/loot-design/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build
-lib
diff --git a/packages/loot-design/__mocks__/fileMock.js b/packages/loot-design/__mocks__/fileMock.js
deleted file mode 100644
index 86059f3629..0000000000
--- a/packages/loot-design/__mocks__/fileMock.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = 'test-file-stub';
diff --git a/packages/loot-design/babel.config.json b/packages/loot-design/babel.config.json
deleted file mode 100644
index 2b7bafa5fa..0000000000
--- a/packages/loot-design/babel.config.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "presets": ["@babel/preset-env", "@babel/preset-react"]
-}
diff --git a/packages/loot-design/jest.config.js b/packages/loot-design/jest.config.js
deleted file mode 100644
index ccd8a57d44..0000000000
--- a/packages/loot-design/jest.config.js
+++ /dev/null
@@ -1,14 +0,0 @@
-module.exports = {
- moduleFileExtensions: ['testing.js', 'web.js', 'mjs', 'js', 'ts', 'json'],
- testEnvironment: 'jsdom',
- setupFilesAfterEnv: ['<rootDir>/src/setupTests.js'],
- testPathIgnorePatterns: [
- '/node_modules/',
- '/lib/',
- '/src/components/mobile/',
- ],
- moduleNameMapper: {
- '^.+\\.(css|sass|scss)$': 'identity-obj-proxy',
- '^.+\\.(png)$': '<rootDir>/__mocks__/fileMock.js',
- },
-};
diff --git a/packages/loot-design/package.json b/packages/loot-design/package.json
deleted file mode 100644
index ab874e55fc..0000000000
--- a/packages/loot-design/package.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "name": "loot-design",
- "version": "0.1.0",
- "private": true,
- "devDependencies": {
- "@babel/preset-env": "^7.20.2",
- "@babel/preset-react": "^7.18.6",
- "@babel/traverse": "^7.0.0-rc.1",
- "@babel/types": "^7.0.0-rc.1",
- "@jlongster/lively": "0.0.4",
- "@svgr/cli": "^6.5.1",
- "@testing-library/react": "14.0.0",
- "chroma-js": "^1.3.3",
- "date-fns": "2.0.0-alpha.27",
- "downshift": "1.31.16",
- "eslint": "8.35.0",
- "formik": "^0.11.10",
- "glamor": "^2.20.40",
- "jest": "^27.0.0",
- "memoize-one": "^4.0.0",
- "node-noop": "1.0.0",
- "npm-run-all": "^4.1.3",
- "prop-types": "15.6.0",
- "react": "18.2.0",
- "react-dnd-html5-backend": "^10.0.2",
- "react-dom": "18.2.0",
- "wobble": "^1.5.0"
- },
- "dependencies": {
- "@juggle/resize-observer": "^3.1.2",
- "hotkeys-js": "3.8.2",
- "pikaday": "1.8.0",
- "react-dnd": "^10.0.2",
- "react-merge-refs": "^1.1.0",
- "react-modal": "3.16.1",
- "react-select": "^5.7.0",
- "react-spring": "^8.0.27",
- "react-virtualized-auto-sizer": "^1.0.2"
- },
- "scripts": {
- "test": "npm-run-all -cp 'test:*'",
- "test:web": "jest -c jest.config.js",
- "lint": "eslint src"
- },
- "homepage": "./",
- "manifest": "manifest.json",
- "pathAliases": {
- "react-art": "../../node_modules/node-noop"
- }
-}
diff --git a/packages/loot-design/src/assets/background.png b/packages/loot-design/src/assets/background.png
deleted file mode 100644
index 9fcba3bca8..0000000000
Binary files a/packages/loot-design/src/assets/background.png and /dev/null differ
diff --git a/packages/loot-design/src/components/spreadsheet/SpreadsheetContext.js b/packages/loot-design/src/components/spreadsheet/SpreadsheetContext.js
deleted file mode 100644
index 417d05a21d..0000000000
--- a/packages/loot-design/src/components/spreadsheet/SpreadsheetContext.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import React from 'react';
-
-export default React.createContext(undefined);
diff --git a/packages/loot-design/src/parse-figma-theme.js b/packages/loot-design/src/parse-figma-theme.js
deleted file mode 100644
index 39e7de6066..0000000000
--- a/packages/loot-design/src/parse-figma-theme.js
+++ /dev/null
@@ -1,16 +0,0 @@
-let fs = require('fs');
-
-let contents = fs.readFileSync(process.argv[2], 'utf8');
-let list = contents.match(/(#[0-9a-fA-F]*)/g);
-
-let groups = ['y', 'r', 'b', 'n', 'g', 'p'];
-let colors = {};
-
-list.forEach((color, idx) => {
- const group = Math.floor(idx / 11);
- const n = idx % 11;
-
- colors[groups[group] + (n + 1)] = color;
-});
-
-console.log(colors);
diff --git a/packages/loot-design/src/setupTests.js b/packages/loot-design/src/setupTests.js
deleted file mode 100644
index 6b025e72a3..0000000000
--- a/packages/loot-design/src/setupTests.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { resetStore } from 'loot-core/src/mocks/redux';
-
-global.IS_TESTING = true;
-global.Actual = {};
-
-jest.mock(
- 'react-virtualized-auto-sizer',
- () =>
- ({ children }) =>
- children({ height: 1000, width: 600 }),
-);
-
-global.Date.now = () => 123456789;
-
-global.__resetWorld = () => {
- resetStore();
-};
-
-process.on('unhandledRejection', reason => {
- console.log('REJECTION', reason);
-});
-
-global.afterEach(() => {
- global.__resetWorld();
-});
diff --git a/upcoming-release-notes/800.md b/upcoming-release-notes/800.md
new file mode 100644
index 0000000000..342cd99f5b
--- /dev/null
+++ b/upcoming-release-notes/800.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [j-f1]
+---
+
+Eliminate the `loot-design` package and move all of its code into `desktop-client`
diff --git a/yarn.lock b/yarn.lock
index ae407a455a..7f62e9bb23 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -53,6 +53,7 @@ __metadata:
resolution: "@actual-app/web@workspace:packages/desktop-client"
dependencies:
"@jlongster/lively": 0.0.4
+ "@juggle/resize-observer": ^3.1.2
"@playwright/test": ^1.29.1
"@reach/listbox": ^0.11.2
"@react-aria/focus": ^3.8.0
@@ -61,35 +62,49 @@ __metadata:
"@react-stately/collections": ^3.4.3
"@react-stately/list": ^3.5.3
"@reactions/component": ^2.0.2
+ "@svgr/cli": ^6.5.1
"@testing-library/react": 14.0.0
"@testing-library/user-event": 14.4.3
chalk: 2.4.1
+ chroma-js: ^1.3.3
cross-env: ^7.0.3
customize-cra: ^1.0.0
date-fns: 2.0.0-alpha.27
debounce: ^1.2.0
+ downshift: 1.31.16
eslint: ^8.35.0
focus-visible: ^4.1.1
+ formik: ^0.11.10
glamor: ^2.20.40
+ hotkeys-js: 3.8.2
identity-obj-proxy: 3.0.0
inter-ui: ^3.19.3
+ jest: ^27.0.0
jest-watch-typeahead: ^2.2.2
+ memoize-one: ^4.0.0
mitt: ^3.0.0
+ node-noop: 1.0.0
+ pikaday: 1.8.0
prop-types: 15.6.0
react: 18.2.0
react-app-rewired: ^2.2.1
react-dnd: ^10.0.2
+ react-dnd-html5-backend: ^10.0.2
react-dom: 18.2.0
+ react-merge-refs: ^1.1.0
+ react-modal: 3.16.1
react-redux: 7.2.1
react-router: 5.2.0
react-router-dom: 5.2.0
react-router-dom-v5-compat: ^6.4.1
react-scripts: ^5.0.1
+ react-select: ^5.7.0
react-spring: ^8.0.27
react-virtualized-auto-sizer: ^1.0.2
redux: ^4.0.5
redux-thunk: ^2.3.0
victory: ^36.6.8
+ wobble: ^1.5.0
languageName: unknown
linkType: soft
@@ -1527,7 +1542,7 @@ __metadata:
languageName: node
linkType: hard
-"@babel/preset-react@npm:^7.12.5, @babel/preset-react@npm:^7.16.0, @babel/preset-react@npm:^7.18.6":
+"@babel/preset-react@npm:^7.12.5, @babel/preset-react@npm:^7.16.0":
version: 7.18.6
resolution: "@babel/preset-react@npm:7.18.6"
dependencies:
@@ -1598,7 +1613,7 @@ __metadata:
languageName: node
linkType: hard
-"@babel/traverse@npm:^7.0.0-rc.1, @babel/traverse@npm:^7.14.8, @babel/traverse@npm:^7.20.5, @babel/traverse@npm:^7.20.7, @babel/traverse@npm:^7.21.0, @babel/traverse@npm:^7.21.2, @babel/traverse@npm:^7.7.2":
+"@babel/traverse@npm:^7.14.8, @babel/traverse@npm:^7.20.5, @babel/traverse@npm:^7.20.7, @babel/traverse@npm:^7.21.0, @babel/traverse@npm:^7.21.2, @babel/traverse@npm:^7.7.2":
version: 7.21.2
resolution: "@babel/traverse@npm:7.21.2"
dependencies:
@@ -1616,7 +1631,7 @@ __metadata:
languageName: node
linkType: hard
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.0.0-rc.1, @babel/types@npm:^7.12.6, @babel/types@npm:^7.14.8, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.2, @babel/types@npm:^7.20.5, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.0, @babel/types@npm:^7.21.2, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.6, @babel/types@npm:^7.14.8, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.2, @babel/types@npm:^7.20.5, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.0, @babel/types@npm:^7.21.2, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
version: 7.21.2
resolution: "@babel/types@npm:7.21.2"
dependencies:
@@ -13682,44 +13697,6 @@ __metadata:
languageName: unknown
linkType: soft
-"loot-design@workspace:packages/loot-design":
- version: 0.0.0-use.local
- resolution: "loot-design@workspace:packages/loot-design"
- dependencies:
- "@babel/preset-env": ^7.20.2
- "@babel/preset-react": ^7.18.6
- "@babel/traverse": ^7.0.0-rc.1
- "@babel/types": ^7.0.0-rc.1
- "@jlongster/lively": 0.0.4
- "@juggle/resize-observer": ^3.1.2
- "@svgr/cli": ^6.5.1
- "@testing-library/react": 14.0.0
- chroma-js: ^1.3.3
- date-fns: 2.0.0-alpha.27
- downshift: 1.31.16
- eslint: 8.35.0
- formik: ^0.11.10
- glamor: ^2.20.40
- hotkeys-js: 3.8.2
- jest: ^27.0.0
- memoize-one: ^4.0.0
- node-noop: 1.0.0
- npm-run-all: ^4.1.3
- pikaday: 1.8.0
- prop-types: 15.6.0
- react: 18.2.0
- react-dnd: ^10.0.2
- react-dnd-html5-backend: ^10.0.2
- react-dom: 18.2.0
- react-merge-refs: ^1.1.0
- react-modal: 3.16.1
- react-select: ^5.7.0
- react-spring: ^8.0.27
- react-virtualized-auto-sizer: ^1.0.2
- wobble: ^1.5.0
- languageName: unknown
- linkType: soft
-
"lower-case@npm:^2.0.2":
version: 2.0.2
resolution: "lower-case@npm:2.0.2"