A local-first personal finance app
:recycle: (common) migrating to specific common component import paths pt2 (#1419)
Matiss Janis Aboltins30d035f8c640
diff --git a/packages/desktop-client/src/components/AppBackground.js b/packages/desktop-client/src/components/AppBackground.jsindex c769da7f86..697e20f02d 100644--- a/packages/desktop-client/src/components/AppBackground.js+++ b/packages/desktop-client/src/components/AppBackground.js@@ -6,7 +6,8 @@ import AnimatedLoading from '../icons/AnimatedLoading';import { theme } from '../style';import Background from './Background';-import { View, Block } from './common';+import Block from './common/Block';+import View from './common/View';function AppBackground({ initializing, loadingText }) {return (diff --git a/packages/desktop-client/src/components/FatalError.js b/packages/desktop-client/src/components/FatalError.jsindex 2f40dca257..59a50cae9d 100644--- a/packages/desktop-client/src/components/FatalError.js+++ b/packages/desktop-client/src/components/FatalError.js@@ -2,17 +2,15 @@ import React, { Component, useState } from 'react';import { theme } from '../style';-import {- View,- Stack,- Text,- Block,- Modal,- LinkButton,- Button,- ExternalLink,-} from './common';+import { ExternalLink } from './common';+import Block from './common/Block';+import Button from './common/Button';+import LinkButton from './common/LinkButton';+import Modal from './common/Modal';import Paragraph from './common/Paragraph';+import Stack from './common/Stack';+import Text from './common/Text';+import View from './common/View';import { Checkbox } from './forms';class FatalError extends Component {diff --git a/packages/desktop-client/src/components/ManageRules.js b/packages/desktop-client/src/components/ManageRules.jsindex b47684c2ee..4d427ae582 100644--- a/packages/desktop-client/src/components/ManageRules.js+++ b/packages/desktop-client/src/components/ManageRules.js@@ -31,15 +31,13 @@ import useSelected, {import ArrowRight from '../icons/v0/RightArrow2';import { colors } from '../style';-import {- View,- Text,- Button,- Stack,- ExternalLink,- Input,- LinkButton,-} from './common';+import { ExternalLink } from './common';+import Button from './common/Button';+import Input from './common/Input';+import LinkButton from './common/LinkButton';+import Stack from './common/Stack';+import Text from './common/Text';+import View from './common/View';import { SelectCell, Row, Field, Cell, CellButton, TableHeader } from './table';let SchedulesQuery = liveQueryContext(q('schedules').select('*'));diff --git a/packages/desktop-client/src/components/Notifications.tsx b/packages/desktop-client/src/components/Notifications.tsxindex aebc72c0ac..e2599bb751 100644--- a/packages/desktop-client/src/components/Notifications.tsx+++ b/packages/desktop-client/src/components/Notifications.tsx@@ -15,15 +15,12 @@ import AnimatedLoading from '../icons/AnimatedLoading';import Delete from '../icons/v0/Delete';import { styles, colors } from '../style';-import {- View,- Text,- Button,- ButtonWithLoading,- Stack,- ExternalLink,- LinkButton,-} from './common';+import { ExternalLink } from './common';+import Button, { ButtonWithLoading } from './common/Button';+import LinkButton from './common/LinkButton';+import Stack from './common/Stack';+import Text from './common/Text';+import View from './common/View';function compileMessage(message: string,diff --git a/packages/desktop-client/src/components/Page.tsx b/packages/desktop-client/src/components/Page.tsxindex aa2d8999d5..ae638f952d 100644--- a/packages/desktop-client/src/components/Page.tsx+++ b/packages/desktop-client/src/components/Page.tsx@@ -6,7 +6,9 @@ import { type CSSProperties } from 'glamor';import { useResponsive } from '../ResponsiveProvider';import { colors, styles } from '../style';-import { Modal, View, Text } from './common';+import Modal from './common/Modal';+import Text from './common/Text';+import View from './common/View';let PageTypeContext = createContext({ type: 'page', current: undefined });diff --git a/packages/desktop-client/src/components/UpdateNotification.js b/packages/desktop-client/src/components/UpdateNotification.jsindex 12e1a15933..df42cc420b 100644--- a/packages/desktop-client/src/components/UpdateNotification.js+++ b/packages/desktop-client/src/components/UpdateNotification.js@@ -5,7 +5,10 @@ import { useActions } from '../hooks/useActions';import Close from '../icons/v1/Close';import { colors } from '../style';-import { View, Text, LinkButton, Button } from './common';+import Button from './common/Button';+import LinkButton from './common/LinkButton';+import Text from './common/Text';+import View from './common/View';function closeNotification(setAppState) {// Set a flag to never show an update notification again for this sessiondiff --git a/packages/desktop-client/src/components/accounts/Reconcile.js b/packages/desktop-client/src/components/accounts/Reconcile.jsindex f698c9a36e..1591f5fff3 100644--- a/packages/desktop-client/src/components/accounts/Reconcile.js+++ b/packages/desktop-client/src/components/accounts/Reconcile.js@@ -5,7 +5,11 @@ import { currencyToInteger } from 'loot-core/src/shared/util';import CheckCircle1 from '../../icons/v2/CheckCircle1';import { styles, colors } from '../../style';-import { View, Text, Button, Input, InitialFocus } from '../common';+import Button from '../common/Button';+import InitialFocus from '../common/InitialFocus';+import Input from '../common/Input';+import Text from '../common/Text';+import View from '../common/View';import format from '../spreadsheet/format';import useSheetValue from '../spreadsheet/useSheetValue';import { Tooltip } from '../tooltips';diff --git a/packages/desktop-client/src/components/budget/MobileBudgetTable.js b/packages/desktop-client/src/components/budget/MobileBudgetTable.jsindex 525063953c..6f27e80396 100644--- a/packages/desktop-client/src/components/budget/MobileBudgetTable.js+++ b/packages/desktop-client/src/components/budget/MobileBudgetTable.js@@ -17,7 +17,11 @@ 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 Button from '../common/Button';+import Card from '../common/Card';+import Label from '../common/Label';+import Text from '../common/Text';+import View from '../common/View';import CellValue from '../spreadsheet/CellValue';import format from '../spreadsheet/format';import NamespaceContext from '../spreadsheet/NamespaceContext';diff --git a/packages/desktop-client/src/components/budget/misc.js b/packages/desktop-client/src/components/budget/misc.jsindex cfc8c44eca..376ac186fd 100644--- a/packages/desktop-client/src/components/budget/misc.js+++ b/packages/desktop-client/src/components/budget/misc.js@@ -13,7 +13,10 @@ import ExpandArrow from '../../icons/v0/ExpandArrow';import CheveronDown from '../../icons/v1/CheveronDown';import DotsHorizontalTriple from '../../icons/v1/DotsHorizontalTriple';import { styles, colors } from '../../style';-import { View, Text, Button, Menu } from '../common';+import Button from '../common/Button';+import Menu from '../common/Menu';+import Text from '../common/Text';+import View from '../common/View';import NotesButton from '../NotesButton';import {useDraggable,diff --git a/packages/desktop-client/src/components/common.tsx b/packages/desktop-client/src/components/common.tsxindex 8950da820d..832518d21a 100644--- a/packages/desktop-client/src/components/common.tsx+++ b/packages/desktop-client/src/components/common.tsx@@ -8,19 +8,11 @@ import { colors } from '../style';import Button from './common/Button';export { default as AnchorLink } from './common/AnchorLink';-export { default as Block } from './common/Block';export { default as Button, ButtonWithLoading } from './common/Button';-export { default as Card } from './common/Card';export { default as Select } from './common/Select';-export { default as InitialFocus } from './common/InitialFocus';export { default as Input } from './common/Input';-export { default as Label } from './common/Label';-export { default as Menu } from './common/Menu';-export { default as Modal, ModalButtons } from './common/Modal';-export { default as Stack } from './common/Stack';export { default as Text } from './common/Text';export { default as View } from './common/View';-export { default as LinkButton } from './common/LinkButton';let externalLinkColors = {purple: colors.p4,diff --git a/packages/desktop-client/src/components/gocardless/GoCardlessLink.js b/packages/desktop-client/src/components/gocardless/GoCardlessLink.jsindex a2cac94998..099030bd07 100644--- a/packages/desktop-client/src/components/gocardless/GoCardlessLink.js+++ b/packages/desktop-client/src/components/gocardless/GoCardlessLink.js@@ -1,7 +1,8 @@import React from 'react';-import { Modal, View } from '../common';+import Modal from '../common/Modal';import Paragraph from '../common/Paragraph';+import View from '../common/View';export default function GoCardlessLink() {window.close();diff --git a/packages/desktop-client/src/components/manager/BudgetList.js b/packages/desktop-client/src/components/manager/BudgetList.jsindex f58ce2ef86..cbea84d23e 100644--- a/packages/desktop-client/src/components/manager/BudgetList.js+++ b/packages/desktop-client/src/components/manager/BudgetList.js@@ -15,7 +15,10 @@ import Key from '../../icons/v2/Key';import RefreshArrow from '../../icons/v2/RefreshArrow';import { styles, colors } from '../../style';import tokens from '../../tokens';-import { View, Text, Button, Menu } from '../common';+import Button from '../common/Button';+import Menu from '../common/Menu';+import Text from '../common/Text';+import View from '../common/View';import { Tooltip } from '../tooltips';function getFileDescription(file) {diff --git a/packages/desktop-client/src/components/manager/DeleteFile.js b/packages/desktop-client/src/components/manager/DeleteFile.jsindex 36aafb9930..025dec7c0c 100644--- a/packages/desktop-client/src/components/manager/DeleteFile.js+++ b/packages/desktop-client/src/components/manager/DeleteFile.js@@ -1,7 +1,10 @@import React, { useState } from 'react';import { colors } from '../../style';-import { View, Text, Modal, ButtonWithLoading } from '../common';+import { ButtonWithLoading } from '../common/Button';+import Modal from '../common/Modal';+import Text from '../common/Text';+import View from '../common/View';export default function DeleteMenu({ modalProps, actions, file }) {let [loadingState, setLoadingState] = useState(null);diff --git a/packages/desktop-client/src/components/manager/Import.js b/packages/desktop-client/src/components/manager/Import.jsindex be9491e007..4940a3765b 100644--- a/packages/desktop-client/src/components/manager/Import.js+++ b/packages/desktop-client/src/components/manager/Import.js@@ -1,7 +1,11 @@import React, { useState } from 'react';import { styles, colors } from '../../style';-import { View, Block, Modal, Button, Text } from '../common';+import Block from '../common/Block';+import Button from '../common/Button';+import Modal from '../common/Modal';+import Text from '../common/Text';+import View from '../common/View';function getErrorMessage(error) {switch (error) {diff --git a/packages/desktop-client/src/components/manager/ImportActual.js b/packages/desktop-client/src/components/manager/ImportActual.jsindex 3d763af7e3..e9720afde1 100644--- a/packages/desktop-client/src/components/manager/ImportActual.js+++ b/packages/desktop-client/src/components/manager/ImportActual.js@@ -4,8 +4,11 @@ import { useDispatch } from 'react-redux';import { importBudget } from 'loot-core/src/client/actions/budgets';import { styles, colors } from '../../style';-import { View, Block, Modal, ButtonWithLoading } from '../common';+import Block from '../common/Block';+import { ButtonWithLoading } from '../common/Button';+import Modal from '../common/Modal';import Paragraph from '../common/Paragraph';+import View from '../common/View';function getErrorMessage(error) {switch (error) {diff --git a/packages/desktop-client/src/components/manager/ImportYNAB4.js b/packages/desktop-client/src/components/manager/ImportYNAB4.jsindex 0486e2efd1..ddde7e37bc 100644--- a/packages/desktop-client/src/components/manager/ImportYNAB4.js+++ b/packages/desktop-client/src/components/manager/ImportYNAB4.js@@ -4,8 +4,11 @@ import { useDispatch } from 'react-redux';import { importBudget } from 'loot-core/src/client/actions/budgets';import { styles, colors } from '../../style';-import { View, Block, Modal, ButtonWithLoading } from '../common';+import Block from '../common/Block';+import { ButtonWithLoading } from '../common/Button';+import Modal from '../common/Modal';import Paragraph from '../common/Paragraph';+import View from '../common/View';function getErrorMessage(error) {switch (error) {diff --git a/packages/desktop-client/src/components/manager/ImportYNAB5.js b/packages/desktop-client/src/components/manager/ImportYNAB5.jsindex 3af439e1f9..2be9442342 100644--- a/packages/desktop-client/src/components/manager/ImportYNAB5.js+++ b/packages/desktop-client/src/components/manager/ImportYNAB5.js@@ -4,8 +4,12 @@ import { useDispatch } from 'react-redux';import { importBudget } from 'loot-core/src/client/actions/budgets';import { styles, colors } from '../../style';-import { View, Block, Modal, ButtonWithLoading, ExternalLink } from '../common';+import { ExternalLink } from '../common';+import Block from '../common/Block';+import { ButtonWithLoading } from '../common/Button';+import Modal from '../common/Modal';import Paragraph from '../common/Paragraph';+import View from '../common/View';function getErrorMessage(error) {switch (error) {diff --git a/packages/desktop-client/src/components/modals/BudgetSummary.js b/packages/desktop-client/src/components/modals/BudgetSummary.jsindex 33a81e77eb..4e78e8881d 100644--- a/packages/desktop-client/src/components/modals/BudgetSummary.js+++ b/packages/desktop-client/src/components/modals/BudgetSummary.js@@ -4,7 +4,10 @@ import { rolloverBudget } from 'loot-core/src/client/queries';import * as monthUtils from 'loot-core/src/shared/months';import { colors, styles } from '../../style';-import { View, Text, Modal, Button } from '../common';+import Button from '../common/Button';+import Modal from '../common/Modal';+import Text from '../common/Text';+import View from '../common/View';import CellValue from '../spreadsheet/CellValue';import format from '../spreadsheet/format';import NamespaceContext from '../spreadsheet/NamespaceContext';diff --git a/packages/desktop-client/src/components/modals/ConfirmCategoryDelete.js b/packages/desktop-client/src/components/modals/ConfirmCategoryDelete.jsindex c8b08018c0..747bf63e5b 100644--- a/packages/desktop-client/src/components/modals/ConfirmCategoryDelete.js+++ b/packages/desktop-client/src/components/modals/ConfirmCategoryDelete.js@@ -2,7 +2,11 @@ import React, { useState } from 'react';import { colors } from '../../style';import CategoryAutocomplete from '../autocomplete/CategorySelect';-import { View, Text, Block, Modal, Button } from '../common';+import Block from '../common/Block';+import Button from '../common/Button';+import Modal from '../common/Modal';+import Text from '../common/Text';+import View from '../common/View';export default function ConfirmCategoryDelete({modalProps,diff --git a/packages/desktop-client/src/components/modals/CreateAccount.js b/packages/desktop-client/src/components/modals/CreateAccount.jsindex f6c4371a3c..e5bfbd9dd8 100644--- a/packages/desktop-client/src/components/modals/CreateAccount.js+++ b/packages/desktop-client/src/components/modals/CreateAccount.js@@ -5,15 +5,12 @@ import { pushModal } from 'loot-core/src/client/actions/modals';import { authorizeBank } from '../../gocardless';import useGoCardlessStatus from '../../hooks/useGoCardlessStatus';-import {- View,- Text,- Modal,- Button,- ButtonWithLoading,- ExternalLink,-} from '../common';+import { ExternalLink } from '../common';+import Button, { ButtonWithLoading } from '../common/Button';+import Modal from '../common/Modal';import Paragraph from '../common/Paragraph';+import Text from '../common/Text';+import View from '../common/View';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.jsindex ffe36d82c7..5644581ac0 100644--- a/packages/desktop-client/src/components/modals/CreateEncryptionKey.js+++ b/packages/desktop-client/src/components/modals/CreateEncryptionKey.js@@ -6,17 +6,14 @@ import { send } from 'loot-core/src/platform/client/fetch';import { getCreateKeyError } from 'loot-core/src/shared/errors';import { colors } from '../../style';-import {- View,- Text,- Modal,- ButtonWithLoading,- ExternalLink,- ModalButtons,- Input,- InitialFocus,-} from '../common';+import { ExternalLink } from '../common';+import { ButtonWithLoading } from '../common/Button';+import InitialFocus from '../common/InitialFocus';+import Input from '../common/Input';+import Modal, { ModalButtons } from '../common/Modal';import Paragraph from '../common/Paragraph';+import Text from '../common/Text';+import View from '../common/View';export default function CreateEncryptionKey({modalProps,diff --git a/packages/desktop-client/src/components/modals/EditField.js b/packages/desktop-client/src/components/modals/EditField.jsindex 4d5f7ea1fe..faff7a2612 100644--- a/packages/desktop-client/src/components/modals/EditField.js+++ b/packages/desktop-client/src/components/modals/EditField.js@@ -11,7 +11,9 @@ import { colors } from '../../style';import AccountAutocomplete from '../autocomplete/AccountAutocomplete';import CategoryAutocomplete from '../autocomplete/CategorySelect';import PayeeAutocomplete from '../autocomplete/PayeeAutocomplete';-import { View, Modal, Input } from '../common';+import Input from '../common/Input';+import Modal from '../common/Modal';+import View from '../common/View';import { SectionLabel } from '../forms';import DateSelect from '../select/DateSelect';diff --git a/packages/desktop-client/src/components/modals/FixEncryptionKey.js b/packages/desktop-client/src/components/modals/FixEncryptionKey.jsindex 610a8686c8..a617d33b53 100644--- a/packages/desktop-client/src/components/modals/FixEncryptionKey.js+++ b/packages/desktop-client/src/components/modals/FixEncryptionKey.js@@ -4,18 +4,14 @@ import { send } from 'loot-core/src/platform/client/fetch';import { getTestKeyError } from 'loot-core/src/shared/errors';import { colors } from '../../style';-import {- View,- Text,- Modal,- Button,- ButtonWithLoading,- ModalButtons,- Input,- InitialFocus,- ExternalLink,-} from '../common';+import { ExternalLink } from '../common';+import Button, { ButtonWithLoading } from '../common/Button';+import InitialFocus from '../common/InitialFocus';+import Input from '../common/Input';+import Modal, { ModalButtons } from '../common/Modal';import Paragraph from '../common/Paragraph';+import Text from '../common/Text';+import View from '../common/View';export default function FixEncryptionKey({modalProps,diff --git a/packages/desktop-client/src/components/modals/ImportTransactions.js b/packages/desktop-client/src/components/modals/ImportTransactions.jsindex 6a2387d5a2..88af52fe27 100644--- a/packages/desktop-client/src/components/modals/ImportTransactions.js+++ b/packages/desktop-client/src/components/modals/ImportTransactions.js@@ -12,16 +12,13 @@ import {import { useActions } from '../../hooks/useActions';import { colors, styles } from '../../style';-import {- View,- Text,- Stack,- Modal,- Select,- Input,- Button,- ButtonWithLoading,-} from '../common';+import Button, { ButtonWithLoading } from '../common/Button';+import Input from '../common/Input';+import Modal from '../common/Modal';+import Select from '../common/Select';+import Stack from '../common/Stack';+import Text from '../common/Text';+import View from '../common/View';import { Checkbox, SectionLabel } from '../forms';import { TableHeader, TableWithNavigator, Row, Field } from '../table';diff --git a/packages/desktop-client/src/components/modals/LoadBackup.js b/packages/desktop-client/src/components/modals/LoadBackup.jsindex a43e173c1e..33a946af07 100644--- a/packages/desktop-client/src/components/modals/LoadBackup.js+++ b/packages/desktop-client/src/components/modals/LoadBackup.js@@ -3,7 +3,11 @@ import React, { Component, useState, useEffect } from 'react';import { send, listen, unlisten } from 'loot-core/src/platform/client/fetch';import { colors } from '../../style';-import { View, Text, Block, Modal, Button } from '../common';+import Block from '../common/Block';+import Button from '../common/Button';+import Modal from '../common/Modal';+import Text from '../common/Text';+import View from '../common/View';import { Row, Cell } from '../table';class BackupTable extends Component {diff --git a/packages/desktop-client/src/components/modals/ManageRulesModal.js b/packages/desktop-client/src/components/modals/ManageRulesModal.jsindex 1eb05415a8..fcf52c5c81 100644--- a/packages/desktop-client/src/components/modals/ManageRulesModal.js+++ b/packages/desktop-client/src/components/modals/ManageRulesModal.js@@ -3,7 +3,7 @@ import { useLocation } from 'react-router-dom';import { isNonProductionEnvironment } from 'loot-core/src/shared/environment';-import { Modal } from '../common';+import Modal from '../common/Modal';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.jsindex 9814e1ad02..12932cfdfe 100644--- a/packages/desktop-client/src/components/modals/MergeUnusedPayees.js+++ b/packages/desktop-client/src/components/modals/MergeUnusedPayees.js@@ -6,8 +6,11 @@ import { send } from 'loot-core/src/platform/client/fetch';import { colors } from '../../style';import { Information } from '../alerts';-import { View, Text, Modal, ModalButtons, Button } from '../common';+import Button from '../common/Button';+import Modal, { ModalButtons } from '../common/Modal';import Paragraph from '../common/Paragraph';+import Text from '../common/Text';+import View from '../common/View';let highlightStyle = { color: colors.p5 };diff --git a/packages/desktop-client/src/components/modals/PlaidExternalMsg.js b/packages/desktop-client/src/components/modals/PlaidExternalMsg.jsindex f390f53d0e..bf1315ef3d 100644--- a/packages/desktop-client/src/components/modals/PlaidExternalMsg.js+++ b/packages/desktop-client/src/components/modals/PlaidExternalMsg.js@@ -3,8 +3,11 @@ import React, { useState, useRef } from 'react';import AnimatedLoading from '../../icons/AnimatedLoading';import { colors } from '../../style';import { Error } from '../alerts';-import { View, Text, Modal, Button, ModalButtons } from '../common';+import Button from '../common/Button';+import Modal, { ModalButtons } from '../common/Modal';import Paragraph from '../common/Paragraph';+import Text from '../common/Text';+import View from '../common/View';function renderError(error) {return (diff --git a/packages/desktop-client/src/components/modals/SelectLinkedAccounts.js b/packages/desktop-client/src/components/modals/SelectLinkedAccounts.jsindex f7580f520b..4220a0c5a6 100644--- a/packages/desktop-client/src/components/modals/SelectLinkedAccounts.js+++ b/packages/desktop-client/src/components/modals/SelectLinkedAccounts.js@@ -2,7 +2,10 @@ import React, { useState } from 'react';import { colors } from '../../style';import Autocomplete from '../autocomplete/Autocomplete';-import { View, Modal, Button, Text } from '../common';+import Button from '../common/Button';+import Modal from '../common/Modal';+import Text from '../common/Text';+import View from '../common/View';import { TableHeader, Table, Row, Field } from '../table';const addAccountOption = { id: 'new', name: 'Create new account' };diff --git a/packages/desktop-client/src/components/reports/Change.js b/packages/desktop-client/src/components/reports/Change.jsindex b344077e0b..3d491f57bc 100644--- a/packages/desktop-client/src/components/reports/Change.js+++ b/packages/desktop-client/src/components/reports/Change.js@@ -3,7 +3,7 @@ import React from 'react';import { integerToCurrency } from 'loot-core/src/shared/util';import { colors, styles } from '../../style';-import { Block } from '../common';+import Block from '../common/Block';function Change({ amount }) {return (diff --git a/packages/desktop-client/src/components/reports/DateRange.js b/packages/desktop-client/src/components/reports/DateRange.jsindex 06ee410c7f..927d5784ee 100644--- a/packages/desktop-client/src/components/reports/DateRange.js+++ b/packages/desktop-client/src/components/reports/DateRange.js@@ -3,7 +3,7 @@ import React from 'react';import * as d from 'date-fns';import { colors } from '../../style';-import { Block } from '../common';+import Block from '../common/Block';function DateRange({ start, end }) {start = d.parseISO(start);diff --git a/packages/desktop-client/src/components/reports/Overview.js b/packages/desktop-client/src/components/reports/Overview.jsindex 0ea17ef09c..7b01ee811d 100644--- a/packages/desktop-client/src/components/reports/Overview.js+++ b/packages/desktop-client/src/components/reports/Overview.js@@ -7,7 +7,9 @@ import * as monthUtils from 'loot-core/src/shared/months';import { integerToCurrency } from 'loot-core/src/shared/util';import { colors, styles } from '../../style';-import { View, Block, AnchorLink } from '../common';+import AnchorLink from '../common/AnchorLink';+import Block from '../common/Block';+import View from '../common/View';import Change from './Change';import theme from './chart-theme';diff --git a/packages/desktop-client/src/components/schedules/DiscoverSchedules.js b/packages/desktop-client/src/components/schedules/DiscoverSchedules.jsindex 574e488cba..de1a600bbe 100644--- a/packages/desktop-client/src/components/schedules/DiscoverSchedules.js+++ b/packages/desktop-client/src/components/schedules/DiscoverSchedules.js@@ -13,8 +13,10 @@ import useSelected, {import useSendPlatformRequest from '../../hooks/useSendPlatformRequest';import { colors } from '../../style';import { getParent } from '../../util/router-tools';-import { View, Stack, ButtonWithLoading } from '../common';+import { ButtonWithLoading } from '../common/Button';import Paragraph from '../common/Paragraph';+import Stack from '../common/Stack';+import View from '../common/View';import { Page, usePageType } from '../Page';import { Table, TableHeader, Row, Field, SelectCell } from '../table';import DisplayId from '../util/DisplayId';diff --git a/packages/desktop-client/src/components/schedules/EditSchedule.js b/packages/desktop-client/src/components/schedules/EditSchedule.jsindex ba4091d3d2..9548eb55d8 100644--- a/packages/desktop-client/src/components/schedules/EditSchedule.js+++ b/packages/desktop-client/src/components/schedules/EditSchedule.js@@ -13,7 +13,10 @@ import useSelected, { SelectedProvider } from '../../hooks/useSelected';import { colors } from '../../style';import AccountAutocomplete from '../autocomplete/AccountAutocomplete';import PayeeAutocomplete from '../autocomplete/PayeeAutocomplete';-import { Stack, View, Text, Button } from '../common';+import Button from '../common/Button';+import Stack from '../common/Stack';+import Text from '../common/Text';+import View from '../common/View';import { FormField, FormLabel, Checkbox } from '../forms';import { OpSelect } from '../modals/EditRule';import { Page } from '../Page';diff --git a/packages/desktop-client/src/components/schedules/PostsOfflineNotification.js b/packages/desktop-client/src/components/schedules/PostsOfflineNotification.jsindex 34375205bc..1c292825d1 100644--- a/packages/desktop-client/src/components/schedules/PostsOfflineNotification.js+++ b/packages/desktop-client/src/components/schedules/PostsOfflineNotification.js@@ -4,8 +4,10 @@ import { useLocation, useNavigate } from 'react-router-dom';import { send } from 'loot-core/src/platform/client/fetch';import { colors } from '../../style';-import { Text, Button, Stack } from '../common';+import Button from '../common/Button';import Paragraph from '../common/Paragraph';+import Stack from '../common/Stack';+import Text from '../common/Text';import { Page } from '../Page';import DisplayId from '../util/DisplayId';diff --git a/packages/desktop-client/src/components/settings/Experimental.tsx b/packages/desktop-client/src/components/settings/Experimental.tsxindex 0b6d1908a6..7c989a19a2 100644--- a/packages/desktop-client/src/components/settings/Experimental.tsx+++ b/packages/desktop-client/src/components/settings/Experimental.tsx@@ -6,7 +6,9 @@ import type { FeatureFlag } from 'loot-core/src/types/prefs';import { useActions } from '../../hooks/useActions';import useFeatureFlag from '../../hooks/useFeatureFlag';import { colors, useTheme } from '../../style';-import { LinkButton, Text, View } from '../common';+import LinkButton from '../common/LinkButton';+import Text from '../common/Text';+import View from '../common/View';import { Checkbox } from '../forms';import { Setting } from './UI';diff --git a/packages/desktop-client/src/components/settings/UI.tsx b/packages/desktop-client/src/components/settings/UI.tsxindex b3052256e1..7c88d9ffe3 100644--- a/packages/desktop-client/src/components/settings/UI.tsx+++ b/packages/desktop-client/src/components/settings/UI.tsx@@ -6,7 +6,8 @@ import type { CSSProperties } from 'glamor';import { colors } from '../../style';import tokens from '../../tokens';-import { View, LinkButton } from '../common';+import LinkButton from '../common/LinkButton';+import View from '../common/View';type SettingProps = {primaryAction?: ReactNode;diff --git a/packages/desktop-client/src/components/transactions/SelectedTransactions.js b/packages/desktop-client/src/components/transactions/SelectedTransactions.jsindex a33f23ca3a..dc1bd5c0f3 100644--- a/packages/desktop-client/src/components/transactions/SelectedTransactions.js+++ b/packages/desktop-client/src/components/transactions/SelectedTransactions.js@@ -2,7 +2,7 @@ import React, { useMemo } from 'react';import { useSelectedItems } from '../../hooks/useSelected';import { usePushModal } from '../../util/router-tools';-import { Menu } from '../common';+import Menu from '../common/Menu';import { SelectedItemsButton } from '../table';import { isPreviewId } from './TransactionsTable';diff --git a/packages/desktop-client/src/components/util/LoadComponent.tsx b/packages/desktop-client/src/components/util/LoadComponent.tsxindex 956be6ba72..982a3450d1 100644--- a/packages/desktop-client/src/components/util/LoadComponent.tsx+++ b/packages/desktop-client/src/components/util/LoadComponent.tsx@@ -2,7 +2,8 @@ import { type ComponentType, useEffect, useState } from 'react';import AnimatedLoading from '../../icons/AnimatedLoading';import { colors, styles } from '../../style';-import { Block, View } from '../common';+import Block from '../common/Block';+import View from '../common/View';type ProplessComponent = ComponentType<Record<string, never>>;type LoadComponentProps<K extends string> = {diff --git a/upcoming-release-notes/1419.md b/upcoming-release-notes/1419.mdnew file mode 100644index 0000000000..ecaa829896--- /dev/null+++ b/upcoming-release-notes/1419.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [MatissJanis]+---++Moving away from barrel `common` imports to more specific per-component imports (part 2)