Skip to content

A local-first personal finance app

ESLint no-default-exports 3 (#2117)

Joel Jeremy Marquez882fd9f5cdff
diff --git a/.eslintrc.js b/.eslintrc.js
index 9b20e7bb39..aabdb637ea 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -249,7 +249,24 @@ module.exports = {
// './packages/desktop-client/src/components/accounts/**/*',
// './packages/desktop-client/src/components/autocomplete/**/*',
// './packages/desktop-client/src/components/budget/**/*',
+ './packages/desktop-client/src/components/common/AlignedText.tsx',
+ './packages/desktop-client/src/components/common/AnchorLink.tsx',
+ './packages/desktop-client/src/components/common/Block.tsx',
'./packages/desktop-client/src/components/common/Button.tsx',
+ './packages/desktop-client/src/components/common/ButtonLink.tsx',
+ './packages/desktop-client/src/components/common/Card.tsx',
+ './packages/desktop-client/src/components/common/ExternalLink.tsx',
+ './packages/desktop-client/src/components/common/FormError.tsx',
+ './packages/desktop-client/src/components/common/HoverTarget.tsx',
+ './packages/desktop-client/src/components/common/InitialFocus.tsx',
+ './packages/desktop-client/src/components/common/InlineField.tsx',
+ './packages/desktop-client/src/components/common/Input.tsx',
+ './packages/desktop-client/src/components/common/InputWithContent.tsx',
+ './packages/desktop-client/src/components/common/Label.tsx',
+ './packages/desktop-client/src/components/common/Link.tsx',
+ './packages/desktop-client/src/components/common/LinkButton.tsx',
+ './packages/desktop-client/src/components/common/Menu.tsx',
+ './packages/desktop-client/src/components/common/MenuTooltip.tsx',
// './packages/desktop-client/src/components/common/**/*',
// './packages/desktop-client/src/components/filters/**/*',
// './packages/desktop-client/src/components/gocardless/**/*',
diff --git a/packages/desktop-client/src/components/AppBackground.tsx b/packages/desktop-client/src/components/AppBackground.tsx
index 258ded5153..7f4d12b327 100644
--- a/packages/desktop-client/src/components/AppBackground.tsx
+++ b/packages/desktop-client/src/components/AppBackground.tsx
@@ -6,7 +6,7 @@ import AnimatedLoading from '../icons/AnimatedLoading';
import { theme } from '../style';
import { Background } from './Background';
-import Block from './common/Block';
+import { Block } from './common/Block';
import View from './common/View';
type AppBackgroundProps = {
diff --git a/packages/desktop-client/src/components/DevelopmentTopBar.tsx b/packages/desktop-client/src/components/DevelopmentTopBar.tsx
index f163863fa7..170c90f151 100644
--- a/packages/desktop-client/src/components/DevelopmentTopBar.tsx
+++ b/packages/desktop-client/src/components/DevelopmentTopBar.tsx
@@ -1,6 +1,6 @@
import { theme } from '../style';
-import ExternalLink from './common/ExternalLink';
+import { ExternalLink } from './common/ExternalLink';
import View from './common/View';
export function DevelopmentTopBar() {
diff --git a/packages/desktop-client/src/components/FatalError.tsx b/packages/desktop-client/src/components/FatalError.tsx
index 6fb0c80318..187a6270bf 100644
--- a/packages/desktop-client/src/components/FatalError.tsx
+++ b/packages/desktop-client/src/components/FatalError.tsx
@@ -1,9 +1,9 @@
import React, { useState } from 'react';
-import Block from './common/Block';
+import { Block } from './common/Block';
import { Button } from './common/Button';
-import ExternalLink from './common/ExternalLink';
-import LinkButton from './common/LinkButton';
+import { ExternalLink } from './common/ExternalLink';
+import { LinkButton } from './common/LinkButton';
import Modal from './common/Modal';
import Paragraph from './common/Paragraph';
import Stack from './common/Stack';
diff --git a/packages/desktop-client/src/components/LoggedInUser.tsx b/packages/desktop-client/src/components/LoggedInUser.tsx
index c834b88ca5..a3fddb9418 100644
--- a/packages/desktop-client/src/components/LoggedInUser.tsx
+++ b/packages/desktop-client/src/components/LoggedInUser.tsx
@@ -5,7 +5,7 @@ import { useActions } from '../hooks/useActions';
import { theme, styles, type CSSProperties } from '../style';
import { Button } from './common/Button';
-import Menu from './common/Menu';
+import { Menu } from './common/Menu';
import Text from './common/Text';
import View from './common/View';
import { useServerURL } from './ServerContext';
diff --git a/packages/desktop-client/src/components/ManageRules.tsx b/packages/desktop-client/src/components/ManageRules.tsx
index 8caa447a81..638fa13e22 100644
--- a/packages/desktop-client/src/components/ManageRules.tsx
+++ b/packages/desktop-client/src/components/ManageRules.tsx
@@ -21,7 +21,7 @@ import useSelected, { SelectedProvider } from '../hooks/useSelected';
import { theme } from '../style';
import { Button } from './common/Button';
-import ExternalLink from './common/ExternalLink';
+import { ExternalLink } from './common/ExternalLink';
import Search from './common/Search';
import Stack from './common/Stack';
import Text from './common/Text';
diff --git a/packages/desktop-client/src/components/Notifications.tsx b/packages/desktop-client/src/components/Notifications.tsx
index 881b562c64..48b8b229ea 100644
--- a/packages/desktop-client/src/components/Notifications.tsx
+++ b/packages/desktop-client/src/components/Notifications.tsx
@@ -14,8 +14,8 @@ import Delete from '../icons/v0/Delete';
import { styles, theme, type CSSProperties } from '../style';
import { Button, ButtonWithLoading } from './common/Button';
-import ExternalLink from './common/ExternalLink';
-import LinkButton from './common/LinkButton';
+import { ExternalLink } from './common/ExternalLink';
+import { LinkButton } from './common/LinkButton';
import Stack from './common/Stack';
import Text from './common/Text';
import View from './common/View';
diff --git a/packages/desktop-client/src/components/ThemeSelector.tsx b/packages/desktop-client/src/components/ThemeSelector.tsx
index 45987b6309..667fb272ba 100644
--- a/packages/desktop-client/src/components/ThemeSelector.tsx
+++ b/packages/desktop-client/src/components/ThemeSelector.tsx
@@ -10,7 +10,7 @@ import { useResponsive } from '../ResponsiveProvider';
import { type CSSProperties, themeOptions, useTheme } from '../style';
import { Button } from './common/Button';
-import Menu from './common/Menu';
+import { Menu } from './common/Menu';
import { Tooltip } from './tooltips';
type ThemeSelectorProps = {
diff --git a/packages/desktop-client/src/components/Titlebar.tsx b/packages/desktop-client/src/components/Titlebar.tsx
index 34d61014b4..4b6bb75cda 100644
--- a/packages/desktop-client/src/components/Titlebar.tsx
+++ b/packages/desktop-client/src/components/Titlebar.tsx
@@ -29,8 +29,8 @@ import AccountSyncCheck from './accounts/AccountSyncCheck';
import { AnimatedRefresh } from './AnimatedRefresh';
import { MonthCountSelector } from './budget/MonthCountSelector';
import { Button, ButtonWithLoading } from './common/Button';
-import ExternalLink from './common/ExternalLink';
-import Link from './common/Link';
+import { ExternalLink } from './common/ExternalLink';
+import { Link } from './common/Link';
import Paragraph from './common/Paragraph';
import Text from './common/Text';
import View from './common/View';
diff --git a/packages/desktop-client/src/components/UpdateNotification.tsx b/packages/desktop-client/src/components/UpdateNotification.tsx
index f6d224accb..9430f4e3ad 100644
--- a/packages/desktop-client/src/components/UpdateNotification.tsx
+++ b/packages/desktop-client/src/components/UpdateNotification.tsx
@@ -6,7 +6,7 @@ import Close from '../icons/v1/Close';
import { theme } from '../style';
import { Button } from './common/Button';
-import LinkButton from './common/LinkButton';
+import { LinkButton } from './common/LinkButton';
import Text from './common/Text';
import View from './common/View';
diff --git a/packages/desktop-client/src/components/accounts/AccountSyncCheck.jsx b/packages/desktop-client/src/components/accounts/AccountSyncCheck.jsx
index 7cb042e108..05274e4944 100644
--- a/packages/desktop-client/src/components/accounts/AccountSyncCheck.jsx
+++ b/packages/desktop-client/src/components/accounts/AccountSyncCheck.jsx
@@ -7,7 +7,7 @@ import { useActions } from '../../hooks/useActions';
import ExclamationOutline from '../../icons/v1/ExclamationOutline';
import { theme } from '../../style';
import { Button } from '../common/Button';
-import ExternalLink from '../common/ExternalLink';
+import { ExternalLink } from '../common/ExternalLink';
import View from '../common/View';
import { Tooltip } from '../tooltips';
diff --git a/packages/desktop-client/src/components/accounts/Header.jsx b/packages/desktop-client/src/components/accounts/Header.jsx
index e9738eb401..d5bad60712 100644
--- a/packages/desktop-client/src/components/accounts/Header.jsx
+++ b/packages/desktop-client/src/components/accounts/Header.jsx
@@ -10,11 +10,11 @@ import Pencil1 from '../../icons/v2/Pencil1';
import { theme, styles } from '../../style';
import { AnimatedRefresh } from '../AnimatedRefresh';
import { Button } from '../common/Button';
-import InitialFocus from '../common/InitialFocus';
-import Input from '../common/Input';
-import Menu from '../common/Menu';
+import { InitialFocus } from '../common/InitialFocus';
+import { Input } from '../common/Input';
+import { Menu } from '../common/Menu';
import MenuButton from '../common/MenuButton';
-import MenuTooltip from '../common/MenuTooltip';
+import { MenuTooltip } from '../common/MenuTooltip';
import Search from '../common/Search';
import Stack from '../common/Stack';
import View from '../common/View';
diff --git a/packages/desktop-client/src/components/accounts/MobileAccountDetails.jsx b/packages/desktop-client/src/components/accounts/MobileAccountDetails.jsx
index 37b0d016dd..7fd1b09abd 100644
--- a/packages/desktop-client/src/components/accounts/MobileAccountDetails.jsx
+++ b/packages/desktop-client/src/components/accounts/MobileAccountDetails.jsx
@@ -4,9 +4,9 @@ import { useActions } from '../../hooks/useActions';
import Add from '../../icons/v1/Add';
import SearchAlternate from '../../icons/v2/SearchAlternate';
import { theme } from '../../style';
-import ButtonLink from '../common/ButtonLink';
-import InputWithContent from '../common/InputWithContent';
-import Label from '../common/Label';
+import { ButtonLink } from '../common/ButtonLink';
+import { InputWithContent } from '../common/InputWithContent';
+import { Label } from '../common/Label';
import View from '../common/View';
import { MobileBackButton } from '../MobileBackButton';
import { Page } from '../Page';
diff --git a/packages/desktop-client/src/components/accounts/Reconcile.jsx b/packages/desktop-client/src/components/accounts/Reconcile.jsx
index 0efd70f36c..bd3f4a59b6 100644
--- a/packages/desktop-client/src/components/accounts/Reconcile.jsx
+++ b/packages/desktop-client/src/components/accounts/Reconcile.jsx
@@ -6,8 +6,8 @@ import { currencyToInteger } from 'loot-core/src/shared/util';
import CheckCircle1 from '../../icons/v2/CheckCircle1';
import { styles, theme } from '../../style';
import { Button } from '../common/Button';
-import InitialFocus from '../common/InitialFocus';
-import Input from '../common/Input';
+import { InitialFocus } from '../common/InitialFocus';
+import { Input } from '../common/Input';
import Text from '../common/Text';
import View from '../common/View';
import useFormat from '../spreadsheet/useFormat';
diff --git a/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx b/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx
index 81b838b725..71d49edd1e 100644
--- a/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx
+++ b/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx
@@ -16,7 +16,7 @@ import { css } from 'glamor';
import Remove from '../../icons/v2/Remove';
import { theme, type CSSProperties } from '../../style';
import { Button } from '../common/Button';
-import Input from '../common/Input';
+import { Input } from '../common/Input';
import View from '../common/View';
import { Tooltip } from '../tooltips';
diff --git a/packages/desktop-client/src/components/budget/BudgetTotals.tsx b/packages/desktop-client/src/components/budget/BudgetTotals.tsx
index 11e4284268..3864660d55 100644
--- a/packages/desktop-client/src/components/budget/BudgetTotals.tsx
+++ b/packages/desktop-client/src/components/budget/BudgetTotals.tsx
@@ -3,7 +3,7 @@ import React, { type ComponentProps, memo, useState } from 'react';
import DotsHorizontalTriple from '../../icons/v1/DotsHorizontalTriple';
import { theme, styles } from '../../style';
import { Button } from '../common/Button';
-import Menu from '../common/Menu';
+import { Menu } from '../common/Menu';
import View from '../common/View';
import { Tooltip } from '../tooltips';
diff --git a/packages/desktop-client/src/components/budget/MobileBudgetTable.jsx b/packages/desktop-client/src/components/budget/MobileBudgetTable.jsx
index c3297e72c3..59e50bc20e 100644
--- a/packages/desktop-client/src/components/budget/MobileBudgetTable.jsx
+++ b/packages/desktop-client/src/components/budget/MobileBudgetTable.jsx
@@ -13,9 +13,9 @@ import DotsHorizontalTriple from '../../icons/v1/DotsHorizontalTriple';
import { useResponsive } from '../../ResponsiveProvider';
import { theme, styles } from '../../style';
import { Button } from '../common/Button';
-import Card from '../common/Card';
-import Label from '../common/Label';
-import Menu from '../common/Menu';
+import { Card } from '../common/Card';
+import { Label } from '../common/Label';
+import { Menu } from '../common/Menu';
import Text from '../common/Text';
import View from '../common/View';
import { Page } from '../Page';
diff --git a/packages/desktop-client/src/components/budget/SidebarCategory.tsx b/packages/desktop-client/src/components/budget/SidebarCategory.tsx
index 52947951e4..9b367bb218 100644
--- a/packages/desktop-client/src/components/budget/SidebarCategory.tsx
+++ b/packages/desktop-client/src/components/budget/SidebarCategory.tsx
@@ -5,7 +5,7 @@ import { type CategoryEntity } from 'loot-core/src/types/models';
import CheveronDown from '../../icons/v1/CheveronDown';
import { theme } from '../../style';
import { Button } from '../common/Button';
-import Menu from '../common/Menu';
+import { Menu } from '../common/Menu';
import View from '../common/View';
import { NotesButton } from '../NotesButton';
import { InputCell } from '../table';
diff --git a/packages/desktop-client/src/components/budget/SidebarGroup.tsx b/packages/desktop-client/src/components/budget/SidebarGroup.tsx
index 9621b2b5a1..8c951c6291 100644
--- a/packages/desktop-client/src/components/budget/SidebarGroup.tsx
+++ b/packages/desktop-client/src/components/budget/SidebarGroup.tsx
@@ -5,7 +5,7 @@ import ExpandArrow from '../../icons/v0/ExpandArrow';
import CheveronDown from '../../icons/v1/CheveronDown';
import { theme } from '../../style';
import { Button } from '../common/Button';
-import Menu from '../common/Menu';
+import { Menu } from '../common/Menu';
import Text from '../common/Text';
import View from '../common/View';
import { NotesButton } from '../NotesButton';
diff --git a/packages/desktop-client/src/components/budget/report/BalanceTooltip.tsx b/packages/desktop-client/src/components/budget/report/BalanceTooltip.tsx
index c1c297518a..ceefd77dcc 100644
--- a/packages/desktop-client/src/components/budget/report/BalanceTooltip.tsx
+++ b/packages/desktop-client/src/components/budget/report/BalanceTooltip.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import { reportBudget } from 'loot-core/src/client/queries';
-import Menu from '../../common/Menu';
+import { Menu } from '../../common/Menu';
import useSheetValue from '../../spreadsheet/useSheetValue';
import { Tooltip } from '../../tooltips';
diff --git a/packages/desktop-client/src/components/budget/report/ReportComponents.tsx b/packages/desktop-client/src/components/budget/report/ReportComponents.tsx
index 13f03a653d..5e96e234c9 100644
--- a/packages/desktop-client/src/components/budget/report/ReportComponents.tsx
+++ b/packages/desktop-client/src/components/budget/report/ReportComponents.tsx
@@ -8,7 +8,7 @@ import useFeatureFlag from '../../../hooks/useFeatureFlag';
import CheveronDown from '../../../icons/v1/CheveronDown';
import { styles, theme, type CSSProperties } from '../../../style';
import { Button } from '../../common/Button';
-import Menu from '../../common/Menu';
+import { Menu } from '../../common/Menu';
import Text from '../../common/Text';
import View from '../../common/View';
import CellValue from '../../spreadsheet/CellValue';
diff --git a/packages/desktop-client/src/components/budget/report/budgetsummary/BudgetSummary.tsx b/packages/desktop-client/src/components/budget/report/budgetsummary/BudgetSummary.tsx
index 0bcc7e5ea0..ee4b80ca1d 100644
--- a/packages/desktop-client/src/components/budget/report/budgetsummary/BudgetSummary.tsx
+++ b/packages/desktop-client/src/components/budget/report/budgetsummary/BudgetSummary.tsx
@@ -10,7 +10,7 @@ import ArrowButtonDown1 from '../../../../icons/v2/ArrowButtonDown1';
import ArrowButtonUp1 from '../../../../icons/v2/ArrowButtonUp1';
import { theme, styles } from '../../../../style';
import { Button } from '../../../common/Button';
-import Menu from '../../../common/Menu';
+import { Menu } from '../../../common/Menu';
import Stack from '../../../common/Stack';
import View from '../../../common/View';
import { NotesButton } from '../../../NotesButton';
diff --git a/packages/desktop-client/src/components/budget/report/budgetsummary/Saved.tsx b/packages/desktop-client/src/components/budget/report/budgetsummary/Saved.tsx
index 59ede1c3a2..e1e94de9e1 100644
--- a/packages/desktop-client/src/components/budget/report/budgetsummary/Saved.tsx
+++ b/packages/desktop-client/src/components/budget/report/budgetsummary/Saved.tsx
@@ -5,8 +5,8 @@ import { css } from 'glamor';
import { reportBudget } from 'loot-core/src/client/queries';
import { theme, type CSSProperties, styles } from '../../../../style';
-import AlignedText from '../../../common/AlignedText';
-import HoverTarget from '../../../common/HoverTarget';
+import { AlignedText } from '../../../common/AlignedText';
+import { HoverTarget } from '../../../common/HoverTarget';
import Text from '../../../common/Text';
import View from '../../../common/View';
import { PrivacyFilter } from '../../../PrivacyFilter';
diff --git a/packages/desktop-client/src/components/budget/rollover/BalanceTooltip.tsx b/packages/desktop-client/src/components/budget/rollover/BalanceTooltip.tsx
index 6df17d977b..1df4d38063 100644
--- a/packages/desktop-client/src/components/budget/rollover/BalanceTooltip.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/BalanceTooltip.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
import { rolloverBudget } from 'loot-core/src/client/queries';
-import Menu from '../../common/Menu';
+import { Menu } from '../../common/Menu';
import useSheetValue from '../../spreadsheet/useSheetValue';
import { Tooltip } from '../../tooltips';
diff --git a/packages/desktop-client/src/components/budget/rollover/CoverTooltip.tsx b/packages/desktop-client/src/components/budget/rollover/CoverTooltip.tsx
index 6cbc8be7b7..e9a2294577 100644
--- a/packages/desktop-client/src/components/budget/rollover/CoverTooltip.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/CoverTooltip.tsx
@@ -3,7 +3,7 @@ import React, { type ComponentProps, useState } from 'react';
import useCategories from '../../../hooks/useCategories';
import CategoryAutocomplete from '../../autocomplete/CategoryAutocomplete';
import { Button } from '../../common/Button';
-import InitialFocus from '../../common/InitialFocus';
+import { InitialFocus } from '../../common/InitialFocus';
import View from '../../common/View';
import { Tooltip } from '../../tooltips';
import { addToBeBudgetedGroup } from '../util';
diff --git a/packages/desktop-client/src/components/budget/rollover/HoldTooltip.tsx b/packages/desktop-client/src/components/budget/rollover/HoldTooltip.tsx
index adf170f2e5..e072ae527f 100644
--- a/packages/desktop-client/src/components/budget/rollover/HoldTooltip.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/HoldTooltip.tsx
@@ -11,8 +11,8 @@ import evalArithmetic from 'loot-core/src/shared/arithmetic';
import { integerToCurrency, amountToInteger } from 'loot-core/src/shared/util';
import { Button } from '../../common/Button';
-import InitialFocus from '../../common/InitialFocus';
-import Input from '../../common/Input';
+import { InitialFocus } from '../../common/InitialFocus';
+import { Input } from '../../common/Input';
import View from '../../common/View';
import NamespaceContext from '../../spreadsheet/NamespaceContext';
import { Tooltip } from '../../tooltips';
diff --git a/packages/desktop-client/src/components/budget/rollover/RolloverComponents.tsx b/packages/desktop-client/src/components/budget/rollover/RolloverComponents.tsx
index e29dbacf79..50fb3f6299 100644
--- a/packages/desktop-client/src/components/budget/rollover/RolloverComponents.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/RolloverComponents.tsx
@@ -8,7 +8,7 @@ import useFeatureFlag from '../../../hooks/useFeatureFlag';
import CheveronDown from '../../../icons/v1/CheveronDown';
import { styles, theme, type CSSProperties } from '../../../style';
import { Button } from '../../common/Button';
-import Menu from '../../common/Menu';
+import { Menu } from '../../common/Menu';
import Text from '../../common/Text';
import View from '../../common/View';
import CellValue from '../../spreadsheet/CellValue';
diff --git a/packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx b/packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx
index 6b397bbc35..dea5dc5090 100644
--- a/packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx
@@ -12,8 +12,8 @@ import { integerToCurrency, amountToInteger } from 'loot-core/src/shared/util';
import useCategories from '../../../hooks/useCategories';
import CategoryAutocomplete from '../../autocomplete/CategoryAutocomplete';
import { Button } from '../../common/Button';
-import InitialFocus from '../../common/InitialFocus';
-import Input from '../../common/Input';
+import { InitialFocus } from '../../common/InitialFocus';
+import { Input } from '../../common/Input';
import View from '../../common/View';
import NamespaceContext from '../../spreadsheet/NamespaceContext';
import { Tooltip } from '../../tooltips';
diff --git a/packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetSummary.tsx b/packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetSummary.tsx
index 799fbbd81b..584fdf2c55 100644
--- a/packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetSummary.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/budgetsummary/BudgetSummary.tsx
@@ -9,7 +9,7 @@ import ArrowButtonDown1 from '../../../../icons/v2/ArrowButtonDown1';
import ArrowButtonUp1 from '../../../../icons/v2/ArrowButtonUp1';
import { theme, styles } from '../../../../style';
import { Button } from '../../../common/Button';
-import Menu from '../../../common/Menu';
+import { Menu } from '../../../common/Menu';
import View from '../../../common/View';
import { NotesButton } from '../../../NotesButton';
import NamespaceContext from '../../../spreadsheet/NamespaceContext';
diff --git a/packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudget.tsx b/packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudget.tsx
index cd3b7d09b9..50e2da3b50 100644
--- a/packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudget.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/budgetsummary/ToBudget.tsx
@@ -5,9 +5,9 @@ import { css } from 'glamor';
import { rolloverBudget } from 'loot-core/src/client/queries';
import { theme, styles, type CSSProperties } from '../../../../style';
-import Block from '../../../common/Block';
-import HoverTarget from '../../../common/HoverTarget';
-import Menu from '../../../common/Menu';
+import { Block } from '../../../common/Block';
+import { HoverTarget } from '../../../common/HoverTarget';
+import { Menu } from '../../../common/Menu';
import View from '../../../common/View';
import { PrivacyFilter } from '../../../PrivacyFilter';
import useFormat from '../../../spreadsheet/useFormat';
diff --git a/packages/desktop-client/src/components/budget/rollover/budgetsummary/TotalsList.tsx b/packages/desktop-client/src/components/budget/rollover/budgetsummary/TotalsList.tsx
index 20a5fd4b9c..fc85dfb07b 100644
--- a/packages/desktop-client/src/components/budget/rollover/budgetsummary/TotalsList.tsx
+++ b/packages/desktop-client/src/components/budget/rollover/budgetsummary/TotalsList.tsx
@@ -3,9 +3,9 @@ import React from 'react';
import { rolloverBudget } from 'loot-core/src/client/queries';
import { styles, type CSSProperties } from '../../../../style';
-import AlignedText from '../../../common/AlignedText';
-import Block from '../../../common/Block';
-import HoverTarget from '../../../common/HoverTarget';
+import { AlignedText } from '../../../common/AlignedText';
+import { Block } from '../../../common/Block';
+import { HoverTarget } from '../../../common/HoverTarget';
import View from '../../../common/View';
import CellValue from '../../../spreadsheet/CellValue';
import useFormat from '../../../spreadsheet/useFormat';
diff --git a/packages/desktop-client/src/components/common/AlignedText.tsx b/packages/desktop-client/src/components/common/AlignedText.tsx
index a119449a39..0808536194 100644
--- a/packages/desktop-client/src/components/common/AlignedText.tsx
+++ b/packages/desktop-client/src/components/common/AlignedText.tsx
@@ -2,7 +2,7 @@ import { type ComponentProps } from 'react';
import { type CSSProperties } from '../../style';
-import Block from './Block';
+import { Block } from './Block';
import View from './View';
type AlignedTextProps = ComponentProps<typeof View> & {
@@ -13,7 +13,7 @@ type AlignedTextProps = ComponentProps<typeof View> & {
rightStyle?: CSSProperties;
truncate?: 'left' | 'right';
};
-export default function AlignedText({
+export function AlignedText({
left,
right,
style,
diff --git a/packages/desktop-client/src/components/common/AnchorLink.tsx b/packages/desktop-client/src/components/common/AnchorLink.tsx
index 2cc6ba3fd0..5defecba68 100644
--- a/packages/desktop-client/src/components/common/AnchorLink.tsx
+++ b/packages/desktop-client/src/components/common/AnchorLink.tsx
@@ -12,7 +12,7 @@ type AnchorLinkProps = {
children?: ReactNode;
};
-export default function AnchorLink({
+export function AnchorLink({
to,
style,
activeStyle,
diff --git a/packages/desktop-client/src/components/common/Block.tsx b/packages/desktop-client/src/components/common/Block.tsx
index 4a4db9b968..a1603aef0c 100644
--- a/packages/desktop-client/src/components/common/Block.tsx
+++ b/packages/desktop-client/src/components/common/Block.tsx
@@ -6,7 +6,7 @@ type BlockProps = HTMLProps<HTMLDivElement> & {
innerRef?: Ref<HTMLDivElement>;
};
-export default function Block(props: BlockProps) {
+export function Block(props: BlockProps) {
const { className = '', style, innerRef, ...restProps } = props;
return (
<div
diff --git a/packages/desktop-client/src/components/common/ButtonLink.tsx b/packages/desktop-client/src/components/common/ButtonLink.tsx
index ad953ecb61..081ffcc8cb 100644
--- a/packages/desktop-client/src/components/common/ButtonLink.tsx
+++ b/packages/desktop-client/src/components/common/ButtonLink.tsx
@@ -10,7 +10,7 @@ type ButtonLinkProps = ComponentProps<typeof Button> & {
to: string;
activeStyle?: CSSProperties;
};
-export default function ButtonLink({
+export function ButtonLink({
to,
style,
activeStyle,
diff --git a/packages/desktop-client/src/components/common/Card.tsx b/packages/desktop-client/src/components/common/Card.tsx
index 5f143cd355..da6e177a8b 100644
--- a/packages/desktop-client/src/components/common/Card.tsx
+++ b/packages/desktop-client/src/components/common/Card.tsx
@@ -6,7 +6,7 @@ import View from './View';
type CardProps = ComponentProps<typeof View>;
-const Card = forwardRef<HTMLDivElement, CardProps>(
+export const Card = forwardRef<HTMLDivElement, CardProps>(
({ children, ...props }, ref) => {
return (
<View
@@ -35,5 +35,3 @@ const Card = forwardRef<HTMLDivElement, CardProps>(
);
},
);
-
-export default Card;
diff --git a/packages/desktop-client/src/components/common/ExternalLink.tsx b/packages/desktop-client/src/components/common/ExternalLink.tsx
index f31d240c9b..979a62a902 100644
--- a/packages/desktop-client/src/components/common/ExternalLink.tsx
+++ b/packages/desktop-client/src/components/common/ExternalLink.tsx
@@ -13,7 +13,7 @@ type ExternalLinkProps = {
linkColor?: keyof typeof externalLinkColors;
};
-const ExternalLink = forwardRef<HTMLAnchorElement, ExternalLinkProps>(
+export const ExternalLink = forwardRef<HTMLAnchorElement, ExternalLinkProps>(
({ children, to, linkColor = 'blue' }, ref) => (
// we can’t use <ExternalLink /> here for obvious reasons
// eslint-disable-next-line no-restricted-syntax
@@ -28,5 +28,3 @@ const ExternalLink = forwardRef<HTMLAnchorElement, ExternalLinkProps>(
</a>
),
);
-
-export default ExternalLink;
diff --git a/packages/desktop-client/src/components/common/FormError.tsx b/packages/desktop-client/src/components/common/FormError.tsx
index 505388caf4..fafca109ad 100644
--- a/packages/desktop-client/src/components/common/FormError.tsx
+++ b/packages/desktop-client/src/components/common/FormError.tsx
@@ -9,7 +9,7 @@ type FormErrorProps = {
children?: ReactNode;
};
-export default function FormError({ style, children }: FormErrorProps) {
+export function FormError({ style, children }: FormErrorProps) {
return (
<View style={{ color: 'red', fontSize: 13, ...style }}>{children}</View>
);
diff --git a/packages/desktop-client/src/components/common/HoverTarget.tsx b/packages/desktop-client/src/components/common/HoverTarget.tsx
index 097ad9c013..9df85a11f8 100644
--- a/packages/desktop-client/src/components/common/HoverTarget.tsx
+++ b/packages/desktop-client/src/components/common/HoverTarget.tsx
@@ -12,7 +12,7 @@ type HoverTargetProps = {
disabled?: boolean;
};
-export default function HoverTarget({
+export function HoverTarget({
style,
contentStyle,
children,
diff --git a/packages/desktop-client/src/components/common/InitialFocus.ts b/packages/desktop-client/src/components/common/InitialFocus.ts
index 6f88cbb60f..1e8a0cb706 100644
--- a/packages/desktop-client/src/components/common/InitialFocus.ts
+++ b/packages/desktop-client/src/components/common/InitialFocus.ts
@@ -10,7 +10,7 @@ type InitialFocusProps = {
children?: ReactElement | ((node: Ref<HTMLInputElement>) => ReactElement);
};
-export default function InitialFocus({ children }: InitialFocusProps) {
+export function InitialFocus({ children }: InitialFocusProps) {
const node = useRef(null);
useEffect(() => {
diff --git a/packages/desktop-client/src/components/common/InlineField.tsx b/packages/desktop-client/src/components/common/InlineField.tsx
index 0a31f19865..9328f674fd 100644
--- a/packages/desktop-client/src/components/common/InlineField.tsx
+++ b/packages/desktop-client/src/components/common/InlineField.tsx
@@ -12,7 +12,7 @@ type InlineFieldProps = {
style?: CSSProperties;
};
-export default function InlineField({
+export function InlineField({
label,
labelWidth,
children,
diff --git a/packages/desktop-client/src/components/common/Input.tsx b/packages/desktop-client/src/components/common/Input.tsx
index 6a4e6eaf96..aab2993a3d 100644
--- a/packages/desktop-client/src/components/common/Input.tsx
+++ b/packages/desktop-client/src/components/common/Input.tsx
@@ -29,7 +29,7 @@ export type InputProps = InputHTMLAttributes<HTMLInputElement> & {
focused?: boolean;
};
-export default function Input({
+export function Input({
style,
inputRef,
onEnter,
diff --git a/packages/desktop-client/src/components/common/InputWithContent.tsx b/packages/desktop-client/src/components/common/InputWithContent.tsx
index 24b357342a..e9a6569588 100644
--- a/packages/desktop-client/src/components/common/InputWithContent.tsx
+++ b/packages/desktop-client/src/components/common/InputWithContent.tsx
@@ -2,7 +2,7 @@ import { useState, type ComponentProps, type ReactNode } from 'react';
import { type CSSProperties, theme } from '../../style';
-import Input, { defaultInputStyle } from './Input';
+import { Input, defaultInputStyle } from './Input';
import View from './View';
type InputWithContentProps = ComponentProps<typeof Input> & {
@@ -13,7 +13,7 @@ type InputWithContentProps = ComponentProps<typeof Input> & {
style?: CSSProperties;
getStyle?: (focused: boolean) => CSSProperties;
};
-export default function InputWithContent({
+export function InputWithContent({
leftContent,
rightContent,
inputStyle,
diff --git a/packages/desktop-client/src/components/common/Label.tsx b/packages/desktop-client/src/components/common/Label.tsx
index a540214a53..09dafa4e01 100644
--- a/packages/desktop-client/src/components/common/Label.tsx
+++ b/packages/desktop-client/src/components/common/Label.tsx
@@ -9,7 +9,7 @@ type LabelProps = {
style?: CSSProperties;
};
-export default function Label({ title, style }: LabelProps) {
+export function Label({ title, style }: LabelProps) {
return (
<Text
style={{
diff --git a/packages/desktop-client/src/components/common/Link.tsx b/packages/desktop-client/src/components/common/Link.tsx
index ce847a48f3..0132c12880 100644
--- a/packages/desktop-client/src/components/common/Link.tsx
+++ b/packages/desktop-client/src/components/common/Link.tsx
@@ -71,7 +71,7 @@ type LinkProps =
} & ButtonLinkProps)
| ({ variant?: 'anchor' } & AnchorLinkProps);
-export default function Link({ variant = 'anchor', ...props }: LinkProps) {
+export function Link({ variant = 'anchor', ...props }: LinkProps) {
switch (variant) {
case 'anchor':
return <AnchorLink {...props} />;
diff --git a/packages/desktop-client/src/components/common/LinkButton.tsx b/packages/desktop-client/src/components/common/LinkButton.tsx
index e5f1ba8a1a..daec85d684 100644
--- a/packages/desktop-client/src/components/common/LinkButton.tsx
+++ b/packages/desktop-client/src/components/common/LinkButton.tsx
@@ -6,11 +6,7 @@ import { styles, theme } from '../../style';
type LinkProps = HTMLAttributes<HTMLButtonElement>;
-export default function LinkButton({
- style,
- children,
- ...nativeProps
-}: LinkProps) {
+export function LinkButton({ style, children, ...nativeProps }: LinkProps) {
return (
<button
type="button"
diff --git a/packages/desktop-client/src/components/common/Menu.tsx b/packages/desktop-client/src/components/common/Menu.tsx
index 2f0d002f71..0cb4456168 100644
--- a/packages/desktop-client/src/components/common/Menu.tsx
+++ b/packages/desktop-client/src/components/common/Menu.tsx
@@ -42,7 +42,7 @@ type MenuProps<T extends MenuItem = MenuItem> = {
style?: CSSProperties;
};
-export default function Menu<T extends MenuItem>({
+export function Menu<T extends MenuItem>({
header,
footer,
items: allItems,
diff --git a/packages/desktop-client/src/components/common/MenuTooltip.tsx b/packages/desktop-client/src/components/common/MenuTooltip.tsx
index 94b63a0df0..f8fa7044f7 100644
--- a/packages/desktop-client/src/components/common/MenuTooltip.tsx
+++ b/packages/desktop-client/src/components/common/MenuTooltip.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import { Tooltip } from '../tooltips';
-export default function MenuTooltip({ width, onClose, children }) {
+export function MenuTooltip({ width, onClose, children }) {
return (
<Tooltip
position="bottom-right"
diff --git a/packages/desktop-client/src/components/common/Modal.tsx b/packages/desktop-client/src/components/common/Modal.tsx
index cf4a96f33a..a67df272b2 100644
--- a/packages/desktop-client/src/components/common/Modal.tsx
+++ b/packages/desktop-client/src/components/common/Modal.tsx
@@ -15,7 +15,7 @@ import { type CSSProperties, styles, theme } from '../../style';
import { tokens } from '../../tokens';
import { Button } from './Button';
-import Input from './Input';
+import { Input } from './Input';
import Text from './Text';
import View from './View';
diff --git a/packages/desktop-client/src/components/common/Search.tsx b/packages/desktop-client/src/components/common/Search.tsx
index 644be48f16..35a17a9a55 100644
--- a/packages/desktop-client/src/components/common/Search.tsx
+++ b/packages/desktop-client/src/components/common/Search.tsx
@@ -5,7 +5,7 @@ import SearchAlternate from '../../icons/v2/SearchAlternate';
import { theme } from '../../style';
import { Button } from './Button';
-import InputWithContent from './InputWithContent';
+import { InputWithContent } from './InputWithContent';
type SearchProps = {
inputRef?: Ref<HTMLInputElement>;
diff --git a/packages/desktop-client/src/components/filters/FiltersMenu.jsx b/packages/desktop-client/src/components/filters/FiltersMenu.jsx
index 95154f1700..2ac03f7a3f 100644
--- a/packages/desktop-client/src/components/filters/FiltersMenu.jsx
+++ b/packages/desktop-client/src/components/filters/FiltersMenu.jsx
@@ -26,8 +26,8 @@ import { titleFirst, integerToCurrency } from 'loot-core/src/shared/util';
import DeleteIcon from '../../icons/v0/Delete';
import { theme } from '../../style';
import { Button } from '../common/Button';
-import HoverTarget from '../common/HoverTarget';
-import Menu from '../common/Menu';
+import { HoverTarget } from '../common/HoverTarget';
+import { Menu } from '../common/Menu';
import Select from '../common/Select';
import Stack from '../common/Stack';
import Text from '../common/Text';
diff --git a/packages/desktop-client/src/components/filters/SavedFilters.jsx b/packages/desktop-client/src/components/filters/SavedFilters.jsx
index 4cb2183f2e..47a24e9b93 100644
--- a/packages/desktop-client/src/components/filters/SavedFilters.jsx
+++ b/packages/desktop-client/src/components/filters/SavedFilters.jsx
@@ -5,8 +5,8 @@ import { send, sendCatch } from 'loot-core/src/platform/client/fetch';
import ExpandArrow from '../../icons/v0/ExpandArrow';
import { theme } from '../../style';
import { Button } from '../common/Button';
-import Menu from '../common/Menu';
-import MenuTooltip from '../common/MenuTooltip';
+import { Menu } from '../common/Menu';
+import { MenuTooltip } from '../common/MenuTooltip';
import Stack from '../common/Stack';
import Text from '../common/Text';
import View from '../common/View';
diff --git a/packages/desktop-client/src/components/manager/BudgetList.jsx b/packages/desktop-client/src/components/manager/BudgetList.jsx
index 42de48e86b..53311e6534 100644
--- a/packages/desktop-client/src/components/manager/BudgetList.jsx
+++ b/packages/desktop-client/src/components/manager/BudgetList.jsx
@@ -16,7 +16,7 @@ import RefreshArrow from '../../icons/v2/RefreshArrow';
import { styles, theme } from '../../style';
import { tokens } from '../../tokens';
import { Button } from '../common/Button';
-import Menu from '../common/Menu';
+import { Menu } from '../common/Menu';
import Text from '../common/Text';
import View from '../common/View';
import { Tooltip } from '../tooltips';
diff --git a/packages/desktop-client/src/components/manager/Import.tsx b/packages/desktop-client/src/components/manager/Import.tsx
index a2022e8ba9..aff8677144 100644
--- a/packages/desktop-client/src/components/manager/Import.tsx
+++ b/packages/desktop-client/src/components/manager/Import.tsx
@@ -3,7 +3,7 @@ import React, { useState } from 'react';
import { type BoundActions } from '../../hooks/useActions';
import { styles, theme } from '../../style';
import { type CommonModalProps } from '../../types/modals';
-import Block from '../common/Block';
+import { Block } from '../common/Block';
import { Button } from '../common/Button';
import Modal from '../common/Modal';
import Text from '../common/Text';
diff --git a/packages/desktop-client/src/components/manager/ImportActual.tsx b/packages/desktop-client/src/components/manager/ImportActual.tsx
index 0a66be3f6c..45e2aff9ad 100644
--- a/packages/desktop-client/src/components/manager/ImportActual.tsx
+++ b/packages/desktop-client/src/components/manager/ImportActual.tsx
@@ -4,7 +4,7 @@ import { useDispatch } from 'react-redux';
import { importBudget } from 'loot-core/src/client/actions/budgets';
import { styles, theme } from '../../style';
-import Block from '../common/Block';
+import { Block } from '../common/Block';
import { ButtonWithLoading } from '../common/Button';
import Modal, { type ModalProps } from '../common/Modal';
import Paragraph from '../common/Paragraph';
diff --git a/packages/desktop-client/src/components/manager/ImportYNAB4.tsx b/packages/desktop-client/src/components/manager/ImportYNAB4.tsx
index 7e71637148..c3cbfb1c03 100644
--- a/packages/desktop-client/src/components/manager/ImportYNAB4.tsx
+++ b/packages/desktop-client/src/components/manager/ImportYNAB4.tsx
@@ -4,7 +4,7 @@ import { useDispatch } from 'react-redux';
import { importBudget } from 'loot-core/src/client/actions/budgets';
import { styles, theme } from '../../style';
-import Block from '../common/Block';
+import { Block } from '../common/Block';
import { ButtonWithLoading } from '../common/Button';
import Modal, { type ModalProps } from '../common/Modal';
import Paragraph from '../common/Paragraph';
diff --git a/packages/desktop-client/src/components/manager/ImportYNAB5.tsx b/packages/desktop-client/src/components/manager/ImportYNAB5.tsx
index 3b7a29393a..32ec1b9645 100644
--- a/packages/desktop-client/src/components/manager/ImportYNAB5.tsx
+++ b/packages/desktop-client/src/components/manager/ImportYNAB5.tsx
@@ -4,9 +4,9 @@ import { useDispatch } from 'react-redux';
import { importBudget } from 'loot-core/src/client/actions/budgets';
import { styles, theme } from '../../style';
-import Block from '../common/Block';
+import { Block } from '../common/Block';
import { ButtonWithLoading } from '../common/Button';
-import ExternalLink from '../common/ExternalLink';
+import { ExternalLink } from '../common/ExternalLink';
import Modal, { type ModalProps } from '../common/Modal';
import Paragraph from '../common/Paragraph';
import View from '../common/View';
diff --git a/packages/desktop-client/src/components/manager/ServerURL.tsx b/packages/desktop-client/src/components/manager/ServerURL.tsx
index 49b059142a..3df5be6c3a 100644
--- a/packages/desktop-client/src/components/manager/ServerURL.tsx
+++ b/packages/desktop-client/src/components/manager/ServerURL.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import Link from '../common/Link';
+import { Link } from '../common/Link';
import Text from '../common/Text';
import View from '../common/View';
import { useServerURL } from '../ServerContext';
diff --git a/packages/desktop-client/src/components/manager/WelcomeScreen.tsx b/packages/desktop-client/src/components/manager/WelcomeScreen.tsx
index 3276141085..911b79cdf6 100644
--- a/packages/desktop-client/src/components/manager/WelcomeScreen.tsx
+++ b/packages/desktop-client/src/components/manager/WelcomeScreen.tsx
@@ -3,7 +3,7 @@ import React from 'react';
import { useActions } from '../../hooks/useActions';
import { styles, theme } from '../../style';
import { Button } from '../common/Button';
-import ExternalLink from '../common/ExternalLink';
+import { ExternalLink } from '../common/ExternalLink';
import Paragraph from '../common/Paragraph';
import Text from '../common/Text';
import View from '../common/View';
diff --git a/packages/desktop-client/src/components/manager/subscribe/Bootstrap.tsx b/packages/desktop-client/src/components/manager/subscribe/Bootstrap.tsx
index 7d5c62e828..afe6472a24 100644
--- a/packages/desktop-client/src/components/manager/subscribe/Bootstrap.tsx
+++ b/packages/desktop-client/src/components/manager/subscribe/Bootstrap.tsx
@@ -7,7 +7,7 @@ import { send } from 'loot-core/src/platform/client/fetch';
import { theme } from '../../../style';
import { Button } from '../../common/Button';
-import ExternalLink from '../../common/ExternalLink';
+import { ExternalLink } from '../../common/ExternalLink';
import Paragraph from '../../common/Paragraph';
import Text from '../../common/Text';
import View from '../../common/View';
diff --git a/packages/desktop-client/src/components/mobile/MobileForms.jsx b/packages/desktop-client/src/components/mobile/MobileForms.jsx
index 8ebfda0a37..71fa826fb6 100644
--- a/packages/desktop-client/src/components/mobile/MobileForms.jsx
+++ b/packages/desktop-client/src/components/mobile/MobileForms.jsx
@@ -4,7 +4,7 @@ import { css } from 'glamor';
import { theme, styles } from '../../style';
import { Button } from '../common/Button';
-import Input from '../common/Input';
+import { Input } from '../common/Input';
import Text from '../common/Text';
import View from '../common/View';
diff --git a/packages/desktop-client/src/components/modals/CategoryGroupMenu.tsx b/packages/desktop-client/src/components/modals/CategoryGroupMenu.tsx
index 1b753fec6a..75df912b88 100644
--- a/packages/desktop-client/src/components/modals/CategoryGroupMenu.tsx
+++ b/packages/desktop-client/src/components/modals/CategoryGroupMenu.tsx
@@ -14,7 +14,7 @@ import ViewShow from '../../icons/v2/ViewShow';
import { type CSSProperties, styles, theme } from '../../style';
import { type CommonModalProps } from '../../types/modals';
import { Button } from '../common/Button';
-import Menu from '../common/Menu';
+import { Menu } from '../common/Menu';
import Modal from '../common/Modal';
import View from '../common/View';
import { Notes } from '../Notes';
diff --git a/packages/desktop-client/src/components/modals/CategoryMenu.tsx b/packages/desktop-client/src/components/modals/CategoryMenu.tsx
index 84952aa9eb..0f23c27429 100644
--- a/packages/desktop-client/src/components/modals/CategoryMenu.tsx
+++ b/packages/desktop-client/src/components/modals/CategoryMenu.tsx
@@ -13,7 +13,7 @@ import ViewShow from '../../icons/v2/ViewShow';
import { type CSSProperties, styles, theme } from '../../style';
import { type CommonModalProps } from '../../types/modals';
import { Button } from '../common/Button';
-import Menu from '../common/Menu';
+import { Menu } from '../common/Menu';
import Modal from '../common/Modal';
import View from '../common/View';
import { Notes } from '../Notes';
diff --git a/packages/desktop-client/src/components/modals/CloseAccount.tsx b/packages/desktop-client/src/components/modals/CloseAccount.tsx
index 582ce0fe98..fa3fddb091 100644
--- a/packages/desktop-client/src/components/modals/CloseAccount.tsx
+++ b/packages/desktop-client/src/components/modals/CloseAccount.tsx
@@ -12,8 +12,8 @@ import { type CommonModalProps } from '../../types/modals';
import AccountAutocomplete from '../autocomplete/AccountAutocomplete';
import CategoryAutocomplete from '../autocomplete/CategoryAutocomplete';
import { Button } from '../common/Button';
-import FormError from '../common/FormError';
-import LinkButton from '../common/LinkButton';
+import { FormError } from '../common/FormError';
+import { LinkButton } from '../common/LinkButton';
import Modal from '../common/Modal';
import Paragraph from '../common/Paragraph';
import Text from '../common/Text';
diff --git a/packages/desktop-client/src/components/modals/ConfirmCategoryDelete.tsx b/packages/desktop-client/src/components/modals/ConfirmCategoryDelete.tsx
index f86c7b66a4..30af9dfd99 100644
--- a/packages/desktop-client/src/components/modals/ConfirmCategoryDelete.tsx
+++ b/packages/desktop-client/src/components/modals/ConfirmCategoryDelete.tsx
@@ -5,7 +5,7 @@ import { type CategoryGroupEntity } from 'loot-core/src/types/models';
import { theme } from '../../style';
import { type CommonModalProps } from '../../types/modals';
import CategoryAutocomplete from '../autocomplete/CategoryAutocomplete';
-import Block from '../common/Block';
+import { Block } from '../common/Block';
import { Button } from '../common/Button';
import Modal from '../common/Modal';
import Text from '../common/Text';
diff --git a/packages/desktop-client/src/components/modals/ConfirmTransactionEdit.tsx b/packages/desktop-client/src/components/modals/ConfirmTransactionEdit.tsx
index 096768a727..c72bda06b2 100644
--- a/packages/desktop-client/src/components/modals/ConfirmTransactionEdit.tsx
+++ b/packages/desktop-client/src/components/modals/ConfirmTransactionEdit.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { type CommonModalProps } from '../../types/modals';
-import Block from '../common/Block';
+import { Block } from '../common/Block';
import { Button } from '../common/Button';
import Modal from '../common/Modal';
import View from '../common/View';
diff --git a/packages/desktop-client/src/components/modals/CreateAccount.tsx b/packages/desktop-client/src/components/modals/CreateAccount.tsx
index a7ff9a680b..f69c1aac9b 100644
--- a/packages/desktop-client/src/components/modals/CreateAccount.tsx
+++ b/packages/desktop-client/src/components/modals/CreateAccount.tsx
@@ -7,7 +7,7 @@ import { type SyncServerStatus } from '../../hooks/useSyncServerStatus';
import { theme } from '../../style';
import { type CommonModalProps } from '../../types/modals';
import { Button, ButtonWithLoading } from '../common/Button';
-import ExternalLink from '../common/ExternalLink';
+import { ExternalLink } from '../common/ExternalLink';
import Modal from '../common/Modal';
import Paragraph from '../common/Paragraph';
import Text from '../common/Text';
diff --git a/packages/desktop-client/src/components/modals/CreateEncryptionKey.tsx b/packages/desktop-client/src/components/modals/CreateEncryptionKey.tsx
index 8a18eff5f7..46132012ca 100644
--- a/packages/desktop-client/src/components/modals/CreateEncryptionKey.tsx
+++ b/packages/desktop-client/src/components/modals/CreateEncryptionKey.tsx
@@ -9,9 +9,9 @@ import { type BoundActions } from '../../hooks/useActions';
import { theme } from '../../style';
import { type CommonModalProps } from '../../types/modals';
import { ButtonWithLoading } from '../common/Button';
-import ExternalLink from '../common/ExternalLink';
-import InitialFocus from '../common/InitialFocus';
-import Input from '../common/Input';
+import { ExternalLink } from '../common/ExternalLink';
+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';
diff --git a/packages/desktop-client/src/components/modals/CreateLocalAccount.tsx b/packages/desktop-client/src/components/modals/CreateLocalAccount.tsx
index df1a559478..f964a90d6b 100644
--- a/packages/desktop-client/src/components/modals/CreateLocalAccount.tsx
+++ b/packages/desktop-client/src/components/modals/CreateLocalAccount.tsx
@@ -7,11 +7,11 @@ import useNavigate from '../../hooks/useNavigate';
import { theme } from '../../style';
import { type CommonModalProps } from '../../types/modals';
import { Button } from '../common/Button';
-import ExternalLink from '../common/ExternalLink';
-import FormError from '../common/FormError';
-import InitialFocus from '../common/InitialFocus';
-import InlineField from '../common/InlineField';
-import Input from '../common/Input';
+import { ExternalLink } from '../common/ExternalLink';
+import { FormError } from '../common/FormError';
+import { InitialFocus } from '../common/InitialFocus';
+import { InlineField } from '../common/InlineField';
+import { Input } from '../common/Input';
import Modal, { ModalButtons } from '../common/Modal';
import Text from '../common/Text';
import View from '../common/View';
diff --git a/packages/desktop-client/src/components/modals/EditField.jsx b/packages/desktop-client/src/components/modals/EditField.jsx
index abd07d79fe..2c82a4227d 100644
--- a/packages/desktop-client/src/components/modals/EditField.jsx
+++ b/packages/desktop-client/src/components/modals/EditField.jsx
@@ -24,7 +24,7 @@ import PayeeAutocomplete, {
PayeeItemGroupHeader,
PayeeItem,
} from '../autocomplete/PayeeAutocomplete';
-import Input from '../common/Input';
+import { Input } from '../common/Input';
import Modal from '../common/Modal';
import View from '../common/View';
import { SectionLabel } from '../forms';
diff --git a/packages/desktop-client/src/components/modals/FixEncryptionKey.tsx b/packages/desktop-client/src/components/modals/FixEncryptionKey.tsx
index a5335a52b6..26639ddd06 100644
--- a/packages/desktop-client/src/components/modals/FixEncryptionKey.tsx
+++ b/packages/desktop-client/src/components/modals/FixEncryptionKey.tsx
@@ -8,9 +8,9 @@ import { type BoundActions } from '../../hooks/useActions';
import { theme } from '../../style';
import { type CommonModalProps } from '../../types/modals';
import { Button, ButtonWithLoading } from '../common/Button';
-import ExternalLink from '../common/ExternalLink';
-import InitialFocus from '../common/InitialFocus';
-import Input from '../common/Input';
+import { ExternalLink } from '../common/ExternalLink';
+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';
diff --git a/packages/desktop-client/src/components/modals/GoCardlessExternalMsg.tsx b/packages/desktop-client/src/components/modals/GoCardlessExternalMsg.tsx
index 0ea0c279d7..dd4c9d4bee 100644
--- a/packages/desktop-client/src/components/modals/GoCardlessExternalMsg.tsx
+++ b/packages/desktop-client/src/components/modals/GoCardlessExternalMsg.tsx
@@ -16,9 +16,9 @@ import { type CommonModalProps } from '../../types/modals';
import { Error, Warning } from '../alerts';
import Autocomplete from '../autocomplete/Autocomplete';
import { Button } from '../common/Button';
-import ExternalLink from '../common/ExternalLink';
-import LinkButton from '../common/LinkButton';
-import Menu from '../common/Menu';
+import { ExternalLink } from '../common/ExternalLink';
+import { LinkButton } from '../common/LinkButton';
+import { Menu } from '../common/Menu';
import Modal from '../common/Modal';
import Paragraph from '../common/Paragraph';
import View from '../common/View';
diff --git a/packages/desktop-client/src/components/modals/GoCardlessInitialise.tsx b/packages/desktop-client/src/components/modals/GoCardlessInitialise.tsx
index b175f7da0c..f351251937 100644
--- a/packages/desktop-client/src/components/modals/GoCardlessInitialise.tsx
+++ b/packages/desktop-client/src/components/modals/GoCardlessInitialise.tsx
@@ -4,8 +4,8 @@ import { send } from 'loot-core/src/platform/client/fetch';
import { Error } from '../alerts';
import { ButtonWithLoading } from '../common/Button';
-import ExternalLink from '../common/ExternalLink';
-import Input from '../common/Input';
+import { ExternalLink } from '../common/ExternalLink';
+import { Input } from '../common/Input';
import Modal, { ModalButtons } from '../common/Modal';
import type { ModalProps } from '../common/Modal';
import Text from '../common/Text';
diff --git a/packages/desktop-client/src/components/modals/ImportTransactions.jsx b/packages/desktop-client/src/components/modals/ImportTransactions.jsx
index 072f58a3d9..31e99e16fc 100644
--- a/packages/desktop-client/src/components/modals/ImportTransactions.jsx
+++ b/packages/desktop-client/src/components/modals/ImportTransactions.jsx
@@ -14,7 +14,7 @@ import { useActions } from '../../hooks/useActions';
import useFeatureFlag from '../../hooks/useFeatureFlag';
import { theme, styles } from '../../style';
import { Button, ButtonWithLoading } from '../common/Button';
-import Input from '../common/Input';
+import { Input } from '../common/Input';
import Modal from '../common/Modal';
import Select from '../common/Select';
import Stack from '../common/Stack';
diff --git a/packages/desktop-client/src/components/modals/LoadBackup.jsx b/packages/desktop-client/src/components/modals/LoadBackup.jsx
index 1685baad18..efae2b282d 100644
--- a/packages/desktop-client/src/components/modals/LoadBackup.jsx
+++ b/packages/desktop-client/src/components/modals/LoadBackup.jsx
@@ -3,7 +3,7 @@ import React, { Component, useState, useEffect } from 'react';
import { send, listen, unlisten } from 'loot-core/src/platform/client/fetch';
import { theme } from '../../style';
-import Block from '../common/Block';
+import { Block } from '../common/Block';
import { Button } from '../common/Button';
import Modal from '../common/Modal';
import Text from '../common/Text';
diff --git a/packages/desktop-client/src/components/modals/SingleInput.tsx b/packages/desktop-client/src/components/modals/SingleInput.tsx
index a4046910ad..3a76166a8d 100644
--- a/packages/desktop-client/src/components/modals/SingleInput.tsx
+++ b/packages/desktop-client/src/components/modals/SingleInput.tsx
@@ -3,9 +3,9 @@ import React, { useState } from 'react';
import { styles } from '../../style';
import { type CommonModalProps } from '../../types/modals';
import { Button } from '../common/Button';
-import FormError from '../common/FormError';
-import InitialFocus from '../common/InitialFocus';
-import Input from '../common/Input';
+import { FormError } from '../common/FormError';
+import { InitialFocus } from '../common/InitialFocus';
+import { Input } from '../common/Input';
import Modal from '../common/Modal';
import View from '../common/View';
diff --git a/packages/desktop-client/src/components/modals/SwitchBudgetType.tsx b/packages/desktop-client/src/components/modals/SwitchBudgetType.tsx
index 801127f78a..7efa4d2c68 100644
--- a/packages/desktop-client/src/components/modals/SwitchBudgetType.tsx
+++ b/packages/desktop-client/src/components/modals/SwitchBudgetType.tsx
@@ -3,7 +3,7 @@ import { useSelector } from 'react-redux';
import { type CommonModalProps } from '../../types/modals';
import { Button } from '../common/Button';
-import ExternalLink from '../common/ExternalLink';
+import { ExternalLink } from '../common/ExternalLink';
import Modal from '../common/Modal';
import Paragraph from '../common/Paragraph';
import Text from '../common/Text';
diff --git a/packages/desktop-client/src/components/payees/PayeeMenu.tsx b/packages/desktop-client/src/components/payees/PayeeMenu.tsx
index 479ee0242c..fedfbd0be1 100644
--- a/packages/desktop-client/src/components/payees/PayeeMenu.tsx
+++ b/packages/desktop-client/src/components/payees/PayeeMenu.tsx
@@ -3,7 +3,7 @@ import { type PayeeEntity } from 'loot-core/src/types/models';
import Delete from '../../icons/v0/Delete';
import Merge from '../../icons/v0/Merge';
import { theme } from '../../style';
-import Menu from '../common/Menu';
+import { Menu } from '../common/Menu';
import View from '../common/View';
import { Tooltip } from '../tooltips';
diff --git a/packages/desktop-client/src/components/reports/Change.jsx b/packages/desktop-client/src/components/reports/Change.jsx
index a135f0aeb8..745fe10d37 100644
--- a/packages/desktop-client/src/components/reports/Change.jsx
+++ b/packages/desktop-client/src/components/reports/Change.jsx
@@ -3,7 +3,7 @@ import React from 'react';
import { integerToCurrency } from 'loot-core/src/shared/util';
import { theme, styles } from '../../style';
-import Block from '../common/Block';
+import { Block } from '../common/Block';
function Change({ amount }) {
return (
diff --git a/packages/desktop-client/src/components/reports/DateRange.tsx b/packages/desktop-client/src/components/reports/DateRange.tsx
index df3d6eb50e..81d1fb4455 100644
--- a/packages/desktop-client/src/components/reports/DateRange.tsx
+++ b/packages/desktop-client/src/components/reports/DateRange.tsx
@@ -3,7 +3,7 @@ import React, { type ReactElement } from 'react';
import * as d from 'date-fns';
import { theme } from '../../style';
-import Block from '../common/Block';
+import { Block } from '../common/Block';
type DateRangeProps = {
start: string;
diff --git a/packages/desktop-client/src/components/reports/GraphButton.tsx b/packages/desktop-client/src/components/reports/GraphButton.tsx
index d7a06453e6..61b14edd76 100644
--- a/packages/desktop-client/src/components/reports/GraphButton.tsx
+++ b/packages/desktop-client/src/components/reports/GraphButton.tsx
@@ -2,7 +2,7 @@ import React, { type HTMLProps } from 'react';
import { type CSSProperties, theme } from '../../style';
import { Button } from '../common/Button';
-import HoverTarget from '../common/HoverTarget';
+import { HoverTarget } from '../common/HoverTarget';
import Text from '../common/Text';
import { Tooltip } from '../tooltips';
diff --git a/packages/desktop-client/src/components/reports/Header.jsx b/packages/desktop-client/src/components/reports/Header.jsx
index a3db665b81..8b78ad1c31 100644
--- a/packages/desktop-client/src/components/reports/Header.jsx
+++ b/packages/desktop-client/src/components/reports/Header.jsx
@@ -5,7 +5,7 @@ import * as monthUtils from 'loot-core/src/shared/months';
import ArrowLeft from '../../icons/v1/ArrowLeft';
import { styles } from '../../style';
import { Button } from '../common/Button';
-import ButtonLink from '../common/ButtonLink';
+import { ButtonLink } from '../common/ButtonLink';
import Select from '../common/Select';
import View from '../common/View';
import { FilterButton, AppliedFilters } from '../filters/FiltersMenu';
diff --git a/packages/desktop-client/src/components/reports/LoadingIndicator.tsx b/packages/desktop-client/src/components/reports/LoadingIndicator.tsx
index 8e71593df3..62166ebbcf 100644
--- a/packages/desktop-client/src/components/reports/LoadingIndicator.tsx
+++ b/packages/desktop-client/src/components/reports/LoadingIndicator.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import AnimatedLoading from '../../icons/AnimatedLoading';
import { theme, styles } from '../../style';
-import Block from '../common/Block';
+import { Block } from '../common/Block';
import View from '../common/View';
type LoadingIndicatorProps = {
diff --git a/packages/desktop-client/src/components/reports/ReportCard.tsx b/packages/desktop-client/src/components/reports/ReportCard.tsx
index 0be8e56727..293c6359e7 100644
--- a/packages/desktop-client/src/components/reports/ReportCard.tsx
+++ b/packages/desktop-client/src/components/reports/ReportCard.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { theme } from '../../style';
-import AnchorLink from '../common/AnchorLink';
+import { AnchorLink } from '../common/AnchorLink';
import View from '../common/View';
export default function ReportCard({ flex, to, style, children }) {
diff --git a/packages/desktop-client/src/components/reports/SaveReport.tsx b/packages/desktop-client/src/components/reports/SaveReport.tsx
index ed0476b1e1..cb7aada2eb 100644
--- a/packages/desktop-client/src/components/reports/SaveReport.tsx
+++ b/packages/desktop-client/src/components/reports/SaveReport.tsx
@@ -2,8 +2,8 @@ import React, { useState } from 'react';
import ExpandArrow from '../../icons/v0/ExpandArrow';
import { Button } from '../common/Button';
-import Menu from '../common/Menu';
-import MenuTooltip from '../common/MenuTooltip';
+import { Menu } from '../common/Menu';
+import { MenuTooltip } from '../common/MenuTooltip';
import Text from '../common/Text';
import View from '../common/View';
diff --git a/packages/desktop-client/src/components/reports/graphs/AreaGraph.tsx b/packages/desktop-client/src/components/reports/graphs/AreaGraph.tsx
index 0821dfc895..19c5694c42 100644
--- a/packages/desktop-client/src/components/reports/graphs/AreaGraph.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/AreaGraph.tsx
@@ -16,7 +16,7 @@ import { amountToCurrency } from 'loot-core/src/shared/util';
import { theme } from '../../../style';
import { type CSSProperties } from '../../../style';
-import AlignedText from '../../common/AlignedText';
+import { AlignedText } from '../../common/AlignedText';
import { PrivacyFilter } from '../../PrivacyFilter';
import Container from '../Container';
import { type DataEntity } from '../entities';
diff --git a/packages/desktop-client/src/components/reports/graphs/BarGraph.tsx b/packages/desktop-client/src/components/reports/graphs/BarGraph.tsx
index 7b6b1e41ed..282ea71358 100644
--- a/packages/desktop-client/src/components/reports/graphs/BarGraph.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/BarGraph.tsx
@@ -18,7 +18,7 @@ import { amountToCurrency } from 'loot-core/src/shared/util';
import { theme } from '../../../style';
import { type CSSProperties } from '../../../style';
-import AlignedText from '../../common/AlignedText';
+import { AlignedText } from '../../common/AlignedText';
import { PrivacyFilter } from '../../PrivacyFilter';
import Container from '../Container';
import { type DataEntity } from '../entities';
diff --git a/packages/desktop-client/src/components/reports/graphs/BarLineGraph.tsx b/packages/desktop-client/src/components/reports/graphs/BarLineGraph.tsx
index 7983e11928..213f6a295b 100644
--- a/packages/desktop-client/src/components/reports/graphs/BarLineGraph.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/BarLineGraph.tsx
@@ -14,7 +14,7 @@ import {
import { theme } from '../../../style';
import { type CSSProperties } from '../../../style';
-import AlignedText from '../../common/AlignedText';
+import { AlignedText } from '../../common/AlignedText';
import { PrivacyFilter } from '../../PrivacyFilter';
import Container from '../Container';
import numberFormatterTooltip from '../numberFormatter';
diff --git a/packages/desktop-client/src/components/reports/graphs/LineGraph.tsx b/packages/desktop-client/src/components/reports/graphs/LineGraph.tsx
index a1e4797ce8..225eda6097 100644
--- a/packages/desktop-client/src/components/reports/graphs/LineGraph.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/LineGraph.tsx
@@ -13,7 +13,7 @@ import {
import { theme } from '../../../style';
import { type CSSProperties } from '../../../style';
-import AlignedText from '../../common/AlignedText';
+import { AlignedText } from '../../common/AlignedText';
import { PrivacyFilter } from '../../PrivacyFilter';
import Container from '../Container';
import numberFormatterTooltip from '../numberFormatter';
diff --git a/packages/desktop-client/src/components/reports/graphs/NetWorthGraph.tsx b/packages/desktop-client/src/components/reports/graphs/NetWorthGraph.tsx
index 4da88b194d..9ebfe2ad65 100644
--- a/packages/desktop-client/src/components/reports/graphs/NetWorthGraph.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/NetWorthGraph.tsx
@@ -13,7 +13,7 @@ import {
import { theme } from '../../../style';
import { type CSSProperties } from '../../../style';
-import AlignedText from '../../common/AlignedText';
+import { AlignedText } from '../../common/AlignedText';
import Container from '../Container';
import numberFormatterTooltip from '../numberFormatter';
diff --git a/packages/desktop-client/src/components/reports/graphs/StackedBarGraph.tsx b/packages/desktop-client/src/components/reports/graphs/StackedBarGraph.tsx
index 22efa939c6..9b94381cbe 100644
--- a/packages/desktop-client/src/components/reports/graphs/StackedBarGraph.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/StackedBarGraph.tsx
@@ -16,7 +16,7 @@ import { amountToCurrency } from 'loot-core/src/shared/util';
import { theme } from '../../../style';
import { type CSSProperties } from '../../../style';
-import AlignedText from '../../common/AlignedText';
+import { AlignedText } from '../../common/AlignedText';
import { PrivacyFilter } from '../../PrivacyFilter';
import Container from '../Container';
import { type DataEntity } from '../entities';
diff --git a/packages/desktop-client/src/components/reports/reports/CashFlow.tsx b/packages/desktop-client/src/components/reports/reports/CashFlow.tsx
index a74a089b05..42375a7417 100644
--- a/packages/desktop-client/src/components/reports/reports/CashFlow.tsx
+++ b/packages/desktop-client/src/components/reports/reports/CashFlow.tsx
@@ -8,8 +8,8 @@ import { integerToCurrency } from 'loot-core/src/shared/util';
import useFilters from '../../../hooks/useFilters';
import { theme, styles } from '../../../style';
-import AlignedText from '../../common/AlignedText';
-import Block from '../../common/Block';
+import { AlignedText } from '../../common/AlignedText';
+import { Block } from '../../common/Block';
import Paragraph from '../../common/Paragraph';
import Text from '../../common/Text';
import View from '../../common/View';
diff --git a/packages/desktop-client/src/components/reports/reports/CashFlowCard.jsx b/packages/desktop-client/src/components/reports/reports/CashFlowCard.jsx
index d4f17d132f..5826ca92a4 100644
--- a/packages/desktop-client/src/components/reports/reports/CashFlowCard.jsx
+++ b/packages/desktop-client/src/components/reports/reports/CashFlowCard.jsx
@@ -6,7 +6,7 @@ import * as monthUtils from 'loot-core/src/shared/months';
import { integerToCurrency } from 'loot-core/src/shared/util';
import { theme, styles } from '../../../style';
-import Block from '../../common/Block';
+import { Block } from '../../common/Block';
import View from '../../common/View';
import { PrivacyFilter } from '../../PrivacyFilter';
import Change from '../Change';
diff --git a/packages/desktop-client/src/components/reports/reports/CategorySpendingCard.jsx b/packages/desktop-client/src/components/reports/reports/CategorySpendingCard.jsx
index 2a705305d9..7a671e50c0 100644
--- a/packages/desktop-client/src/components/reports/reports/CategorySpendingCard.jsx
+++ b/packages/desktop-client/src/components/reports/reports/CategorySpendingCard.jsx
@@ -4,7 +4,7 @@ import * as monthUtils from 'loot-core/src/shared/months';
import useCategories from '../../../hooks/useCategories';
import { styles } from '../../../style';
-import Block from '../../common/Block';
+import { Block } from '../../common/Block';
import View from '../../common/View';
import DateRange from '../DateRange';
import CategorySpendingGraph from '../graphs/CategorySpendingGraph';
diff --git a/packages/desktop-client/src/components/reports/reports/CustomReport.jsx b/packages/desktop-client/src/components/reports/reports/CustomReport.jsx
index d2417f6673..292dfca2f2 100644
--- a/packages/desktop-client/src/components/reports/reports/CustomReport.jsx
+++ b/packages/desktop-client/src/components/reports/reports/CustomReport.jsx
@@ -13,8 +13,8 @@ import { useActions } from '../../../hooks/useActions';
import useCategories from '../../../hooks/useCategories';
import useFilters from '../../../hooks/useFilters';
import { theme, styles } from '../../../style';
-import AlignedText from '../../common/AlignedText';
-import Block from '../../common/Block';
+import { AlignedText } from '../../common/AlignedText';
+import { Block } from '../../common/Block';
import Text from '../../common/Text';
import View from '../../common/View';
import { AppliedFilters } from '../../filters/FiltersMenu';
diff --git a/packages/desktop-client/src/components/reports/reports/CustomReportCard.jsx b/packages/desktop-client/src/components/reports/reports/CustomReportCard.jsx
index ba99695416..50dd0bffe9 100644
--- a/packages/desktop-client/src/components/reports/reports/CustomReportCard.jsx
+++ b/packages/desktop-client/src/components/reports/reports/CustomReportCard.jsx
@@ -4,7 +4,7 @@ import * as monthUtils from 'loot-core/src/shared/months';
import useCategories from '../../../hooks/useCategories';
import { styles } from '../../../style';
-import Block from '../../common/Block';
+import { Block } from '../../common/Block';
import View from '../../common/View';
import DateRange from '../DateRange';
import BarGraph from '../graphs/BarGraph';
diff --git a/packages/desktop-client/src/components/reports/reports/NetWorthCard.jsx b/packages/desktop-client/src/components/reports/reports/NetWorthCard.jsx
index 19ce70df59..2eb8c2f4e8 100644
--- a/packages/desktop-client/src/components/reports/reports/NetWorthCard.jsx
+++ b/packages/desktop-client/src/components/reports/reports/NetWorthCard.jsx
@@ -4,7 +4,7 @@ import * as monthUtils from 'loot-core/src/shared/months';
import { integerToCurrency } from 'loot-core/src/shared/util';
import { theme, styles } from '../../../style';
-import Block from '../../common/Block';
+import { Block } from '../../common/Block';
import View from '../../common/View';
import { PrivacyFilter } from '../../PrivacyFilter';
import Change from '../Change';
diff --git a/packages/desktop-client/src/components/reports/reports/SankeyCard.jsx b/packages/desktop-client/src/components/reports/reports/SankeyCard.jsx
index f79ec22726..9dd0be08eb 100644
--- a/packages/desktop-client/src/components/reports/reports/SankeyCard.jsx
+++ b/packages/desktop-client/src/components/reports/reports/SankeyCard.jsx
@@ -4,7 +4,7 @@ import * as monthUtils from 'loot-core/src/shared/months';
import useCategories from '../../../hooks/useCategories';
import { styles } from '../../../style';
-import Block from '../../common/Block';
+import { Block } from '../../common/Block';
import View from '../../common/View';
import DateRange from '../DateRange';
import SankeyGraph from '../graphs/SankeyGraph';
diff --git a/packages/desktop-client/src/components/reports/spreadsheets/cash-flow-spreadsheet.tsx b/packages/desktop-client/src/components/reports/spreadsheets/cash-flow-spreadsheet.tsx
index 5d874cb821..fe2521beba 100644
--- a/packages/desktop-client/src/components/reports/spreadsheets/cash-flow-spreadsheet.tsx
+++ b/packages/desktop-client/src/components/reports/spreadsheets/cash-flow-spreadsheet.tsx
@@ -7,7 +7,7 @@ import { send } from 'loot-core/src/platform/client/fetch';
import * as monthUtils from 'loot-core/src/shared/months';
import { integerToCurrency, integerToAmount } from 'loot-core/src/shared/util';
-import AlignedText from '../../common/AlignedText';
+import { AlignedText } from '../../common/AlignedText';
import { runAll, indexCashFlow } from '../util';
export function simpleCashFlow(start, end) {
diff --git a/packages/desktop-client/src/components/reports/spreadsheets/category-spending-spreadsheet.tsx b/packages/desktop-client/src/components/reports/spreadsheets/category-spending-spreadsheet.tsx
index d4bb392edd..d527bbdf80 100644
--- a/packages/desktop-client/src/components/reports/spreadsheets/category-spending-spreadsheet.tsx
+++ b/packages/desktop-client/src/components/reports/spreadsheets/category-spending-spreadsheet.tsx
@@ -7,7 +7,7 @@ import q, { runQuery } from 'loot-core/src/client/query-helpers';
import * as monthUtils from 'loot-core/src/shared/months';
import { integerToAmount, integerToCurrency } from 'loot-core/src/shared/util';
-import AlignedText from '../../common/AlignedText';
+import { AlignedText } from '../../common/AlignedText';
type CategoryGraphDataForMonth = {
x: number;
diff --git a/packages/desktop-client/src/components/rules/Value.tsx b/packages/desktop-client/src/components/rules/Value.tsx
index 82c1744894..6be607996b 100644
--- a/packages/desktop-client/src/components/rules/Value.tsx
+++ b/packages/desktop-client/src/components/rules/Value.tsx
@@ -9,7 +9,7 @@ import { integerToCurrency } from 'loot-core/src/shared/util';
import useCategories from '../../hooks/useCategories';
import { type CSSProperties, theme } from '../../style';
-import LinkButton from '../common/LinkButton';
+import { LinkButton } from '../common/LinkButton';
import Text from '../common/Text';
type ValueProps<T> = {
diff --git a/packages/desktop-client/src/components/schedules/SchedulesTable.tsx b/packages/desktop-client/src/components/schedules/SchedulesTable.tsx
index e16efa873c..0ff8c283fb 100644
--- a/packages/desktop-client/src/components/schedules/SchedulesTable.tsx
+++ b/packages/desktop-client/src/components/schedules/SchedulesTable.tsx
@@ -16,7 +16,7 @@ import DotsHorizontalTriple from '../../icons/v1/DotsHorizontalTriple';
import Check from '../../icons/v2/Check';
import { theme } from '../../style';
import { Button } from '../common/Button';
-import Menu from '../common/Menu';
+import { Menu } from '../common/Menu';
import Text from '../common/Text';
import View from '../common/View';
import { PrivacyFilter } from '../PrivacyFilter';
diff --git a/packages/desktop-client/src/components/select/DateSelect.tsx b/packages/desktop-client/src/components/select/DateSelect.tsx
index 0e3754bf2c..d0a6e9aa61 100644
--- a/packages/desktop-client/src/components/select/DateSelect.tsx
+++ b/packages/desktop-client/src/components/select/DateSelect.tsx
@@ -26,7 +26,7 @@ import {
import { stringToInteger } from 'loot-core/src/shared/util';
import { type CSSProperties, theme } from '../../style';
-import Input, { type InputProps } from '../common/Input';
+import { Input, type InputProps } from '../common/Input';
import View, { type ViewProps } from '../common/View';
import { Tooltip } from '../tooltips';
diff --git a/packages/desktop-client/src/components/select/RecurringSchedulePicker.jsx b/packages/desktop-client/src/components/select/RecurringSchedulePicker.jsx
index f865328e81..ccc635d1ca 100644
--- a/packages/desktop-client/src/components/select/RecurringSchedulePicker.jsx
+++ b/packages/desktop-client/src/components/select/RecurringSchedulePicker.jsx
@@ -9,7 +9,7 @@ import AddIcon from '../../icons/v0/Add';
import SubtractIcon from '../../icons/v0/Subtract';
import { theme } from '../../style';
import { Button } from '../common/Button';
-import Input from '../common/Input';
+import { Input } from '../common/Input';
import Select from '../common/Select';
import Stack from '../common/Stack';
import Text from '../common/Text';
diff --git a/packages/desktop-client/src/components/settings/Encryption.tsx b/packages/desktop-client/src/components/settings/Encryption.tsx
index cca17a173e..5b1a58cec4 100644
--- a/packages/desktop-client/src/components/settings/Encryption.tsx
+++ b/packages/desktop-client/src/components/settings/Encryption.tsx
@@ -4,7 +4,7 @@ import { useSelector } from 'react-redux';
import { useActions } from '../../hooks/useActions';
import { theme } from '../../style';
import { Button } from '../common/Button';
-import ExternalLink from '../common/ExternalLink';
+import { ExternalLink } from '../common/ExternalLink';
import Text from '../common/Text';
import { useServerURL } from '../ServerContext';
diff --git a/packages/desktop-client/src/components/settings/Experimental.tsx b/packages/desktop-client/src/components/settings/Experimental.tsx
index e82840a4a7..f4de0036c2 100644
--- a/packages/desktop-client/src/components/settings/Experimental.tsx
+++ b/packages/desktop-client/src/components/settings/Experimental.tsx
@@ -6,7 +6,7 @@ import type { FeatureFlag } from 'loot-core/src/types/prefs';
import { useActions } from '../../hooks/useActions';
import useFeatureFlag from '../../hooks/useFeatureFlag';
import { theme } from '../../style';
-import LinkButton from '../common/LinkButton';
+import { LinkButton } from '../common/LinkButton';
import Text from '../common/Text';
import View from '../common/View';
import { Checkbox } from '../forms';
diff --git a/packages/desktop-client/src/components/settings/Export.tsx b/packages/desktop-client/src/components/settings/Export.tsx
index ee3f8864f0..63252403e4 100644
--- a/packages/desktop-client/src/components/settings/Export.tsx
+++ b/packages/desktop-client/src/components/settings/Export.tsx
@@ -6,7 +6,7 @@ import { format } from 'date-fns';
import { send } from 'loot-core/src/platform/client/fetch';
import { theme } from '../../style';
-import Block from '../common/Block';
+import { Block } from '../common/Block';
import { ButtonWithLoading } from '../common/Button';
import Text from '../common/Text';
diff --git a/packages/desktop-client/src/components/settings/index.tsx b/packages/desktop-client/src/components/settings/index.tsx
index 6d4c82adb2..2378c66072 100644
--- a/packages/desktop-client/src/components/settings/index.tsx
+++ b/packages/desktop-client/src/components/settings/index.tsx
@@ -13,8 +13,8 @@ import { useResponsive } from '../../ResponsiveProvider';
import { theme } from '../../style';
import { tokens } from '../../tokens';
import { Button } from '../common/Button';
-import ExternalLink from '../common/ExternalLink';
-import Input from '../common/Input';
+import { ExternalLink } from '../common/ExternalLink';
+import { Input } from '../common/Input';
import Text from '../common/Text';
import View from '../common/View';
import { FormField, FormLabel } from '../forms';
diff --git a/packages/desktop-client/src/components/sidebar/Account.tsx b/packages/desktop-client/src/components/sidebar/Account.tsx
index d0f7ef7010..24ff6158e7 100644
--- a/packages/desktop-client/src/components/sidebar/Account.tsx
+++ b/packages/desktop-client/src/components/sidebar/Account.tsx
@@ -5,8 +5,8 @@ import { css } from 'glamor';
import { type AccountEntity } from 'loot-core/src/types/models';
import { styles, theme, type CSSProperties } from '../../style';
-import AlignedText from '../common/AlignedText';
-import AnchorLink from '../common/AnchorLink';
+import { AlignedText } from '../common/AlignedText';
+import { AnchorLink } from '../common/AnchorLink';
import View from '../common/View';
import {
useDraggable,
diff --git a/packages/desktop-client/src/components/sidebar/Item.tsx b/packages/desktop-client/src/components/sidebar/Item.tsx
index 043e44d412..589c18bcc3 100644
--- a/packages/desktop-client/src/components/sidebar/Item.tsx
+++ b/packages/desktop-client/src/components/sidebar/Item.tsx
@@ -6,7 +6,7 @@ import React, {
} from 'react';
import { styles, theme, type CSSProperties } from '../../style';
-import Block from '../common/Block';
+import { Block } from '../common/Block';
import View from '../common/View';
import ItemContent from './ItemContent';
diff --git a/packages/desktop-client/src/components/sidebar/ItemContent.tsx b/packages/desktop-client/src/components/sidebar/ItemContent.tsx
index 3724a0a22e..ac35e9b4b9 100644
--- a/packages/desktop-client/src/components/sidebar/ItemContent.tsx
+++ b/packages/desktop-client/src/components/sidebar/ItemContent.tsx
@@ -1,7 +1,7 @@
import React, { type MouseEventHandler, type ReactNode } from 'react';
import { type CSSProperties } from '../../style';
-import AnchorLink from '../common/AnchorLink';
+import { AnchorLink } from '../common/AnchorLink';
import View from '../common/View';
type ItemContentProps = {
diff --git a/packages/desktop-client/src/components/sidebar/SecondaryItem.tsx b/packages/desktop-client/src/components/sidebar/SecondaryItem.tsx
index 0780acbfb4..8796d0a661 100644
--- a/packages/desktop-client/src/components/sidebar/SecondaryItem.tsx
+++ b/packages/desktop-client/src/components/sidebar/SecondaryItem.tsx
@@ -5,7 +5,7 @@ import React, {
} from 'react';
import { theme, type CSSProperties } from '../../style';
-import Block from '../common/Block';
+import { Block } from '../common/Block';
import View from '../common/View';
import { accountNameStyle } from './Account';
diff --git a/packages/desktop-client/src/components/sidebar/SidebarWithData.tsx b/packages/desktop-client/src/components/sidebar/SidebarWithData.tsx
index 06ec2c6510..5eb39f4373 100644
--- a/packages/desktop-client/src/components/sidebar/SidebarWithData.tsx
+++ b/packages/desktop-client/src/components/sidebar/SidebarWithData.tsx
@@ -12,9 +12,9 @@ import useNavigate from '../../hooks/useNavigate';
import ExpandArrow from '../../icons/v0/ExpandArrow';
import { styles, theme } from '../../style';
import { Button } from '../common/Button';
-import InitialFocus from '../common/InitialFocus';
-import Input from '../common/Input';
-import Menu from '../common/Menu';
+import { InitialFocus } from '../common/InitialFocus';
+import { Input } from '../common/Input';
+import { Menu } from '../common/Menu';
import Text from '../common/Text';
import { Tooltip } from '../tooltips';
diff --git a/packages/desktop-client/src/components/table.tsx b/packages/desktop-client/src/components/table.tsx
index 28f5776aa9..d6689bce3c 100644
--- a/packages/desktop-client/src/components/table.tsx
+++ b/packages/desktop-client/src/components/table.tsx
@@ -29,8 +29,8 @@ import Checkmark from '../icons/v1/Checkmark';
import { type CSSProperties, styles, theme } from '../style';
import { Button } from './common/Button';
-import Input from './common/Input';
-import Menu from './common/Menu';
+import { Input } from './common/Input';
+import { Menu } from './common/Menu';
import Text from './common/Text';
import View from './common/View';
import { FixedSizeList } from './FixedSizeList';
diff --git a/packages/desktop-client/src/components/transactions/SelectedTransactions.jsx b/packages/desktop-client/src/components/transactions/SelectedTransactions.jsx
index 0af017a798..d0c3609829 100644
--- a/packages/desktop-client/src/components/transactions/SelectedTransactions.jsx
+++ b/packages/desktop-client/src/components/transactions/SelectedTransactions.jsx
@@ -1,7 +1,7 @@
import React, { useMemo } from 'react';
import { useSelectedItems } from '../../hooks/useSelected';
-import Menu from '../common/Menu';
+import { Menu } from '../common/Menu';
import { SelectedItemsButton } from '../table';
import { isPreviewId } from './TransactionsTable';
diff --git a/packages/desktop-client/src/components/util/AmountInput.tsx b/packages/desktop-client/src/components/util/AmountInput.tsx
index 848672b01e..9a22a0122b 100644
--- a/packages/desktop-client/src/components/util/AmountInput.tsx
+++ b/packages/desktop-client/src/components/util/AmountInput.tsx
@@ -14,7 +14,7 @@ import Add from '../../icons/v1/Add';
import Subtract from '../../icons/v1/Subtract';
import { type CSSProperties, theme } from '../../style';
import { Button } from '../common/Button';
-import InputWithContent from '../common/InputWithContent';
+import { InputWithContent } from '../common/InputWithContent';
import View from '../common/View';
import useFormat from '../spreadsheet/useFormat';
diff --git a/packages/desktop-client/src/components/util/GenericInput.jsx b/packages/desktop-client/src/components/util/GenericInput.jsx
index dfa2d95ddc..e72b272aa2 100644
--- a/packages/desktop-client/src/components/util/GenericInput.jsx
+++ b/packages/desktop-client/src/components/util/GenericInput.jsx
@@ -9,7 +9,7 @@ import Autocomplete from '../autocomplete/Autocomplete';
import CategoryAutocomplete from '../autocomplete/CategoryAutocomplete';
import PayeeAutocomplete from '../autocomplete/PayeeAutocomplete';
import SavedFilterAutocomplete from '../autocomplete/SavedFilterAutocomplete';
-import Input from '../common/Input';
+import { Input } from '../common/Input';
import View from '../common/View';
import { Checkbox } from '../forms';
import DateSelect from '../select/DateSelect';
diff --git a/packages/desktop-client/src/components/util/LoadComponent.tsx b/packages/desktop-client/src/components/util/LoadComponent.tsx
index 74a97f62d4..dcdd12ca63 100644
--- a/packages/desktop-client/src/components/util/LoadComponent.tsx
+++ b/packages/desktop-client/src/components/util/LoadComponent.tsx
@@ -2,7 +2,7 @@ import { type ComponentType, useEffect, useState } from 'react';
import AnimatedLoading from '../../icons/AnimatedLoading';
import { theme, styles } from '../../style';
-import Block from '../common/Block';
+import { Block } from '../common/Block';
import View from '../common/View';
type ProplessComponent = ComponentType<Record<string, never>>;
diff --git a/upcoming-release-notes/2117.md b/upcoming-release-notes/2117.md
new file mode 100644
index 0000000000..d8ccbfa0d5
--- /dev/null
+++ b/upcoming-release-notes/2117.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [joel-jeremy]
+---
+
+eslint: no default exports - part 3