♻️ (imports) updating some common component import paths to th…

packages/desktop-client/src/components/AppBackground.tsx

@@ -1,15 +1,15 @@
 import React from 'react';
 import { useTransition, animated } from 'react-spring';
 
+import { Block } from '@actual-app/components/block';
+import { AnimatedLoading } from '@actual-app/components/icons/AnimatedLoading';
+import { theme } from '@actual-app/components/theme';
+import { View } from '@actual-app/components/view';
 import { css } from '@emotion/css';
 
-import { AnimatedLoading } from '../icons/AnimatedLoading';
 import { useSelector } from '../redux';
-import { theme } from '../style';
 
 import { Background } from './Background';
-import { Block } from './common/Block';
-import { View } from './common/View';
 
 type AppBackgroundProps = {
   isLoading?: boolean;

packages/desktop-client/src/components/FatalError.tsx

@@ -1,17 +1,17 @@
 import React, { useState, type ReactNode } from 'react';
 import { useTranslation, Trans } from 'react-i18next';
 
+import { Block } from '@actual-app/components/block';
 import { Button } from '@actual-app/components/button';
+import { Paragraph } from '@actual-app/components/paragraph';
+import { Stack } from '@actual-app/components/stack';
+import { Text } from '@actual-app/components/text';
 import { View } from '@actual-app/components/view';
 
 import { LazyLoadFailedError } from 'loot-core/shared/errors';
 
-import { Block } from './common/Block';
 import { Link } from './common/Link';
 import { Modal, ModalHeader } from './common/Modal';
-import { Paragraph } from './common/Paragraph';
-import { Stack } from './common/Stack';
-import { Text } from './common/Text';
 import { Checkbox } from './forms';
 
 type AppError = Error & {

packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetAmount.tsx

@@ -1,13 +1,14 @@
 import React, { type CSSProperties, type MouseEventHandler } from 'react';
 
+import { Block } from '@actual-app/components/block';
+import { styles } from '@actual-app/components/styles';
+import { theme } from '@actual-app/components/theme';
+import { Tooltip } from '@actual-app/components/tooltip';
+import { View } from '@actual-app/components/view';
 import { css } from '@emotion/css';
 
 import { envelopeBudget } from 'loot-core/client/queries';
 
-import { theme, styles } from '../../../../style';
-import { Block } from '../../../common/Block';
-import { Tooltip } from '../../../common/Tooltip';
-import { View } from '../../../common/View';
 import { PrivacyFilter } from '../../../PrivacyFilter';
 import { useFormat } from '../../../spreadsheet/useFormat';
 import {

packages/desktop-client/src/components/budget/envelope/budgetsummary/TotalsList.tsx

@@ -1,12 +1,13 @@
 import React, { type CSSProperties } from 'react';
 
+import { AlignedText } from '@actual-app/components/aligned-text';
+import { Block } from '@actual-app/components/block';
+import { styles } from '@actual-app/components/styles';
+import { Tooltip } from '@actual-app/components/tooltip';
+import { View } from '@actual-app/components/view';
+
 import { envelopeBudget } from 'loot-core/client/queries';
 
-import { styles } from '../../../../style';
-import { AlignedText } from '../../../common/AlignedText';
-import { Block } from '../../../common/Block';
-import { Tooltip } from '../../../common/Tooltip';
-import { View } from '../../../common/View';
 import { CellValueText } from '../../../spreadsheet/CellValue';
 import { useFormat } from '../../../spreadsheet/useFormat';
 import { EnvelopeCellValue } from '../EnvelopeBudgetComponents';

packages/desktop-client/src/components/budget/tracking/budgetsummary/Saved.tsx

@@ -1,15 +1,16 @@
 import React, { type CSSProperties } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
+import { AlignedText } from '@actual-app/components/aligned-text';
+import { styles } from '@actual-app/components/styles';
+import { Text } from '@actual-app/components/text';
+import { theme } from '@actual-app/components/theme';
+import { Tooltip } from '@actual-app/components/tooltip';
+import { View } from '@actual-app/components/view';
 import { css } from '@emotion/css';
 
 import { trackingBudget } from 'loot-core/client/queries';
 
-import { theme, styles } from '../../../../style';
-import { AlignedText } from '../../../common/AlignedText';
-import { Text } from '../../../common/Text';
-import { Tooltip } from '../../../common/Tooltip';
-import { View } from '../../../common/View';
 import { PrivacyFilter } from '../../../PrivacyFilter';
 import { useFormat } from '../../../spreadsheet/useFormat';
 import { makeAmountFullStyle } from '../../util';

packages/desktop-client/src/components/modals/ConfirmCategoryDeleteModal.tsx

@@ -2,14 +2,15 @@
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next'; // Import useTranslation
 
+import { Block } from '@actual-app/components/block';
+import { Button } from '@actual-app/components/button';
+import { Text } from '@actual-app/components/text';
+import { theme } from '@actual-app/components/theme';
+import { View } from '@actual-app/components/view';
+
 import { useCategories } from '../../hooks/useCategories';
-import { theme } from '../../style';
 import { CategoryAutocomplete } from '../autocomplete/CategoryAutocomplete';
-import { Block } from '../common/Block';
-import { Button } from '../common/Button2';
 import { Modal, ModalCloseButton, ModalHeader } from '../common/Modal';
-import { Text } from '../common/Text';
-import { View } from '../common/View';
 
 type ConfirmCategoryDeleteProps = {
   category: string;

packages/desktop-client/src/components/modals/ConfirmTransactionEditModal.tsx

@@ -2,11 +2,12 @@
 import React from 'react';
 import { useTranslation, Trans } from 'react-i18next';
 
-import { Block } from '../common/Block';
-import { Button } from '../common/Button2';
-import { InitialFocus } from '../common/InitialFocus';
+import { Block } from '@actual-app/components/block';
+import { Button } from '@actual-app/components/button';
+import { InitialFocus } from '@actual-app/components/initial-focus';
+import { View } from '@actual-app/components/view';
+
 import { Modal, ModalCloseButton, ModalHeader } from '../common/Modal';
-import { View } from '../common/View';
 
 type ConfirmTransactionEditProps = {
   onCancel?: () => void;

packages/desktop-client/src/components/modals/LoadBackupModal.tsx

@@ -1,18 +1,19 @@
 import React, { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { Block } from '@actual-app/components/block';
+import { Button } from '@actual-app/components/button';
+import { Text } from '@actual-app/components/text';
+import { theme } from '@actual-app/components/theme';
+import { View } from '@actual-app/components/view';
+
 import { loadBackup, makeBackup } from 'loot-core/client/actions';
 import { send, listen, unlisten } from 'loot-core/platform/client/fetch';
 import { type Backup } from 'loot-core/server/backups';
 
 import { useMetadataPref } from '../../hooks/useMetadataPref';
 import { useDispatch } from '../../redux';
-import { theme } from '../../style';
-import { Block } from '../common/Block';
-import { Button } from '../common/Button2';
 import { Modal, ModalCloseButton, ModalHeader } from '../common/Modal';
-import { Text } from '../common/Text';
-import { View } from '../common/View';
 import { Row, Cell } from '../table';
 
 type BackupTableProps = {

packages/desktop-client/src/components/modals/manager/ImportActualModal.tsx

@@ -2,16 +2,18 @@
 import React, { useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
+import { Block } from '@actual-app/components/block';
+import { ButtonWithLoading } from '@actual-app/components/button';
+import { Paragraph } from '@actual-app/components/paragraph';
+import { styles } from '@actual-app/components/styles';
+import { theme } from '@actual-app/components/theme';
+import { View } from '@actual-app/components/view';
+
 import { importBudget } from 'loot-core/client/actions/budgets';
 
 import { useNavigate } from '../../../hooks/useNavigate';
 import { useDispatch } from '../../../redux';
-import { styles, theme } from '../../../style';
-import { Block } from '../../common/Block';
-import { ButtonWithLoading } from '../../common/Button2';
 import { Modal, ModalCloseButton, ModalHeader } from '../../common/Modal';
-import { Paragraph } from '../../common/Paragraph';
-import { View } from '../../common/View';
 
 function getErrorMessage(error: string): string {
   switch (error) {

packages/desktop-client/src/components/modals/manager/ImportModal.tsx

@@ -1,15 +1,17 @@
 import React, { useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
+import { Block } from '@actual-app/components/block';
+import { Button } from '@actual-app/components/button';
+import { styles } from '@actual-app/components/styles';
+import { Text } from '@actual-app/components/text';
+import { theme } from '@actual-app/components/theme';
+import { View } from '@actual-app/components/view';
+
 import { pushModal } from 'loot-core/client/actions';
 
 import { useDispatch } from '../../../redux';
-import { styles, theme } from '../../../style';
-import { Block } from '../../common/Block';
-import { Button } from '../../common/Button2';
 import { Modal, ModalCloseButton, ModalHeader } from '../../common/Modal';
-import { Text } from '../../common/Text';
-import { View } from '../../common/View';
 
 function getErrorMessage(error: 'not-ynab4' | boolean) {
   switch (error) {

packages/desktop-client/src/components/modals/manager/ImportYNAB4Modal.tsx

@@ -2,16 +2,18 @@
 import React, { useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
+import { Block } from '@actual-app/components/block';
+import { ButtonWithLoading } from '@actual-app/components/button';
+import { Paragraph } from '@actual-app/components/paragraph';
+import { styles } from '@actual-app/components/styles';
+import { theme } from '@actual-app/components/theme';
+import { View } from '@actual-app/components/view';
+
 import { importBudget } from 'loot-core/client/actions/budgets';
 
 import { useNavigate } from '../../../hooks/useNavigate';
 import { useDispatch } from '../../../redux';
-import { styles, theme } from '../../../style';
-import { Block } from '../../common/Block';
-import { ButtonWithLoading } from '../../common/Button2';
 import { Modal, ModalCloseButton, ModalHeader } from '../../common/Modal';
-import { Paragraph } from '../../common/Paragraph';
-import { View } from '../../common/View';
 
 function getErrorMessage(error: string): string {
   switch (error) {

packages/desktop-client/src/components/modals/manager/ImportYNAB5Modal.tsx

@@ -2,17 +2,19 @@
 import React, { useState } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
+import { Block } from '@actual-app/components/block';
+import { ButtonWithLoading } from '@actual-app/components/button';
+import { Paragraph } from '@actual-app/components/paragraph';
+import { styles } from '@actual-app/components/styles';
+import { theme } from '@actual-app/components/theme';
+import { View } from '@actual-app/components/view';
+
 import { importBudget } from 'loot-core/client/actions/budgets';
 
 import { useNavigate } from '../../../hooks/useNavigate';
 import { useDispatch } from '../../../redux';
-import { styles, theme } from '../../../style';
-import { Block } from '../../common/Block';
-import { ButtonWithLoading } from '../../common/Button2';
 import { Link } from '../../common/Link';
 import { Modal, ModalCloseButton, ModalHeader } from '../../common/Modal';
-import { Paragraph } from '../../common/Paragraph';
-import { View } from '../../common/View';
 
 function getErrorMessage(error: string): string {
   switch (error) {

packages/desktop-client/src/components/reports/Change.tsx

@@ -1,10 +1,10 @@
 import React, { type CSSProperties } from 'react';
 
-import { integerToCurrency } from 'loot-core/shared/util';
+import { Block } from '@actual-app/components/block';
+import { styles } from '@actual-app/components/styles';
+import { theme } from '@actual-app/components/theme';
 
-import { styles } from '../../style/styles';
-import { theme } from '../../style/theme';
-import { Block } from '../common/Block';
+import { integerToCurrency } from 'loot-core/shared/util';
 
 export function Change({
   amount,

packages/desktop-client/src/components/reports/DateRange.tsx

@@ -1,15 +1,14 @@
 import React, { type ReactElement } from 'react';
 import { Trans } from 'react-i18next';
 
+import { Block } from '@actual-app/components/block';
+import { styles } from '@actual-app/components/styles';
+import { Text } from '@actual-app/components/text';
+import { theme } from '@actual-app/components/theme';
 import * as d from 'date-fns';
 
 import * as monthUtils from 'loot-core/shared/months';
 
-import { theme } from '../../style';
-import { styles } from '../../style/styles';
-import { Block } from '../common/Block';
-import { Text } from '../common/Text';
-
 type DateRangeProps = {
   start: string;
   end: string;

packages/desktop-client/src/components/reports/LoadingIndicator.tsx

@@ -1,9 +1,10 @@
 import React from 'react';
 
-import { AnimatedLoading } from '../../icons/AnimatedLoading';
-import { theme, styles } from '../../style';
-import { Block } from '../common/Block';
-import { View } from '../common/View';
+import { Block } from '@actual-app/components/block';
+import { AnimatedLoading } from '@actual-app/components/icons/AnimatedLoading';
+import { styles } from '@actual-app/components/styles';
+import { theme } from '@actual-app/components/theme';
+import { View } from '@actual-app/components/view';
 
 type LoadingIndicatorProps = {
   message?: string;

packages/desktop-client/src/components/reports/ReportCardName.tsx

@@ -1,8 +1,9 @@
 import React from 'react';
 
-import { styles } from '../../style';
-import { Block } from '../common/Block';
-import { InitialFocus } from '../common/InitialFocus';
+import { Block } from '@actual-app/components/block';
+import { InitialFocus } from '@actual-app/components/initial-focus';
+import { styles } from '@actual-app/components/styles';
+
 import { Input } from '../common/Input';
 
 import { NON_DRAGGABLE_AREA_CLASS_NAME } from './constants';

packages/desktop-client/src/components/reports/graphs/AreaGraph.tsx

@@ -1,6 +1,8 @@
 import React, { type CSSProperties } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { AlignedText } from '@actual-app/components/aligned-text';
+import { theme } from '@actual-app/components/theme';
 import { css } from '@emotion/css';
 import {
   AreaChart,
@@ -23,8 +25,6 @@ import {
 } from 'loot-core/types/models/reports';
 
 import { usePrivacyMode } from '../../../hooks/usePrivacyMode';
-import { theme } from '../../../style';
-import { AlignedText } from '../../common/AlignedText';
 import { Container } from '../Container';
 
 import { adjustTextSize } from './adjustTextSize';

packages/desktop-client/src/components/reports/graphs/BarGraph.tsx

@@ -2,6 +2,8 @@
 import React, { useState, type CSSProperties } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { AlignedText } from '@actual-app/components/aligned-text';
+import { theme } from '@actual-app/components/theme';
 import { css } from '@emotion/css';
 import {
   BarChart,
@@ -30,8 +32,6 @@ import { useAccounts } from '../../../hooks/useAccounts';
 import { useCategories } from '../../../hooks/useCategories';
 import { useNavigate } from '../../../hooks/useNavigate';
 import { usePrivacyMode } from '../../../hooks/usePrivacyMode';
-import { theme } from '../../../style';
-import { AlignedText } from '../../common/AlignedText';
 import { Container } from '../Container';
 import { getCustomTick } from '../getCustomTick';
 import { numberFormatterTooltip } from '../numberFormatter';

packages/desktop-client/src/components/reports/graphs/BarLineGraph.tsx

@@ -2,6 +2,8 @@
 import React, { type CSSProperties } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { AlignedText } from '@actual-app/components/aligned-text';
+import { theme } from '@actual-app/components/theme';
 import { css } from '@emotion/css';
 import {
   ComposedChart,
@@ -16,8 +18,6 @@ import {
 
 import { amountToCurrencyNoDecimal } from 'loot-core/shared/util';
 
-import { theme } from '../../../style';
-import { AlignedText } from '../../common/AlignedText';
 import { PrivacyFilter } from '../../PrivacyFilter';
 import { Container } from '../Container';
 import { numberFormatterTooltip } from '../numberFormatter';