Skip to content

A local-first personal finance app

lint: add perfectionist/sort-named-imports rule (#6680)

Matiss Janis Aboltinsb6452f930b15
diff --git a/.oxlintrc.json b/.oxlintrc.json
index 5caab52e86..5452d08a8b 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -55,6 +55,12 @@
"newlinesBetween": "always"
}
],
+ "perfectionist/sort-named-imports": [
+ "warn",
+ {
+ "groups": ["value-import", "type-import"]
+ }
+ ],
// Actual rules
"actual/typography": "warn",
diff --git a/packages/ci-actions/src/versions/get-next-package-version.test.js b/packages/ci-actions/src/versions/get-next-package-version.test.js
index 031019e298..9277a239d7 100644
--- a/packages/ci-actions/src/versions/get-next-package-version.test.js
+++ b/packages/ci-actions/src/versions/get-next-package-version.test.js
@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
import { getNextVersion } from './get-next-package-version';
diff --git a/packages/component-library/src/AlignedText.tsx b/packages/component-library/src/AlignedText.tsx
index 8195206415..4094a58a9e 100644
--- a/packages/component-library/src/AlignedText.tsx
+++ b/packages/component-library/src/AlignedText.tsx
@@ -1,4 +1,4 @@
-import { type ComponentProps, type ReactNode, type CSSProperties } from 'react';
+import { type ComponentProps, type CSSProperties, type ReactNode } from 'react';
import { Block } from './Block';
import { View } from './View';
diff --git a/packages/component-library/src/Button.tsx b/packages/component-library/src/Button.tsx
index a87e1a245e..5639d7a2fb 100644
--- a/packages/component-library/src/Button.tsx
+++ b/packages/component-library/src/Button.tsx
@@ -2,8 +2,8 @@ import React, {
forwardRef,
useMemo,
type ComponentPropsWithoutRef,
- type ReactNode,
type CSSProperties,
+ type ReactNode,
} from 'react';
import { Button as ReactAriaButton } from 'react-aria-components';
diff --git a/packages/component-library/src/Card.tsx b/packages/component-library/src/Card.tsx
index 5dd4eb5f9b..6897996caa 100644
--- a/packages/component-library/src/Card.tsx
+++ b/packages/component-library/src/Card.tsx
@@ -1,4 +1,4 @@
-import { type ComponentProps, forwardRef } from 'react';
+import { forwardRef, type ComponentProps } from 'react';
import { theme } from './theme';
import { View } from './View';
diff --git a/packages/component-library/src/ColorPicker.tsx b/packages/component-library/src/ColorPicker.tsx
index a7831a0440..445c13b962 100644
--- a/packages/component-library/src/ColorPicker.tsx
+++ b/packages/component-library/src/ColorPicker.tsx
@@ -1,15 +1,15 @@
import { type ChangeEvent, type ReactNode } from 'react';
import {
ColorPicker as AriaColorPicker,
- type ColorPickerProps as AriaColorPickerProps,
- Dialog,
- DialogTrigger,
ColorSwatch as AriaColorSwatch,
- type ColorSwatchProps,
ColorSwatchPicker as AriaColorSwatchPicker,
- ColorSwatchPickerItem,
ColorField,
+ ColorSwatchPickerItem,
+ Dialog,
+ DialogTrigger,
parseColor,
+ type ColorPickerProps as AriaColorPickerProps,
+ type ColorSwatchProps,
} from 'react-aria-components';
import { css } from '@emotion/css';
diff --git a/packages/component-library/src/FormError.tsx b/packages/component-library/src/FormError.tsx
index 4b953cf7c9..b9ad7cf145 100644
--- a/packages/component-library/src/FormError.tsx
+++ b/packages/component-library/src/FormError.tsx
@@ -1,4 +1,4 @@
-import { type ReactNode, type CSSProperties } from 'react';
+import { type CSSProperties, type ReactNode } from 'react';
import { View } from './View';
diff --git a/packages/component-library/src/InitialFocus.ts b/packages/component-library/src/InitialFocus.ts
index b969fb77a6..a0d13ba2d3 100644
--- a/packages/component-library/src/InitialFocus.ts
+++ b/packages/component-library/src/InitialFocus.ts
@@ -2,11 +2,11 @@ import {
Children,
cloneElement,
isValidElement,
+ useEffect,
+ useRef,
type ReactElement,
type Ref,
type RefObject,
- useEffect,
- useRef,
} from 'react';
type InitialFocusProps<T extends HTMLElement> = {
diff --git a/packages/component-library/src/Input.tsx b/packages/component-library/src/Input.tsx
index 16e9f93964..7197dfce8b 100644
--- a/packages/component-library/src/Input.tsx
+++ b/packages/component-library/src/Input.tsx
@@ -1,8 +1,8 @@
import React, {
type ChangeEvent,
type ComponentPropsWithRef,
- type KeyboardEvent,
type FocusEvent,
+ type KeyboardEvent,
} from 'react';
import { Input as ReactAriaInput } from 'react-aria-components';
diff --git a/packages/component-library/src/Label.tsx b/packages/component-library/src/Label.tsx
index 5e98bedb84..f0a60a2d23 100644
--- a/packages/component-library/src/Label.tsx
+++ b/packages/component-library/src/Label.tsx
@@ -1,4 +1,4 @@
-import { forwardRef, type ReactNode, type CSSProperties } from 'react';
+import { forwardRef, type CSSProperties, type ReactNode } from 'react';
import { styles } from './styles';
import { Text } from './Text';
diff --git a/packages/component-library/src/Menu.tsx b/packages/component-library/src/Menu.tsx
index 8fed12ac42..a7f510e673 100644
--- a/packages/component-library/src/Menu.tsx
+++ b/packages/component-library/src/Menu.tsx
@@ -1,13 +1,13 @@
import {
- type ReactNode,
+ useEffect,
+ useRef,
useState,
type ComponentProps,
type ComponentType,
- type SVGProps,
type CSSProperties,
type KeyboardEvent,
- useEffect,
- useRef,
+ type ReactNode,
+ type SVGProps,
} from 'react';
import { Button } from './Button';
diff --git a/packages/component-library/src/Popover.tsx b/packages/component-library/src/Popover.tsx
index 57a1a34930..e26751869e 100644
--- a/packages/component-library/src/Popover.tsx
+++ b/packages/component-library/src/Popover.tsx
@@ -1,4 +1,4 @@
-import { type ComponentProps, useCallback, useEffect, useRef } from 'react';
+import { useCallback, useEffect, useRef, type ComponentProps } from 'react';
import { Popover as ReactAriaPopover } from 'react-aria-components';
import { css } from '@emotion/css';
diff --git a/packages/component-library/src/Text.tsx b/packages/component-library/src/Text.tsx
index 445a1a28b6..e551dada17 100644
--- a/packages/component-library/src/Text.tsx
+++ b/packages/component-library/src/Text.tsx
@@ -1,8 +1,8 @@
import React, {
+ forwardRef,
type HTMLProps,
- type Ref,
type ReactNode,
- forwardRef,
+ type Ref,
} from 'react';
import { css, cx } from '@emotion/css';
diff --git a/packages/component-library/src/icons/Loading.tsx b/packages/component-library/src/icons/Loading.tsx
index 6012c53db3..353e33603b 100644
--- a/packages/component-library/src/icons/Loading.tsx
+++ b/packages/component-library/src/icons/Loading.tsx
@@ -1,4 +1,4 @@
-import React, { type SVGProps, useState } from 'react';
+import React, { useState, type SVGProps } from 'react';
export const SvgLoading = (props: SVGProps<SVGSVGElement>) => {
const { color = 'currentColor' } = props;
diff --git a/packages/desktop-client/e2e/page-models/edit-rule-modal.ts b/packages/desktop-client/e2e/page-models/edit-rule-modal.ts
index 9777b7d7dd..d9bcccdee8 100644
--- a/packages/desktop-client/e2e/page-models/edit-rule-modal.ts
+++ b/packages/desktop-client/e2e/page-models/edit-rule-modal.ts
@@ -1,4 +1,4 @@
-import { type Page, type Locator } from '@playwright/test';
+import { type Locator, type Page } from '@playwright/test';
type ConditionsEntry = {
field: string;
diff --git a/packages/desktop-client/e2e/page-models/mobile-balance-menu-modal.ts b/packages/desktop-client/e2e/page-models/mobile-balance-menu-modal.ts
index 8c292271a4..e238b9b519 100644
--- a/packages/desktop-client/e2e/page-models/mobile-balance-menu-modal.ts
+++ b/packages/desktop-client/e2e/page-models/mobile-balance-menu-modal.ts
@@ -1,4 +1,4 @@
-import { type Page, type Locator } from '@playwright/test';
+import { type Locator, type Page } from '@playwright/test';
export class BalanceMenuModal {
readonly page: Page;
diff --git a/packages/desktop-client/e2e/page-models/schedule-edit-modal.ts b/packages/desktop-client/e2e/page-models/schedule-edit-modal.ts
index 5f9ea8ea18..f4fb3d6f67 100644
--- a/packages/desktop-client/e2e/page-models/schedule-edit-modal.ts
+++ b/packages/desktop-client/e2e/page-models/schedule-edit-modal.ts
@@ -1,4 +1,4 @@
-import { type Page, type Locator } from '@playwright/test';
+import { type Locator, type Page } from '@playwright/test';
type ScheduleEntry = {
scheduleName?: string;
diff --git a/packages/desktop-client/src/accounts/accountsSlice.ts b/packages/desktop-client/src/accounts/accountsSlice.ts
index 3ead561df3..d58feb9207 100644
--- a/packages/desktop-client/src/accounts/accountsSlice.ts
+++ b/packages/desktop-client/src/accounts/accountsSlice.ts
@@ -5,12 +5,12 @@ import { send } from 'loot-core/platform/client/fetch';
import { type SyncResponseWithErrors } from 'loot-core/server/accounts/app';
import { groupById } from 'loot-core/shared/util';
import {
- type SyncServerGoCardlessAccount,
type AccountEntity,
- type TransactionEntity,
- type SyncServerSimpleFinAccount,
- type SyncServerPluggyAiAccount,
type CategoryEntity,
+ type SyncServerGoCardlessAccount,
+ type SyncServerPluggyAiAccount,
+ type SyncServerSimpleFinAccount,
+ type TransactionEntity,
} from 'loot-core/types/models';
import { resetApp } from '@desktop-client/app/appSlice';
diff --git a/packages/desktop-client/src/components/AppBackground.tsx b/packages/desktop-client/src/components/AppBackground.tsx
index 2771945c0d..0e4ec7be62 100644
--- a/packages/desktop-client/src/components/AppBackground.tsx
+++ b/packages/desktop-client/src/components/AppBackground.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { useTransition, animated } from 'react-spring';
+import { animated, useTransition } from 'react-spring';
import { Block } from '@actual-app/components/block';
import { AnimatedLoading } from '@actual-app/components/icons/AnimatedLoading';
diff --git a/packages/desktop-client/src/components/BankSyncStatus.tsx b/packages/desktop-client/src/components/BankSyncStatus.tsx
index fe4cd06f2b..ee6e8fa349 100644
--- a/packages/desktop-client/src/components/BankSyncStatus.tsx
+++ b/packages/desktop-client/src/components/BankSyncStatus.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { Trans } from 'react-i18next';
-import { useTransition, animated } from 'react-spring';
+import { animated, useTransition } from 'react-spring';
import { styles } from '@actual-app/components/styles';
import { Text } from '@actual-app/components/text';
diff --git a/packages/desktop-client/src/components/CommandBar.tsx b/packages/desktop-client/src/components/CommandBar.tsx
index dc74ec8c79..02b21815ff 100644
--- a/packages/desktop-client/src/components/CommandBar.tsx
+++ b/packages/desktop-client/src/components/CommandBar.tsx
@@ -1,11 +1,11 @@
import {
- type ComponentType,
- type ReactNode,
- type SVGProps,
useCallback,
useEffect,
useMemo,
useState,
+ type ComponentType,
+ type ReactNode,
+ type SVGProps,
} from 'react';
import { Trans, useTranslation } from 'react-i18next';
diff --git a/packages/desktop-client/src/components/FatalError.tsx b/packages/desktop-client/src/components/FatalError.tsx
index fc1831b001..d41b2249f5 100644
--- a/packages/desktop-client/src/components/FatalError.tsx
+++ b/packages/desktop-client/src/components/FatalError.tsx
@@ -1,5 +1,5 @@
import React, { useState, type ReactNode } from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { Block } from '@actual-app/components/block';
import { Button } from '@actual-app/components/button';
diff --git a/packages/desktop-client/src/components/FinancesApp.tsx b/packages/desktop-client/src/components/FinancesApp.tsx
index d94c807f6d..42f60db7e8 100644
--- a/packages/desktop-client/src/components/FinancesApp.tsx
+++ b/packages/desktop-client/src/components/FinancesApp.tsx
@@ -1,12 +1,12 @@
// @ts-strict-ignore
import React, {
- type ReactElement,
useEffect,
useEffectEvent,
useRef,
+ type ReactElement,
} from 'react';
import { useTranslation } from 'react-i18next';
-import { Route, Routes, Navigate, useLocation, useHref } from 'react-router';
+import { Navigate, Route, Routes, useHref, useLocation } from 'react-router';
import { useResponsive } from '@actual-app/components/hooks/useResponsive';
import { theme } from '@actual-app/components/theme';
@@ -42,7 +42,7 @@ import { useMetaThemeColor } from '@desktop-client/hooks/useMetaThemeColor';
import { useNavigate } from '@desktop-client/hooks/useNavigate';
import { ScrollProvider } from '@desktop-client/hooks/useScrollListener';
import { addNotification } from '@desktop-client/notifications/notificationsSlice';
-import { useSelector, useDispatch } from '@desktop-client/redux';
+import { useDispatch, useSelector } from '@desktop-client/redux';
function NarrowNotSupported({
redirectTo = '/budget',
diff --git a/packages/desktop-client/src/components/FixedSizeList.tsx b/packages/desktop-client/src/components/FixedSizeList.tsx
index e82b50e648..3f8da5f5e8 100644
--- a/packages/desktop-client/src/components/FixedSizeList.tsx
+++ b/packages/desktop-client/src/components/FixedSizeList.tsx
@@ -2,11 +2,11 @@
import {
createRef,
PureComponent,
+ type CSSProperties,
type ReactNode,
type Ref,
type RefObject,
type UIEvent,
- type CSSProperties,
} from 'react';
import { View } from '@actual-app/components/view';
diff --git a/packages/desktop-client/src/components/LoggedInUser.tsx b/packages/desktop-client/src/components/LoggedInUser.tsx
index 1622532337..e01141d80b 100644
--- a/packages/desktop-client/src/components/LoggedInUser.tsx
+++ b/packages/desktop-client/src/components/LoggedInUser.tsx
@@ -1,8 +1,8 @@
import React, {
- useState,
+ useCallback,
useEffect,
useRef,
- useCallback,
+ useState,
type CSSProperties,
} from 'react';
import { Trans, useTranslation } from 'react-i18next';
@@ -28,7 +28,7 @@ import { Permissions } from '@desktop-client/auth/types';
import { closeBudget } from '@desktop-client/budgetfiles/budgetfilesSlice';
import { useMetadataPref } from '@desktop-client/hooks/useMetadataPref';
import { useNavigate } from '@desktop-client/hooks/useNavigate';
-import { useSelector, useDispatch } from '@desktop-client/redux';
+import { useDispatch, useSelector } from '@desktop-client/redux';
import { getUserData, signOut } from '@desktop-client/users/usersSlice';
type LoggedInUserProps = {
diff --git a/packages/desktop-client/src/components/ManageRules.tsx b/packages/desktop-client/src/components/ManageRules.tsx
index 8db308db2c..26f1d8e3c2 100644
--- a/packages/desktop-client/src/components/ManageRules.tsx
+++ b/packages/desktop-client/src/components/ManageRules.tsx
@@ -1,11 +1,11 @@
// @ts-strict-ignore
import React, {
- useState,
- useEffectEvent,
useEffect,
+ useEffectEvent,
useMemo,
- type SetStateAction,
+ useState,
type Dispatch,
+ type SetStateAction,
} from 'react';
import { Trans, useTranslation } from 'react-i18next';
@@ -19,11 +19,11 @@ import { send } from 'loot-core/platform/client/fetch';
import * as undo from 'loot-core/platform/client/undo';
import { getNormalisedString } from 'loot-core/shared/normalisation';
import { q } from 'loot-core/shared/query';
-import { mapField, friendlyOp } from 'loot-core/shared/rules';
+import { friendlyOp, mapField } from 'loot-core/shared/rules';
import { describeSchedule } from 'loot-core/shared/schedules';
import {
- type RuleEntity,
type NewRuleEntity,
+ type RuleEntity,
type ScheduleEntity,
} from 'loot-core/types/models';
@@ -38,8 +38,8 @@ import { useCategories } from '@desktop-client/hooks/useCategories';
import { usePayees } from '@desktop-client/hooks/usePayees';
import { useSchedules } from '@desktop-client/hooks/useSchedules';
import {
- useSelected,
SelectedProvider,
+ useSelected,
} from '@desktop-client/hooks/useSelected';
import { pushModal } from '@desktop-client/modals/modalsSlice';
import { getPayees } from '@desktop-client/payees/payeesSlice';
diff --git a/packages/desktop-client/src/components/Notes.tsx b/packages/desktop-client/src/components/Notes.tsx
index c3ee380aaf..61638630a1 100644
--- a/packages/desktop-client/src/components/Notes.tsx
+++ b/packages/desktop-client/src/components/Notes.tsx
@@ -12,9 +12,9 @@ import rehypeExternalLinks from 'rehype-external-links';
import remarkGfm from 'remark-gfm';
import {
+ markdownBaseStyles,
remarkBreaks,
sequentialNewlinesPlugin,
- markdownBaseStyles,
} from '@desktop-client/util/markdown';
const remarkPlugins = [sequentialNewlinesPlugin, remarkGfm, remarkBreaks];
diff --git a/packages/desktop-client/src/components/NotesButton.tsx b/packages/desktop-client/src/components/NotesButton.tsx
index 6fc93ca3bb..48a8870b21 100644
--- a/packages/desktop-client/src/components/NotesButton.tsx
+++ b/packages/desktop-client/src/components/NotesButton.tsx
@@ -1,10 +1,10 @@
import React, {
+ useCallback,
useEffect,
useRef,
useState,
type ComponentProps,
type CSSProperties,
- useCallback,
} from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/desktop-client/src/components/Notifications.tsx b/packages/desktop-client/src/components/Notifications.tsx
index 28d9a6a22d..5d778e3ec9 100644
--- a/packages/desktop-client/src/components/Notifications.tsx
+++ b/packages/desktop-client/src/components/Notifications.tsx
@@ -1,14 +1,14 @@
// @ts-strict-ignore
import React, {
- useState,
- useEffectEvent,
useEffect,
+ useEffectEvent,
useMemo,
- type SetStateAction,
+ useState,
type CSSProperties,
+ type SetStateAction,
} from 'react';
import { useTranslation } from 'react-i18next';
-import { animated, useSpring, to } from 'react-spring';
+import { animated, to, useSpring } from 'react-spring';
import { useSwipeable } from 'react-swipeable';
import { Button, ButtonWithLoading } from '@actual-app/components/button';
@@ -29,7 +29,7 @@ import {
removeNotification,
type NotificationWithId,
} from '@desktop-client/notifications/notificationsSlice';
-import { useSelector, useDispatch } from '@desktop-client/redux';
+import { useDispatch, useSelector } from '@desktop-client/redux';
// Notification stacking configuration
const MAX_VISIBLE_NOTIFICATIONS = 3; // Maximum number of notifications visible in the stack
diff --git a/packages/desktop-client/src/components/Page.tsx b/packages/desktop-client/src/components/Page.tsx
index 65c60e6e72..0b92d1f599 100644
--- a/packages/desktop-client/src/components/Page.tsx
+++ b/packages/desktop-client/src/components/Page.tsx
@@ -1,4 +1,4 @@
-import React, { type ReactNode, type CSSProperties } from 'react';
+import React, { type CSSProperties, type ReactNode } from 'react';
import { useResponsive } from '@actual-app/components/hooks/useResponsive';
import { styles } from '@actual-app/components/styles';
diff --git a/packages/desktop-client/src/components/PrivacyFilter.tsx b/packages/desktop-client/src/components/PrivacyFilter.tsx
index f2968e5eb7..0b9d0806b5 100644
--- a/packages/desktop-client/src/components/PrivacyFilter.tsx
+++ b/packages/desktop-client/src/components/PrivacyFilter.tsx
@@ -1,10 +1,10 @@
// @ts-strict-ignore
import {
Children,
- type ComponentPropsWithRef,
- type ReactNode,
useLayoutEffect,
useRef,
+ type ComponentPropsWithRef,
+ type ReactNode,
} from 'react';
import { useResponsive } from '@actual-app/components/hooks/useResponsive';
diff --git a/packages/desktop-client/src/components/ServerContext.tsx b/packages/desktop-client/src/components/ServerContext.tsx
index 4788940a0a..f6854e2a44 100644
--- a/packages/desktop-client/src/components/ServerContext.tsx
+++ b/packages/desktop-client/src/components/ServerContext.tsx
@@ -1,9 +1,9 @@
import React, {
createContext,
- useState,
useCallback,
- useEffect,
useContext,
+ useEffect,
+ useState,
type ReactNode,
} from 'react';
diff --git a/packages/desktop-client/src/components/SyncRefresh.tsx b/packages/desktop-client/src/components/SyncRefresh.tsx
index adfcd8f4b7..d41ef5bcc5 100644
--- a/packages/desktop-client/src/components/SyncRefresh.tsx
+++ b/packages/desktop-client/src/components/SyncRefresh.tsx
@@ -1,4 +1,4 @@
-import React, { type ReactNode, useState } from 'react';
+import React, { useState, type ReactNode } from 'react';
type ChildrenProps = {
refreshing: boolean;
diff --git a/packages/desktop-client/src/components/Titlebar.tsx b/packages/desktop-client/src/components/Titlebar.tsx
index 5a3e0b1b2d..f9129dda71 100644
--- a/packages/desktop-client/src/components/Titlebar.tsx
+++ b/packages/desktop-client/src/components/Titlebar.tsx
@@ -1,7 +1,7 @@
-import React, { useState, useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
import { useHotkeys } from 'react-hotkeys-hook';
import { Trans, useTranslation } from 'react-i18next';
-import { Routes, Route, useLocation } from 'react-router';
+import { Route, Routes, useLocation } from 'react-router';
import { Button } from '@actual-app/components/button';
import { useResponsive } from '@actual-app/components/hooks/useResponsive';
diff --git a/packages/desktop-client/src/components/UpdateNotification.tsx b/packages/desktop-client/src/components/UpdateNotification.tsx
index 7be0f2ba8c..43e7c5d249 100644
--- a/packages/desktop-client/src/components/UpdateNotification.tsx
+++ b/packages/desktop-client/src/components/UpdateNotification.tsx
@@ -10,7 +10,7 @@ import { View } from '@actual-app/components/view';
import { Link } from './common/Link';
import { setAppState, updateApp } from '@desktop-client/app/appSlice';
-import { useSelector, useDispatch } from '@desktop-client/redux';
+import { useDispatch, useSelector } from '@desktop-client/redux';
export function UpdateNotification() {
const { t } = useTranslation();
diff --git a/packages/desktop-client/src/components/accounts/Account.tsx b/packages/desktop-client/src/components/accounts/Account.tsx
index 0e410d8a5e..837af6dcd3 100644
--- a/packages/desktop-client/src/components/accounts/Account.tsx
+++ b/packages/desktop-client/src/components/accounts/Account.tsx
@@ -1,13 +1,13 @@
import React, {
- PureComponent,
- type RefObject,
createRef,
+ PureComponent,
+ useEffect,
useMemo,
type ReactElement,
- useEffect,
+ type RefObject,
} from 'react';
import { Trans } from 'react-i18next';
-import { Navigate, useParams, useLocation } from 'react-router';
+import { Navigate, useLocation, useParams } from 'react-router';
import { styles } from '@actual-app/components/styles';
import { theme } from '@actual-app/components/theme';
@@ -17,24 +17,24 @@ import debounce from 'lodash/debounce';
import isEqual from 'lodash/isEqual';
import { v4 as uuidv4 } from 'uuid';
-import { send, listen } from 'loot-core/platform/client/fetch';
+import { listen, send } from 'loot-core/platform/client/fetch';
import * as undo from 'loot-core/platform/client/undo';
import { type UndoState } from 'loot-core/server/undo';
import { currentDay } from 'loot-core/shared/months';
import { q, type Query } from 'loot-core/shared/query';
import {
- updateTransaction,
+ makeAsNonChildTransactions,
+ makeChild,
realizeTempTransactions,
ungroupTransaction,
ungroupTransactions,
- makeChild,
- makeAsNonChildTransactions,
+ updateTransaction,
} from 'loot-core/shared/transactions';
import { applyChanges, type IntegerAmount } from 'loot-core/shared/util';
import {
+ type AccountEntity,
type NewRuleEntity,
type RuleActionEntity,
- type AccountEntity,
type RuleConditionEntity,
type TransactionEntity,
type TransactionFilterEntity,
@@ -44,10 +44,10 @@ import { AccountEmptyMessage } from './AccountEmptyMessage';
import { AccountHeader } from './Header';
import {
- unlinkAccount,
+ markAccountRead,
reopenAccount,
+ unlinkAccount,
updateAccount,
- markAccountRead,
} from '@desktop-client/accounts/accountsSlice';
import { syncAndDownload } from '@desktop-client/app/appSlice';
import { type SavedFilter } from '@desktop-client/components/filters/SavedFilterMenuButton';
@@ -87,7 +87,7 @@ import {
pagedQuery,
type PagedQuery,
} from '@desktop-client/queries/pagedQuery';
-import { useSelector, useDispatch } from '@desktop-client/redux';
+import { useDispatch, useSelector } from '@desktop-client/redux';
import { type AppDispatch } from '@desktop-client/redux/store';
import { updateNewTransactions } from '@desktop-client/transactions/transactionsSlice';
diff --git a/packages/desktop-client/src/components/accounts/BalanceHistoryGraph.tsx b/packages/desktop-client/src/components/accounts/BalanceHistoryGraph.tsx
index 3b6b5e71f0..97d4ade7ef 100644
--- a/packages/desktop-client/src/components/accounts/BalanceHistoryGraph.tsx
+++ b/packages/desktop-client/src/components/accounts/BalanceHistoryGraph.tsx
@@ -1,7 +1,7 @@
import React, {
- useState,
useEffect,
useMemo,
+ useState,
type CSSProperties,
type Ref,
} from 'react';
@@ -12,8 +12,8 @@ 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 { subMonths, format, eachMonthOfInterval } from 'date-fns';
-import { AreaChart, Area, YAxis, Tooltip as RechartsTooltip } from 'recharts';
+import { eachMonthOfInterval, format, subMonths } from 'date-fns';
+import { Area, AreaChart, Tooltip as RechartsTooltip, YAxis } from 'recharts';
import * as monthUtils from 'loot-core/shared/months';
import { integerToCurrency } from 'loot-core/shared/util';
diff --git a/packages/desktop-client/src/components/accounts/Header.tsx b/packages/desktop-client/src/components/accounts/Header.tsx
index e875800472..3374edba77 100644
--- a/packages/desktop-client/src/components/accounts/Header.tsx
+++ b/packages/desktop-client/src/components/accounts/Header.tsx
@@ -1,8 +1,8 @@
import React, {
- type ComponentProps,
- type ReactNode,
useRef,
useState,
+ type ComponentProps,
+ type ReactNode,
} from 'react';
import { Dialog, DialogTrigger } from 'react-aria-components';
import { useHotkeys } from 'react-hotkeys-hook';
diff --git a/packages/desktop-client/src/components/accounts/Reconcile.test.tsx b/packages/desktop-client/src/components/accounts/Reconcile.test.tsx
index 49c67ca55c..ed16a5fd3f 100644
--- a/packages/desktop-client/src/components/accounts/Reconcile.test.tsx
+++ b/packages/desktop-client/src/components/accounts/Reconcile.test.tsx
@@ -7,7 +7,7 @@ import { generateAccount } from 'loot-core/mocks';
import { q } from 'loot-core/shared/query';
import { type AccountEntity } from 'loot-core/types/models';
-import { ReconcilingMessage, ReconcileMenu } from './Reconcile';
+import { ReconcileMenu, ReconcilingMessage } from './Reconcile';
import { useSheetValue } from '@desktop-client/hooks/useSheetValue';
import { TestProvider } from '@desktop-client/redux/mock';
diff --git a/packages/desktop-client/src/components/accounts/Reconcile.tsx b/packages/desktop-client/src/components/accounts/Reconcile.tsx
index 168bd0a949..1301bca8d6 100644
--- a/packages/desktop-client/src/components/accounts/Reconcile.tsx
+++ b/packages/desktop-client/src/components/accounts/Reconcile.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, type FormEvent, useState } from 'react';
+import React, { useEffect, useState, type FormEvent } from 'react';
import { Form } from 'react-aria-components';
import { Trans } from 'react-i18next';
@@ -15,7 +15,7 @@ import { t } from 'i18next';
import { evalArithmetic } from 'loot-core/shared/arithmetic';
import { type Query } from 'loot-core/shared/query';
-import { tsToRelativeTime, amountToInteger } from 'loot-core/shared/util';
+import { amountToInteger, tsToRelativeTime } from 'loot-core/shared/util';
import { type AccountEntity } from 'loot-core/types/models';
import { type TransObjectLiteral } from 'loot-core/types/util';
diff --git a/packages/desktop-client/src/components/admin/UserAccess/UserAccess.tsx b/packages/desktop-client/src/components/admin/UserAccess/UserAccess.tsx
index 6f1b1de2e6..5485d5034f 100644
--- a/packages/desktop-client/src/components/admin/UserAccess/UserAccess.tsx
+++ b/packages/desktop-client/src/components/admin/UserAccess/UserAccess.tsx
@@ -1,9 +1,9 @@
// @ts-strict-ignore
import React, {
- useState,
- useEffect,
useCallback,
+ useEffect,
useMemo,
+ useState,
type CSSProperties,
} from 'react';
import { Trans, useTranslation } from 'react-i18next';
@@ -19,8 +19,8 @@ import { send } from 'loot-core/platform/client/fetch';
import * as undo from 'loot-core/platform/client/undo';
import { type Handlers } from 'loot-core/types/handlers';
import {
- type UserAvailable,
type UserAccessEntity,
+ type UserAvailable,
} from 'loot-core/types/models';
import { UserAccessHeader } from './UserAccessHeader';
diff --git a/packages/desktop-client/src/components/admin/UserAccess/UserAccessRow.tsx b/packages/desktop-client/src/components/admin/UserAccess/UserAccessRow.tsx
index 0efbfee9eb..ae1241ee37 100644
--- a/packages/desktop-client/src/components/admin/UserAccess/UserAccessRow.tsx
+++ b/packages/desktop-client/src/components/admin/UserAccess/UserAccessRow.tsx
@@ -10,7 +10,7 @@ import { getUserAccessErrors } from 'loot-core/shared/errors';
import { type UserAvailable } from 'loot-core/types/models';
import { Checkbox } from '@desktop-client/components/forms';
-import { Row, Cell } from '@desktop-client/components/table';
+import { Cell, Row } from '@desktop-client/components/table';
import { useMetadataPref } from '@desktop-client/hooks/useMetadataPref';
import { addNotification } from '@desktop-client/notifications/notificationsSlice';
import { useDispatch } from '@desktop-client/redux';
diff --git a/packages/desktop-client/src/components/admin/UserDirectory/UserDirectory.tsx b/packages/desktop-client/src/components/admin/UserDirectory/UserDirectory.tsx
index 5e6c55ac78..9ea081021b 100644
--- a/packages/desktop-client/src/components/admin/UserDirectory/UserDirectory.tsx
+++ b/packages/desktop-client/src/components/admin/UserDirectory/UserDirectory.tsx
@@ -1,9 +1,9 @@
// @ts-strict-ignore
import {
- useState,
- useEffect,
useCallback,
+ useEffect,
useMemo,
+ useState,
type CSSProperties,
} from 'react';
import { Trans, useTranslation } from 'react-i18next';
diff --git a/packages/desktop-client/src/components/admin/UserDirectory/UserDirectoryHeader.tsx b/packages/desktop-client/src/components/admin/UserDirectory/UserDirectoryHeader.tsx
index 897e33903d..d5e452e93d 100644
--- a/packages/desktop-client/src/components/admin/UserDirectory/UserDirectoryHeader.tsx
+++ b/packages/desktop-client/src/components/admin/UserDirectory/UserDirectoryHeader.tsx
@@ -2,13 +2,13 @@ import React from 'react';
import { useTranslation } from 'react-i18next';
import {
- SelectCell,
Cell,
+ SelectCell,
TableHeader,
} from '@desktop-client/components/table';
import {
- useSelectedItems,
useSelectedDispatch,
+ useSelectedItems,
} from '@desktop-client/hooks/useSelected';
export function UserDirectoryHeader() {
diff --git a/packages/desktop-client/src/components/admin/UserDirectory/UserDirectoryRow.tsx b/packages/desktop-client/src/components/admin/UserDirectory/UserDirectoryRow.tsx
index 22a5142f43..6e1dc845b7 100644
--- a/packages/desktop-client/src/components/admin/UserDirectory/UserDirectoryRow.tsx
+++ b/packages/desktop-client/src/components/admin/UserDirectory/UserDirectoryRow.tsx
@@ -10,7 +10,7 @@ import { PossibleRoles } from 'loot-core/shared/user';
import { type UserEntity } from 'loot-core/types/models';
import { Checkbox } from '@desktop-client/components/forms';
-import { SelectCell, Row, Cell } from '@desktop-client/components/table';
+import { Cell, Row, SelectCell } from '@desktop-client/components/table';
import { useSelectedDispatch } from '@desktop-client/hooks/useSelected';
type UserDirectoryProps = {
diff --git a/packages/desktop-client/src/components/alerts.tsx b/packages/desktop-client/src/components/alerts.tsx
index 4e560dc1f3..985f7eadb2 100644
--- a/packages/desktop-client/src/components/alerts.tsx
+++ b/packages/desktop-client/src/components/alerts.tsx
@@ -1,8 +1,8 @@
// @ts-strict-ignore
import React, {
type ComponentType,
- type ReactNode,
type CSSProperties,
+ type ReactNode,
} from 'react';
import {
diff --git a/packages/desktop-client/src/components/autocomplete/AccountAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/AccountAutocomplete.tsx
index 8f44f4e92c..c543f7f068 100644
--- a/packages/desktop-client/src/components/autocomplete/AccountAutocomplete.tsx
+++ b/packages/desktop-client/src/components/autocomplete/AccountAutocomplete.tsx
@@ -1,11 +1,11 @@
// @ts-strict-ignore
import React, {
Fragment,
+ useMemo,
type ComponentProps,
type ComponentPropsWithoutRef,
- type ReactElement,
type CSSProperties,
- useMemo,
+ type ReactElement,
} from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx b/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx
index bc00693bb0..6653cdc55a 100644
--- a/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx
+++ b/packages/desktop-client/src/components/autocomplete/Autocomplete.tsx
@@ -1,13 +1,13 @@
// @ts-strict-ignore
import React, {
- type ComponentProps,
- type HTMLProps,
- type KeyboardEvent,
- type ReactNode,
useEffect,
useMemo,
useRef,
useState,
+ type ComponentProps,
+ type HTMLProps,
+ type KeyboardEvent,
+ type ReactNode,
} from 'react';
import { Button } from '@actual-app/components/button';
diff --git a/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
index c9031edf33..e261a0fe1e 100644
--- a/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
+++ b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx
@@ -1,14 +1,14 @@
import React, {
- type ComponentProps,
Fragment,
+ useCallback,
useMemo,
- type ReactNode,
- type SVGProps,
- type ComponentType,
+ type ComponentProps,
type ComponentPropsWithoutRef,
- type ReactElement,
+ type ComponentType,
type CSSProperties,
- useCallback,
+ type ReactElement,
+ type ReactNode,
+ type SVGProps,
} from 'react';
import { Trans, useTranslation } from 'react-i18next';
@@ -37,8 +37,8 @@ import { useCategories } from '@desktop-client/hooks/useCategories';
import { useSheetValue } from '@desktop-client/hooks/useSheetValue';
import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
import {
- trackingBudget,
envelopeBudget,
+ trackingBudget,
} from '@desktop-client/spreadsheet/bindings';
type CategoryAutocompleteItem = Omit<CategoryEntity, 'group'> & {
diff --git a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.test.tsx b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.test.tsx
index 5e88e577cf..e606432cc0 100644
--- a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.test.tsx
+++ b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.test.tsx
@@ -1,4 +1,4 @@
-import { render, type Screen, screen } from '@testing-library/react';
+import { render, screen, type Screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { vi } from 'vitest';
diff --git a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx
index b37d4846f6..27a6242e12 100644
--- a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx
+++ b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx
@@ -1,15 +1,15 @@
// @ts-strict-ignore
import React, {
Fragment,
- useState,
useMemo,
+ useState,
type ComponentProps,
- type ReactNode,
- type ComponentType,
- type SVGProps,
type ComponentPropsWithoutRef,
- type ReactElement,
+ type ComponentType,
type CSSProperties,
+ type ReactElement,
+ type ReactNode,
+ type SVGProps,
} from 'react';
import { Trans, useTranslation } from 'react-i18next';
@@ -27,8 +27,8 @@ import { type AccountEntity, type PayeeEntity } from 'loot-core/types/models';
import {
Autocomplete,
- defaultFilterSuggestion,
AutocompleteFooter,
+ defaultFilterSuggestion,
} from './Autocomplete';
import { ItemHeader } from './ItemHeader';
diff --git a/packages/desktop-client/src/components/banksync/AccountRow.tsx b/packages/desktop-client/src/components/banksync/AccountRow.tsx
index de6cc9b455..587db777a2 100644
--- a/packages/desktop-client/src/components/banksync/AccountRow.tsx
+++ b/packages/desktop-client/src/components/banksync/AccountRow.tsx
@@ -10,7 +10,7 @@ import { format as formatDate, type Locale } from 'date-fns';
import { tsToRelativeTime } from 'loot-core/shared/util';
import { type AccountEntity } from 'loot-core/types/models';
-import { Row, Cell } from '@desktop-client/components/table';
+import { Cell, Row } from '@desktop-client/components/table';
type AccountRowProps = {
account: AccountEntity;
diff --git a/packages/desktop-client/src/components/banksync/BankSyncCheckboxOptions.tsx b/packages/desktop-client/src/components/banksync/BankSyncCheckboxOptions.tsx
index 7e3bdc37ef..a50ed0dea8 100644
--- a/packages/desktop-client/src/components/banksync/BankSyncCheckboxOptions.tsx
+++ b/packages/desktop-client/src/components/banksync/BankSyncCheckboxOptions.tsx
@@ -1,5 +1,5 @@
import React, { useState, type ReactNode } from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
import { SvgQuestion } from '@actual-app/components/icons/v1';
diff --git a/packages/desktop-client/src/components/banksync/FieldMapping.tsx b/packages/desktop-client/src/components/banksync/FieldMapping.tsx
index 9ca2b93fab..4846f9c317 100644
--- a/packages/desktop-client/src/components/banksync/FieldMapping.tsx
+++ b/packages/desktop-client/src/components/banksync/FieldMapping.tsx
@@ -13,7 +13,7 @@ import {
type TransactionDirection,
} from './EditSyncAccount';
-import { Row, Cell, TableHeader } from '@desktop-client/components/table';
+import { Cell, Row, TableHeader } from '@desktop-client/components/table';
const useTransactionDirectionOptions = () => {
const { t } = useTranslation();
diff --git a/packages/desktop-client/src/components/banksync/index.tsx b/packages/desktop-client/src/components/banksync/index.tsx
index eb1db43c3b..c63cb3e426 100644
--- a/packages/desktop-client/src/components/banksync/index.tsx
+++ b/packages/desktop-client/src/components/banksync/index.tsx
@@ -1,4 +1,4 @@
-import { useMemo, useState, useCallback } from 'react';
+import { useCallback, useMemo, useState } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { useResponsive } from '@actual-app/components/hooks/useResponsive';
@@ -6,8 +6,8 @@ import { Text } from '@actual-app/components/text';
import { View } from '@actual-app/components/view';
import {
- type BankSyncProviders,
type AccountEntity,
+ type BankSyncProviders,
} from 'loot-core/types/models';
import { AccountsHeader } from './AccountsHeader';
diff --git a/packages/desktop-client/src/components/banksync/useBankSyncAccountSettings.ts b/packages/desktop-client/src/components/banksync/useBankSyncAccountSettings.ts
index b532f36241..5f28c5522b 100644
--- a/packages/desktop-client/src/components/banksync/useBankSyncAccountSettings.ts
+++ b/packages/desktop-client/src/components/banksync/useBankSyncAccountSettings.ts
@@ -2,16 +2,16 @@ import { useState } from 'react';
import {
defaultMappings,
- type Mappings,
mappingsFromString,
mappingsToString,
+ type Mappings,
} from 'loot-core/server/util/custom-sync-mapping';
import { q } from 'loot-core/shared/query';
import {
- type TransactionDirection,
- type MappableFieldWithExample,
getFields,
+ type MappableFieldWithExample,
+ type TransactionDirection,
} from './EditSyncAccount';
import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
diff --git a/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx b/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx
index e3957dfa28..80c8e99da1 100644
--- a/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx
+++ b/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx
@@ -1,11 +1,11 @@
// @ts-strict-ignore
import React, {
- type ComponentType,
+ useCallback,
type ComponentPropsWithoutRef,
+ type ComponentType,
type CSSProperties,
- useCallback,
} from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { useResponsive } from '@actual-app/components/hooks/useResponsive';
import { SvgArrowThinRight } from '@actual-app/components/icons/v1';
diff --git a/packages/desktop-client/src/components/budget/BudgetCategories.tsx b/packages/desktop-client/src/components/budget/BudgetCategories.tsx
index d2b8e15dc2..69b360bc8f 100644
--- a/packages/desktop-client/src/components/budget/BudgetCategories.tsx
+++ b/packages/desktop-client/src/components/budget/BudgetCategories.tsx
@@ -1,4 +1,4 @@
-import React, { memo, useState, useMemo } from 'react';
+import React, { memo, useMemo, useState } from 'react';
import { styles } from '@actual-app/components/styles';
import { theme } from '@actual-app/components/theme';
diff --git a/packages/desktop-client/src/components/budget/BudgetMonthCountContext.tsx b/packages/desktop-client/src/components/budget/BudgetMonthCountContext.tsx
index 5ddbfc1dc3..858375d5cc 100644
--- a/packages/desktop-client/src/components/budget/BudgetMonthCountContext.tsx
+++ b/packages/desktop-client/src/components/budget/BudgetMonthCountContext.tsx
@@ -1,11 +1,11 @@
// @ts-strict-ignore
import React, {
createContext,
+ useContext,
+ useState,
type Dispatch,
type ReactNode,
type SetStateAction,
- useContext,
- useState,
} from 'react';
type BudgetMonthCountContextValue = {
diff --git a/packages/desktop-client/src/components/budget/BudgetPageHeader.tsx b/packages/desktop-client/src/components/budget/BudgetPageHeader.tsx
index 3f96488288..25f96ae0fd 100644
--- a/packages/desktop-client/src/components/budget/BudgetPageHeader.tsx
+++ b/packages/desktop-client/src/components/budget/BudgetPageHeader.tsx
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import React, { type ComponentProps, memo } from 'react';
+import React, { memo, type ComponentProps } from 'react';
import { View } from '@actual-app/components/view';
diff --git a/packages/desktop-client/src/components/budget/BudgetSummaries.tsx b/packages/desktop-client/src/components/budget/BudgetSummaries.tsx
index fccb911882..970c786edb 100644
--- a/packages/desktop-client/src/components/budget/BudgetSummaries.tsx
+++ b/packages/desktop-client/src/components/budget/BudgetSummaries.tsx
@@ -6,7 +6,7 @@ import React, {
useRef,
useState,
} from 'react';
-import { useSpring, animated } from 'react-spring';
+import { animated, useSpring } from 'react-spring';
import { View } from '@actual-app/components/view';
import { css } from '@emotion/css';
diff --git a/packages/desktop-client/src/components/budget/BudgetTable.tsx b/packages/desktop-client/src/components/budget/BudgetTable.tsx
index a35ab3d5de..2ed16956fe 100644
--- a/packages/desktop-client/src/components/budget/BudgetTable.tsx
+++ b/packages/desktop-client/src/components/budget/BudgetTable.tsx
@@ -1,4 +1,4 @@
-import React, { type KeyboardEvent, useMemo, useState } from 'react';
+import React, { useMemo, useState, type KeyboardEvent } from 'react';
import { styles } from '@actual-app/components/styles';
import { theme } from '@actual-app/components/theme';
@@ -13,7 +13,7 @@ import {
import { BudgetCategories } from './BudgetCategories';
import { BudgetSummaries } from './BudgetSummaries';
import { BudgetTotals } from './BudgetTotals';
-import { type MonthBounds, MonthsProvider } from './MonthsContext';
+import { MonthsProvider, type MonthBounds } from './MonthsContext';
import {
findSortDown,
findSortUp,
diff --git a/packages/desktop-client/src/components/budget/BudgetTotals.tsx b/packages/desktop-client/src/components/budget/BudgetTotals.tsx
index 9506e25e96..67d02502d0 100644
--- a/packages/desktop-client/src/components/budget/BudgetTotals.tsx
+++ b/packages/desktop-client/src/components/budget/BudgetTotals.tsx
@@ -1,5 +1,5 @@
import React, { memo, useRef, useState } from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
import { SvgDotsHorizontalTriple } from '@actual-app/components/icons/v1';
diff --git a/packages/desktop-client/src/components/budget/ExpenseCategory.tsx b/packages/desktop-client/src/components/budget/ExpenseCategory.tsx
index 39aeaf30d2..0594d7e048 100644
--- a/packages/desktop-client/src/components/budget/ExpenseCategory.tsx
+++ b/packages/desktop-client/src/components/budget/ExpenseCategory.tsx
@@ -5,8 +5,8 @@ import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';
import {
- type CategoryGroupEntity,
type CategoryEntity,
+ type CategoryGroupEntity,
} from 'loot-core/types/models';
import { RenderMonths } from './RenderMonths';
@@ -15,9 +15,9 @@ import { SidebarCategory } from './SidebarCategory';
import { useBudgetComponents } from '.';
import {
+ DropHighlight,
useDraggable,
useDroppable,
- DropHighlight,
type DragState,
type OnDragChangeCallback,
type OnDropCallback,
diff --git a/packages/desktop-client/src/components/budget/ExpenseGroup.tsx b/packages/desktop-client/src/components/budget/ExpenseGroup.tsx
index d39a56f3e8..3b2243b618 100644
--- a/packages/desktop-client/src/components/budget/ExpenseGroup.tsx
+++ b/packages/desktop-client/src/components/budget/ExpenseGroup.tsx
@@ -15,12 +15,12 @@ import { SidebarGroup } from './SidebarGroup';
import { useBudgetComponents } from '.';
import {
+ DropHighlight,
useDraggable,
useDroppable,
- DropHighlight,
+ type DragState,
type OnDragChangeCallback,
type OnDropCallback,
- type DragState,
} from '@desktop-client/components/sort';
import { Row, ROW_HEIGHT } from '@desktop-client/components/table';
import { useDragRef } from '@desktop-client/hooks/useDragRef';
diff --git a/packages/desktop-client/src/components/budget/IncomeCategory.tsx b/packages/desktop-client/src/components/budget/IncomeCategory.tsx
index 07a80878dd..64e067ffa6 100644
--- a/packages/desktop-client/src/components/budget/IncomeCategory.tsx
+++ b/packages/desktop-client/src/components/budget/IncomeCategory.tsx
@@ -9,9 +9,9 @@ import { SidebarCategory } from './SidebarCategory';
import { useBudgetComponents } from '.';
import {
+ DropHighlight,
useDraggable,
useDroppable,
- DropHighlight,
type OnDragChangeCallback,
type OnDropCallback,
} from '@desktop-client/components/sort';
diff --git a/packages/desktop-client/src/components/budget/MonthPicker.tsx b/packages/desktop-client/src/components/budget/MonthPicker.tsx
index 85121dcba4..391c4cde1e 100644
--- a/packages/desktop-client/src/components/budget/MonthPicker.tsx
+++ b/packages/desktop-client/src/components/budget/MonthPicker.tsx
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import React, { type CSSProperties, useState } from 'react';
+import React, { useState, type CSSProperties } from 'react';
import { useTranslation } from 'react-i18next';
import {
diff --git a/packages/desktop-client/src/components/budget/RenderMonths.tsx b/packages/desktop-client/src/components/budget/RenderMonths.tsx
index 0dae91fe03..1d74eaf76e 100644
--- a/packages/desktop-client/src/components/budget/RenderMonths.tsx
+++ b/packages/desktop-client/src/components/budget/RenderMonths.tsx
@@ -1,4 +1,4 @@
-import React, { type ReactNode, useContext, type CSSProperties } from 'react';
+import React, { useContext, type CSSProperties, type ReactNode } from 'react';
import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';
diff --git a/packages/desktop-client/src/components/budget/SidebarCategory.tsx b/packages/desktop-client/src/components/budget/SidebarCategory.tsx
index c849d736c8..29cd421f98 100644
--- a/packages/desktop-client/src/components/budget/SidebarCategory.tsx
+++ b/packages/desktop-client/src/components/budget/SidebarCategory.tsx
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import React, { type CSSProperties, type Ref, useRef } from 'react';
+import React, { useRef, type CSSProperties, type Ref } from 'react';
import { useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
@@ -11,8 +11,8 @@ import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';
import {
- type CategoryGroupEntity,
type CategoryEntity,
+ type CategoryGroupEntity,
} from 'loot-core/types/models';
import { SidebarCategoryButtons } from './SidebarCategoryButtons';
diff --git a/packages/desktop-client/src/components/budget/SidebarGroup.tsx b/packages/desktop-client/src/components/budget/SidebarGroup.tsx
index 41290a789f..77f5d96e9b 100644
--- a/packages/desktop-client/src/components/budget/SidebarGroup.tsx
+++ b/packages/desktop-client/src/components/budget/SidebarGroup.tsx
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import React, { type CSSProperties, type RefCallback, useRef } from 'react';
+import React, { useRef, type CSSProperties, type RefCallback } from 'react';
import { useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
diff --git a/packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetComponents.tsx b/packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetComponents.tsx
index d98088046c..f2395db011 100644
--- a/packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetComponents.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetComponents.tsx
@@ -1,10 +1,10 @@
import React, {
- type ComponentProps,
- type CSSProperties,
memo,
useRef,
+ type ComponentProps,
+ type CSSProperties,
} from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
import { SvgCheveronDown } from '@actual-app/components/icons/v1';
@@ -34,8 +34,8 @@ import {
CellValueText,
} from '@desktop-client/components/spreadsheet/CellValue';
import {
- Row,
Field,
+ Row,
SheetCell,
type SheetCellProps,
} from '@desktop-client/components/table';
diff --git a/packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetContext.tsx b/packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetContext.tsx
index 236c84ef79..c34e90e285 100644
--- a/packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetContext.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetContext.tsx
@@ -1,4 +1,4 @@
-import React, { type ReactNode, createContext, useContext } from 'react';
+import React, { createContext, useContext, type ReactNode } from 'react';
import * as monthUtils from 'loot-core/shared/months';
diff --git a/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudget.tsx b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudget.tsx
index 3e8b91e4c4..e344d939db 100644
--- a/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudget.tsx
+++ b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudget.tsx
@@ -1,8 +1,8 @@
import React, {
- type CSSProperties,
useCallback,
useRef,
useState,
+ type CSSProperties,
} from 'react';
import { Popover } from '@actual-app/components/popover';
diff --git a/packages/desktop-client/src/components/budget/goals/BudgetAutomationEditor.tsx b/packages/desktop-client/src/components/budget/goals/BudgetAutomationEditor.tsx
index 10a315e96e..80a9095f98 100644
--- a/packages/desktop-client/src/components/budget/goals/BudgetAutomationEditor.tsx
+++ b/packages/desktop-client/src/components/budget/goals/BudgetAutomationEditor.tsx
@@ -1,5 +1,5 @@
import { type ReactNode } from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { InitialFocus } from '@actual-app/components/initial-focus';
import { Select } from '@actual-app/components/select';
@@ -13,7 +13,7 @@ import type {
ScheduleEntity,
} from 'loot-core/types/models';
-import { type Action, setType } from './actions';
+import { setType, type Action } from './actions';
import { displayTemplateTypes, type ReducerState } from './constants';
import { HistoricalAutomation } from './editor/HistoricalAutomation';
import { PercentageAutomation } from './editor/PercentageAutomation';
diff --git a/packages/desktop-client/src/components/budget/goals/CategoryAutomationButton.tsx b/packages/desktop-client/src/components/budget/goals/CategoryAutomationButton.tsx
index 8a3c9e290a..6277c9cd21 100644
--- a/packages/desktop-client/src/components/budget/goals/CategoryAutomationButton.tsx
+++ b/packages/desktop-client/src/components/budget/goals/CategoryAutomationButton.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
import { SvgChartPie } from '@actual-app/components/icons/v1';
import { theme } from '@actual-app/components/theme';
-import { cx, css } from '@emotion/css';
+import { css, cx } from '@emotion/css';
import { type CategoryEntity } from 'loot-core/types/models';
diff --git a/packages/desktop-client/src/components/budget/goals/constants.ts b/packages/desktop-client/src/components/budget/goals/constants.ts
index 313bb0db75..f9e52f5034 100644
--- a/packages/desktop-client/src/components/budget/goals/constants.ts
+++ b/packages/desktop-client/src/components/budget/goals/constants.ts
@@ -2,9 +2,9 @@ import {
type AverageTemplate,
type CopyTemplate,
type PercentageTemplate,
+ type PeriodicTemplate,
type ScheduleTemplate,
type SimpleTemplate,
- type PeriodicTemplate,
} from 'loot-core/types/models/templates';
export const displayTemplateTypes = [
diff --git a/packages/desktop-client/src/components/budget/goals/editor/HistoricalAutomation.tsx b/packages/desktop-client/src/components/budget/goals/editor/HistoricalAutomation.tsx
index 615a2359d6..533306c9be 100644
--- a/packages/desktop-client/src/components/budget/goals/editor/HistoricalAutomation.tsx
+++ b/packages/desktop-client/src/components/budget/goals/editor/HistoricalAutomation.tsx
@@ -4,13 +4,13 @@ import { Select } from '@actual-app/components/select';
import { SpaceBetween } from '@actual-app/components/space-between';
import type {
- CopyTemplate,
AverageTemplate,
+ CopyTemplate,
} from 'loot-core/types/models/templates';
import {
- type Action,
updateTemplate,
+ type Action,
} from '@desktop-client/components/budget/goals/actions';
import { FormField, FormLabel } from '@desktop-client/components/forms';
import { GenericInput } from '@desktop-client/components/util/GenericInput';
diff --git a/packages/desktop-client/src/components/budget/goals/editor/HistoricalAutomationReadOnly.tsx b/packages/desktop-client/src/components/budget/goals/editor/HistoricalAutomationReadOnly.tsx
index c45d12e6ba..5b6311c429 100644
--- a/packages/desktop-client/src/components/budget/goals/editor/HistoricalAutomationReadOnly.tsx
+++ b/packages/desktop-client/src/components/budget/goals/editor/HistoricalAutomationReadOnly.tsx
@@ -1,8 +1,8 @@
import { Trans } from 'react-i18next';
import type {
- CopyTemplate,
AverageTemplate,
+ CopyTemplate,
} from 'loot-core/types/models/templates';
type HistoricalAutomationReadOnlyProps = {
diff --git a/packages/desktop-client/src/components/budget/goals/editor/PercentageAutomation.tsx b/packages/desktop-client/src/components/budget/goals/editor/PercentageAutomation.tsx
index ed7474aa72..e97b93f9d7 100644
--- a/packages/desktop-client/src/components/budget/goals/editor/PercentageAutomation.tsx
+++ b/packages/desktop-client/src/components/budget/goals/editor/PercentageAutomation.tsx
@@ -5,15 +5,15 @@ import { SpaceBetween } from '@actual-app/components/space-between';
import { View } from '@actual-app/components/view';
import type {
- CategoryGroupEntity,
CategoryEntity,
+ CategoryGroupEntity,
} from 'loot-core/types/models';
import type { PercentageTemplate } from 'loot-core/types/models/templates';
import { CategoryAutocomplete } from '@desktop-client/components/autocomplete/CategoryAutocomplete';
import {
- type Action,
updateTemplate,
+ type Action,
} from '@desktop-client/components/budget/goals/actions';
import { FormField, FormLabel } from '@desktop-client/components/forms';
import { PercentInput } from '@desktop-client/components/util/PercentInput';
diff --git a/packages/desktop-client/src/components/budget/goals/editor/PercentageAutomationReadOnly.tsx b/packages/desktop-client/src/components/budget/goals/editor/PercentageAutomationReadOnly.tsx
index d71ef6ad56..84f7649c17 100644
--- a/packages/desktop-client/src/components/budget/goals/editor/PercentageAutomationReadOnly.tsx
+++ b/packages/desktop-client/src/components/budget/goals/editor/PercentageAutomationReadOnly.tsx
@@ -1,4 +1,4 @@
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import type { PercentageTemplate } from 'loot-core/types/models/templates';
diff --git a/packages/desktop-client/src/components/budget/goals/editor/ScheduleAutomation.tsx b/packages/desktop-client/src/components/budget/goals/editor/ScheduleAutomation.tsx
index 8857165ada..fd5b1f5182 100644
--- a/packages/desktop-client/src/components/budget/goals/editor/ScheduleAutomation.tsx
+++ b/packages/desktop-client/src/components/budget/goals/editor/ScheduleAutomation.tsx
@@ -1,4 +1,4 @@
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { Select } from '@actual-app/components/select';
import { SpaceBetween } from '@actual-app/components/space-between';
@@ -8,8 +8,8 @@ import type { ScheduleEntity } from 'loot-core/types/models';
import type { ScheduleTemplate } from 'loot-core/types/models/templates';
import {
- type Action,
updateTemplate,
+ type Action,
} from '@desktop-client/components/budget/goals/actions';
import { Link } from '@desktop-client/components/common/Link';
import { FormField, FormLabel } from '@desktop-client/components/forms';
diff --git a/packages/desktop-client/src/components/budget/goals/editor/SimpleAutomation.tsx b/packages/desktop-client/src/components/budget/goals/editor/SimpleAutomation.tsx
index ca3a4ce0f2..a7efd9f970 100644
--- a/packages/desktop-client/src/components/budget/goals/editor/SimpleAutomation.tsx
+++ b/packages/desktop-client/src/components/budget/goals/editor/SimpleAutomation.tsx
@@ -3,8 +3,8 @@ import { useTranslation } from 'react-i18next';
import type { SimpleTemplate } from 'loot-core/types/models/templates';
import {
- type Action,
updateTemplate,
+ type Action,
} from '@desktop-client/components/budget/goals/actions';
import { FormField, FormLabel } from '@desktop-client/components/forms';
import { AmountInput } from '@desktop-client/components/util/AmountInput';
diff --git a/packages/desktop-client/src/components/budget/goals/editor/WeekAutomation.tsx b/packages/desktop-client/src/components/budget/goals/editor/WeekAutomation.tsx
index 4cb96474e4..e9135b8913 100644
--- a/packages/desktop-client/src/components/budget/goals/editor/WeekAutomation.tsx
+++ b/packages/desktop-client/src/components/budget/goals/editor/WeekAutomation.tsx
@@ -3,8 +3,8 @@ import { useTranslation } from 'react-i18next';
import type { PeriodicTemplate } from 'loot-core/types/models/templates';
import {
- type Action,
updateTemplate,
+ type Action,
} from '@desktop-client/components/budget/goals/actions';
import { FormField, FormLabel } from '@desktop-client/components/forms';
import { AmountInput } from '@desktop-client/components/util/AmountInput';
diff --git a/packages/desktop-client/src/components/budget/goals/reducer.ts b/packages/desktop-client/src/components/budget/goals/reducer.ts
index 0fd5686674..8d9821f59a 100644
--- a/packages/desktop-client/src/components/budget/goals/reducer.ts
+++ b/packages/desktop-client/src/components/budget/goals/reducer.ts
@@ -1,7 +1,7 @@
import { type Template } from 'loot-core/types/models/templates';
import { type Action } from './actions';
-import { type ReducerState, type DisplayTemplateType } from './constants';
+import { type DisplayTemplateType, type ReducerState } from './constants';
export const DEFAULT_PRIORITY = 1;
diff --git a/packages/desktop-client/src/components/budget/index.tsx b/packages/desktop-client/src/components/budget/index.tsx
index 3dea7cdf61..7518a8fcdf 100644
--- a/packages/desktop-client/src/components/budget/index.tsx
+++ b/packages/desktop-client/src/components/budget/index.tsx
@@ -1,9 +1,9 @@
// @ts-strict-ignore
import React, {
- useMemo,
- useState,
useEffect,
useEffectEvent,
+ useMemo,
+ useState,
type ComponentType,
} from 'react';
diff --git a/packages/desktop-client/src/components/budget/tracking/TrackingBudgetComponents.tsx b/packages/desktop-client/src/components/budget/tracking/TrackingBudgetComponents.tsx
index 838e703c36..3af78691c3 100644
--- a/packages/desktop-client/src/components/budget/tracking/TrackingBudgetComponents.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/TrackingBudgetComponents.tsx
@@ -1,10 +1,10 @@
// @ts-strict-ignore
import React, {
- type ComponentProps,
- type CSSProperties,
memo,
useRef,
useState,
+ type ComponentProps,
+ type CSSProperties,
} from 'react';
import { Trans } from 'react-i18next';
diff --git a/packages/desktop-client/src/components/budget/tracking/TrackingBudgetContext.tsx b/packages/desktop-client/src/components/budget/tracking/TrackingBudgetContext.tsx
index d6c126455d..d6d86a4ea5 100644
--- a/packages/desktop-client/src/components/budget/tracking/TrackingBudgetContext.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/TrackingBudgetContext.tsx
@@ -1,4 +1,4 @@
-import React, { type ReactNode, createContext, useContext } from 'react';
+import React, { createContext, useContext, type ReactNode } from 'react';
import * as monthUtils from 'loot-core/shared/months';
diff --git a/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetTotal.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetTotal.tsx
index a9cc04f69f..bffb520630 100644
--- a/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetTotal.tsx
+++ b/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetTotal.tsx
@@ -1,7 +1,7 @@
// @ts-strict-ignore
import React, {
- type CSSProperties,
type ComponentType,
+ type CSSProperties,
type ReactNode,
} from 'react';
import { Trans } from 'react-i18next';
@@ -12,7 +12,7 @@ import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';
import { CellValue } from '@desktop-client/components/spreadsheet/CellValue';
-import { type SheetFields, type Binding } from '@desktop-client/spreadsheet';
+import { type Binding, type SheetFields } from '@desktop-client/spreadsheet';
type BudgetTotalProps<
CurrentField extends SheetFields<'tracking-budget'>,
diff --git a/packages/desktop-client/src/components/common/Link.tsx b/packages/desktop-client/src/components/common/Link.tsx
index 13452f98e8..19150cfeb7 100644
--- a/packages/desktop-client/src/components/common/Link.tsx
+++ b/packages/desktop-client/src/components/common/Link.tsx
@@ -1,6 +1,6 @@
import React, {
- type MouseEventHandler,
type ComponentProps,
+ type MouseEventHandler,
type ReactNode,
} from 'react';
import { NavLink, useMatch } from 'react-router';
diff --git a/packages/desktop-client/src/components/common/Modal.tsx b/packages/desktop-client/src/components/common/Modal.tsx
index b5efee822e..d1620dc6d8 100644
--- a/packages/desktop-client/src/components/common/Modal.tsx
+++ b/packages/desktop-client/src/components/common/Modal.tsx
@@ -1,17 +1,17 @@
import React, {
useEffect,
- useRef,
useLayoutEffect,
+ useRef,
useState,
- type ReactNode,
type ComponentPropsWithoutRef,
type ComponentPropsWithRef,
type CSSProperties,
+ type ReactNode,
} from 'react';
import {
- ModalOverlay as ReactAriaModalOverlay,
- Modal as ReactAriaModal,
Dialog,
+ Modal as ReactAriaModal,
+ ModalOverlay as ReactAriaModalOverlay,
} from 'react-aria-components';
import { useHotkeysContext } from 'react-hotkeys-hook';
import { useTranslation } from 'react-i18next';
diff --git a/packages/desktop-client/src/components/filters/FilterExpression.tsx b/packages/desktop-client/src/components/filters/FilterExpression.tsx
index 2cf08ac5ae..da516038b5 100644
--- a/packages/desktop-client/src/components/filters/FilterExpression.tsx
+++ b/packages/desktop-client/src/components/filters/FilterExpression.tsx
@@ -8,7 +8,7 @@ import { Text } from '@actual-app/components/text';
import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';
-import { mapField, friendlyOp } from 'loot-core/shared/rules';
+import { friendlyOp, mapField } from 'loot-core/shared/rules';
import { type RuleConditionEntity } from 'loot-core/types/models';
import { FilterEditor } from './FiltersMenu';
diff --git a/packages/desktop-client/src/components/filters/FiltersMenu.tsx b/packages/desktop-client/src/components/filters/FiltersMenu.tsx
index 32e3df9fac..adaf6e5cf4 100644
--- a/packages/desktop-client/src/components/filters/FiltersMenu.tsx
+++ b/packages/desktop-client/src/components/filters/FiltersMenu.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useRef, useEffect, useReducer, useMemo } from 'react';
+import React, { useEffect, useMemo, useReducer, useRef, useState } from 'react';
import { FocusScope } from 'react-aria';
import { Form } from 'react-aria-components';
import { useHotkeys } from 'react-hotkeys-hook';
@@ -15,22 +15,22 @@ import { theme } from '@actual-app/components/theme';
import { Tooltip } from '@actual-app/components/tooltip';
import { View } from '@actual-app/components/view';
import {
- parse as parseDate,
format as formatDate,
isValid as isDateValid,
+ parse as parseDate,
} from 'date-fns';
import { send } from 'loot-core/platform/client/fetch';
import { getMonthYearFormat } from 'loot-core/shared/months';
import {
- mapField,
deserializeField,
- getFieldError,
- unparse,
FIELD_TYPES,
+ getFieldError,
getValidOps,
+ mapField,
+ unparse,
} from 'loot-core/shared/rules';
-import { type IntegerAmount, titleFirst } from 'loot-core/shared/util';
+import { titleFirst, type IntegerAmount } from 'loot-core/shared/util';
import { type RuleConditionEntity } from 'loot-core/types/models';
import { CompactFiltersButton } from './CompactFiltersButton';
diff --git a/packages/desktop-client/src/components/filters/FiltersStack.tsx b/packages/desktop-client/src/components/filters/FiltersStack.tsx
index d9548eda8b..f6e4c9c961 100644
--- a/packages/desktop-client/src/components/filters/FiltersStack.tsx
+++ b/packages/desktop-client/src/components/filters/FiltersStack.tsx
@@ -4,14 +4,14 @@ import { SpaceBetween } from '@actual-app/components/space-between';
import { View } from '@actual-app/components/view';
import {
- type TransactionFilterEntity,
type RuleConditionEntity,
+ type TransactionFilterEntity,
} from 'loot-core/types/models';
import { AppliedFilters } from './AppliedFilters';
import {
- type SavedFilter,
SavedFilterMenuButton,
+ type SavedFilter,
} from './SavedFilterMenuButton';
export function FiltersStack({
diff --git a/packages/desktop-client/src/components/filters/NameFilter.tsx b/packages/desktop-client/src/components/filters/NameFilter.tsx
index c439b5fddf..c09f440a37 100644
--- a/packages/desktop-client/src/components/filters/NameFilter.tsx
+++ b/packages/desktop-client/src/components/filters/NameFilter.tsx
@@ -1,4 +1,4 @@
-import React, { useRef, useEffect } from 'react';
+import React, { useEffect, useRef } from 'react';
import { Form } from 'react-aria-components';
import { useTranslation } from 'react-i18next';
diff --git a/packages/desktop-client/src/components/filters/SavedFilterMenuButton.tsx b/packages/desktop-client/src/components/filters/SavedFilterMenuButton.tsx
index ff3e72f957..591dc8f63c 100644
--- a/packages/desktop-client/src/components/filters/SavedFilterMenuButton.tsx
+++ b/packages/desktop-client/src/components/filters/SavedFilterMenuButton.tsx
@@ -9,8 +9,8 @@ import { View } from '@actual-app/components/view';
import { send, sendCatch } from 'loot-core/platform/client/fetch';
import {
- type TransactionFilterEntity,
type RuleConditionEntity,
+ type TransactionFilterEntity,
} from 'loot-core/types/models';
import { FilterMenu } from './FilterMenu';
diff --git a/packages/desktop-client/src/components/filters/updateFilterReducer.test.ts b/packages/desktop-client/src/components/filters/updateFilterReducer.test.ts
index 06dd052ffc..fe5ff01d63 100644
--- a/packages/desktop-client/src/components/filters/updateFilterReducer.test.ts
+++ b/packages/desktop-client/src/components/filters/updateFilterReducer.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
import { updateFilterReducer } from './updateFilterReducer';
diff --git a/packages/desktop-client/src/components/filters/updateFilterReducer.ts b/packages/desktop-client/src/components/filters/updateFilterReducer.ts
index 9b51284afe..2cb2bf2273 100644
--- a/packages/desktop-client/src/components/filters/updateFilterReducer.ts
+++ b/packages/desktop-client/src/components/filters/updateFilterReducer.ts
@@ -1,4 +1,4 @@
-import { makeValue, FIELD_TYPES } from 'loot-core/shared/rules';
+import { FIELD_TYPES, makeValue } from 'loot-core/shared/rules';
import { type RuleConditionEntity } from 'loot-core/types/models';
export function updateFilterReducer<T extends RuleConditionEntity>(
diff --git a/packages/desktop-client/src/components/forms/LabeledCheckbox.tsx b/packages/desktop-client/src/components/forms/LabeledCheckbox.tsx
index b32a0e8127..b3d966c374 100644
--- a/packages/desktop-client/src/components/forms/LabeledCheckbox.tsx
+++ b/packages/desktop-client/src/components/forms/LabeledCheckbox.tsx
@@ -1,6 +1,6 @@
import React, {
- type CSSProperties,
type ComponentProps,
+ type CSSProperties,
type ReactNode,
} from 'react';
diff --git a/packages/desktop-client/src/components/forms/index.tsx b/packages/desktop-client/src/components/forms/index.tsx
index 492ec4a62a..fb38eb02b3 100644
--- a/packages/desktop-client/src/components/forms/index.tsx
+++ b/packages/desktop-client/src/components/forms/index.tsx
@@ -1,4 +1,4 @@
-import React, { type ReactNode, type ComponentProps } from 'react';
+import React, { type ComponentProps, type ReactNode } from 'react';
import { type CSSProperties } from '@actual-app/components/styles';
import { Text } from '@actual-app/components/text';
diff --git a/packages/desktop-client/src/components/formula/QueryManager.tsx b/packages/desktop-client/src/components/formula/QueryManager.tsx
index 61d8e1b7da..4658cdff7e 100644
--- a/packages/desktop-client/src/components/formula/QueryManager.tsx
+++ b/packages/desktop-client/src/components/formula/QueryManager.tsx
@@ -31,9 +31,9 @@ import { FilterButton } from '@desktop-client/components/filters/FiltersMenu';
import { getLiveRange } from '@desktop-client/components/reports/getLiveRange';
import {
calculateTimeRange,
+ getLatestRange,
validateEnd,
validateStart,
- getLatestRange,
} from '@desktop-client/components/reports/reportRanges';
import { fromDateRepr } from '@desktop-client/components/reports/util';
import { useRuleConditionFilters } from '@desktop-client/hooks/useRuleConditionFilters';
diff --git a/packages/desktop-client/src/components/formula/codeMirror-excelLanguage.tsx b/packages/desktop-client/src/components/formula/codeMirror-excelLanguage.tsx
index 951f641e96..126433dcdc 100644
--- a/packages/desktop-client/src/components/formula/codeMirror-excelLanguage.tsx
+++ b/packages/desktop-client/src/components/formula/codeMirror-excelLanguage.tsx
@@ -10,17 +10,17 @@ import {
type CompletionContext,
} from '@codemirror/autocomplete';
import {
- syntaxHighlighting,
HighlightStyle,
StreamLanguage,
+ syntaxHighlighting,
type StreamParser,
} from '@codemirror/language';
import { type Extension } from '@codemirror/state';
import {
- hoverTooltip,
- type Tooltip,
EditorView,
+ hoverTooltip,
tooltips,
+ type Tooltip,
} from '@codemirror/view';
import { tags } from '@lezer/highlight';
import { t } from 'i18next';
diff --git a/packages/desktop-client/src/components/manager/BudgetFileSelection.tsx b/packages/desktop-client/src/components/manager/BudgetFileSelection.tsx
index 10ba1d8836..f0ea4e0c48 100644
--- a/packages/desktop-client/src/components/manager/BudgetFileSelection.tsx
+++ b/packages/desktop-client/src/components/manager/BudgetFileSelection.tsx
@@ -1,10 +1,10 @@
import React, {
- useState,
- useRef,
- useEffect,
- type CSSProperties,
useCallback,
+ useEffect,
+ useRef,
+ useState,
type ComponentPropsWithoutRef,
+ type CSSProperties,
} from 'react';
import { GridList, GridListItem } from 'react-aria-components';
import { Trans, useTranslation } from 'react-i18next';
@@ -41,9 +41,9 @@ import {
isNonProductionEnvironment,
} from 'loot-core/shared/environment';
import {
- type RemoteFile,
type File,
type LocalFile,
+ type RemoteFile,
type SyncableLocalFile,
type SyncedLocalFile,
} from 'loot-core/types/file';
@@ -61,7 +61,7 @@ import { useInitialMount } from '@desktop-client/hooks/useInitialMount';
import { useMetadataPref } from '@desktop-client/hooks/useMetadataPref';
import { useSyncServerStatus } from '@desktop-client/hooks/useSyncServerStatus';
import { pushModal } from '@desktop-client/modals/modalsSlice';
-import { useSelector, useDispatch } from '@desktop-client/redux';
+import { useDispatch, useSelector } from '@desktop-client/redux';
import { getUserData } from '@desktop-client/users/usersSlice';
function getFileDescription(file: File, t: (key: string) => string) {
diff --git a/packages/desktop-client/src/components/manager/ConfigServer.tsx b/packages/desktop-client/src/components/manager/ConfigServer.tsx
index c189b95137..e4b7e107c1 100644
--- a/packages/desktop-client/src/components/manager/ConfigServer.tsx
+++ b/packages/desktop-client/src/components/manager/ConfigServer.tsx
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import React, { useState, useEffect, useCallback } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { Button, ButtonWithLoading } from '@actual-app/components/button';
@@ -11,8 +11,8 @@ import { View } from '@actual-app/components/view';
import { css } from '@emotion/css';
import {
- isNonProductionEnvironment,
isElectron,
+ isNonProductionEnvironment,
} from 'loot-core/shared/environment';
import { Title } from './subscribe/common';
diff --git a/packages/desktop-client/src/components/manager/ManagementApp.tsx b/packages/desktop-client/src/components/manager/ManagementApp.tsx
index fa1e314018..b75585d705 100644
--- a/packages/desktop-client/src/components/manager/ManagementApp.tsx
+++ b/packages/desktop-client/src/components/manager/ManagementApp.tsx
@@ -33,7 +33,7 @@ import {
useServerVersion,
} from '@desktop-client/components/ServerContext';
import { useMetaThemeColor } from '@desktop-client/hooks/useMetaThemeColor';
-import { useSelector, useDispatch } from '@desktop-client/redux';
+import { useDispatch, useSelector } from '@desktop-client/redux';
import { loggedIn } from '@desktop-client/users/usersSlice';
function Version() {
diff --git a/packages/desktop-client/src/components/manager/subscribe/Bootstrap.tsx b/packages/desktop-client/src/components/manager/subscribe/Bootstrap.tsx
index 6d1bb27bcc..31a0a82e93 100644
--- a/packages/desktop-client/src/components/manager/subscribe/Bootstrap.tsx
+++ b/packages/desktop-client/src/components/manager/subscribe/Bootstrap.tsx
@@ -10,7 +10,7 @@ import { View } from '@actual-app/components/view';
import { send } from 'loot-core/platform/client/fetch';
-import { useBootstrapped, Title } from './common';
+import { Title, useBootstrapped } from './common';
import { ConfirmPasswordForm } from './ConfirmPasswordForm';
import { createBudget } from '@desktop-client/budgetfiles/budgetfilesSlice';
diff --git a/packages/desktop-client/src/components/manager/subscribe/ConfirmPasswordForm.tsx b/packages/desktop-client/src/components/manager/subscribe/ConfirmPasswordForm.tsx
index 6375034687..af21776792 100644
--- a/packages/desktop-client/src/components/manager/subscribe/ConfirmPasswordForm.tsx
+++ b/packages/desktop-client/src/components/manager/subscribe/ConfirmPasswordForm.tsx
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import React, { type ChangeEvent, type ReactNode, useState } from 'react';
+import React, { useState, type ChangeEvent, type ReactNode } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { ButtonWithLoading } from '@actual-app/components/button';
diff --git a/packages/desktop-client/src/components/manager/subscribe/Login.tsx b/packages/desktop-client/src/components/manager/subscribe/Login.tsx
index fb8414f58a..9bfffcaac9 100644
--- a/packages/desktop-client/src/components/manager/subscribe/Login.tsx
+++ b/packages/desktop-client/src/components/manager/subscribe/Login.tsx
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { useSearchParams } from 'react-router';
@@ -19,7 +19,7 @@ import { send } from 'loot-core/platform/client/fetch';
import { isElectron } from 'loot-core/shared/environment';
import { type OpenIdConfig } from 'loot-core/types/models';
-import { useBootstrapped, Title } from './common';
+import { Title, useBootstrapped } from './common';
import { OpenIdForm } from './OpenIdForm';
import { Link } from '@desktop-client/components/common/Link';
diff --git a/packages/desktop-client/src/components/manager/subscribe/OpenIdForm.tsx b/packages/desktop-client/src/components/manager/subscribe/OpenIdForm.tsx
index 2b828d0744..0966cf1168 100644
--- a/packages/desktop-client/src/components/manager/subscribe/OpenIdForm.tsx
+++ b/packages/desktop-client/src/components/manager/subscribe/OpenIdForm.tsx
@@ -1,4 +1,4 @@
-import { type ReactNode, useEffect, useState } from 'react';
+import { useEffect, useState, type ReactNode } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { useLocation, type Location } from 'react-router';
diff --git a/packages/desktop-client/src/components/mobile/ActionableGridListItem.tsx b/packages/desktop-client/src/components/mobile/ActionableGridListItem.tsx
index e1f8b2c688..5b995670a5 100644
--- a/packages/desktop-client/src/components/mobile/ActionableGridListItem.tsx
+++ b/packages/desktop-client/src/components/mobile/ActionableGridListItem.tsx
@@ -1,6 +1,6 @@
-import React, { type ReactNode, useRef, useState } from 'react';
+import React, { useRef, useState, type ReactNode } from 'react';
import { GridListItem, type GridListItemProps } from 'react-aria-components';
-import { useSpring, animated, config } from 'react-spring';
+import { animated, config, useSpring } from 'react-spring';
import { styles } from '@actual-app/components/styles';
import { theme } from '@actual-app/components/theme';
diff --git a/packages/desktop-client/src/components/mobile/FloatingActionBar.tsx b/packages/desktop-client/src/components/mobile/FloatingActionBar.tsx
index a9d9ed6e7b..7f4fa1c107 100644
--- a/packages/desktop-client/src/components/mobile/FloatingActionBar.tsx
+++ b/packages/desktop-client/src/components/mobile/FloatingActionBar.tsx
@@ -1,4 +1,4 @@
-import { type PropsWithChildren, type CSSProperties } from 'react';
+import { type CSSProperties, type PropsWithChildren } from 'react';
import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';
diff --git a/packages/desktop-client/src/components/mobile/MobileForms.tsx b/packages/desktop-client/src/components/mobile/MobileForms.tsx
index 3a5328be48..ceb5869bd4 100644
--- a/packages/desktop-client/src/components/mobile/MobileForms.tsx
+++ b/packages/desktop-client/src/components/mobile/MobileForms.tsx
@@ -1,8 +1,8 @@
import React, {
type ComponentPropsWithoutRef,
type ComponentPropsWithRef,
- type ReactNode,
type CSSProperties,
+ type ReactNode,
} from 'react';
import { Button } from '@actual-app/components/button';
diff --git a/packages/desktop-client/src/components/mobile/MobileNavTabs.tsx b/packages/desktop-client/src/components/mobile/MobileNavTabs.tsx
index 56ce3066e9..4da730b127 100644
--- a/packages/desktop-client/src/components/mobile/MobileNavTabs.tsx
+++ b/packages/desktop-client/src/components/mobile/MobileNavTabs.tsx
@@ -1,13 +1,13 @@
import React, {
+ useCallback,
+ useState,
type ComponentProps,
type ComponentType,
type CSSProperties,
- useCallback,
- useState,
} from 'react';
import { useTranslation } from 'react-i18next';
import { NavLink } from 'react-router';
-import { useSpring, animated, config } from 'react-spring';
+import { animated, config, useSpring } from 'react-spring';
import { useResponsive } from '@actual-app/components/hooks/useResponsive';
import {
diff --git a/packages/desktop-client/src/components/mobile/accounts/AccountPage.tsx b/packages/desktop-client/src/components/mobile/accounts/AccountPage.tsx
index 9856e4a811..94c2d53e81 100644
--- a/packages/desktop-client/src/components/mobile/accounts/AccountPage.tsx
+++ b/packages/desktop-client/src/components/mobile/accounts/AccountPage.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
import { useParams } from 'react-router';
import { Button } from '@actual-app/components/button';
-import { type CSSProperties, styles } from '@actual-app/components/styles';
+import { styles, type CSSProperties } 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';
diff --git a/packages/desktop-client/src/components/mobile/accounts/AccountTransactions.tsx b/packages/desktop-client/src/components/mobile/accounts/AccountTransactions.tsx
index 9c2fc559e9..b8852d9d23 100644
--- a/packages/desktop-client/src/components/mobile/accounts/AccountTransactions.tsx
+++ b/packages/desktop-client/src/components/mobile/accounts/AccountTransactions.tsx
@@ -21,8 +21,8 @@ import { getSchedulesQuery } from '@desktop-client/hooks/useSchedules';
import { useSheetValue } from '@desktop-client/hooks/useSheetValue';
import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
import {
- useTransactions,
calculateRunningBalancesTopDown,
+ useTransactions,
} from '@desktop-client/hooks/useTransactions';
import { useTransactionsSearch } from '@desktop-client/hooks/useTransactionsSearch';
import { collapseModals, pushModal } from '@desktop-client/modals/modalsSlice';
diff --git a/packages/desktop-client/src/components/mobile/accounts/AccountsPage.tsx b/packages/desktop-client/src/components/mobile/accounts/AccountsPage.tsx
index 04651e1fb7..769fc7ba91 100644
--- a/packages/desktop-client/src/components/mobile/accounts/AccountsPage.tsx
+++ b/packages/desktop-client/src/components/mobile/accounts/AccountsPage.tsx
@@ -1,9 +1,9 @@
import React, {
forwardRef,
- type ComponentPropsWithoutRef,
- type CSSProperties,
useCallback,
useRef,
+ type ComponentPropsWithoutRef,
+ type CSSProperties,
} from 'react';
import { type DragItem } from 'react-aria';
import {
@@ -12,13 +12,13 @@ import {
ListBoxItem,
useDragAndDrop,
} from 'react-aria-components';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
import {
SvgAdd,
- SvgCheveronRight,
SvgCheveronDown,
+ SvgCheveronRight,
} from '@actual-app/components/icons/v1';
import { styles } from '@actual-app/components/styles';
import { Text } from '@actual-app/components/text';
diff --git a/packages/desktop-client/src/components/mobile/banksync/MobileBankSyncAccountEditPage.tsx b/packages/desktop-client/src/components/mobile/banksync/MobileBankSyncAccountEditPage.tsx
index 7df58c19eb..fcb16bf112 100644
--- a/packages/desktop-client/src/components/mobile/banksync/MobileBankSyncAccountEditPage.tsx
+++ b/packages/desktop-client/src/components/mobile/banksync/MobileBankSyncAccountEditPage.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { useParams } from 'react-router';
import { Button } from '@actual-app/components/button';
diff --git a/packages/desktop-client/src/components/mobile/banksync/MobileBankSyncPage.tsx b/packages/desktop-client/src/components/mobile/banksync/MobileBankSyncPage.tsx
index cfa30bde44..0197a297f6 100644
--- a/packages/desktop-client/src/components/mobile/banksync/MobileBankSyncPage.tsx
+++ b/packages/desktop-client/src/components/mobile/banksync/MobileBankSyncPage.tsx
@@ -1,4 +1,4 @@
-import { useMemo, useState, useCallback } from 'react';
+import { useCallback, useMemo, useState } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { styles } from '@actual-app/components/styles';
@@ -7,8 +7,8 @@ import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';
import {
- type BankSyncProviders,
type AccountEntity,
+ type BankSyncProviders,
} from 'loot-core/types/models';
import { BankSyncAccountsList } from './BankSyncAccountsList';
diff --git a/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryList.tsx b/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryList.tsx
index 5d24d66738..a330587894 100644
--- a/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryList.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryList.tsx
@@ -6,8 +6,8 @@ import { theme } from '@actual-app/components/theme';
import { css } from '@emotion/css';
import {
- type CategoryGroupEntity,
type CategoryEntity,
+ type CategoryGroupEntity,
} from 'loot-core/types/models';
import { ExpenseCategoryListItem } from './ExpenseCategoryListItem';
diff --git a/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx b/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx
index 96edbb151f..7680bf24b3 100644
--- a/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx
@@ -1,4 +1,4 @@
-import { type ComponentPropsWithoutRef, useCallback } from 'react';
+import { useCallback, type ComponentPropsWithoutRef } from 'react';
import { GridListItem } from 'react-aria-components';
import { useTranslation } from 'react-i18next';
diff --git a/packages/desktop-client/src/components/mobile/budget/ExpenseGroupListItem.tsx b/packages/desktop-client/src/components/mobile/budget/ExpenseGroupListItem.tsx
index 6df907f08b..d5d8a65060 100644
--- a/packages/desktop-client/src/components/mobile/budget/ExpenseGroupListItem.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/ExpenseGroupListItem.tsx
@@ -1,11 +1,11 @@
-import { type ComponentPropsWithoutRef, useCallback, useMemo } from 'react';
+import { useCallback, useMemo, type ComponentPropsWithoutRef } from 'react';
import { GridListItem } from 'react-aria-components';
import { Button } from '@actual-app/components/button';
import { Card } from '@actual-app/components/card';
import { SvgExpandArrow } from '@actual-app/components/icons/v0';
import { SvgCheveronRight } from '@actual-app/components/icons/v1';
-import { type CSSProperties, styles } from '@actual-app/components/styles';
+import { styles, type CSSProperties } 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';
diff --git a/packages/desktop-client/src/components/mobile/budget/IncomeGroup.tsx b/packages/desktop-client/src/components/mobile/budget/IncomeGroup.tsx
index 4598dd7e7b..5c6491a8d8 100644
--- a/packages/desktop-client/src/components/mobile/budget/IncomeGroup.tsx
+++ b/packages/desktop-client/src/components/mobile/budget/IncomeGroup.tsx
@@ -6,7 +6,7 @@ import { Card } from '@actual-app/components/card';
import { SvgExpandArrow } from '@actual-app/components/icons/v0';
import { SvgCheveronRight } from '@actual-app/components/icons/v1';
import { Label } from '@actual-app/components/label';
-import { type CSSProperties, styles } from '@actual-app/components/styles';
+import { styles, type CSSProperties } 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';
diff --git a/packages/desktop-client/src/components/mobile/payees/MobilePayeeEditPage.tsx b/packages/desktop-client/src/components/mobile/payees/MobilePayeeEditPage.tsx
index 3dd06f24f8..af60161640 100644
--- a/packages/desktop-client/src/components/mobile/payees/MobilePayeeEditPage.tsx
+++ b/packages/desktop-client/src/components/mobile/payees/MobilePayeeEditPage.tsx
@@ -1,5 +1,5 @@
-import React, { useEffect, useState, useCallback } from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import React, { useCallback, useEffect, useState } from 'react';
+import { Trans, useTranslation } from 'react-i18next';
import { useParams } from 'react-router';
import { Button } from '@actual-app/components/button';
diff --git a/packages/desktop-client/src/components/mobile/payees/PayeesList.tsx b/packages/desktop-client/src/components/mobile/payees/PayeesList.tsx
index bd48a02636..7503bf2c7d 100644
--- a/packages/desktop-client/src/components/mobile/payees/PayeesList.tsx
+++ b/packages/desktop-client/src/components/mobile/payees/PayeesList.tsx
@@ -1,4 +1,4 @@
-import { GridList, Virtualizer, ListLayout } from 'react-aria-components';
+import { GridList, ListLayout, Virtualizer } from 'react-aria-components';
import { Trans, useTranslation } from 'react-i18next';
import { AnimatedLoading } from '@actual-app/components/icons/AnimatedLoading';
diff --git a/packages/desktop-client/src/components/mobile/rules/MobileRuleEditPage.tsx b/packages/desktop-client/src/components/mobile/rules/MobileRuleEditPage.tsx
index c61794fe0b..95cf97eaf3 100644
--- a/packages/desktop-client/src/components/mobile/rules/MobileRuleEditPage.tsx
+++ b/packages/desktop-client/src/components/mobile/rules/MobileRuleEditPage.tsx
@@ -1,5 +1,5 @@
-import React, { useEffect, useState, useMemo } from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import React, { useEffect, useMemo, useState } from 'react';
+import { Trans, useTranslation } from 'react-i18next';
import { useLocation, useParams } from 'react-router';
import { Text } from '@actual-app/components/text';
@@ -8,7 +8,7 @@ import { View } from '@actual-app/components/view';
import { send } from 'loot-core/platform/client/fetch';
import { q } from 'loot-core/shared/query';
-import { type RuleEntity, type NewRuleEntity } from 'loot-core/types/models';
+import { type NewRuleEntity, type RuleEntity } from 'loot-core/types/models';
import { MobileBackButton } from '@desktop-client/components/mobile/MobileBackButton';
import { MobilePageHeader, Page } from '@desktop-client/components/Page';
diff --git a/packages/desktop-client/src/components/mobile/rules/MobileRulesPage.tsx b/packages/desktop-client/src/components/mobile/rules/MobileRulesPage.tsx
index 6c6b012ec2..3031186205 100644
--- a/packages/desktop-client/src/components/mobile/rules/MobileRulesPage.tsx
+++ b/packages/desktop-client/src/components/mobile/rules/MobileRulesPage.tsx
@@ -1,11 +1,11 @@
-import React, { useState, useEffect, useCallback, useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { styles } from '@actual-app/components/styles';
import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';
-import { send, listen } from 'loot-core/platform/client/fetch';
+import { listen, send } from 'loot-core/platform/client/fetch';
import * as undo from 'loot-core/platform/client/undo';
import { getNormalisedString } from 'loot-core/shared/normalisation';
import { q } from 'loot-core/shared/query';
diff --git a/packages/desktop-client/src/components/mobile/rules/RulesList.tsx b/packages/desktop-client/src/components/mobile/rules/RulesList.tsx
index c9d496530b..29afc92fd7 100644
--- a/packages/desktop-client/src/components/mobile/rules/RulesList.tsx
+++ b/packages/desktop-client/src/components/mobile/rules/RulesList.tsx
@@ -1,4 +1,4 @@
-import { Virtualizer, GridList, ListLayout } from 'react-aria-components';
+import { GridList, ListLayout, Virtualizer } from 'react-aria-components';
import { useTranslation } from 'react-i18next';
import { AnimatedLoading } from '@actual-app/components/icons/AnimatedLoading';
diff --git a/packages/desktop-client/src/components/mobile/schedules/MobileScheduleEditPage.tsx b/packages/desktop-client/src/components/mobile/schedules/MobileScheduleEditPage.tsx
index e29d8a517b..10c0e6b3c9 100644
--- a/packages/desktop-client/src/components/mobile/schedules/MobileScheduleEditPage.tsx
+++ b/packages/desktop-client/src/components/mobile/schedules/MobileScheduleEditPage.tsx
@@ -1,6 +1,6 @@
// @ts-strict-ignore
import React from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { useParams } from 'react-router';
import { Button } from '@actual-app/components/button';
diff --git a/packages/desktop-client/src/components/mobile/schedules/MobileSchedulesPage.tsx b/packages/desktop-client/src/components/mobile/schedules/MobileSchedulesPage.tsx
index b141ecff14..4d1fd46111 100644
--- a/packages/desktop-client/src/components/mobile/schedules/MobileSchedulesPage.tsx
+++ b/packages/desktop-client/src/components/mobile/schedules/MobileSchedulesPage.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useCallback, useMemo } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
diff --git a/packages/desktop-client/src/components/mobile/schedules/SchedulesList.tsx b/packages/desktop-client/src/components/mobile/schedules/SchedulesList.tsx
index 7294023241..d29f4e9f7f 100644
--- a/packages/desktop-client/src/components/mobile/schedules/SchedulesList.tsx
+++ b/packages/desktop-client/src/components/mobile/schedules/SchedulesList.tsx
@@ -1,4 +1,4 @@
-import { Virtualizer, GridList, ListLayout } from 'react-aria-components';
+import { GridList, ListLayout, Virtualizer } from 'react-aria-components';
import { useTranslation } from 'react-i18next';
import { AnimatedLoading } from '@actual-app/components/icons/AnimatedLoading';
diff --git a/packages/desktop-client/src/components/mobile/transactions/FocusableAmountInput.tsx b/packages/desktop-client/src/components/mobile/transactions/FocusableAmountInput.tsx
index 85f043314e..71eff29fe3 100644
--- a/packages/desktop-client/src/components/mobile/transactions/FocusableAmountInput.tsx
+++ b/packages/desktop-client/src/components/mobile/transactions/FocusableAmountInput.tsx
@@ -1,12 +1,12 @@
import React, {
- type Ref,
- type ComponentPropsWithRef,
- type HTMLProps,
memo,
useEffect,
useRef,
useState,
+ type ComponentPropsWithRef,
type CSSProperties,
+ type HTMLProps,
+ type Ref,
} from 'react';
import { Button } from '@actual-app/components/button';
diff --git a/packages/desktop-client/src/components/mobile/transactions/TransactionList.tsx b/packages/desktop-client/src/components/mobile/transactions/TransactionList.tsx
index 4f3310c645..ba7b6ac3a3 100644
--- a/packages/desktop-client/src/components/mobile/transactions/TransactionList.tsx
+++ b/packages/desktop-client/src/components/mobile/transactions/TransactionList.tsx
@@ -7,12 +7,12 @@ import React, {
type CSSProperties,
} from 'react';
import {
+ Collection,
+ Header,
ListBox,
ListBoxSection,
- Header,
- Collection,
- Virtualizer,
ListLayout,
+ Virtualizer,
} from 'react-aria-components';
import { Trans, useTranslation } from 'react-i18next';
@@ -36,8 +36,8 @@ import { isPreviewId } from 'loot-core/shared/transactions';
import { validForTransfer } from 'loot-core/shared/transfer';
import {
groupById,
- type IntegerAmount,
integerToCurrency,
+ type IntegerAmount,
} from 'loot-core/shared/util';
import { type TransactionEntity } from 'loot-core/types/models';
diff --git a/packages/desktop-client/src/components/mobile/transactions/TransactionListItem.tsx b/packages/desktop-client/src/components/mobile/transactions/TransactionListItem.tsx
index 0ff4713202..0db20de0f1 100644
--- a/packages/desktop-client/src/components/mobile/transactions/TransactionListItem.tsx
+++ b/packages/desktop-client/src/components/mobile/transactions/TransactionListItem.tsx
@@ -1,6 +1,6 @@
import React, {
- type CSSProperties,
type ComponentPropsWithoutRef,
+ type CSSProperties,
} from 'react';
import { mergeProps } from 'react-aria';
import { ListBoxItem } from 'react-aria-components';
@@ -25,12 +25,12 @@ import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';
import {
PressResponder,
- usePress,
useLongPress,
+ usePress,
} from '@react-aria/interactions';
import { isPreviewId } from 'loot-core/shared/transactions';
-import { type IntegerAmount, integerToCurrency } from 'loot-core/shared/util';
+import { integerToCurrency, type IntegerAmount } from 'loot-core/shared/util';
import {
type AccountEntity,
type TransactionEntity,
diff --git a/packages/desktop-client/src/components/mobile/transactions/TransactionListWithBalances.tsx b/packages/desktop-client/src/components/mobile/transactions/TransactionListWithBalances.tsx
index 6ba38b7547..cf844c7aba 100644
--- a/packages/desktop-client/src/components/mobile/transactions/TransactionListWithBalances.tsx
+++ b/packages/desktop-client/src/components/mobile/transactions/TransactionListWithBalances.tsx
@@ -1,4 +1,4 @@
-import React, { type ComponentProps, useState } from 'react';
+import React, { useState, type ComponentProps } from 'react';
import { useTranslation } from 'react-i18next';
import { Label } from '@actual-app/components/label';
@@ -25,8 +25,8 @@ import {
import { useSheetValue } from '@desktop-client/hooks/useSheetValue';
import type {
Binding,
- SheetNames,
SheetFields,
+ SheetNames,
} from '@desktop-client/spreadsheet';
type TransactionSearchInputProps = {
diff --git a/packages/desktop-client/src/components/modals/AccountAutocompleteModal.tsx b/packages/desktop-client/src/components/modals/AccountAutocompleteModal.tsx
index fcba73712e..4075b011b3 100644
--- a/packages/desktop-client/src/components/modals/AccountAutocompleteModal.tsx
+++ b/packages/desktop-client/src/components/modals/AccountAutocompleteModal.tsx
@@ -7,10 +7,10 @@ import { View } from '@actual-app/components/view';
import { AccountAutocomplete } from '@desktop-client/components/autocomplete/AccountAutocomplete';
import {
- ModalCloseButton,
Modal,
- ModalTitle,
+ ModalCloseButton,
ModalHeader,
+ ModalTitle,
} from '@desktop-client/components/common/Modal';
import { SectionLabel } from '@desktop-client/components/forms';
import { type Modal as ModalType } from '@desktop-client/modals/modalsSlice';
diff --git a/packages/desktop-client/src/components/modals/AccountMenuModal.tsx b/packages/desktop-client/src/components/modals/AccountMenuModal.tsx
index ffcc783097..7c6f2c8fb7 100644
--- a/packages/desktop-client/src/components/modals/AccountMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/AccountMenuModal.tsx
@@ -1,9 +1,9 @@
import {
- type ComponentProps,
- type CSSProperties,
Fragment,
useRef,
useState,
+ type ComponentProps,
+ type CSSProperties,
} from 'react';
import { Trans, useTranslation } from 'react-i18next';
diff --git a/packages/desktop-client/src/components/modals/BudgetAutomationsModal.tsx b/packages/desktop-client/src/components/modals/BudgetAutomationsModal.tsx
index e924cf99cb..7e0098fe97 100644
--- a/packages/desktop-client/src/components/modals/BudgetAutomationsModal.tsx
+++ b/packages/desktop-client/src/components/modals/BudgetAutomationsModal.tsx
@@ -1,4 +1,4 @@
-import { type CSSProperties, useCallback, useMemo, useState } from 'react';
+import { useCallback, useMemo, useState, type CSSProperties } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
diff --git a/packages/desktop-client/src/components/modals/BudgetFileSelectionModal.tsx b/packages/desktop-client/src/components/modals/BudgetFileSelectionModal.tsx
index fab2789a21..45f7f37915 100644
--- a/packages/desktop-client/src/components/modals/BudgetFileSelectionModal.tsx
+++ b/packages/desktop-client/src/components/modals/BudgetFileSelectionModal.tsx
@@ -6,8 +6,8 @@ import { View } from '@actual-app/components/view';
import {
Modal,
- ModalHeader,
ModalCloseButton,
+ ModalHeader,
} from '@desktop-client/components/common/Modal';
import { BudgetFileSelection } from '@desktop-client/components/manager/BudgetFileSelection';
import { useMetadataPref } from '@desktop-client/hooks/useMetadataPref';
diff --git a/packages/desktop-client/src/components/modals/CategoryAutocompleteModal.tsx b/packages/desktop-client/src/components/modals/CategoryAutocompleteModal.tsx
index a718a737f9..06f6db4bab 100644
--- a/packages/desktop-client/src/components/modals/CategoryAutocompleteModal.tsx
+++ b/packages/desktop-client/src/components/modals/CategoryAutocompleteModal.tsx
@@ -9,10 +9,10 @@ import * as monthUtils from 'loot-core/shared/months';
import { CategoryAutocomplete } from '@desktop-client/components/autocomplete/CategoryAutocomplete';
import {
- ModalCloseButton,
Modal,
- ModalTitle,
+ ModalCloseButton,
ModalHeader,
+ ModalTitle,
} from '@desktop-client/components/common/Modal';
import { SectionLabel } from '@desktop-client/components/forms';
import { SheetNameProvider } from '@desktop-client/hooks/useSheetName';
diff --git a/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsx b/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsx
index 9316d5f319..17f7389a66 100644
--- a/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsx
@@ -1,14 +1,14 @@
// @ts-strict-ignore
-import React, { type ComponentProps, useRef, useState } from 'react';
+import React, { useRef, useState, type ComponentProps } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
import {
- SvgDotsHorizontalTriple,
SvgAdd,
- SvgTrash,
SvgCheveronDown,
SvgCheveronUp,
+ SvgDotsHorizontalTriple,
+ SvgTrash,
} from '@actual-app/components/icons/v1';
import {
SvgNotesPaper,
diff --git a/packages/desktop-client/src/components/modals/CloseAccountModal.tsx b/packages/desktop-client/src/components/modals/CloseAccountModal.tsx
index 5101d73940..b13ad631ef 100644
--- a/packages/desktop-client/src/components/modals/CloseAccountModal.tsx
+++ b/packages/desktop-client/src/components/modals/CloseAccountModal.tsx
@@ -1,7 +1,7 @@
// @ts-strict-ignore
-import React, { type FormEvent, useState, type CSSProperties } from 'react';
+import React, { useState, type CSSProperties, type FormEvent } from 'react';
import { Form } from 'react-aria-components';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
import { FormError } from '@actual-app/components/form-error';
@@ -28,8 +28,8 @@ import {
import { useAccounts } from '@desktop-client/hooks/useAccounts';
import { useCategories } from '@desktop-client/hooks/useCategories';
import {
- type Modal as ModalType,
pushModal,
+ type Modal as ModalType,
} from '@desktop-client/modals/modalsSlice';
import { useDispatch } from '@desktop-client/redux';
diff --git a/packages/desktop-client/src/components/modals/ConfirmTransactionEditModal.tsx b/packages/desktop-client/src/components/modals/ConfirmTransactionEditModal.tsx
index 1b4b5a7f6e..d80b5c6664 100644
--- a/packages/desktop-client/src/components/modals/ConfirmTransactionEditModal.tsx
+++ b/packages/desktop-client/src/components/modals/ConfirmTransactionEditModal.tsx
@@ -1,6 +1,6 @@
// @ts-strict-ignore
import React from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { Block } from '@actual-app/components/block';
import { Button } from '@actual-app/components/button';
diff --git a/packages/desktop-client/src/components/modals/ConvertToScheduleModal.tsx b/packages/desktop-client/src/components/modals/ConvertToScheduleModal.tsx
index 183f5215d9..ab711dbdca 100644
--- a/packages/desktop-client/src/components/modals/ConvertToScheduleModal.tsx
+++ b/packages/desktop-client/src/components/modals/ConvertToScheduleModal.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { Block } from '@actual-app/components/block';
import { Button } from '@actual-app/components/button';
diff --git a/packages/desktop-client/src/components/modals/CoverModal.tsx b/packages/desktop-client/src/components/modals/CoverModal.tsx
index a8899d127e..739f6036a7 100644
--- a/packages/desktop-client/src/components/modals/CoverModal.tsx
+++ b/packages/desktop-client/src/components/modals/CoverModal.tsx
@@ -25,8 +25,8 @@ import { AmountInput } from '@desktop-client/components/util/AmountInput';
import { useCategories } from '@desktop-client/hooks/useCategories';
import { useInitialMount } from '@desktop-client/hooks/useInitialMount';
import {
- type Modal as ModalType,
pushModal,
+ type Modal as ModalType,
} from '@desktop-client/modals/modalsSlice';
import { useDispatch } from '@desktop-client/redux';
diff --git a/packages/desktop-client/src/components/modals/CreateAccountModal.tsx b/packages/desktop-client/src/components/modals/CreateAccountModal.tsx
index defa805ed4..094a6f972b 100644
--- a/packages/desktop-client/src/components/modals/CreateAccountModal.tsx
+++ b/packages/desktop-client/src/components/modals/CreateAccountModal.tsx
@@ -30,8 +30,8 @@ import { usePluggyAiStatus } from '@desktop-client/hooks/usePluggyAiStatus';
import { useSimpleFinStatus } from '@desktop-client/hooks/useSimpleFinStatus';
import { useSyncServerStatus } from '@desktop-client/hooks/useSyncServerStatus';
import {
- type Modal as ModalType,
pushModal,
+ type Modal as ModalType,
} from '@desktop-client/modals/modalsSlice';
import { addNotification } from '@desktop-client/notifications/notificationsSlice';
import { useDispatch } from '@desktop-client/redux';
diff --git a/packages/desktop-client/src/components/modals/CreateEncryptionKeyModal.tsx b/packages/desktop-client/src/components/modals/CreateEncryptionKeyModal.tsx
index 078f8e6e97..5b30577999 100644
--- a/packages/desktop-client/src/components/modals/CreateEncryptionKeyModal.tsx
+++ b/packages/desktop-client/src/components/modals/CreateEncryptionKeyModal.tsx
@@ -1,7 +1,7 @@
// @ts-strict-ignore
import React, { useState } from 'react';
import { Form } from 'react-aria-components';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { ButtonWithLoading } from '@actual-app/components/button';
import { useResponsive } from '@actual-app/components/hooks/useResponsive';
diff --git a/packages/desktop-client/src/components/modals/CreateLocalAccountModal.tsx b/packages/desktop-client/src/components/modals/CreateLocalAccountModal.tsx
index 75cc299a30..513f8f1732 100644
--- a/packages/desktop-client/src/components/modals/CreateLocalAccountModal.tsx
+++ b/packages/desktop-client/src/components/modals/CreateLocalAccountModal.tsx
@@ -1,7 +1,7 @@
// @ts-strict-ignore
-import { type FormEvent, useState } from 'react';
+import { useState, type FormEvent } from 'react';
import { Form } from 'react-aria-components';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
import { FormError } from '@actual-app/components/form-error';
diff --git a/packages/desktop-client/src/components/modals/EditAccess.tsx b/packages/desktop-client/src/components/modals/EditAccess.tsx
index e65f834a21..0596e09e1e 100644
--- a/packages/desktop-client/src/components/modals/EditAccess.tsx
+++ b/packages/desktop-client/src/components/modals/EditAccess.tsx
@@ -19,8 +19,8 @@ import {
} from '@desktop-client/components/common/Modal';
import { FormField, FormLabel } from '@desktop-client/components/forms';
import {
- type Modal as ModalType,
popModal,
+ type Modal as ModalType,
} from '@desktop-client/modals/modalsSlice';
import { addNotification } from '@desktop-client/notifications/notificationsSlice';
import { useDispatch } from '@desktop-client/redux';
diff --git a/packages/desktop-client/src/components/modals/EditFieldModal.tsx b/packages/desktop-client/src/components/modals/EditFieldModal.tsx
index 8b84f55f0a..adfce8ebc3 100644
--- a/packages/desktop-client/src/components/modals/EditFieldModal.tsx
+++ b/packages/desktop-client/src/components/modals/EditFieldModal.tsx
@@ -1,4 +1,4 @@
-import { type CSSProperties, type ReactNode, useRef, useState } from 'react';
+import { useRef, useState, type CSSProperties, type ReactNode } from 'react';
import { useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
diff --git a/packages/desktop-client/src/components/modals/EditRuleModal.tsx b/packages/desktop-client/src/components/modals/EditRuleModal.tsx
index 8b1629e091..787dbc9852 100644
--- a/packages/desktop-client/src/components/modals/EditRuleModal.tsx
+++ b/packages/desktop-client/src/components/modals/EditRuleModal.tsx
@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
import { theme } from '@actual-app/components/theme';
-import type { RuleEntity, NewRuleEntity } from 'loot-core/types/models';
+import type { NewRuleEntity, RuleEntity } from 'loot-core/types/models';
import {
Modal,
diff --git a/packages/desktop-client/src/components/modals/EditUser.tsx b/packages/desktop-client/src/components/modals/EditUser.tsx
index c15ae4c9ea..2cae8f9665 100644
--- a/packages/desktop-client/src/components/modals/EditUser.tsx
+++ b/packages/desktop-client/src/components/modals/EditUser.tsx
@@ -25,8 +25,8 @@ import {
FormLabel,
} from '@desktop-client/components/forms';
import {
- type Modal as ModalType,
popModal,
+ type Modal as ModalType,
} from '@desktop-client/modals/modalsSlice';
import { addNotification } from '@desktop-client/notifications/notificationsSlice';
import { useDispatch } from '@desktop-client/redux';
diff --git a/packages/desktop-client/src/components/modals/EnvelopeBudgetMenuModal.tsx b/packages/desktop-client/src/components/modals/EnvelopeBudgetMenuModal.tsx
index acbb356f5a..d0b2db4c33 100644
--- a/packages/desktop-client/src/components/modals/EnvelopeBudgetMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/EnvelopeBudgetMenuModal.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, type CSSProperties } from 'react';
+import React, { useEffect, useState, type CSSProperties } from 'react';
import { Trans } from 'react-i18next';
import { styles } from '@actual-app/components/styles';
diff --git a/packages/desktop-client/src/components/modals/EnvelopeBudgetSummaryModal.tsx b/packages/desktop-client/src/components/modals/EnvelopeBudgetSummaryModal.tsx
index 333b89f4b8..4fa2daf7d2 100644
--- a/packages/desktop-client/src/components/modals/EnvelopeBudgetSummaryModal.tsx
+++ b/packages/desktop-client/src/components/modals/EnvelopeBudgetSummaryModal.tsx
@@ -5,8 +5,8 @@ import { styles } from '@actual-app/components/styles';
import {
format as formatMonth,
- sheetForMonth,
prevMonth,
+ sheetForMonth,
} from 'loot-core/shared/months';
import { groupById } from 'loot-core/shared/util';
@@ -25,8 +25,8 @@ import { SheetNameProvider } from '@desktop-client/hooks/useSheetName';
import { useUndo } from '@desktop-client/hooks/useUndo';
import {
collapseModals,
- type Modal as ModalType,
pushModal,
+ type Modal as ModalType,
} from '@desktop-client/modals/modalsSlice';
import { useDispatch } from '@desktop-client/redux';
import { envelopeBudget } from '@desktop-client/spreadsheet/bindings';
diff --git a/packages/desktop-client/src/components/modals/GoCardlessExternalMsgModal.tsx b/packages/desktop-client/src/components/modals/GoCardlessExternalMsgModal.tsx
index 018b6a481c..8ef02844a9 100644
--- a/packages/desktop-client/src/components/modals/GoCardlessExternalMsgModal.tsx
+++ b/packages/desktop-client/src/components/modals/GoCardlessExternalMsgModal.tsx
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import React, { useEffect, useState, useRef } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
@@ -28,8 +28,8 @@ import { getCountryFromBrowser } from '@desktop-client/components/util/localeToC
import { useGlobalPref } from '@desktop-client/hooks/useGlobalPref';
import { useGoCardlessStatus } from '@desktop-client/hooks/useGoCardlessStatus';
import {
- type Modal as ModalType,
pushModal,
+ type Modal as ModalType,
} from '@desktop-client/modals/modalsSlice';
import { useDispatch } from '@desktop-client/redux';
diff --git a/packages/desktop-client/src/components/modals/GoCardlessInitialiseModal.tsx b/packages/desktop-client/src/components/modals/GoCardlessInitialiseModal.tsx
index 6e2f497874..83f8560cde 100644
--- a/packages/desktop-client/src/components/modals/GoCardlessInitialiseModal.tsx
+++ b/packages/desktop-client/src/components/modals/GoCardlessInitialiseModal.tsx
@@ -1,6 +1,6 @@
// @ts-strict-ignore
import React, { useState } from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { ButtonWithLoading } from '@actual-app/components/button';
import { InitialFocus } from '@actual-app/components/initial-focus';
diff --git a/packages/desktop-client/src/components/modals/GoalTemplateModal.tsx b/packages/desktop-client/src/components/modals/GoalTemplateModal.tsx
index 871a23eed9..84e95f7fdb 100644
--- a/packages/desktop-client/src/components/modals/GoalTemplateModal.tsx
+++ b/packages/desktop-client/src/components/modals/GoalTemplateModal.tsx
@@ -10,7 +10,7 @@ import {
ModalCloseButton,
ModalHeader,
} from '@desktop-client/components/common/Modal';
-import { TableHeader, Row, Field } from '@desktop-client/components/table';
+import { Field, Row, TableHeader } from '@desktop-client/components/table';
export function GoalTemplateModal() {
const { t } = useTranslation();
diff --git a/packages/desktop-client/src/components/modals/ImportTransactionsModal/DateFormatSelect.tsx b/packages/desktop-client/src/components/modals/ImportTransactionsModal/DateFormatSelect.tsx
index cc94fb2de2..1ac6c0e857 100644
--- a/packages/desktop-client/src/components/modals/ImportTransactionsModal/DateFormatSelect.tsx
+++ b/packages/desktop-client/src/components/modals/ImportTransactionsModal/DateFormatSelect.tsx
@@ -7,8 +7,8 @@ import { View } from '@actual-app/components/view';
import {
dateFormats,
type DateFormat,
- type ImportTransaction,
type FieldMapping,
+ type ImportTransaction,
} from './utils';
import { SectionLabel } from '@desktop-client/components/forms';
diff --git a/packages/desktop-client/src/components/modals/ImportTransactionsModal/ImportTransactionsModal.tsx b/packages/desktop-client/src/components/modals/ImportTransactionsModal/ImportTransactionsModal.tsx
index 5767179de7..a818347e7c 100644
--- a/packages/desktop-client/src/components/modals/ImportTransactionsModal/ImportTransactionsModal.tsx
+++ b/packages/desktop-client/src/components/modals/ImportTransactionsModal/ImportTransactionsModal.tsx
@@ -1,11 +1,11 @@
// @ts-strict-ignore
import React, {
- useState,
- useEffect,
useCallback,
+ useEffect,
+ useState,
type ComponentProps,
} from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { Button, ButtonWithLoading } from '@actual-app/components/button';
import { Input } from '@actual-app/components/input';
diff --git a/packages/desktop-client/src/components/modals/ImportTransactionsModal/Transaction.tsx b/packages/desktop-client/src/components/modals/ImportTransactionsModal/Transaction.tsx
index a8feda20db..283011c765 100644
--- a/packages/desktop-client/src/components/modals/ImportTransactionsModal/Transaction.tsx
+++ b/packages/desktop-client/src/components/modals/ImportTransactionsModal/Transaction.tsx
@@ -1,4 +1,4 @@
-import React, { type ComponentProps, useMemo } from 'react';
+import React, { useMemo, type ComponentProps } from 'react';
import { useTranslation } from 'react-i18next';
import { SvgDownAndRightArrow } from '@actual-app/components/icons/v2';
@@ -14,14 +14,14 @@ import { type CategoryEntity } from 'loot-core/types/models';
import { ParsedDate } from './ParsedDate';
import {
applyFieldMappings,
- type FieldMapping,
formatDate,
- type ImportTransaction,
parseAmountFields,
+ type FieldMapping,
+ type ImportTransaction,
} from './utils';
import { Checkbox } from '@desktop-client/components/forms';
-import { Row, Field } from '@desktop-client/components/table';
+import { Field, Row } from '@desktop-client/components/table';
type TransactionProps = {
transaction: ImportTransaction;
diff --git a/packages/desktop-client/src/components/modals/KeyboardShortcutModal.tsx b/packages/desktop-client/src/components/modals/KeyboardShortcutModal.tsx
index aa17121012..a78b25ff41 100644
--- a/packages/desktop-client/src/components/modals/KeyboardShortcutModal.tsx
+++ b/packages/desktop-client/src/components/modals/KeyboardShortcutModal.tsx
@@ -1,4 +1,4 @@
-import { useState, type CSSProperties, useMemo, type ReactNode } from 'react';
+import { useMemo, useState, type CSSProperties, type ReactNode } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
diff --git a/packages/desktop-client/src/components/modals/LoadBackupModal.tsx b/packages/desktop-client/src/components/modals/LoadBackupModal.tsx
index 65d7128f77..ad984067c8 100644
--- a/packages/desktop-client/src/components/modals/LoadBackupModal.tsx
+++ b/packages/desktop-client/src/components/modals/LoadBackupModal.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { Block } from '@actual-app/components/block';
@@ -7,7 +7,7 @@ import { Text } from '@actual-app/components/text';
import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';
-import { send, listen } from 'loot-core/platform/client/fetch';
+import { listen, send } from 'loot-core/platform/client/fetch';
import { type Backup } from 'loot-core/server/budgetfiles/backups';
import {
@@ -19,7 +19,7 @@ import {
ModalCloseButton,
ModalHeader,
} from '@desktop-client/components/common/Modal';
-import { Row, Cell } from '@desktop-client/components/table';
+import { Cell, Row } from '@desktop-client/components/table';
import { useMetadataPref } from '@desktop-client/hooks/useMetadataPref';
import { type Modal as ModalType } from '@desktop-client/modals/modalsSlice';
import { useDispatch } from '@desktop-client/redux';
diff --git a/packages/desktop-client/src/components/modals/MergeUnusedPayeesModal.tsx b/packages/desktop-client/src/components/modals/MergeUnusedPayeesModal.tsx
index ecbd8c8e7c..71d8d5f805 100644
--- a/packages/desktop-client/src/components/modals/MergeUnusedPayeesModal.tsx
+++ b/packages/desktop-client/src/components/modals/MergeUnusedPayeesModal.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useRef, useEffect, useCallback } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
@@ -15,10 +15,10 @@ import { Information } from '@desktop-client/components/alerts';
import { Modal, ModalButtons } from '@desktop-client/components/common/Modal';
import { usePayees } from '@desktop-client/hooks/usePayees';
import {
- type Modal as ModalType,
replaceModal,
+ type Modal as ModalType,
} from '@desktop-client/modals/modalsSlice';
-import { useSelector, useDispatch } from '@desktop-client/redux';
+import { useDispatch, useSelector } from '@desktop-client/redux';
const highlightStyle = { color: theme.pageTextPositive };
diff --git a/packages/desktop-client/src/components/modals/OpenIDEnableModal.tsx b/packages/desktop-client/src/components/modals/OpenIDEnableModal.tsx
index 6df2d115de..4409b8e0f3 100644
--- a/packages/desktop-client/src/components/modals/OpenIDEnableModal.tsx
+++ b/packages/desktop-client/src/components/modals/OpenIDEnableModal.tsx
@@ -22,8 +22,8 @@ import {
import { OpenIdForm } from '@desktop-client/components/manager/subscribe/OpenIdForm';
import { useRefreshLoginMethods } from '@desktop-client/components/ServerContext';
import {
- type Modal as ModalType,
popModal,
+ type Modal as ModalType,
} from '@desktop-client/modals/modalsSlice';
import { useDispatch } from '@desktop-client/redux';
diff --git a/packages/desktop-client/src/components/modals/PasswordEnableModal.tsx b/packages/desktop-client/src/components/modals/PasswordEnableModal.tsx
index 2ab1e49ac6..6b2fd1b148 100644
--- a/packages/desktop-client/src/components/modals/PasswordEnableModal.tsx
+++ b/packages/desktop-client/src/components/modals/PasswordEnableModal.tsx
@@ -28,8 +28,8 @@ import {
useRefreshLoginMethods,
} from '@desktop-client/components/ServerContext';
import {
- type Modal as ModalType,
popModal,
+ type Modal as ModalType,
} from '@desktop-client/modals/modalsSlice';
import { useDispatch } from '@desktop-client/redux';
diff --git a/packages/desktop-client/src/components/modals/PayeeAutocompleteModal.tsx b/packages/desktop-client/src/components/modals/PayeeAutocompleteModal.tsx
index 3a50b5b466..a40a6df216 100644
--- a/packages/desktop-client/src/components/modals/PayeeAutocompleteModal.tsx
+++ b/packages/desktop-client/src/components/modals/PayeeAutocompleteModal.tsx
@@ -6,10 +6,10 @@ import { theme } from '@actual-app/components/theme';
import { PayeeAutocomplete } from '@desktop-client/components/autocomplete/PayeeAutocomplete';
import {
- ModalCloseButton,
Modal,
- ModalTitle,
+ ModalCloseButton,
ModalHeader,
+ ModalTitle,
} from '@desktop-client/components/common/Modal';
import { useAccounts } from '@desktop-client/hooks/useAccounts';
import { useNavigate } from '@desktop-client/hooks/useNavigate';
diff --git a/packages/desktop-client/src/components/modals/ScheduledTransactionMenuModal.tsx b/packages/desktop-client/src/components/modals/ScheduledTransactionMenuModal.tsx
index 1bd0350bc4..d155a4c8ba 100644
--- a/packages/desktop-client/src/components/modals/ScheduledTransactionMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/ScheduledTransactionMenuModal.tsx
@@ -14,8 +14,8 @@ import { View } from '@actual-app/components/view';
import { format } from 'loot-core/shared/months';
import { q } from 'loot-core/shared/query';
import {
- scheduleIsRecurring,
extractScheduleConds,
+ scheduleIsRecurring,
} from 'loot-core/shared/schedules';
import {
diff --git a/packages/desktop-client/src/components/modals/SelectLinkedAccountsModal.tsx b/packages/desktop-client/src/components/modals/SelectLinkedAccountsModal.tsx
index b02b2184d2..cf2f2861e0 100644
--- a/packages/desktop-client/src/components/modals/SelectLinkedAccountsModal.tsx
+++ b/packages/desktop-client/src/components/modals/SelectLinkedAccountsModal.tsx
@@ -1,5 +1,5 @@
import React, { useMemo, useState } from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
import { useResponsive } from '@actual-app/components/hooks/useResponsive';
@@ -33,11 +33,11 @@ import {
} from '@desktop-client/components/common/Modal';
import { PrivacyFilter } from '@desktop-client/components/PrivacyFilter';
import {
- TableHeader,
- Table,
- Row,
- Field,
Cell,
+ Field,
+ Row,
+ Table,
+ TableHeader,
} from '@desktop-client/components/table';
import { useAccounts } from '@desktop-client/hooks/useAccounts';
import { useFormat } from '@desktop-client/hooks/useFormat';
diff --git a/packages/desktop-client/src/components/modals/SimpleFinInitialiseModal.tsx b/packages/desktop-client/src/components/modals/SimpleFinInitialiseModal.tsx
index 241dd40ba1..eb96af28d9 100644
--- a/packages/desktop-client/src/components/modals/SimpleFinInitialiseModal.tsx
+++ b/packages/desktop-client/src/components/modals/SimpleFinInitialiseModal.tsx
@@ -1,6 +1,6 @@
// @ts-strict-ignore
import React, { useState } from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { ButtonWithLoading } from '@actual-app/components/button';
import { Input } from '@actual-app/components/input';
diff --git a/packages/desktop-client/src/components/modals/SingleInputModal.tsx b/packages/desktop-client/src/components/modals/SingleInputModal.tsx
index 87f26eb41a..a1510b2534 100644
--- a/packages/desktop-client/src/components/modals/SingleInputModal.tsx
+++ b/packages/desktop-client/src/components/modals/SingleInputModal.tsx
@@ -1,8 +1,8 @@
// @ts-strict-ignore
import React, {
useState,
- type ComponentType,
type ComponentPropsWithoutRef,
+ type ComponentType,
type FormEvent,
} from 'react';
import { Form } from 'react-aria-components';
diff --git a/packages/desktop-client/src/components/modals/TrackingBudgetMenuModal.tsx b/packages/desktop-client/src/components/modals/TrackingBudgetMenuModal.tsx
index 2475ef2bd6..9a51b913a1 100644
--- a/packages/desktop-client/src/components/modals/TrackingBudgetMenuModal.tsx
+++ b/packages/desktop-client/src/components/modals/TrackingBudgetMenuModal.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, type CSSProperties } from 'react';
+import React, { useEffect, useState, type CSSProperties } from 'react';
import { Trans } from 'react-i18next';
import { styles } from '@actual-app/components/styles';
diff --git a/packages/desktop-client/src/components/modals/TransferModal.tsx b/packages/desktop-client/src/components/modals/TransferModal.tsx
index 2a45d3c3b6..e625024640 100644
--- a/packages/desktop-client/src/components/modals/TransferModal.tsx
+++ b/packages/desktop-client/src/components/modals/TransferModal.tsx
@@ -24,8 +24,8 @@ import {
import { AmountInput } from '@desktop-client/components/util/AmountInput';
import { useCategories } from '@desktop-client/hooks/useCategories';
import {
- type Modal as ModalType,
pushModal,
+ type Modal as ModalType,
} from '@desktop-client/modals/modalsSlice';
import { useDispatch } from '@desktop-client/redux';
diff --git a/packages/desktop-client/src/components/modals/TransferOwnership.tsx b/packages/desktop-client/src/components/modals/TransferOwnership.tsx
index 4ffecdbe0e..6fe6da8d79 100644
--- a/packages/desktop-client/src/components/modals/TransferOwnership.tsx
+++ b/packages/desktop-client/src/components/modals/TransferOwnership.tsx
@@ -24,8 +24,8 @@ import {
import { FormField, FormLabel } from '@desktop-client/components/forms';
import { useMetadataPref } from '@desktop-client/hooks/useMetadataPref';
import {
- type Modal as ModalType,
popModal,
+ type Modal as ModalType,
} from '@desktop-client/modals/modalsSlice';
import { addNotification } from '@desktop-client/notifications/notificationsSlice';
import { useDispatch, useSelector } from '@desktop-client/redux';
diff --git a/packages/desktop-client/src/components/payees/ManagePayees.tsx b/packages/desktop-client/src/components/payees/ManagePayees.tsx
index b85c9d046b..a9fa48deb7 100644
--- a/packages/desktop-client/src/components/payees/ManagePayees.tsx
+++ b/packages/desktop-client/src/components/payees/ManagePayees.tsx
@@ -1,8 +1,8 @@
import {
- useState,
- useRef,
- useMemo,
useCallback,
+ useMemo,
+ useRef,
+ useState,
type ComponentProps,
} from 'react';
import { Trans, useTranslation } from 'react-i18next';
@@ -15,7 +15,7 @@ import { View } from '@actual-app/components/view';
import memoizeOne from 'memoize-one';
import { getNormalisedString } from 'loot-core/shared/normalisation';
-import { type Diff, groupById } from 'loot-core/shared/util';
+import { groupById, type Diff } from 'loot-core/shared/util';
import { type PayeeEntity } from 'loot-core/types/models';
import { PayeeMenu } from './PayeeMenu';
@@ -23,13 +23,13 @@ import { PayeeTable } from './PayeeTable';
import { Search } from '@desktop-client/components/common/Search';
import {
- TableHeader,
Cell,
SelectCell,
+ TableHeader,
} from '@desktop-client/components/table';
import {
- useSelected,
SelectedProvider,
+ useSelected,
useSelectedDispatch,
useSelectedItems,
} from '@desktop-client/hooks/useSelected';
diff --git a/packages/desktop-client/src/components/payees/ManagePayeesWithData.tsx b/packages/desktop-client/src/components/payees/ManagePayeesWithData.tsx
index 0b29ed6059..afd66b9341 100644
--- a/packages/desktop-client/src/components/payees/ManagePayeesWithData.tsx
+++ b/packages/desktop-client/src/components/payees/ManagePayeesWithData.tsx
@@ -1,6 +1,6 @@
-import React, { useState, useEffect, useCallback } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
-import { send, listen } from 'loot-core/platform/client/fetch';
+import { listen, send } from 'loot-core/platform/client/fetch';
import * as undo from 'loot-core/platform/client/undo';
import { type UndoState } from 'loot-core/server/undo';
import { applyChanges, type Diff } from 'loot-core/shared/util';
diff --git a/packages/desktop-client/src/components/payees/PayeeMenu.tsx b/packages/desktop-client/src/components/payees/PayeeMenu.tsx
index f103ffa43d..f9161313d5 100644
--- a/packages/desktop-client/src/components/payees/PayeeMenu.tsx
+++ b/packages/desktop-client/src/components/payees/PayeeMenu.tsx
@@ -1,4 +1,4 @@
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { SvgDelete, SvgMerge } from '@actual-app/components/icons/v0';
import { SvgBookmark, SvgLightBulb } from '@actual-app/components/icons/v1';
diff --git a/packages/desktop-client/src/components/payees/PayeeTable.tsx b/packages/desktop-client/src/components/payees/PayeeTable.tsx
index 1b97f44c67..400e549236 100644
--- a/packages/desktop-client/src/components/payees/PayeeTable.tsx
+++ b/packages/desktop-client/src/components/payees/PayeeTable.tsx
@@ -14,7 +14,7 @@ import { type PayeeEntity } from 'loot-core/types/models';
import { PayeeTableRow } from './PayeeTableRow';
-import { useTableNavigator, Table } from '@desktop-client/components/table';
+import { Table, useTableNavigator } from '@desktop-client/components/table';
import { useSelectedItems } from '@desktop-client/hooks/useSelected';
// Table items require an ID to work, it's optional in the loot-core
diff --git a/packages/desktop-client/src/components/payees/PayeeTableRow.tsx b/packages/desktop-client/src/components/payees/PayeeTableRow.tsx
index 838e0b41d8..676d797664 100644
--- a/packages/desktop-client/src/components/payees/PayeeTableRow.tsx
+++ b/packages/desktop-client/src/components/payees/PayeeTableRow.tsx
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import { memo, useRef, useMemo, type CSSProperties } from 'react';
+import { memo, useMemo, useRef, type CSSProperties } from 'react';
import { useTranslation } from 'react-i18next';
import {
diff --git a/packages/desktop-client/src/components/reports/ChooseGraph.tsx b/packages/desktop-client/src/components/reports/ChooseGraph.tsx
index a9bc13d31a..ff3df77df1 100644
--- a/packages/desktop-client/src/components/reports/ChooseGraph.tsx
+++ b/packages/desktop-client/src/components/reports/ChooseGraph.tsx
@@ -1,4 +1,4 @@
-import React, { type UIEvent, useRef, type CSSProperties } from 'react';
+import React, { useRef, type CSSProperties, type UIEvent } from 'react';
import { styles } from '@actual-app/components/styles';
diff --git a/packages/desktop-client/src/components/reports/Container.tsx b/packages/desktop-client/src/components/reports/Container.tsx
index 638eb28385..c35bf87dae 100644
--- a/packages/desktop-client/src/components/reports/Container.tsx
+++ b/packages/desktop-client/src/components/reports/Container.tsx
@@ -1,4 +1,4 @@
-import React, { useRef, type ReactNode, type CSSProperties } from 'react';
+import React, { useRef, type CSSProperties, type ReactNode } from 'react';
import AutoSizer from 'react-virtualized-auto-sizer';
import { View } from '@actual-app/components/view';
diff --git a/packages/desktop-client/src/components/reports/DashboardHeader.tsx b/packages/desktop-client/src/components/reports/DashboardHeader.tsx
index 0c5fc375b1..b2f91942f9 100644
--- a/packages/desktop-client/src/components/reports/DashboardHeader.tsx
+++ b/packages/desktop-client/src/components/reports/DashboardHeader.tsx
@@ -1,5 +1,5 @@
import { useState } from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
import { SvgPencil1 } from '@actual-app/components/icons/v2';
diff --git a/packages/desktop-client/src/components/reports/FormulaResult.tsx b/packages/desktop-client/src/components/reports/FormulaResult.tsx
index 9b010c10e0..d01767c91b 100644
--- a/packages/desktop-client/src/components/reports/FormulaResult.tsx
+++ b/packages/desktop-client/src/components/reports/FormulaResult.tsx
@@ -1,11 +1,11 @@
import React, {
- type Ref,
- type RefObject,
useCallback,
useEffect,
useMemo,
useRef,
useState,
+ type Ref,
+ type RefObject,
} from 'react';
import { theme } from '@actual-app/components/theme';
diff --git a/packages/desktop-client/src/components/reports/GraphButton.tsx b/packages/desktop-client/src/components/reports/GraphButton.tsx
index 04706b4dfc..60da7d4ea5 100644
--- a/packages/desktop-client/src/components/reports/GraphButton.tsx
+++ b/packages/desktop-client/src/components/reports/GraphButton.tsx
@@ -1,4 +1,4 @@
-import React, { type HTMLProps, type CSSProperties } from 'react';
+import React, { type CSSProperties, type HTMLProps } from 'react';
import { Button } from '@actual-app/components/button';
import { styles } from '@actual-app/components/styles';
diff --git a/packages/desktop-client/src/components/reports/ModeButton.tsx b/packages/desktop-client/src/components/reports/ModeButton.tsx
index 9e3226e785..cb768766e2 100644
--- a/packages/desktop-client/src/components/reports/ModeButton.tsx
+++ b/packages/desktop-client/src/components/reports/ModeButton.tsx
@@ -1,4 +1,4 @@
-import React, { type ReactNode, type CSSProperties } from 'react';
+import React, { type CSSProperties, type ReactNode } from 'react';
import { Button } from '@actual-app/components/button';
import { theme } from '@actual-app/components/theme';
diff --git a/packages/desktop-client/src/components/reports/ReportCard.tsx b/packages/desktop-client/src/components/reports/ReportCard.tsx
index e681507623..e929d4129a 100644
--- a/packages/desktop-client/src/components/reports/ReportCard.tsx
+++ b/packages/desktop-client/src/components/reports/ReportCard.tsx
@@ -3,8 +3,8 @@ import React, {
useRef,
useState,
type ComponentProps,
- type ReactNode,
type CSSProperties,
+ type ReactNode,
} from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/desktop-client/src/components/reports/ReportOptions.ts b/packages/desktop-client/src/components/reports/ReportOptions.ts
index b0768d5c6b..cc08060705 100644
--- a/packages/desktop-client/src/components/reports/ReportOptions.ts
+++ b/packages/desktop-client/src/components/reports/ReportOptions.ts
@@ -2,9 +2,9 @@ import { t } from 'i18next';
import * as monthUtils from 'loot-core/shared/months';
import {
- type CustomReportEntity,
type CategoryEntity,
type CategoryGroupEntity,
+ type CustomReportEntity,
type sortByOpType,
} from 'loot-core/types/models';
diff --git a/packages/desktop-client/src/components/reports/ReportSidebar.tsx b/packages/desktop-client/src/components/reports/ReportSidebar.tsx
index 54fa6e4908..25e610575d 100644
--- a/packages/desktop-client/src/components/reports/ReportSidebar.tsx
+++ b/packages/desktop-client/src/components/reports/ReportSidebar.tsx
@@ -16,9 +16,9 @@ import * as monthUtils from 'loot-core/shared/months';
import {
type CategoryEntity,
type CategoryGroupEntity,
- type TimeFrame,
type CustomReportEntity,
type sortByOpType,
+ type TimeFrame,
} from 'loot-core/types/models';
import { type SyncedPrefs } from 'loot-core/types/prefs';
@@ -26,7 +26,7 @@ import { CategorySelector } from './CategorySelector';
import { defaultsList, disabledList } from './disabledList';
import { getLiveRange } from './getLiveRange';
import { ModeButton } from './ModeButton';
-import { type dateRangeProps, ReportOptions } from './ReportOptions';
+import { ReportOptions, type dateRangeProps } from './ReportOptions';
import { validateEnd, validateStart } from './reportRanges';
import { setSessionReport } from './setSessionReport';
diff --git a/packages/desktop-client/src/components/reports/ReportTopbar.tsx b/packages/desktop-client/src/components/reports/ReportTopbar.tsx
index ea934874c8..deaf296e09 100644
--- a/packages/desktop-client/src/components/reports/ReportTopbar.tsx
+++ b/packages/desktop-client/src/components/reports/ReportTopbar.tsx
@@ -3,14 +3,14 @@ import { useTranslation } from 'react-i18next';
import {
SvgCalculator,
+ SvgCamera,
SvgChart,
+ SvgChartArea,
SvgChartBar,
SvgChartPie,
SvgListBullet,
SvgQueue,
SvgTag,
- SvgCamera,
- SvgChartArea,
} from '@actual-app/components/icons/v1';
import { SpaceBetween } from '@actual-app/components/space-between';
import { theme } from '@actual-app/components/theme';
diff --git a/packages/desktop-client/src/components/reports/SaveReportChoose.tsx b/packages/desktop-client/src/components/reports/SaveReportChoose.tsx
index 4b7a2a8752..ddbe9857bc 100644
--- a/packages/desktop-client/src/components/reports/SaveReportChoose.tsx
+++ b/packages/desktop-client/src/components/reports/SaveReportChoose.tsx
@@ -1,4 +1,4 @@
-import React, { useRef, useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
import { Form } from 'react-aria-components';
import { Trans } from 'react-i18next';
diff --git a/packages/desktop-client/src/components/reports/SaveReportName.tsx b/packages/desktop-client/src/components/reports/SaveReportName.tsx
index 252f0ea5ea..45bbdff1ce 100644
--- a/packages/desktop-client/src/components/reports/SaveReportName.tsx
+++ b/packages/desktop-client/src/components/reports/SaveReportName.tsx
@@ -1,4 +1,4 @@
-import React, { type RefObject, useEffect } from 'react';
+import React, { useEffect, type RefObject } from 'react';
import { Form } from 'react-aria-components';
import { useTranslation } from 'react-i18next';
diff --git a/packages/desktop-client/src/components/reports/SnapshotButton.tsx b/packages/desktop-client/src/components/reports/SnapshotButton.tsx
index 37b7397373..fe2921d343 100644
--- a/packages/desktop-client/src/components/reports/SnapshotButton.tsx
+++ b/packages/desktop-client/src/components/reports/SnapshotButton.tsx
@@ -1,4 +1,4 @@
-import React, { type ReactNode, type CSSProperties } from 'react';
+import React, { type CSSProperties, type ReactNode } from 'react';
import { Button } from '@actual-app/components/button';
import { styles } from '@actual-app/components/styles';
diff --git a/packages/desktop-client/src/components/reports/SummaryNumber.tsx b/packages/desktop-client/src/components/reports/SummaryNumber.tsx
index e1aea30509..2ad043ae6f 100644
--- a/packages/desktop-client/src/components/reports/SummaryNumber.tsx
+++ b/packages/desktop-client/src/components/reports/SummaryNumber.tsx
@@ -1,4 +1,4 @@
-import React, { type Ref, useRef, useState } from 'react';
+import React, { useRef, useState, type Ref } from 'react';
import { useTranslation } from 'react-i18next';
import { View } from '@actual-app/components/view';
diff --git a/packages/desktop-client/src/components/reports/graphs/AreaGraph.tsx b/packages/desktop-client/src/components/reports/graphs/AreaGraph.tsx
index 105f8f7d64..2d90401375 100644
--- a/packages/desktop-client/src/components/reports/graphs/AreaGraph.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/AreaGraph.tsx
@@ -1,17 +1,17 @@
-import React, { type SVGAttributes, type CSSProperties } from 'react';
+import React, { type CSSProperties, type SVGAttributes } 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,
Area,
+ AreaChart,
CartesianGrid,
+ LabelList,
+ Tooltip,
XAxis,
YAxis,
- Tooltip,
- LabelList,
type LabelProps,
} from 'recharts';
@@ -25,7 +25,7 @@ import { renderCustomLabel } from './renderCustomLabel';
import { useRechartsAnimation } from '@desktop-client/components/reports/chart-theme';
import { Container } from '@desktop-client/components/reports/Container';
-import { type FormatType, useFormat } from '@desktop-client/hooks/useFormat';
+import { useFormat, type FormatType } from '@desktop-client/hooks/useFormat';
import { usePrivacyMode } from '@desktop-client/hooks/usePrivacyMode';
type PayloadItem = {
diff --git a/packages/desktop-client/src/components/reports/graphs/BarGraph.tsx b/packages/desktop-client/src/components/reports/graphs/BarGraph.tsx
index e319b7f05a..050d3f2a70 100644
--- a/packages/desktop-client/src/components/reports/graphs/BarGraph.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/BarGraph.tsx
@@ -6,15 +6,15 @@ import { AlignedText } from '@actual-app/components/aligned-text';
import { theme } from '@actual-app/components/theme';
import { css } from '@emotion/css';
import {
- BarChart,
Bar,
+ BarChart,
CartesianGrid,
Cell,
+ LabelList,
ReferenceLine,
+ Tooltip,
XAxis,
YAxis,
- Tooltip,
- LabelList,
} from 'recharts';
import {
@@ -33,7 +33,7 @@ import { getCustomTick } from '@desktop-client/components/reports/getCustomTick'
import { numberFormatterTooltip } from '@desktop-client/components/reports/numberFormatter';
import { useAccounts } from '@desktop-client/hooks/useAccounts';
import { useCategories } from '@desktop-client/hooks/useCategories';
-import { type FormatType, useFormat } from '@desktop-client/hooks/useFormat';
+import { useFormat, type FormatType } from '@desktop-client/hooks/useFormat';
import { useNavigate } from '@desktop-client/hooks/useNavigate';
import { usePrivacyMode } from '@desktop-client/hooks/usePrivacyMode';
diff --git a/packages/desktop-client/src/components/reports/graphs/BarLineGraph.tsx b/packages/desktop-client/src/components/reports/graphs/BarLineGraph.tsx
index b501e5de58..b91c0a8eb1 100644
--- a/packages/desktop-client/src/components/reports/graphs/BarLineGraph.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/BarLineGraph.tsx
@@ -6,13 +6,13 @@ import { AlignedText } from '@actual-app/components/aligned-text';
import { theme } from '@actual-app/components/theme';
import { css } from '@emotion/css';
import {
- ComposedChart,
- Line,
Bar,
CartesianGrid,
+ ComposedChart,
+ Line,
+ Tooltip,
XAxis,
YAxis,
- Tooltip,
} from 'recharts';
import { PrivacyFilter } from '@desktop-client/components/PrivacyFilter';
diff --git a/packages/desktop-client/src/components/reports/graphs/CalendarGraph.tsx b/packages/desktop-client/src/components/reports/graphs/CalendarGraph.tsx
index c35bdc5e6e..7bc8c212d8 100644
--- a/packages/desktop-client/src/components/reports/graphs/CalendarGraph.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/CalendarGraph.tsx
@@ -1,4 +1,4 @@
-import { type Ref, useEffect, useState } from 'react';
+import { useEffect, useState, type Ref } from 'react';
import { Trans } from 'react-i18next';
import { Button } from '@actual-app/components/button';
diff --git a/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.tsx b/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.tsx
index 70af3fa00d..bddfc53016 100644
--- a/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.tsx
@@ -21,7 +21,7 @@ import {
useRechartsAnimation,
} from '@desktop-client/components/reports/chart-theme';
import { Container } from '@desktop-client/components/reports/Container';
-import { type FormatType, useFormat } from '@desktop-client/hooks/useFormat';
+import { useFormat, type FormatType } from '@desktop-client/hooks/useFormat';
import { useLocale } from '@desktop-client/hooks/useLocale';
import { usePrivacyMode } from '@desktop-client/hooks/usePrivacyMode';
diff --git a/packages/desktop-client/src/components/reports/graphs/CrossoverGraph.tsx b/packages/desktop-client/src/components/reports/graphs/CrossoverGraph.tsx
index b74d198c1f..7032ae15ff 100644
--- a/packages/desktop-client/src/components/reports/graphs/CrossoverGraph.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/CrossoverGraph.tsx
@@ -5,14 +5,14 @@ import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';
import { css } from '@emotion/css';
import {
- LineChart,
- Line,
CartesianGrid,
+ Line,
+ LineChart,
+ ReferenceLine,
+ ResponsiveContainer,
+ Tooltip,
XAxis,
YAxis,
- Tooltip,
- ResponsiveContainer,
- ReferenceLine,
} from 'recharts';
import { useRechartsAnimation } from '@desktop-client/components/reports/chart-theme';
diff --git a/packages/desktop-client/src/components/reports/graphs/DonutGraph.tsx b/packages/desktop-client/src/components/reports/graphs/DonutGraph.tsx
index d8049971b6..63faade8ff 100644
--- a/packages/desktop-client/src/components/reports/graphs/DonutGraph.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/DonutGraph.tsx
@@ -2,7 +2,7 @@
import React, { useState, type CSSProperties } from 'react';
import { theme } from '@actual-app/components/theme';
-import { PieChart, Pie, Cell, Sector, Tooltip } from 'recharts';
+import { Cell, Pie, PieChart, Sector, Tooltip } from 'recharts';
import {
type balanceTypeOpType,
diff --git a/packages/desktop-client/src/components/reports/graphs/LineGraph.tsx b/packages/desktop-client/src/components/reports/graphs/LineGraph.tsx
index 81e0e22894..079e79d9f3 100644
--- a/packages/desktop-client/src/components/reports/graphs/LineGraph.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/LineGraph.tsx
@@ -6,12 +6,12 @@ import { AlignedText } from '@actual-app/components/aligned-text';
import { theme } from '@actual-app/components/theme';
import { css } from '@emotion/css';
import {
- LineChart,
- Line,
CartesianGrid,
+ Line,
+ LineChart,
+ Tooltip,
XAxis,
YAxis,
- Tooltip,
} from 'recharts';
import {
@@ -28,7 +28,7 @@ import { getCustomTick } from '@desktop-client/components/reports/getCustomTick'
import { numberFormatterTooltip } from '@desktop-client/components/reports/numberFormatter';
import { useAccounts } from '@desktop-client/hooks/useAccounts';
import { useCategories } from '@desktop-client/hooks/useCategories';
-import { type FormatType, useFormat } from '@desktop-client/hooks/useFormat';
+import { useFormat, type FormatType } from '@desktop-client/hooks/useFormat';
import { useNavigate } from '@desktop-client/hooks/useNavigate';
import { usePrivacyMode } from '@desktop-client/hooks/usePrivacyMode';
diff --git a/packages/desktop-client/src/components/reports/graphs/NetWorthGraph.tsx b/packages/desktop-client/src/components/reports/graphs/NetWorthGraph.tsx
index 8ced0f96c4..149af92dd7 100644
--- a/packages/desktop-client/src/components/reports/graphs/NetWorthGraph.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/NetWorthGraph.tsx
@@ -6,14 +6,14 @@ import { AlignedText } from '@actual-app/components/aligned-text';
import { type CSSProperties } from '@actual-app/components/styles';
import { theme } from '@actual-app/components/theme';
import { css } from '@emotion/css';
-import { parse, getDay } from 'date-fns';
+import { getDay, parse } from 'date-fns';
import {
- AreaChart,
Area,
+ AreaChart,
CartesianGrid,
+ Tooltip,
XAxis,
YAxis,
- Tooltip,
} from 'recharts';
import { computePadding } from './util/computePadding';
diff --git a/packages/desktop-client/src/components/reports/graphs/SpendingGraph.tsx b/packages/desktop-client/src/components/reports/graphs/SpendingGraph.tsx
index 79fe97e446..27f05285e3 100644
--- a/packages/desktop-client/src/components/reports/graphs/SpendingGraph.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/SpendingGraph.tsx
@@ -1,17 +1,17 @@
// @ts-strict-ignore
import React, { type ComponentProps, type CSSProperties } from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, 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,
Area,
+ AreaChart,
CartesianGrid,
+ Tooltip,
XAxis,
YAxis,
- Tooltip,
} from 'recharts';
import { type SpendingEntity } from 'loot-core/types/models';
diff --git a/packages/desktop-client/src/components/reports/graphs/StackedBarGraph.tsx b/packages/desktop-client/src/components/reports/graphs/StackedBarGraph.tsx
index 584118355b..c9ca029edf 100644
--- a/packages/desktop-client/src/components/reports/graphs/StackedBarGraph.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/StackedBarGraph.tsx
@@ -6,13 +6,13 @@ import { AlignedText } from '@actual-app/components/aligned-text';
import { theme } from '@actual-app/components/theme';
import { css } from '@emotion/css';
import {
- BarChart,
Bar,
+ BarChart,
CartesianGrid,
+ LabelList,
+ Tooltip,
XAxis,
YAxis,
- Tooltip,
- LabelList,
} from 'recharts';
import {
diff --git a/packages/desktop-client/src/components/reports/graphs/showActivity.ts b/packages/desktop-client/src/components/reports/graphs/showActivity.ts
index 31b71a98e9..869eddca2e 100644
--- a/packages/desktop-client/src/components/reports/graphs/showActivity.ts
+++ b/packages/desktop-client/src/components/reports/graphs/showActivity.ts
@@ -3,9 +3,9 @@ import { type NavigateFunction } from 'react-router';
import * as monthUtils from 'loot-core/shared/months';
import {
type AccountEntity,
+ type balanceTypeOpType,
type CategoryEntity,
type CategoryGroupEntity,
- type balanceTypeOpType,
type RuleConditionEntity,
} from 'loot-core/types/models';
diff --git a/packages/desktop-client/src/components/reports/graphs/tableGraph/RenderTableRow.tsx b/packages/desktop-client/src/components/reports/graphs/tableGraph/RenderTableRow.tsx
index ea04725373..32b43d7853 100644
--- a/packages/desktop-client/src/components/reports/graphs/tableGraph/RenderTableRow.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/tableGraph/RenderTableRow.tsx
@@ -1,4 +1,4 @@
-import React, { type ReactNode, type CSSProperties } from 'react';
+import React, { type CSSProperties, type ReactNode } from 'react';
import { View } from '@actual-app/components/view';
diff --git a/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTable.tsx b/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTable.tsx
index ed4fa357f5..200817748e 100644
--- a/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTable.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTable.tsx
@@ -1,7 +1,7 @@
import React, {
- type RefObject,
useLayoutEffect,
useRef,
+ type RefObject,
type UIEventHandler,
} from 'react';
@@ -10,9 +10,9 @@ import { type CSSProperties } from '@actual-app/components/styles';
import { View } from '@actual-app/components/view';
import {
- type GroupedEntity,
- type DataEntity,
type balanceTypeOpType,
+ type DataEntity,
+ type GroupedEntity,
type RuleConditionEntity,
} from 'loot-core/types/models';
diff --git a/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableHeader.tsx b/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableHeader.tsx
index 6423c63603..bd48df0a00 100644
--- a/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableHeader.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableHeader.tsx
@@ -1,7 +1,7 @@
import React, {
+ type CSSProperties,
type RefObject,
type UIEventHandler,
- type CSSProperties,
} from 'react';
import { useTranslation } from 'react-i18next';
@@ -14,7 +14,7 @@ import {
} from 'loot-core/types/models';
import { ReportOptions } from '@desktop-client/components/reports/ReportOptions';
-import { Row, Cell } from '@desktop-client/components/table';
+import { Cell, Row } from '@desktop-client/components/table';
type ReportTableHeaderProps = {
groupBy: string;
diff --git a/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableList.tsx b/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableList.tsx
index baf64d1f79..64e769ca20 100644
--- a/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableList.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableList.tsx
@@ -1,9 +1,9 @@
-import React, { type ReactNode, type CSSProperties } from 'react';
+import React, { type CSSProperties, type ReactNode } from 'react';
import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';
-import { type GroupedEntity, type DataEntity } from 'loot-core/types/models';
+import { type DataEntity, type GroupedEntity } from 'loot-core/types/models';
import { RenderTableRow } from './RenderTableRow';
import { type renderRowProps } from './ReportTable';
diff --git a/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableRow.tsx b/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableRow.tsx
index 859040e722..aa7a2f821d 100644
--- a/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableRow.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableRow.tsx
@@ -1,8 +1,8 @@
import React, {
memo,
+ type CSSProperties,
type RefObject,
type UIEventHandler,
- type CSSProperties,
} from 'react';
import { useResponsive } from '@actual-app/components/hooks/useResponsive';
@@ -17,7 +17,7 @@ import {
} from 'loot-core/types/models';
import { showActivity } from '@desktop-client/components/reports/graphs/showActivity';
-import { Row, Cell } from '@desktop-client/components/table';
+import { Cell, Row } from '@desktop-client/components/table';
import { useAccounts } from '@desktop-client/hooks/useAccounts';
import { useCategories } from '@desktop-client/hooks/useCategories';
import { useFormat } from '@desktop-client/hooks/useFormat';
diff --git a/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableTotals.tsx b/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableTotals.tsx
index 5acc7378c1..13de1cb2ae 100644
--- a/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableTotals.tsx
+++ b/packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableTotals.tsx
@@ -1,9 +1,9 @@
import React, {
- type ReactNode,
useLayoutEffect,
useState,
- type RefObject,
type CSSProperties,
+ type ReactNode,
+ type RefObject,
} from 'react';
import { useTranslation } from 'react-i18next';
@@ -11,7 +11,7 @@ import { styles } from '@actual-app/components/styles';
import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';
-import { type GroupedEntity, type DataEntity } from 'loot-core/types/models';
+import { type DataEntity, type GroupedEntity } from 'loot-core/types/models';
import { type renderTotalsProps } from './ReportTable';
diff --git a/packages/desktop-client/src/components/reports/reports/Calendar.tsx b/packages/desktop-client/src/components/reports/reports/Calendar.tsx
index ef85552209..e68df7cf30 100644
--- a/packages/desktop-client/src/components/reports/reports/Calendar.tsx
+++ b/packages/desktop-client/src/components/reports/reports/Calendar.tsx
@@ -1,10 +1,10 @@
import {
- type Ref,
useCallback,
useEffect,
useMemo,
useRef,
useState,
+ type Ref,
} from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { useParams, useSearchParams } from 'react-router';
@@ -52,8 +52,8 @@ import { Header } from '@desktop-client/components/reports/Header';
import { LoadingIndicator } from '@desktop-client/components/reports/LoadingIndicator';
import { calculateTimeRange } from '@desktop-client/components/reports/reportRanges';
import {
- type CalendarDataType,
calendarSpreadsheet,
+ type CalendarDataType,
} from '@desktop-client/components/reports/spreadsheets/calendar-spreadsheet';
import { useReport } from '@desktop-client/components/reports/useReport';
import { fromDateRepr } from '@desktop-client/components/reports/util';
@@ -63,7 +63,7 @@ import { useAccounts } from '@desktop-client/hooks/useAccounts';
import { SchedulesProvider } from '@desktop-client/hooks/useCachedSchedules';
import { useCategories } from '@desktop-client/hooks/useCategories';
import { useDateFormat } from '@desktop-client/hooks/useDateFormat';
-import { type FormatType, useFormat } from '@desktop-client/hooks/useFormat';
+import { useFormat, type FormatType } from '@desktop-client/hooks/useFormat';
import { useLocale } from '@desktop-client/hooks/useLocale';
import { useMergedRefs } from '@desktop-client/hooks/useMergedRefs';
import { useNavigate } from '@desktop-client/hooks/useNavigate';
diff --git a/packages/desktop-client/src/components/reports/reports/CalendarCard.tsx b/packages/desktop-client/src/components/reports/reports/CalendarCard.tsx
index f1a467bbeb..c6925a03bd 100644
--- a/packages/desktop-client/src/components/reports/reports/CalendarCard.tsx
+++ b/packages/desktop-client/src/components/reports/reports/CalendarCard.tsx
@@ -1,12 +1,12 @@
import React, {
- useState,
+ useCallback,
+ useEffect,
useMemo,
useRef,
- type Ref,
- useEffect,
+ useState,
type Dispatch,
+ type Ref,
type SetStateAction,
- useCallback,
} from 'react';
import { Trans, useTranslation } from 'react-i18next';
@@ -38,12 +38,12 @@ import { ReportCard } from '@desktop-client/components/reports/ReportCard';
import { ReportCardName } from '@desktop-client/components/reports/ReportCardName';
import { calculateTimeRange } from '@desktop-client/components/reports/reportRanges';
import {
- type CalendarDataType,
calendarSpreadsheet,
+ type CalendarDataType,
} from '@desktop-client/components/reports/spreadsheets/calendar-spreadsheet';
import { useReport } from '@desktop-client/components/reports/useReport';
import { useWidgetCopyMenu } from '@desktop-client/components/reports/useWidgetCopyMenu';
-import { type FormatType, useFormat } from '@desktop-client/hooks/useFormat';
+import { useFormat, type FormatType } from '@desktop-client/hooks/useFormat';
import { useMergedRefs } from '@desktop-client/hooks/useMergedRefs';
import { useNavigate } from '@desktop-client/hooks/useNavigate';
import { useResizeObserver } from '@desktop-client/hooks/useResizeObserver';
diff --git a/packages/desktop-client/src/components/reports/reports/CashFlow.tsx b/packages/desktop-client/src/components/reports/reports/CashFlow.tsx
index 848346a858..d8c748bf55 100644
--- a/packages/desktop-client/src/components/reports/reports/CashFlow.tsx
+++ b/packages/desktop-client/src/components/reports/reports/CashFlow.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useMemo } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { useParams } from 'react-router';
diff --git a/packages/desktop-client/src/components/reports/reports/CashFlowCard.tsx b/packages/desktop-client/src/components/reports/reports/CashFlowCard.tsx
index 1137524138..a0cf4633d4 100644
--- a/packages/desktop-client/src/components/reports/reports/CashFlowCard.tsx
+++ b/packages/desktop-client/src/components/reports/reports/CashFlowCard.tsx
@@ -1,8 +1,8 @@
import React, {
- useState,
- useMemo,
useCallback,
useEffect,
+ useMemo,
+ useState,
type SVGAttributes,
} from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/desktop-client/src/components/reports/reports/Crossover.tsx b/packages/desktop-client/src/components/reports/reports/Crossover.tsx
index b99186d53f..74609d802a 100644
--- a/packages/desktop-client/src/components/reports/reports/Crossover.tsx
+++ b/packages/desktop-client/src/components/reports/reports/Crossover.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState, useCallback } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { useParams } from 'react-router';
@@ -18,9 +18,9 @@ import { View } from '@actual-app/components/view';
import { send } from 'loot-core/platform/client/fetch';
import * as monthUtils from 'loot-core/shared/months';
import {
+ type CategoryEntity,
type CrossoverWidget,
type TimeFrame,
- type CategoryEntity,
} from 'loot-core/types/models';
import { Link } from '@desktop-client/components/common/Link';
diff --git a/packages/desktop-client/src/components/reports/reports/CrossoverCard.tsx b/packages/desktop-client/src/components/reports/reports/CrossoverCard.tsx
index 088a24cb66..e48a73ee45 100644
--- a/packages/desktop-client/src/components/reports/reports/CrossoverCard.tsx
+++ b/packages/desktop-client/src/components/reports/reports/CrossoverCard.tsx
@@ -1,5 +1,5 @@
-import React, { useMemo, useState, useCallback, useEffect } from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { Trans, useTranslation } from 'react-i18next';
import { Block } from '@actual-app/components/block';
import { useResponsive } from '@actual-app/components/hooks/useResponsive';
diff --git a/packages/desktop-client/src/components/reports/reports/CustomReport.tsx b/packages/desktop-client/src/components/reports/reports/CustomReport.tsx
index f1fc0a0f60..9f83d693d4 100644
--- a/packages/desktop-client/src/components/reports/reports/CustomReport.tsx
+++ b/packages/desktop-client/src/components/reports/reports/CustomReport.tsx
@@ -1,5 +1,5 @@
-import React, { useState, useEffect, useMemo } from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import React, { useEffect, useMemo, useState } from 'react';
+import { Trans, useTranslation } from 'react-i18next';
import { useLocation, useParams } from 'react-router';
import { AlignedText } from '@actual-app/components/aligned-text';
@@ -14,12 +14,12 @@ import * as d from 'date-fns';
import { send } from 'loot-core/platform/client/fetch';
import * as monthUtils from 'loot-core/shared/months';
import {
- type CategoryEntity,
type balanceTypeOpType,
+ type CategoryEntity,
type CustomReportEntity,
type DataEntity,
- type sortByOpType,
type RuleConditionEntity,
+ type sortByOpType,
} from 'loot-core/types/models';
import { type TransObjectLiteral } from 'loot-core/types/util';
@@ -44,8 +44,8 @@ import { getLiveRange } from '@desktop-client/components/reports/getLiveRange';
import { LoadingIndicator } from '@desktop-client/components/reports/LoadingIndicator';
import { ReportLegend } from '@desktop-client/components/reports/ReportLegend';
import {
- ReportOptions,
defaultReport,
+ ReportOptions,
type dateRangeProps,
} from '@desktop-client/components/reports/ReportOptions';
import { ReportSidebar } from '@desktop-client/components/reports/ReportSidebar';
diff --git a/packages/desktop-client/src/components/reports/reports/Formula.tsx b/packages/desktop-client/src/components/reports/reports/Formula.tsx
index 494d9d00bc..52d58eb01c 100644
--- a/packages/desktop-client/src/components/reports/reports/Formula.tsx
+++ b/packages/desktop-client/src/components/reports/reports/Formula.tsx
@@ -1,10 +1,10 @@
import {
- useState,
- useRef,
+ lazy,
+ Suspense,
useCallback,
useMemo,
- Suspense,
- lazy,
+ useRef,
+ useState,
type ChangeEvent,
} from 'react';
import { Trans, useTranslation } from 'react-i18next';
diff --git a/packages/desktop-client/src/components/reports/reports/FormulaCard.tsx b/packages/desktop-client/src/components/reports/reports/FormulaCard.tsx
index 4fb69cac07..2ec9414183 100644
--- a/packages/desktop-client/src/components/reports/reports/FormulaCard.tsx
+++ b/packages/desktop-client/src/components/reports/reports/FormulaCard.tsx
@@ -1,4 +1,4 @@
-import { useState, useMemo, useRef } from 'react';
+import { useMemo, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { View } from '@actual-app/components/view';
diff --git a/packages/desktop-client/src/components/reports/reports/GetCardData.tsx b/packages/desktop-client/src/components/reports/reports/GetCardData.tsx
index 0ec0b5b004..571af41504 100644
--- a/packages/desktop-client/src/components/reports/reports/GetCardData.tsx
+++ b/packages/desktop-client/src/components/reports/reports/GetCardData.tsx
@@ -12,8 +12,8 @@ import {
type AccountEntity,
type CategoryEntity,
type CategoryGroupEntity,
- type PayeeEntity,
type CustomReportEntity,
+ type PayeeEntity,
} from 'loot-core/types/models';
import { type SyncedPrefs } from 'loot-core/types/prefs';
diff --git a/packages/desktop-client/src/components/reports/reports/MarkdownCard.tsx b/packages/desktop-client/src/components/reports/reports/MarkdownCard.tsx
index 6c61fd285b..81c3a16187 100644
--- a/packages/desktop-client/src/components/reports/reports/MarkdownCard.tsx
+++ b/packages/desktop-client/src/components/reports/reports/MarkdownCard.tsx
@@ -17,9 +17,9 @@ import { NON_DRAGGABLE_AREA_CLASS_NAME } from '@desktop-client/components/report
import { ReportCard } from '@desktop-client/components/reports/ReportCard';
import { useWidgetCopyMenu } from '@desktop-client/components/reports/useWidgetCopyMenu';
import {
+ markdownBaseStyles,
remarkBreaks,
sequentialNewlinesPlugin,
- markdownBaseStyles,
} from '@desktop-client/util/markdown';
const remarkPlugins = [sequentialNewlinesPlugin, remarkGfm, remarkBreaks];
diff --git a/packages/desktop-client/src/components/reports/reports/NetWorth.tsx b/packages/desktop-client/src/components/reports/reports/NetWorth.tsx
index 986340f354..16de055e60 100644
--- a/packages/desktop-client/src/components/reports/reports/NetWorth.tsx
+++ b/packages/desktop-client/src/components/reports/reports/NetWorth.tsx
@@ -1,9 +1,9 @@
import React, {
- useState,
+ useCallback,
useEffect,
useMemo,
useRef,
- useCallback,
+ useState,
} from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { useParams } from 'react-router';
@@ -21,7 +21,7 @@ import * as d from 'date-fns';
import { send } from 'loot-core/platform/client/fetch';
import * as monthUtils from 'loot-core/shared/months';
-import { type TimeFrame, type NetWorthWidget } from 'loot-core/types/models';
+import { type NetWorthWidget, type TimeFrame } from 'loot-core/types/models';
import { EditablePageHeaderTitle } from '@desktop-client/components/EditablePageHeaderTitle';
import { MobileBackButton } from '@desktop-client/components/mobile/MobileBackButton';
diff --git a/packages/desktop-client/src/components/reports/reports/NetWorthCard.tsx b/packages/desktop-client/src/components/reports/reports/NetWorthCard.tsx
index f4edc33697..61e83a09af 100644
--- a/packages/desktop-client/src/components/reports/reports/NetWorthCard.tsx
+++ b/packages/desktop-client/src/components/reports/reports/NetWorthCard.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useMemo, useCallback, useEffect } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { Block } from '@actual-app/components/block';
diff --git a/packages/desktop-client/src/components/reports/reports/Spending.tsx b/packages/desktop-client/src/components/reports/reports/Spending.tsx
index 562b62e743..e35c4fa620 100644
--- a/packages/desktop-client/src/components/reports/reports/Spending.tsx
+++ b/packages/desktop-client/src/components/reports/reports/Spending.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useMemo, useEffect } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { useParams } from 'react-router';
@@ -19,8 +19,8 @@ import * as d from 'date-fns';
import { send } from 'loot-core/platform/client/fetch';
import * as monthUtils from 'loot-core/shared/months';
import {
- type SpendingWidget,
type RuleConditionEntity,
+ type SpendingWidget,
} from 'loot-core/types/models';
import { EditablePageHeaderTitle } from '@desktop-client/components/EditablePageHeaderTitle';
diff --git a/packages/desktop-client/src/components/reports/reports/SpendingCard.tsx b/packages/desktop-client/src/components/reports/reports/SpendingCard.tsx
index 71fa3b4977..2368a9479f 100644
--- a/packages/desktop-client/src/components/reports/reports/SpendingCard.tsx
+++ b/packages/desktop-client/src/components/reports/reports/SpendingCard.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useMemo } from 'react';
+import React, { useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { Block } from '@actual-app/components/block';
diff --git a/packages/desktop-client/src/components/reports/reports/Summary.tsx b/packages/desktop-client/src/components/reports/reports/Summary.tsx
index 9d476cdc8b..8ec90d2656 100644
--- a/packages/desktop-client/src/components/reports/reports/Summary.tsx
+++ b/packages/desktop-client/src/components/reports/reports/Summary.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useMemo, type CSSProperties } from 'react';
+import React, { useEffect, useMemo, useState, type CSSProperties } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { useParams } from 'react-router';
diff --git a/packages/desktop-client/src/components/reports/reports/SummaryCard.tsx b/packages/desktop-client/src/components/reports/reports/SummaryCard.tsx
index 354d41f111..4527a76c71 100644
--- a/packages/desktop-client/src/components/reports/reports/SummaryCard.tsx
+++ b/packages/desktop-client/src/components/reports/reports/SummaryCard.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useMemo, useEffect } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { View } from '@actual-app/components/view';
diff --git a/packages/desktop-client/src/components/reports/spreadsheets/calculateLegend.ts b/packages/desktop-client/src/components/reports/spreadsheets/calculateLegend.ts
index a4b2198420..869c0b8d6d 100644
--- a/packages/desktop-client/src/components/reports/spreadsheets/calculateLegend.ts
+++ b/packages/desktop-client/src/components/reports/spreadsheets/calculateLegend.ts
@@ -1,10 +1,10 @@
import { theme } from '@actual-app/components/theme';
import {
- type LegendEntity,
- type IntervalEntity,
- type GroupedEntity,
type balanceTypeOpType,
+ type GroupedEntity,
+ type IntervalEntity,
+ type LegendEntity,
} from 'loot-core/types/models';
import { getColorScale } from '@desktop-client/components/reports/chart-theme';
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 e7c8341899..31a11a87a8 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
@@ -10,7 +10,7 @@ import * as monthUtils from 'loot-core/shared/months';
import { q } from 'loot-core/shared/query';
import { type RuleConditionEntity } from 'loot-core/types/models';
-import { runAll, indexCashFlow } from '@desktop-client/components/reports/util';
+import { indexCashFlow, runAll } from '@desktop-client/components/reports/util';
import { type FormatType } from '@desktop-client/hooks/useFormat';
import { type useSpreadsheet } from '@desktop-client/hooks/useSpreadsheet';
diff --git a/packages/desktop-client/src/components/reports/spreadsheets/custom-spreadsheet.ts b/packages/desktop-client/src/components/reports/spreadsheets/custom-spreadsheet.ts
index 057c8d34dd..3f4e68fbce 100644
--- a/packages/desktop-client/src/components/reports/spreadsheets/custom-spreadsheet.ts
+++ b/packages/desktop-client/src/components/reports/spreadsheets/custom-spreadsheet.ts
@@ -4,15 +4,15 @@ import { send } from 'loot-core/platform/client/fetch';
import * as monthUtils from 'loot-core/shared/months';
import {
type AccountEntity,
- type PayeeEntity,
+ type balanceTypeOpType,
type CategoryEntity,
- type RuleConditionEntity,
type CategoryGroupEntity,
- type balanceTypeOpType,
- type sortByOpType,
type DataEntity,
type GroupedEntity,
type IntervalEntity,
+ type PayeeEntity,
+ type RuleConditionEntity,
+ type sortByOpType,
} from 'loot-core/types/models';
import { type SyncedPrefs } from 'loot-core/types/prefs';
@@ -31,8 +31,8 @@ import {
import {
categoryLists,
groupBySelections,
- type QueryDataEntity,
ReportOptions,
+ type QueryDataEntity,
type UncategorizedEntity,
} from '@desktop-client/components/reports/ReportOptions';
import { type useSpreadsheet } from '@desktop-client/hooks/useSpreadsheet';
diff --git a/packages/desktop-client/src/components/reports/spreadsheets/grouped-spreadsheet.ts b/packages/desktop-client/src/components/reports/spreadsheets/grouped-spreadsheet.ts
index 066009e7fa..009acc5047 100644
--- a/packages/desktop-client/src/components/reports/spreadsheets/grouped-spreadsheet.ts
+++ b/packages/desktop-client/src/components/reports/spreadsheets/grouped-spreadsheet.ts
@@ -14,8 +14,8 @@ import {
import {
categoryLists,
- type QueryDataEntity,
ReportOptions,
+ type QueryDataEntity,
} from '@desktop-client/components/reports/ReportOptions';
import { type useSpreadsheet } from '@desktop-client/hooks/useSpreadsheet';
import { aqlQuery } from '@desktop-client/queries/aqlQuery';
diff --git a/packages/desktop-client/src/components/reports/spreadsheets/recalculate.ts b/packages/desktop-client/src/components/reports/spreadsheets/recalculate.ts
index b6177011fd..932604a346 100644
--- a/packages/desktop-client/src/components/reports/spreadsheets/recalculate.ts
+++ b/packages/desktop-client/src/components/reports/spreadsheets/recalculate.ts
@@ -7,8 +7,8 @@ import {
import { filterHiddenItems } from './filterHiddenItems';
import {
- type UncategorizedEntity,
type QueryDataEntity,
+ type UncategorizedEntity,
} from '@desktop-client/components/reports/ReportOptions';
type recalculateProps = {
diff --git a/packages/desktop-client/src/components/reports/spreadsheets/sortData.ts b/packages/desktop-client/src/components/reports/spreadsheets/sortData.ts
index 5730c88fbf..f4893c3d20 100644
--- a/packages/desktop-client/src/components/reports/spreadsheets/sortData.ts
+++ b/packages/desktop-client/src/components/reports/spreadsheets/sortData.ts
@@ -1,7 +1,7 @@
import {
type balanceTypeOpType,
- type sortByOpType,
type GroupedEntity,
+ type sortByOpType,
} from 'loot-core/types/models';
const reverseSort: Partial<Record<sortByOpType, sortByOpType>> = {
diff --git a/packages/desktop-client/src/components/reports/spreadsheets/spending-spreadsheet.ts b/packages/desktop-client/src/components/reports/spreadsheets/spending-spreadsheet.ts
index 08be443610..f9db145e50 100644
--- a/packages/desktop-client/src/components/reports/spreadsheets/spending-spreadsheet.ts
+++ b/packages/desktop-client/src/components/reports/spreadsheets/spending-spreadsheet.ts
@@ -6,8 +6,8 @@ import * as monthUtils from 'loot-core/shared/months';
import { q } from 'loot-core/shared/query';
import {
type RuleConditionEntity,
- type SpendingMonthEntity,
type SpendingEntity,
+ type SpendingMonthEntity,
} from 'loot-core/types/models';
import { makeQuery } from './makeQuery';
diff --git a/packages/desktop-client/src/components/reports/spreadsheets/summary-spreadsheet.ts b/packages/desktop-client/src/components/reports/spreadsheets/summary-spreadsheet.ts
index 550c9672a0..a958e7417d 100644
--- a/packages/desktop-client/src/components/reports/spreadsheets/summary-spreadsheet.ts
+++ b/packages/desktop-client/src/components/reports/spreadsheets/summary-spreadsheet.ts
@@ -5,8 +5,8 @@ import { send } from 'loot-core/platform/client/fetch';
import * as monthUtils from 'loot-core/shared/months';
import { q } from 'loot-core/shared/query';
import {
- type SummaryContent,
type RuleConditionEntity,
+ type SummaryContent,
} from 'loot-core/types/models';
import { type useSpreadsheet } from '@desktop-client/hooks/useSpreadsheet';
diff --git a/packages/desktop-client/src/components/reports/spreadsheets/trimIntervals.ts b/packages/desktop-client/src/components/reports/spreadsheets/trimIntervals.ts
index 6abf3114c7..5d1d8b5e79 100644
--- a/packages/desktop-client/src/components/reports/spreadsheets/trimIntervals.ts
+++ b/packages/desktop-client/src/components/reports/spreadsheets/trimIntervals.ts
@@ -1,7 +1,7 @@
import {
+ type balanceTypeOpType,
type GroupedEntity,
type IntervalEntity,
- type balanceTypeOpType,
} from 'loot-core/types/models';
function isEmptyForMetric(
diff --git a/packages/desktop-client/src/components/reports/useReport.ts b/packages/desktop-client/src/components/reports/useReport.ts
index e22a2c3c95..255ec2815f 100644
--- a/packages/desktop-client/src/components/reports/useReport.ts
+++ b/packages/desktop-client/src/components/reports/useReport.ts
@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
import { useSpreadsheet } from '@desktop-client/hooks/useSpreadsheet';
diff --git a/packages/desktop-client/src/components/reports/util.ts b/packages/desktop-client/src/components/reports/util.ts
index 04bab6c755..596931e4ff 100644
--- a/packages/desktop-client/src/components/reports/util.ts
+++ b/packages/desktop-client/src/components/reports/util.ts
@@ -1,10 +1,10 @@
// @ts-strict-ignore
import type { Query } from 'loot-core/shared/query';
import type {
- RuleConditionEntity,
- CategoryEntity,
AccountEntity,
+ CategoryEntity,
PayeeEntity,
+ RuleConditionEntity,
} from 'loot-core/types/models';
import { aqlQuery } from '@desktop-client/queries/aqlQuery';
diff --git a/packages/desktop-client/src/components/rules/ActionExpression.tsx b/packages/desktop-client/src/components/rules/ActionExpression.tsx
index 188275a381..aeba30a8cb 100644
--- a/packages/desktop-client/src/components/rules/ActionExpression.tsx
+++ b/packages/desktop-client/src/components/rules/ActionExpression.tsx
@@ -6,18 +6,18 @@ import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';
import {
- mapField,
friendlyOp,
getAllocationMethods,
+ mapField,
} from 'loot-core/shared/rules';
import {
- type SetSplitAmountRuleActionEntity,
+ type AppendNoteRuleActionEntity,
+ type DeleteTransactionRuleActionEntity,
type LinkScheduleRuleActionEntity,
+ type PrependNoteRuleActionEntity,
type RuleActionEntity,
type SetRuleActionEntity,
- type AppendNoteRuleActionEntity,
- type PrependNoteRuleActionEntity,
- type DeleteTransactionRuleActionEntity,
+ type SetSplitAmountRuleActionEntity,
} from 'loot-core/types/models';
import { ScheduleValue } from './ScheduleValue';
diff --git a/packages/desktop-client/src/components/rules/ConditionExpression.tsx b/packages/desktop-client/src/components/rules/ConditionExpression.tsx
index e16f596c7d..4f178e44d9 100644
--- a/packages/desktop-client/src/components/rules/ConditionExpression.tsx
+++ b/packages/desktop-client/src/components/rules/ConditionExpression.tsx
@@ -4,7 +4,7 @@ import { Text } from '@actual-app/components/text';
import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';
-import { mapField, friendlyOp } from 'loot-core/shared/rules';
+import { friendlyOp, mapField } from 'loot-core/shared/rules';
import { Value } from './Value';
diff --git a/packages/desktop-client/src/components/rules/FormulaActionEditor.tsx b/packages/desktop-client/src/components/rules/FormulaActionEditor.tsx
index a464cbd834..e8a4e61a26 100644
--- a/packages/desktop-client/src/components/rules/FormulaActionEditor.tsx
+++ b/packages/desktop-client/src/components/rules/FormulaActionEditor.tsx
@@ -1,4 +1,4 @@
-import React, { Suspense, lazy } from 'react';
+import React, { lazy, Suspense } from 'react';
import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';
diff --git a/packages/desktop-client/src/components/rules/RuleEditor.tsx b/packages/desktop-client/src/components/rules/RuleEditor.tsx
index 8e0101e7ea..e674b8f760 100644
--- a/packages/desktop-client/src/components/rules/RuleEditor.tsx
+++ b/packages/desktop-client/src/components/rules/RuleEditor.tsx
@@ -1,19 +1,19 @@
// @ts-strict-ignore
import {
- useState,
useEffect,
- useRef,
useMemo,
+ useRef,
+ useState,
type CSSProperties,
type ReactNode,
} from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
import { useResponsive } from '@actual-app/components/hooks/useResponsive';
import {
- SvgDelete,
SvgAdd,
+ SvgDelete,
SvgSubtract,
} from '@actual-app/components/icons/v0';
import {
@@ -35,21 +35,21 @@ import { send } from 'loot-core/platform/client/fetch';
import * as monthUtils from 'loot-core/shared/months';
import { q } from 'loot-core/shared/query';
import {
- mapField,
+ FIELD_TYPES,
friendlyOp,
+ getAllocationMethods,
getFieldError,
+ getValidOps,
+ isValidOp,
+ makeValue,
+ mapField,
parse,
unparse,
- makeValue,
- FIELD_TYPES,
- getAllocationMethods,
- isValidOp,
- getValidOps,
} from 'loot-core/shared/rules';
import {
- type RuleEntity,
type NewRuleEntity,
type RuleActionEntity,
+ type RuleEntity,
} from 'loot-core/types/models';
import { FormulaActionEditor } from './FormulaActionEditor';
@@ -67,14 +67,14 @@ import {
type ScheduleStatusType,
} from '@desktop-client/hooks/useSchedules';
import {
- useSelected,
SelectedProvider,
+ useSelected,
} from '@desktop-client/hooks/useSelected';
import { addNotification } from '@desktop-client/notifications/notificationsSlice';
import { getPayees } from '@desktop-client/payees/payeesSlice';
import { aqlQuery } from '@desktop-client/queries/aqlQuery';
import { useDispatch } from '@desktop-client/redux';
-import { enableUndo, disableUndo } from '@desktop-client/undo';
+import { disableUndo, enableUndo } from '@desktop-client/undo';
function updateValue(array, value, update) {
return array.map(v => (v === value ? update() : v));
diff --git a/packages/desktop-client/src/components/rules/RuleRow.tsx b/packages/desktop-client/src/components/rules/RuleRow.tsx
index cc2246ae2d..48baca18af 100644
--- a/packages/desktop-client/src/components/rules/RuleRow.tsx
+++ b/packages/desktop-client/src/components/rules/RuleRow.tsx
@@ -18,7 +18,7 @@ import { type RuleEntity } from 'loot-core/types/models';
import { ActionExpression } from './ActionExpression';
import { ConditionExpression } from './ConditionExpression';
-import { SelectCell, Row, Field, Cell } from '@desktop-client/components/table';
+import { Cell, Field, Row, SelectCell } from '@desktop-client/components/table';
import { useContextMenu } from '@desktop-client/hooks/useContextMenu';
import { useSelectedDispatch } from '@desktop-client/hooks/useSelected';
import { groupActionsBySplitIndex } from '@desktop-client/util/ruleUtils';
diff --git a/packages/desktop-client/src/components/rules/RulesHeader.tsx b/packages/desktop-client/src/components/rules/RulesHeader.tsx
index 3641a83be3..fb0c8dfe72 100644
--- a/packages/desktop-client/src/components/rules/RulesHeader.tsx
+++ b/packages/desktop-client/src/components/rules/RulesHeader.tsx
@@ -2,13 +2,13 @@ import React from 'react';
import { useTranslation } from 'react-i18next';
import {
- SelectCell,
Cell,
+ SelectCell,
TableHeader,
} from '@desktop-client/components/table';
import {
- useSelectedItems,
useSelectedDispatch,
+ useSelectedItems,
} from '@desktop-client/hooks/useSelected';
export function RulesHeader() {
diff --git a/packages/desktop-client/src/components/schedules/DiscoverSchedules.tsx b/packages/desktop-client/src/components/schedules/DiscoverSchedules.tsx
index c0cdf3afcb..f4148523de 100644
--- a/packages/desktop-client/src/components/schedules/DiscoverSchedules.tsx
+++ b/packages/desktop-client/src/components/schedules/DiscoverSchedules.tsx
@@ -21,20 +21,20 @@ import {
ModalHeader,
} from '@desktop-client/components/common/Modal';
import {
- Table,
- TableHeader,
- Row,
Field,
+ Row,
SelectCell,
+ Table,
+ TableHeader,
} from '@desktop-client/components/table';
import { DisplayId } from '@desktop-client/components/util/DisplayId';
import { useDateFormat } from '@desktop-client/hooks/useDateFormat';
import { useLocale } from '@desktop-client/hooks/useLocale';
import {
+ SelectedProvider,
useSelected,
useSelectedDispatch,
useSelectedItems,
- SelectedProvider,
} from '@desktop-client/hooks/useSelected';
import { useSendPlatformRequest } from '@desktop-client/hooks/useSendPlatformRequest';
import { aqlQuery } from '@desktop-client/queries/aqlQuery';
diff --git a/packages/desktop-client/src/components/schedules/ScheduleEditForm.tsx b/packages/desktop-client/src/components/schedules/ScheduleEditForm.tsx
index a76b22dad8..df427dcea8 100644
--- a/packages/desktop-client/src/components/schedules/ScheduleEditForm.tsx
+++ b/packages/desktop-client/src/components/schedules/ScheduleEditForm.tsx
@@ -19,9 +19,9 @@ import {
} from 'loot-core/types/models';
import {
+ Checkbox,
FormField,
FormLabel,
- Checkbox,
} from '@desktop-client/components/forms';
import { OpSelect } from '@desktop-client/components/rules/RuleEditor';
import { DateSelect } from '@desktop-client/components/select/DateSelect';
@@ -36,8 +36,8 @@ import { GenericInput } from '@desktop-client/components/util/GenericInput';
import { useDateFormat } from '@desktop-client/hooks/useDateFormat';
import { useLocale } from '@desktop-client/hooks/useLocale';
import {
- type Actions,
SelectedProvider,
+ type Actions,
} from '@desktop-client/hooks/useSelected';
export type ScheduleFormFields = {
diff --git a/packages/desktop-client/src/components/schedules/ScheduleEditModal.tsx b/packages/desktop-client/src/components/schedules/ScheduleEditModal.tsx
index 8245a8b4fa..32138c798a 100644
--- a/packages/desktop-client/src/components/schedules/ScheduleEditModal.tsx
+++ b/packages/desktop-client/src/components/schedules/ScheduleEditModal.tsx
@@ -1,6 +1,6 @@
// @ts-strict-ignore
import React, { useMemo } from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
import { SpaceBetween } from '@actual-app/components/space-between';
@@ -8,7 +8,7 @@ import { SpaceBetween } from '@actual-app/components/space-between';
import { send, sendCatch } from 'loot-core/platform/client/fetch';
import * as monthUtils from 'loot-core/shared/months';
import { q } from 'loot-core/shared/query';
-import { type ScheduleEntity, type RecurConfig } from 'loot-core/types/models';
+import { type RecurConfig, type ScheduleEntity } from 'loot-core/types/models';
import { updateScheduleConditions } from './schedule-edit-utils';
import { ScheduleEditForm } from './ScheduleEditForm';
@@ -22,8 +22,8 @@ import { usePayees } from '@desktop-client/hooks/usePayees';
import { useScheduleEdit } from '@desktop-client/hooks/useScheduleEdit';
import { useSelected } from '@desktop-client/hooks/useSelected';
import {
- type Modal as ModalType,
pushModal,
+ type Modal as ModalType,
} from '@desktop-client/modals/modalsSlice';
import { getPayeesById } from '@desktop-client/payees/payeesSlice';
import { aqlQuery } from '@desktop-client/queries/aqlQuery';
diff --git a/packages/desktop-client/src/components/schedules/ScheduleLink.tsx b/packages/desktop-client/src/components/schedules/ScheduleLink.tsx
index ce22fe6244..9938e6cbee 100644
--- a/packages/desktop-client/src/components/schedules/ScheduleLink.tsx
+++ b/packages/desktop-client/src/components/schedules/ScheduleLink.tsx
@@ -21,8 +21,8 @@ import {
import { Search } from '@desktop-client/components/common/Search';
import { useSchedules } from '@desktop-client/hooks/useSchedules';
import {
- type Modal as ModalType,
pushModal,
+ type Modal as ModalType,
} from '@desktop-client/modals/modalsSlice';
import { useDispatch } from '@desktop-client/redux';
diff --git a/packages/desktop-client/src/components/schedules/SchedulesTable.tsx b/packages/desktop-client/src/components/schedules/SchedulesTable.tsx
index f4f9e7867d..f73c509733 100644
--- a/packages/desktop-client/src/components/schedules/SchedulesTable.tsx
+++ b/packages/desktop-client/src/components/schedules/SchedulesTable.tsx
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import React, { useRef, useMemo, type CSSProperties } from 'react';
+import React, { useMemo, useRef, type CSSProperties } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
@@ -20,11 +20,11 @@ import { StatusBadge } from './StatusBadge';
import { PrivacyFilter } from '@desktop-client/components/PrivacyFilter';
import {
+ Cell,
+ Field,
+ Row,
Table,
TableHeader,
- Row,
- Field,
- Cell,
} from '@desktop-client/components/table';
import { DisplayId } from '@desktop-client/components/util/DisplayId';
import { useAccounts } from '@desktop-client/hooks/useAccounts';
@@ -34,8 +34,8 @@ import { useFormat } from '@desktop-client/hooks/useFormat';
import { useLocalPref } from '@desktop-client/hooks/useLocalPref';
import { usePayees } from '@desktop-client/hooks/usePayees';
import {
- type ScheduleStatusType,
type ScheduleStatuses,
+ type ScheduleStatusType,
} from '@desktop-client/hooks/useSchedules';
type SchedulesTableProps = {
diff --git a/packages/desktop-client/src/components/schedules/index.tsx b/packages/desktop-client/src/components/schedules/index.tsx
index 47c4e9ada9..b93ad87942 100644
--- a/packages/desktop-client/src/components/schedules/index.tsx
+++ b/packages/desktop-client/src/components/schedules/index.tsx
@@ -9,7 +9,7 @@ import { send } from 'loot-core/platform/client/fetch';
import { q } from 'loot-core/shared/query';
import { type ScheduleEntity } from 'loot-core/types/models';
-import { type ScheduleItemAction, SchedulesTable } from './SchedulesTable';
+import { SchedulesTable, type ScheduleItemAction } from './SchedulesTable';
import { Search } from '@desktop-client/components/common/Search';
import { Page } from '@desktop-client/components/Page';
diff --git a/packages/desktop-client/src/components/schedules/schedule-edit-utils.ts b/packages/desktop-client/src/components/schedules/schedule-edit-utils.ts
index 9f9ebdb4f5..8301e7723a 100644
--- a/packages/desktop-client/src/components/schedules/schedule-edit-utils.ts
+++ b/packages/desktop-client/src/components/schedules/schedule-edit-utils.ts
@@ -2,8 +2,8 @@ import { t } from 'i18next';
import { extractScheduleConds } from 'loot-core/shared/schedules';
import {
- type ScheduleEntity,
type RuleConditionOp,
+ type ScheduleEntity,
} from 'loot-core/types/models';
import { type ScheduleFormFields } from './ScheduleEditForm';
diff --git a/packages/desktop-client/src/components/select/DateSelect.tsx b/packages/desktop-client/src/components/select/DateSelect.tsx
index facf5c93ec..d4a3e1440c 100644
--- a/packages/desktop-client/src/components/select/DateSelect.tsx
+++ b/packages/desktop-client/src/components/select/DateSelect.tsx
@@ -1,7 +1,6 @@
// @ts-strict-ignore
import React, {
forwardRef,
- type Ref,
useEffect,
useImperativeHandle,
useLayoutEffect,
@@ -10,6 +9,7 @@ import React, {
useState,
type ComponentProps,
type KeyboardEvent,
+ type Ref,
} from 'react';
import { useResponsive } from '@actual-app/components/hooks/useResponsive';
@@ -20,22 +20,22 @@ import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';
import { css } from '@emotion/css';
import {
- type Locale,
+ addDays,
+ format,
+ isValid,
parse,
parseISO,
- format,
subDays,
- addDays,
- isValid,
+ type Locale,
} from 'date-fns';
import Pikaday from 'pikaday';
import {
+ currentDate,
getDayMonthFormat,
getDayMonthRegex,
getShortYearFormat,
getShortYearRegex,
- currentDate,
} from 'loot-core/shared/months';
import 'pikaday/css/pikaday.css';
diff --git a/packages/desktop-client/src/components/select/RecurringSchedulePicker.tsx b/packages/desktop-client/src/components/select/RecurringSchedulePicker.tsx
index f83d988bed..27e0d80dad 100644
--- a/packages/desktop-client/src/components/select/RecurringSchedulePicker.tsx
+++ b/packages/desktop-client/src/components/select/RecurringSchedulePicker.tsx
@@ -1,13 +1,13 @@
import {
- type CSSProperties,
- type Dispatch,
useEffect,
useMemo,
useReducer,
useRef,
useState,
+ type CSSProperties,
+ type Dispatch,
} from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
import { useResponsive } from '@actual-app/components/hooks/useResponsive';
diff --git a/packages/desktop-client/src/components/settings/AuthSettings.tsx b/packages/desktop-client/src/components/settings/AuthSettings.tsx
index 8185d13ae9..a6808d848f 100644
--- a/packages/desktop-client/src/components/settings/AuthSettings.tsx
+++ b/packages/desktop-client/src/components/settings/AuthSettings.tsx
@@ -9,8 +9,8 @@ import { theme } from '@actual-app/components/theme';
import { Setting } from './UI';
import {
- useMultiuserEnabled,
useLoginMethod,
+ useMultiuserEnabled,
} from '@desktop-client/components/ServerContext';
import { pushModal } from '@desktop-client/modals/modalsSlice';
import { useDispatch } from '@desktop-client/redux';
diff --git a/packages/desktop-client/src/components/settings/Experimental.tsx b/packages/desktop-client/src/components/settings/Experimental.tsx
index fb7f1194cd..2f0e17f563 100644
--- a/packages/desktop-client/src/components/settings/Experimental.tsx
+++ b/packages/desktop-client/src/components/settings/Experimental.tsx
@@ -1,4 +1,4 @@
-import { type ReactNode, useState } from 'react';
+import { useState, type ReactNode } from 'react';
import { Trans } from 'react-i18next';
import { Text } from '@actual-app/components/text';
diff --git a/packages/desktop-client/src/components/settings/Format.tsx b/packages/desktop-client/src/components/settings/Format.tsx
index e9d9c2de75..c1d751b974 100644
--- a/packages/desktop-client/src/components/settings/Format.tsx
+++ b/packages/desktop-client/src/components/settings/Format.tsx
@@ -1,6 +1,6 @@
// @ts-strict-ignore
import React from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { Select } from '@actual-app/components/select';
import { Text } from '@actual-app/components/text';
diff --git a/packages/desktop-client/src/components/settings/RepairTransactions.tsx b/packages/desktop-client/src/components/settings/RepairTransactions.tsx
index e45ca819a7..b6d5efd5b5 100644
--- a/packages/desktop-client/src/components/settings/RepairTransactions.tsx
+++ b/packages/desktop-client/src/components/settings/RepairTransactions.tsx
@@ -1,5 +1,5 @@
import React, { useState } from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { ButtonWithLoading } from '@actual-app/components/button';
import { Paragraph } from '@actual-app/components/paragraph';
diff --git a/packages/desktop-client/src/components/settings/ThemeInstaller.test.tsx b/packages/desktop-client/src/components/settings/ThemeInstaller.test.tsx
index 0417881ef3..dc14509319 100644
--- a/packages/desktop-client/src/components/settings/ThemeInstaller.test.tsx
+++ b/packages/desktop-client/src/components/settings/ThemeInstaller.test.tsx
@@ -1,6 +1,6 @@
import { render, screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
-import { vi, describe, it, expect, beforeEach } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { ThemeInstaller } from './ThemeInstaller';
diff --git a/packages/desktop-client/src/components/settings/ThemeInstaller.tsx b/packages/desktop-client/src/components/settings/ThemeInstaller.tsx
index 540856d6b3..c172f1586b 100644
--- a/packages/desktop-client/src/components/settings/ThemeInstaller.tsx
+++ b/packages/desktop-client/src/components/settings/ThemeInstaller.tsx
@@ -1,6 +1,6 @@
-import React, { useState, useCallback, useEffect } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
import { TextArea } from 'react-aria-components';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import AutoSizer from 'react-virtualized-auto-sizer';
import { Button } from '@actual-app/components/button';
@@ -14,14 +14,14 @@ import { Link } from '@desktop-client/components/common/Link';
import { FixedSizeList } from '@desktop-client/components/FixedSizeList';
import customThemeCatalog from '@desktop-client/data/customThemeCatalog.json';
import {
- type CatalogTheme,
- type InstalledTheme,
+ extractRepoOwner,
fetchThemeCss,
- validateThemeCss,
generateThemeId,
- normalizeGitHubRepo,
getThemeScreenshotUrl,
- extractRepoOwner,
+ normalizeGitHubRepo,
+ validateThemeCss,
+ type CatalogTheme,
+ type InstalledTheme,
} from '@desktop-client/style/customThemes';
// Theme item fixed dimensions
diff --git a/packages/desktop-client/src/components/settings/Themes.tsx b/packages/desktop-client/src/components/settings/Themes.tsx
index dbf9a1a952..53387db979 100644
--- a/packages/desktop-client/src/components/settings/Themes.tsx
+++ b/packages/desktop-client/src/components/settings/Themes.tsx
@@ -1,5 +1,5 @@
-import React, { useState, useCallback } from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import React, { useCallback, useState } from 'react';
+import { Trans, useTranslation } from 'react-i18next';
import { Menu } from '@actual-app/components/menu';
import { Select } from '@actual-app/components/select';
@@ -18,15 +18,15 @@ import { useSidebar } from '@desktop-client/components/sidebar/SidebarProvider';
import { useFeatureFlag } from '@desktop-client/hooks/useFeatureFlag';
import { useGlobalPref } from '@desktop-client/hooks/useGlobalPref';
import {
+ darkThemeOptions,
themeOptions,
- useTheme,
usePreferredDarkTheme,
- darkThemeOptions,
+ useTheme,
} from '@desktop-client/style';
import {
- type InstalledTheme,
parseInstalledTheme,
serializeInstalledTheme,
+ type InstalledTheme,
} from '@desktop-client/style/customThemes';
const INSTALL_NEW_VALUE = '__install_new__';
diff --git a/packages/desktop-client/src/components/settings/index.tsx b/packages/desktop-client/src/components/settings/index.tsx
index 04704445e5..5d6043a7ff 100644
--- a/packages/desktop-client/src/components/settings/index.tsx
+++ b/packages/desktop-client/src/components/settings/index.tsx
@@ -1,5 +1,5 @@
-import React, { type ReactNode, useEffect } from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import React, { useEffect, type ReactNode } from 'react';
+import { Trans, useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
import { useResponsive } from '@actual-app/components/hooks/useResponsive';
@@ -43,7 +43,7 @@ import { useGlobalPref } from '@desktop-client/hooks/useGlobalPref';
import { useMetadataPref } from '@desktop-client/hooks/useMetadataPref';
import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
import { loadPrefs } from '@desktop-client/prefs/prefsSlice';
-import { useSelector, useDispatch } from '@desktop-client/redux';
+import { useDispatch, useSelector } from '@desktop-client/redux';
function About() {
const version = useServerVersion();
diff --git a/packages/desktop-client/src/components/sidebar/Account.tsx b/packages/desktop-client/src/components/sidebar/Account.tsx
index f500d0e3df..b32496480b 100644
--- a/packages/desktop-client/src/components/sidebar/Account.tsx
+++ b/packages/desktop-client/src/components/sidebar/Account.tsx
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import React, { type CSSProperties, useRef, useState } from 'react';
+import React, { useRef, useState, type CSSProperties } from 'react';
import { useTranslation } from 'react-i18next';
import { AlignedText } from '@actual-app/components/aligned-text';
@@ -44,7 +44,7 @@ import { useNotes } from '@desktop-client/hooks/useNotes';
import { useSyncedPref } from '@desktop-client/hooks/useSyncedPref';
import { openAccountCloseModal } from '@desktop-client/modals/modalsSlice';
import { useDispatch } from '@desktop-client/redux';
-import { type SheetFields, type Binding } from '@desktop-client/spreadsheet';
+import { type Binding, type SheetFields } from '@desktop-client/spreadsheet';
export const accountNameStyle: CSSProperties = {
marginTop: -2,
diff --git a/packages/desktop-client/src/components/sidebar/Accounts.tsx b/packages/desktop-client/src/components/sidebar/Accounts.tsx
index ef518ff9cc..19b09bf25e 100644
--- a/packages/desktop-client/src/components/sidebar/Accounts.tsx
+++ b/packages/desktop-client/src/components/sidebar/Accounts.tsx
@@ -17,7 +17,7 @@ import { useLocalPref } from '@desktop-client/hooks/useLocalPref';
import { useOffBudgetAccounts } from '@desktop-client/hooks/useOffBudgetAccounts';
import { useOnBudgetAccounts } from '@desktop-client/hooks/useOnBudgetAccounts';
import { useUpdatedAccounts } from '@desktop-client/hooks/useUpdatedAccounts';
-import { useSelector, useDispatch } from '@desktop-client/redux';
+import { useDispatch, useSelector } from '@desktop-client/redux';
import * as bindings from '@desktop-client/spreadsheet/bindings';
const fontWeight = 600;
diff --git a/packages/desktop-client/src/components/sidebar/BudgetName.tsx b/packages/desktop-client/src/components/sidebar/BudgetName.tsx
index 56ef66c481..52e3be4537 100644
--- a/packages/desktop-client/src/components/sidebar/BudgetName.tsx
+++ b/packages/desktop-client/src/components/sidebar/BudgetName.tsx
@@ -1,4 +1,4 @@
-import React, { type ReactNode, useRef, useState } from 'react';
+import React, { useRef, useState, type ReactNode } from 'react';
import { useTranslation } from 'react-i18next';
import { Button } from '@actual-app/components/button';
diff --git a/packages/desktop-client/src/components/sidebar/Item.tsx b/packages/desktop-client/src/components/sidebar/Item.tsx
index d91f8d14d7..0aa46b5366 100644
--- a/packages/desktop-client/src/components/sidebar/Item.tsx
+++ b/packages/desktop-client/src/components/sidebar/Item.tsx
@@ -1,10 +1,10 @@
// @ts-strict-ignore
import React, {
type ComponentType,
+ type CSSProperties,
type MouseEventHandler,
type ReactNode,
type SVGProps,
- type CSSProperties,
} from 'react';
import { Block } from '@actual-app/components/block';
diff --git a/packages/desktop-client/src/components/sidebar/ItemContent.tsx b/packages/desktop-client/src/components/sidebar/ItemContent.tsx
index b9882c147b..56a695b749 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 ComponentProps,
type MouseEventHandler,
type ReactNode,
- type ComponentProps,
} from 'react';
import { type CSSProperties } from '@actual-app/components/styles';
diff --git a/packages/desktop-client/src/components/sidebar/PrimaryButtons.tsx b/packages/desktop-client/src/components/sidebar/PrimaryButtons.tsx
index 2c957af14e..01cff8ec38 100644
--- a/packages/desktop-client/src/components/sidebar/PrimaryButtons.tsx
+++ b/packages/desktop-client/src/components/sidebar/PrimaryButtons.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useCallback, useEffect } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useLocation } from 'react-router';
diff --git a/packages/desktop-client/src/components/sidebar/SecondaryItem.tsx b/packages/desktop-client/src/components/sidebar/SecondaryItem.tsx
index 60dcc27220..00a3388614 100644
--- a/packages/desktop-client/src/components/sidebar/SecondaryItem.tsx
+++ b/packages/desktop-client/src/components/sidebar/SecondaryItem.tsx
@@ -1,9 +1,9 @@
// @ts-strict-ignore
import React, {
type ComponentType,
+ type CSSProperties,
type MouseEventHandler,
type SVGProps,
- type CSSProperties,
} from 'react';
import { Block } from '@actual-app/components/block';
diff --git a/packages/desktop-client/src/components/sidebar/Sidebar.tsx b/packages/desktop-client/src/components/sidebar/Sidebar.tsx
index f9fdfc79f0..b2e5408df1 100644
--- a/packages/desktop-client/src/components/sidebar/Sidebar.tsx
+++ b/packages/desktop-client/src/components/sidebar/Sidebar.tsx
@@ -1,4 +1,4 @@
-import React, { type CSSProperties, useState } from 'react';
+import React, { useState, type CSSProperties } from 'react';
import { useTranslation } from 'react-i18next';
import { useResponsive } from '@actual-app/components/hooks/useResponsive';
diff --git a/packages/desktop-client/src/components/sidebar/SidebarProvider.tsx b/packages/desktop-client/src/components/sidebar/SidebarProvider.tsx
index c704a6d847..c0ddac3112 100644
--- a/packages/desktop-client/src/components/sidebar/SidebarProvider.tsx
+++ b/packages/desktop-client/src/components/sidebar/SidebarProvider.tsx
@@ -1,11 +1,11 @@
// @ts-strict-ignore
import React, {
createContext,
- useState,
useContext,
useMemo,
- type ReactNode,
+ useState,
type Dispatch,
+ type ReactNode,
type SetStateAction,
} from 'react';
diff --git a/packages/desktop-client/src/components/sort.tsx b/packages/desktop-client/src/components/sort.tsx
index c487eb22e8..ae744e197a 100644
--- a/packages/desktop-client/src/components/sort.tsx
+++ b/packages/desktop-client/src/components/sort.tsx
@@ -1,11 +1,11 @@
// @ts-strict-ignore
import React, {
createContext,
+ useContext,
useEffect,
- useRef,
useLayoutEffect,
+ useRef,
useState,
- useContext,
type Context,
} from 'react';
import { useDrag, useDrop } from 'react-dnd';
diff --git a/packages/desktop-client/src/components/spreadsheet/CellValue.tsx b/packages/desktop-client/src/components/spreadsheet/CellValue.tsx
index afdeb4314a..f8fdd7c693 100644
--- a/packages/desktop-client/src/components/spreadsheet/CellValue.tsx
+++ b/packages/desktop-client/src/components/spreadsheet/CellValue.tsx
@@ -1,21 +1,21 @@
// @ts-strict-ignore
import React, {
type ComponentPropsWithoutRef,
- type ReactNode,
type CSSProperties,
+ type ReactNode,
} from 'react';
import { styles } from '@actual-app/components/styles';
import { Text } from '@actual-app/components/text';
import { PrivacyFilter } from '@desktop-client/components/PrivacyFilter';
-import { type FormatType, useFormat } from '@desktop-client/hooks/useFormat';
+import { useFormat, type FormatType } from '@desktop-client/hooks/useFormat';
import { useSheetName } from '@desktop-client/hooks/useSheetName';
import { useSheetValue } from '@desktop-client/hooks/useSheetValue';
import {
type Binding,
- type SheetNames,
type SheetFields,
+ type SheetNames,
type Spreadsheets,
} from '@desktop-client/spreadsheet';
diff --git a/packages/desktop-client/src/components/table.tsx b/packages/desktop-client/src/components/table.tsx
index 4f1456070b..7e36492391 100644
--- a/packages/desktop-client/src/components/table.tsx
+++ b/packages/desktop-client/src/components/table.tsx
@@ -1,6 +1,5 @@
// @ts-strict-ignore
import React, {
- type FocusEvent,
forwardRef,
useCallback,
useImperativeHandle,
@@ -9,6 +8,7 @@ import React, {
useRef,
useState,
type ComponentProps,
+ type FocusEvent,
type JSX,
type KeyboardEvent,
type ReactElement,
@@ -26,7 +26,7 @@ import { SvgCheckmark } from '@actual-app/components/icons/v1';
import { Input } from '@actual-app/components/input';
import { Menu, type MenuItem } from '@actual-app/components/menu';
import { Popover } from '@actual-app/components/popover';
-import { type CSSProperties, styles } from '@actual-app/components/styles';
+import { styles, type CSSProperties } 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';
@@ -37,7 +37,7 @@ import {
mergeConditionalPrivacyFilterProps,
} from './PrivacyFilter';
-import { type FormatType, useFormat } from '@desktop-client/hooks/useFormat';
+import { useFormat, type FormatType } from '@desktop-client/hooks/useFormat';
import { useModalState } from '@desktop-client/hooks/useModalState';
import {
AvoidRefocusScrollProvider,
@@ -46,10 +46,10 @@ import {
import { useSelectedItems } from '@desktop-client/hooks/useSelected';
import { useSheetValue } from '@desktop-client/hooks/useSheetValue';
import {
- type Spreadsheets,
+ type Binding,
type SheetFields,
type SheetNames,
- type Binding,
+ type Spreadsheets,
} from '@desktop-client/spreadsheet';
export const ROW_HEIGHT = 32;
diff --git a/packages/desktop-client/src/components/tags/TagCreationRow.tsx b/packages/desktop-client/src/components/tags/TagCreationRow.tsx
index 2f6100bd64..646850df4a 100644
--- a/packages/desktop-client/src/components/tags/TagCreationRow.tsx
+++ b/packages/desktop-client/src/components/tags/TagCreationRow.tsx
@@ -1,10 +1,10 @@
import React, {
- type ChangeEvent,
- type KeyboardEvent,
useEffect,
useMemo,
useRef,
useState,
+ type ChangeEvent,
+ type KeyboardEvent,
} from 'react';
import { Trans, useTranslation } from 'react-i18next';
diff --git a/packages/desktop-client/src/components/tags/TagRow.tsx b/packages/desktop-client/src/components/tags/TagRow.tsx
index 26f4683948..84c9db4f45 100644
--- a/packages/desktop-client/src/components/tags/TagRow.tsx
+++ b/packages/desktop-client/src/components/tags/TagRow.tsx
@@ -12,11 +12,11 @@ import { type TagEntity } from 'loot-core/types/models';
import { TagEditor } from './TagEditor';
import {
- SelectCell,
- Row,
Cell,
- InputCell,
CellButton,
+ InputCell,
+ Row,
+ SelectCell,
} from '@desktop-client/components/table';
import { useContextMenu } from '@desktop-client/hooks/useContextMenu';
import { useNavigate } from '@desktop-client/hooks/useNavigate';
diff --git a/packages/desktop-client/src/components/tags/TagsHeader.tsx b/packages/desktop-client/src/components/tags/TagsHeader.tsx
index a7a3ebdb11..1922096a7c 100644
--- a/packages/desktop-client/src/components/tags/TagsHeader.tsx
+++ b/packages/desktop-client/src/components/tags/TagsHeader.tsx
@@ -2,13 +2,13 @@ import React from 'react';
import { useTranslation } from 'react-i18next';
import {
- SelectCell,
Cell,
+ SelectCell,
TableHeader,
} from '@desktop-client/components/table';
import {
- useSelectedItems,
useSelectedDispatch,
+ useSelectedItems,
} from '@desktop-client/hooks/useSelected';
export function TagsHeader() {
diff --git a/packages/desktop-client/src/components/transactions/SelectedTransactionsButton.tsx b/packages/desktop-client/src/components/transactions/SelectedTransactionsButton.tsx
index 9d81f8cd63..a34600a339 100644
--- a/packages/desktop-client/src/components/transactions/SelectedTransactionsButton.tsx
+++ b/packages/desktop-client/src/components/transactions/SelectedTransactionsButton.tsx
@@ -6,8 +6,8 @@ import { Menu } from '@actual-app/components/menu';
import { q } from 'loot-core/shared/query';
import {
- scheduleIsRecurring,
extractScheduleConds,
+ scheduleIsRecurring,
} from 'loot-core/shared/schedules';
import { isPreviewId } from 'loot-core/shared/transactions';
import { validForTransfer } from 'loot-core/shared/transfer';
diff --git a/packages/desktop-client/src/components/transactions/SimpleTransactionsTable.tsx b/packages/desktop-client/src/components/transactions/SimpleTransactionsTable.tsx
index 56da2a0cfa..35439693b0 100644
--- a/packages/desktop-client/src/components/transactions/SimpleTransactionsTable.tsx
+++ b/packages/desktop-client/src/components/transactions/SimpleTransactionsTable.tsx
@@ -1,11 +1,11 @@
import React, {
memo,
- useMemo,
useCallback,
+ useMemo,
type CSSProperties,
type ReactNode,
} from 'react';
-import { useTranslation, Trans } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
import { SvgArrowsSynchronize } from '@actual-app/components/icons/v2';
import { styles } from '@actual-app/components/styles';
@@ -30,10 +30,10 @@ import { DisplayId } from '@desktop-client/components/util/DisplayId';
import { useAccount } from '@desktop-client/hooks/useAccount';
import { useCategory } from '@desktop-client/hooks/useCategory';
import { useDateFormat } from '@desktop-client/hooks/useDateFormat';
-import { type FormatType, useFormat } from '@desktop-client/hooks/useFormat';
+import { useFormat, type FormatType } from '@desktop-client/hooks/useFormat';
import {
- useSelectedItems,
useSelectedDispatch,
+ useSelectedItems,
} from '@desktop-client/hooks/useSelected';
function serializeTransaction(
diff --git a/packages/desktop-client/src/components/transactions/TransactionMenu.tsx b/packages/desktop-client/src/components/transactions/TransactionMenu.tsx
index 08af50f8af..6614edd175 100644
--- a/packages/desktop-client/src/components/transactions/TransactionMenu.tsx
+++ b/packages/desktop-client/src/components/transactions/TransactionMenu.tsx
@@ -5,8 +5,8 @@ import { Menu } from '@actual-app/components/menu';
import { q } from 'loot-core/shared/query';
import {
- scheduleIsRecurring,
extractScheduleConds,
+ scheduleIsRecurring,
} from 'loot-core/shared/schedules';
import { isPreviewId } from 'loot-core/shared/transactions';
import { type TransactionEntity } from 'loot-core/types/models';
diff --git a/packages/desktop-client/src/components/transactions/TransactionsTable.test.tsx b/packages/desktop-client/src/components/transactions/TransactionsTable.test.tsx
index 38a7768aaf..ac3ea41fb4 100644
--- a/packages/desktop-client/src/components/transactions/TransactionsTable.test.tsx
+++ b/packages/desktop-client/src/components/transactions/TransactionsTable.test.tsx
@@ -1,14 +1,14 @@
-import React, { useState, useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { format as formatDate, parse as parseDate } from 'date-fns';
import { v4 as uuidv4 } from 'uuid';
import {
- generateTransaction,
generateAccount,
generateCategoryGroups,
+ generateTransaction,
} from 'loot-core/mocks';
import { initServer } from 'loot-core/platform/client/fetch';
import {
diff --git a/packages/desktop-client/src/components/transactions/TransactionsTable.tsx b/packages/desktop-client/src/components/transactions/TransactionsTable.tsx
index ef6b32f8ab..9a8f2667f4 100644
--- a/packages/desktop-client/src/components/transactions/TransactionsTable.tsx
+++ b/packages/desktop-client/src/components/transactions/TransactionsTable.tsx
@@ -1,19 +1,19 @@
import {
createElement,
createRef,
- type CSSProperties,
- type ForwardedRef,
forwardRef,
- type KeyboardEvent,
memo,
- type ReactNode,
- type Ref,
- type RefObject,
useCallback,
useEffect,
useMemo,
useRef,
useState,
+ type CSSProperties,
+ type ForwardedRef,
+ type KeyboardEvent,
+ type ReactNode,
+ type Ref,
+ type RefObject,
} from 'react';
import { useHotkeys } from 'react-hotkeys-hook';
import { Trans, useTranslation } from 'react-i18next';
@@ -59,9 +59,9 @@ import {
import {
amountToCurrency,
currencyToAmount,
- type IntegerAmount,
integerToCurrency,
titleFirst,
+ type IntegerAmount,
} from 'loot-core/shared/util';
import {
type AccountEntity,
@@ -78,8 +78,8 @@ import {
isLastChild,
makeTemporaryTransactions,
selectAscDesc,
- type SerializedTransaction,
serializeTransaction,
+ type SerializedTransaction,
type TransactionEditFunction,
type TransactionUpdateFunction,
} from './table/utils';
@@ -105,11 +105,11 @@ import {
Row,
SelectCell,
Table,
+ UnexposedCellContent,
+ useTableNavigator,
type TableHandleRef,
type TableNavigator,
type TableProps,
- UnexposedCellContent,
- useTableNavigator,
} from '@desktop-client/components/table';
import {
SchedulesProvider,
@@ -130,8 +130,8 @@ import {
} from '@desktop-client/hooks/useSelected';
import { SheetNameProvider } from '@desktop-client/hooks/useSheetName';
import {
- type SplitsExpandedContextValue,
useSplitsExpanded,
+ type SplitsExpandedContextValue,
} from '@desktop-client/hooks/useSplitsExpanded';
import { pushModal } from '@desktop-client/modals/modalsSlice';
import { NotesTagFormatter } from '@desktop-client/notes/NotesTagFormatter';
diff --git a/packages/desktop-client/src/components/transactions/table/utils.ts b/packages/desktop-client/src/components/transactions/table/utils.ts
index be3ad01c68..ac021d46b5 100644
--- a/packages/desktop-client/src/components/transactions/table/utils.ts
+++ b/packages/desktop-client/src/components/transactions/table/utils.ts
@@ -1,11 +1,11 @@
-import { parseISO, isValid as isDateValid } from 'date-fns';
+import { isValid as isDateValid, parseISO } from 'date-fns';
import { evalArithmetic } from 'loot-core/shared/arithmetic';
import { currentDay } from 'loot-core/shared/months';
import {
amountToInteger,
- type CurrencyAmount,
integerToCurrencyWithDecimal,
+ type CurrencyAmount,
} from 'loot-core/shared/util';
import {
type AccountEntity,
diff --git a/packages/desktop-client/src/components/util/AmountInput.tsx b/packages/desktop-client/src/components/util/AmountInput.tsx
index 9836cdc214..7ec271fa59 100644
--- a/packages/desktop-client/src/components/util/AmountInput.tsx
+++ b/packages/desktop-client/src/components/util/AmountInput.tsx
@@ -1,13 +1,13 @@
// @ts-strict-ignore
import React, {
- type Ref,
+ useCallback,
+ useEffect,
useRef,
useState,
- useEffect,
+ type CSSProperties,
type FocusEventHandler,
type KeyboardEvent,
- type CSSProperties,
- useCallback,
+ type Ref,
} from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/desktop-client/src/components/util/FinancialInput.tsx b/packages/desktop-client/src/components/util/FinancialInput.tsx
index f087bf2e40..c92eb52024 100644
--- a/packages/desktop-client/src/components/util/FinancialInput.tsx
+++ b/packages/desktop-client/src/components/util/FinancialInput.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, useRef, type FocusEvent } from 'react';
+import { useEffect, useRef, useState, type FocusEvent } from 'react';
import { Input, type InputProps } from '@actual-app/components/input';
diff --git a/packages/desktop-client/src/components/util/LoadComponent.tsx b/packages/desktop-client/src/components/util/LoadComponent.tsx
index 3f19b27ffd..4d2229dc6f 100644
--- a/packages/desktop-client/src/components/util/LoadComponent.tsx
+++ b/packages/desktop-client/src/components/util/LoadComponent.tsx
@@ -1,4 +1,4 @@
-import { type ComponentType, useEffect, useState } from 'react';
+import { useEffect, useState, type ComponentType } from 'react';
import { Block } from '@actual-app/components/block';
import { AnimatedLoading } from '@actual-app/components/icons/AnimatedLoading';
diff --git a/packages/desktop-client/src/components/util/PercentInput.tsx b/packages/desktop-client/src/components/util/PercentInput.tsx
index c4b6154962..eeea128f12 100644
--- a/packages/desktop-client/src/components/util/PercentInput.tsx
+++ b/packages/desktop-client/src/components/util/PercentInput.tsx
@@ -1,11 +1,11 @@
import React, {
- type Ref,
+ useEffect,
useRef,
useState,
- useEffect,
- type FocusEventHandler,
- type FocusEvent,
type CSSProperties,
+ type FocusEvent,
+ type FocusEventHandler,
+ type Ref,
} from 'react';
import { Input } from '@actual-app/components/input';
diff --git a/packages/desktop-client/src/hooks/useAccountPreviewTransactions.ts b/packages/desktop-client/src/hooks/useAccountPreviewTransactions.ts
index ececdf83f5..4f0a01115c 100644
--- a/packages/desktop-client/src/hooks/useAccountPreviewTransactions.ts
+++ b/packages/desktop-client/src/hooks/useAccountPreviewTransactions.ts
@@ -2,9 +2,9 @@ import { useCallback, useMemo } from 'react';
import { groupById, type IntegerAmount } from 'loot-core/shared/util';
import {
- type ScheduleEntity,
type AccountEntity,
type PayeeEntity,
+ type ScheduleEntity,
type TransactionEntity,
} from 'loot-core/types/models';
diff --git a/packages/desktop-client/src/hooks/useAccounts.ts b/packages/desktop-client/src/hooks/useAccounts.ts
index f528f7b937..b2910a5baf 100644
--- a/packages/desktop-client/src/hooks/useAccounts.ts
+++ b/packages/desktop-client/src/hooks/useAccounts.ts
@@ -3,7 +3,7 @@ import { useEffect } from 'react';
import { useInitialMount } from './useInitialMount';
import { getAccounts } from '@desktop-client/accounts/accountsSlice';
-import { useSelector, useDispatch } from '@desktop-client/redux';
+import { useDispatch, useSelector } from '@desktop-client/redux';
export function useAccounts() {
const dispatch = useDispatch();
diff --git a/packages/desktop-client/src/hooks/useCachedSchedules.tsx b/packages/desktop-client/src/hooks/useCachedSchedules.tsx
index d1f1576613..37aff2128f 100644
--- a/packages/desktop-client/src/hooks/useCachedSchedules.tsx
+++ b/packages/desktop-client/src/hooks/useCachedSchedules.tsx
@@ -1,13 +1,13 @@
import React, {
createContext,
- type PropsWithChildren,
useContext,
+ type PropsWithChildren,
} from 'react';
import {
- type UseSchedulesResult,
- type UseSchedulesProps,
useSchedules,
+ type UseSchedulesProps,
+ type UseSchedulesResult,
} from './useSchedules';
type SchedulesContextValue = UseSchedulesResult;
diff --git a/packages/desktop-client/src/hooks/useCategories.ts b/packages/desktop-client/src/hooks/useCategories.ts
index 7064cf5b03..918b5de291 100644
--- a/packages/desktop-client/src/hooks/useCategories.ts
+++ b/packages/desktop-client/src/hooks/useCategories.ts
@@ -3,7 +3,7 @@ import { useEffect } from 'react';
import { useInitialMount } from './useInitialMount';
import { getCategories } from '@desktop-client/budget/budgetSlice';
-import { useSelector, useDispatch } from '@desktop-client/redux';
+import { useDispatch, useSelector } from '@desktop-client/redux';
export function useCategories() {
const dispatch = useDispatch();
diff --git a/packages/desktop-client/src/hooks/useCategoryPreviewTransactions.ts b/packages/desktop-client/src/hooks/useCategoryPreviewTransactions.ts
index cba2bd6704..545459cde5 100644
--- a/packages/desktop-client/src/hooks/useCategoryPreviewTransactions.ts
+++ b/packages/desktop-client/src/hooks/useCategoryPreviewTransactions.ts
@@ -2,8 +2,8 @@ import { useCallback, useMemo } from 'react';
import * as monthUtils from 'loot-core/shared/months';
import {
- type ScheduleEntity,
type CategoryEntity,
+ type ScheduleEntity,
} from 'loot-core/types/models';
import { useCategory } from './useCategory';
diff --git a/packages/desktop-client/src/hooks/useCategoryScheduleGoalTemplates.ts b/packages/desktop-client/src/hooks/useCategoryScheduleGoalTemplates.ts
index 5e38f2c528..da6a391b31 100644
--- a/packages/desktop-client/src/hooks/useCategoryScheduleGoalTemplates.ts
+++ b/packages/desktop-client/src/hooks/useCategoryScheduleGoalTemplates.ts
@@ -1,8 +1,8 @@
import { useMemo } from 'react';
import {
- type ScheduleEntity,
type CategoryEntity,
+ type ScheduleEntity,
} from 'loot-core/types/models';
import { useCachedSchedules } from './useCachedSchedules';
diff --git a/packages/desktop-client/src/hooks/useContextMenu.ts b/packages/desktop-client/src/hooks/useContextMenu.ts
index 97e718dfa8..3e1a7f9c0e 100644
--- a/packages/desktop-client/src/hooks/useContextMenu.ts
+++ b/packages/desktop-client/src/hooks/useContextMenu.ts
@@ -1,4 +1,4 @@
-import { type MouseEventHandler, useState } from 'react';
+import { useState, type MouseEventHandler } from 'react';
export function useContextMenu() {
const [menuOpen, setMenuOpen] = useState(false);
diff --git a/packages/desktop-client/src/hooks/useDashboard.ts b/packages/desktop-client/src/hooks/useDashboard.ts
index f89dad4956..05eb25bd3d 100644
--- a/packages/desktop-client/src/hooks/useDashboard.ts
+++ b/packages/desktop-client/src/hooks/useDashboard.ts
@@ -1,7 +1,7 @@
import { useMemo } from 'react';
import { q } from 'loot-core/shared/query';
-import { type Widget, type DashboardEntity } from 'loot-core/types/models';
+import { type DashboardEntity, type Widget } from 'loot-core/types/models';
import { useQuery } from './useQuery';
diff --git a/packages/desktop-client/src/hooks/useDisplayPayee.tsx b/packages/desktop-client/src/hooks/useDisplayPayee.tsx
index c7764da13e..289bbbaeab 100644
--- a/packages/desktop-client/src/hooks/useDisplayPayee.tsx
+++ b/packages/desktop-client/src/hooks/useDisplayPayee.tsx
@@ -1,4 +1,4 @@
-import { createContext, type ReactNode, useContext, useMemo } from 'react';
+import { createContext, useContext, useMemo, type ReactNode } from 'react';
import { useTranslation } from 'react-i18next';
import { q } from 'loot-core/shared/query';
diff --git a/packages/desktop-client/src/hooks/useEffectAfterMount.ts b/packages/desktop-client/src/hooks/useEffectAfterMount.ts
index 2373b72eb8..5d3a14a4f0 100644
--- a/packages/desktop-client/src/hooks/useEffectAfterMount.ts
+++ b/packages/desktop-client/src/hooks/useEffectAfterMount.ts
@@ -1,8 +1,8 @@
import {
- type DependencyList,
- type EffectCallback,
useEffect,
useRef,
+ type DependencyList,
+ type EffectCallback,
} from 'react';
/**
diff --git a/packages/desktop-client/src/hooks/useFormat.ts b/packages/desktop-client/src/hooks/useFormat.ts
index aa5672bd18..562c8011b0 100644
--- a/packages/desktop-client/src/hooks/useFormat.ts
+++ b/packages/desktop-client/src/hooks/useFormat.ts
@@ -1,16 +1,16 @@
import { useCallback, useEffect, useMemo } from 'react';
import { evalArithmetic } from 'loot-core/shared/arithmetic';
-import { type Currency, getCurrency } from 'loot-core/shared/currencies';
+import { getCurrency, type Currency } from 'loot-core/shared/currencies';
import {
amountToInteger,
currencyToAmount,
getNumberFormat,
- type IntegerAmount,
integerToAmount,
integerToCurrency,
parseNumberFormat,
setNumberFormat,
+ type IntegerAmount,
} from 'loot-core/shared/util';
import { useSyncedPref } from './useSyncedPref';
diff --git a/packages/desktop-client/src/hooks/useFormulaExecution.ts b/packages/desktop-client/src/hooks/useFormulaExecution.ts
index 7ebd3d395e..4d47190a26 100644
--- a/packages/desktop-client/src/hooks/useFormulaExecution.ts
+++ b/packages/desktop-client/src/hooks/useFormulaExecution.ts
@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
import { send } from 'loot-core/platform/client/fetch';
import * as monthUtils from 'loot-core/shared/months';
diff --git a/packages/desktop-client/src/hooks/useGlobalPref.ts b/packages/desktop-client/src/hooks/useGlobalPref.ts
index 937d73244a..c143e5f991 100644
--- a/packages/desktop-client/src/hooks/useGlobalPref.ts
+++ b/packages/desktop-client/src/hooks/useGlobalPref.ts
@@ -3,7 +3,7 @@ import { useCallback } from 'react';
import { type GlobalPrefs } from 'loot-core/types/prefs';
import { saveGlobalPrefs } from '@desktop-client/prefs/prefsSlice';
-import { useSelector, useDispatch } from '@desktop-client/redux';
+import { useDispatch, useSelector } from '@desktop-client/redux';
type SetGlobalPrefAction<K extends keyof GlobalPrefs> = (
value: GlobalPrefs[K],
diff --git a/packages/desktop-client/src/hooks/useMergedRefs.ts b/packages/desktop-client/src/hooks/useMergedRefs.ts
index 1c9a54428a..29651f112e 100644
--- a/packages/desktop-client/src/hooks/useMergedRefs.ts
+++ b/packages/desktop-client/src/hooks/useMergedRefs.ts
@@ -1,4 +1,4 @@
-import { useCallback, type RefObject, type Ref, type RefCallback } from 'react';
+import { useCallback, type Ref, type RefCallback, type RefObject } from 'react';
export function useMergedRefs<T>(
...refs: (
diff --git a/packages/desktop-client/src/hooks/useMetadataPref.ts b/packages/desktop-client/src/hooks/useMetadataPref.ts
index 193c9d8d28..883a8f05b2 100644
--- a/packages/desktop-client/src/hooks/useMetadataPref.ts
+++ b/packages/desktop-client/src/hooks/useMetadataPref.ts
@@ -3,7 +3,7 @@ import { useCallback } from 'react';
import { type MetadataPrefs } from 'loot-core/types/prefs';
import { savePrefs } from '@desktop-client/prefs/prefsSlice';
-import { useSelector, useDispatch } from '@desktop-client/redux';
+import { useDispatch, useSelector } from '@desktop-client/redux';
type SetMetadataPrefAction<K extends keyof MetadataPrefs> = (
value: MetadataPrefs[K],
diff --git a/packages/desktop-client/src/hooks/useModalState.ts b/packages/desktop-client/src/hooks/useModalState.ts
index e53f113f3d..5c143d2b19 100644
--- a/packages/desktop-client/src/hooks/useModalState.ts
+++ b/packages/desktop-client/src/hooks/useModalState.ts
@@ -1,7 +1,7 @@
import { useCallback } from 'react';
-import { type Modal, popModal } from '@desktop-client/modals/modalsSlice';
-import { useSelector, useDispatch } from '@desktop-client/redux';
+import { popModal, type Modal } from '@desktop-client/modals/modalsSlice';
+import { useDispatch, useSelector } from '@desktop-client/redux';
type ModalState = {
onClose: () => void;
diff --git a/packages/desktop-client/src/hooks/useNavigate.ts b/packages/desktop-client/src/hooks/useNavigate.ts
index 68ab55d91e..2862f1a223 100644
--- a/packages/desktop-client/src/hooks/useNavigate.ts
+++ b/packages/desktop-client/src/hooks/useNavigate.ts
@@ -1,12 +1,12 @@
import { useCallback } from 'react';
import {
+ useLocation,
+ // oxlint-disable-next-line eslint/no-restricted-imports
+ useNavigate as useNavigateReactRouter,
type Location,
type NavigateFunction,
type NavigateOptions,
type To,
- useLocation,
- // oxlint-disable-next-line eslint/no-restricted-imports
- useNavigate as useNavigateReactRouter,
} from 'react-router';
export function useNavigate(): NavigateFunction {
diff --git a/packages/desktop-client/src/hooks/usePayees.ts b/packages/desktop-client/src/hooks/usePayees.ts
index ba584d0148..6d5e61e7f1 100644
--- a/packages/desktop-client/src/hooks/usePayees.ts
+++ b/packages/desktop-client/src/hooks/usePayees.ts
@@ -7,7 +7,7 @@ import {
getPayees,
getPayeesById,
} from '@desktop-client/payees/payeesSlice';
-import { useSelector, useDispatch } from '@desktop-client/redux';
+import { useDispatch, useSelector } from '@desktop-client/redux';
export function useCommonPayees() {
const dispatch = useDispatch();
diff --git a/packages/desktop-client/src/hooks/usePreviewTransactions.ts b/packages/desktop-client/src/hooks/usePreviewTransactions.ts
index efcd7580dd..987dae5f79 100644
--- a/packages/desktop-client/src/hooks/usePreviewTransactions.ts
+++ b/packages/desktop-client/src/hooks/usePreviewTransactions.ts
@@ -1,15 +1,15 @@
-import { useEffect, useState, useMemo, useRef } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
import * as d from 'date-fns';
import { send } from 'loot-core/platform/client/fetch';
-import { currentDay, addDays, parseDate } from 'loot-core/shared/months';
+import { addDays, currentDay, parseDate } from 'loot-core/shared/months';
import {
- getUpcomingDays,
extractScheduleConds,
- scheduleIsRecurring,
getNextDate,
getScheduledAmount,
+ getUpcomingDays,
+ scheduleIsRecurring,
} from 'loot-core/shared/schedules';
import { ungroupTransactions } from 'loot-core/shared/transactions';
import { type IntegerAmount } from 'loot-core/shared/util';
diff --git a/packages/desktop-client/src/hooks/useProperFocus.tsx b/packages/desktop-client/src/hooks/useProperFocus.tsx
index ffb7439a84..51f747b347 100644
--- a/packages/desktop-client/src/hooks/useProperFocus.tsx
+++ b/packages/desktop-client/src/hooks/useProperFocus.tsx
@@ -1,10 +1,10 @@
// @ts-strict-ignore
import React, {
createContext,
- useRef,
- useLayoutEffect,
useContext,
+ useLayoutEffect,
useMemo,
+ useRef,
type ReactElement,
type RefObject,
} from 'react';
diff --git a/packages/desktop-client/src/hooks/useQuery.ts b/packages/desktop-client/src/hooks/useQuery.ts
index 41ec504666..e27d08b5bd 100644
--- a/packages/desktop-client/src/hooks/useQuery.ts
+++ b/packages/desktop-client/src/hooks/useQuery.ts
@@ -1,4 +1,4 @@
-import { useState, useMemo, useEffect, type DependencyList } from 'react';
+import { useEffect, useMemo, useState, type DependencyList } from 'react';
import { type Query } from 'loot-core/shared/query';
diff --git a/packages/desktop-client/src/hooks/useResizeObserver.ts b/packages/desktop-client/src/hooks/useResizeObserver.ts
index 58573eff5d..d661c4fab9 100644
--- a/packages/desktop-client/src/hooks/useResizeObserver.ts
+++ b/packages/desktop-client/src/hooks/useResizeObserver.ts
@@ -1,4 +1,4 @@
-import { useRef, useCallback } from 'react';
+import { useCallback, useRef } from 'react';
export function useResizeObserver<T extends Element>(
func: (contentRect: DOMRectReadOnly) => void,
diff --git a/packages/desktop-client/src/hooks/useScheduleEdit.ts b/packages/desktop-client/src/hooks/useScheduleEdit.ts
index 4fe2577213..a9246dc903 100644
--- a/packages/desktop-client/src/hooks/useScheduleEdit.ts
+++ b/packages/desktop-client/src/hooks/useScheduleEdit.ts
@@ -9,9 +9,9 @@ import {
getScheduledAmount,
} from 'loot-core/shared/schedules';
import {
- type TransactionEntity,
- type ScheduleEntity,
type RecurConfig,
+ type ScheduleEntity,
+ type TransactionEntity,
} from 'loot-core/types/models';
import { updateScheduleConditions } from '@desktop-client/components/schedules/schedule-edit-utils';
diff --git a/packages/desktop-client/src/hooks/useSchedules.ts b/packages/desktop-client/src/hooks/useSchedules.ts
index e2fd2310c0..4fd2347d20 100644
--- a/packages/desktop-client/src/hooks/useSchedules.ts
+++ b/packages/desktop-client/src/hooks/useSchedules.ts
@@ -1,10 +1,10 @@
-import { useState, useRef, useEffect } from 'react';
+import { useEffect, useRef, useState } from 'react';
import { q, type Query } from 'loot-core/shared/query';
import {
+ getHasTransactionsQuery,
getStatus,
getStatusLabel,
- getHasTransactionsQuery,
} from 'loot-core/shared/schedules';
import type {
AccountEntity,
diff --git a/packages/desktop-client/src/hooks/useScrollListener.tsx b/packages/desktop-client/src/hooks/useScrollListener.tsx
index 2ed62a1e29..a8a99b8593 100644
--- a/packages/desktop-client/src/hooks/useScrollListener.tsx
+++ b/packages/desktop-client/src/hooks/useScrollListener.tsx
@@ -1,12 +1,12 @@
import React, {
- type ReactNode,
- type RefObject,
createContext,
+ useCallback,
useContext,
useEffect,
- useCallback,
- useRef,
useMemo,
+ useRef,
+ type ReactNode,
+ type RefObject,
} from 'react';
import debounce from 'lodash/debounce';
diff --git a/packages/desktop-client/src/hooks/useSelected.tsx b/packages/desktop-client/src/hooks/useSelected.tsx
index d3cfe2cf9c..45529951fd 100644
--- a/packages/desktop-client/src/hooks/useSelected.tsx
+++ b/packages/desktop-client/src/hooks/useSelected.tsx
@@ -1,10 +1,10 @@
// @ts-strict-ignore
import React, {
createContext,
- useContext,
- useReducer,
useCallback,
+ useContext,
useEffect,
+ useReducer,
useRef,
type Dispatch,
type ReactElement,
diff --git a/packages/desktop-client/src/hooks/useSheetName.tsx b/packages/desktop-client/src/hooks/useSheetName.tsx
index 6067eb3144..5100747bf3 100644
--- a/packages/desktop-client/src/hooks/useSheetName.tsx
+++ b/packages/desktop-client/src/hooks/useSheetName.tsx
@@ -1,10 +1,10 @@
// @ts-strict-ignore
-import { createContext, type PropsWithChildren, useContext } from 'react';
+import { createContext, useContext, type PropsWithChildren } from 'react';
import {
- type SheetNames,
- type SheetFields,
type Binding,
+ type SheetFields,
+ type SheetNames,
} from '@desktop-client/spreadsheet';
function unresolveName(name) {
diff --git a/packages/desktop-client/src/hooks/useSheetValue.ts b/packages/desktop-client/src/hooks/useSheetValue.ts
index a380200ead..6ea3f9d085 100644
--- a/packages/desktop-client/src/hooks/useSheetValue.ts
+++ b/packages/desktop-client/src/hooks/useSheetValue.ts
@@ -1,14 +1,14 @@
-import { useState, useRef, useLayoutEffect } from 'react';
+import { useLayoutEffect, useRef, useState } from 'react';
import { useSheetName } from './useSheetName';
import { useSpreadsheet } from './useSpreadsheet';
import {
- type Spreadsheets,
- type SheetFields,
- type SheetNames,
type Binding,
type BindingObject,
+ type SheetFields,
+ type SheetNames,
+ type Spreadsheets,
} from '@desktop-client/spreadsheet';
type SheetValueResult<
diff --git a/packages/desktop-client/src/hooks/useSingleActiveEditForm.tsx b/packages/desktop-client/src/hooks/useSingleActiveEditForm.tsx
index 7aab608141..b85afa76fc 100644
--- a/packages/desktop-client/src/hooks/useSingleActiveEditForm.tsx
+++ b/packages/desktop-client/src/hooks/useSingleActiveEditForm.tsx
@@ -1,10 +1,10 @@
// @ts-strict-ignore
import React, {
- type ReactNode,
createContext,
useContext,
- useState,
useRef,
+ useState,
+ type ReactNode,
} from 'react';
type ActiveEditCleanup = () => void;
diff --git a/packages/desktop-client/src/hooks/useSplitsExpanded.tsx b/packages/desktop-client/src/hooks/useSplitsExpanded.tsx
index 7fa5b1c154..b2a69810e5 100644
--- a/packages/desktop-client/src/hooks/useSplitsExpanded.tsx
+++ b/packages/desktop-client/src/hooks/useSplitsExpanded.tsx
@@ -1,12 +1,12 @@
import React, {
createContext,
- useMemo,
- useEffect,
useContext,
+ useEffect,
+ useMemo,
useReducer,
+ useRef,
type Dispatch,
type ReactNode,
- useRef,
} from 'react';
type SplitMode = 'collapse' | 'expand';
diff --git a/packages/desktop-client/src/hooks/useSpreadsheet.tsx b/packages/desktop-client/src/hooks/useSpreadsheet.tsx
index 3c96daff91..f34e511eba 100644
--- a/packages/desktop-client/src/hooks/useSpreadsheet.tsx
+++ b/packages/desktop-client/src/hooks/useSpreadsheet.tsx
@@ -1,8 +1,8 @@
import {
createContext,
+ useContext,
useEffect,
useMemo,
- useContext,
type ReactNode,
} from 'react';
diff --git a/packages/desktop-client/src/hooks/useSyncedPref.ts b/packages/desktop-client/src/hooks/useSyncedPref.ts
index ed91af47f1..72bd793c66 100644
--- a/packages/desktop-client/src/hooks/useSyncedPref.ts
+++ b/packages/desktop-client/src/hooks/useSyncedPref.ts
@@ -3,7 +3,7 @@ import { useCallback } from 'react';
import { type SyncedPrefs } from 'loot-core/types/prefs';
import { saveSyncedPrefs } from '@desktop-client/prefs/prefsSlice';
-import { useSelector, useDispatch } from '@desktop-client/redux';
+import { useDispatch, useSelector } from '@desktop-client/redux';
type SetSyncedPrefAction<K extends keyof SyncedPrefs> = (
value: SyncedPrefs[K],
diff --git a/packages/desktop-client/src/hooks/useSyncedPrefs.ts b/packages/desktop-client/src/hooks/useSyncedPrefs.ts
index a618bac955..0da6ee845c 100644
--- a/packages/desktop-client/src/hooks/useSyncedPrefs.ts
+++ b/packages/desktop-client/src/hooks/useSyncedPrefs.ts
@@ -3,7 +3,7 @@ import { useCallback } from 'react';
import { type SyncedPrefs } from 'loot-core/types/prefs';
import { saveSyncedPrefs } from '@desktop-client/prefs/prefsSlice';
-import { useSelector, useDispatch } from '@desktop-client/redux';
+import { useDispatch, useSelector } from '@desktop-client/redux';
type SetSyncedPrefsAction = (value: Partial<SyncedPrefs>) => void;
diff --git a/packages/desktop-client/src/hooks/useTransactionFormulaExecution.ts b/packages/desktop-client/src/hooks/useTransactionFormulaExecution.ts
index fd58c1d08b..2f166eab23 100644
--- a/packages/desktop-client/src/hooks/useTransactionFormulaExecution.ts
+++ b/packages/desktop-client/src/hooks/useTransactionFormulaExecution.ts
@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
import { useLocale } from './useLocale';
diff --git a/packages/desktop-client/src/hooks/useTransactions.ts b/packages/desktop-client/src/hooks/useTransactions.ts
index 5d81764c8c..0b01b44962 100644
--- a/packages/desktop-client/src/hooks/useTransactions.ts
+++ b/packages/desktop-client/src/hooks/useTransactions.ts
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState, useCallback } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
import { type Query } from 'loot-core/shared/query';
import { type IntegerAmount } from 'loot-core/shared/util';
diff --git a/packages/desktop-client/src/hooks/useTransactionsSearch.ts b/packages/desktop-client/src/hooks/useTransactionsSearch.ts
index e9312f809d..5d99cf6dea 100644
--- a/packages/desktop-client/src/hooks/useTransactionsSearch.ts
+++ b/packages/desktop-client/src/hooks/useTransactionsSearch.ts
@@ -1,4 +1,4 @@
-import { useState, useMemo, useEffect, useRef } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
import debounce from 'lodash/debounce';
diff --git a/packages/desktop-client/src/i18n.test.ts b/packages/desktop-client/src/i18n.test.ts
index c5deb1120e..5317629b0a 100644
--- a/packages/desktop-client/src/i18n.test.ts
+++ b/packages/desktop-client/src/i18n.test.ts
@@ -1,6 +1,6 @@
import i18n from 'i18next';
-import { setI18NextLanguage, availableLanguages } from './i18n';
+import { availableLanguages, setI18NextLanguage } from './i18n';
vi.mock('i18next', () => {
const i18nMock = {
diff --git a/packages/desktop-client/src/queries/index.ts b/packages/desktop-client/src/queries/index.ts
index e97ae1e5ca..6900548dd2 100644
--- a/packages/desktop-client/src/queries/index.ts
+++ b/packages/desktop-client/src/queries/index.ts
@@ -1,15 +1,15 @@
// @ts-strict-ignore
-import { parse as parseDate, isValid as isDateValid } from 'date-fns';
+import { isValid as isDateValid, parse as parseDate } from 'date-fns';
import {
dayFromDate,
- getDayMonthRegex,
getDayMonthFormat,
- getShortYearRegex,
+ getDayMonthRegex,
getShortYearFormat,
+ getShortYearRegex,
} from 'loot-core/shared/months';
import { q, type Query } from 'loot-core/shared/query';
-import { currencyToAmount, amountToInteger } from 'loot-core/shared/util';
+import { amountToInteger, currencyToAmount } from 'loot-core/shared/util';
import { type AccountEntity } from 'loot-core/types/models';
import { type SyncedPrefs } from 'loot-core/types/prefs';
diff --git a/packages/desktop-client/src/redux/mock.tsx b/packages/desktop-client/src/redux/mock.tsx
index 192846ef77..0a56e90994 100644
--- a/packages/desktop-client/src/redux/mock.tsx
+++ b/packages/desktop-client/src/redux/mock.tsx
@@ -1,7 +1,7 @@
import React, { type ReactNode } from 'react';
import { Provider } from 'react-redux';
-import { configureStore, combineReducers } from '@reduxjs/toolkit';
+import { combineReducers, configureStore } from '@reduxjs/toolkit';
import { type store as realStore } from './store';
diff --git a/packages/desktop-client/src/redux/store.ts b/packages/desktop-client/src/redux/store.ts
index 783306905f..712cd7a2cc 100644
--- a/packages/desktop-client/src/redux/store.ts
+++ b/packages/desktop-client/src/redux/store.ts
@@ -26,9 +26,9 @@ import {
reducer as modalsSliceReducer,
} from '@desktop-client/modals/modalsSlice';
import {
+ addNotification,
name as notificationsSliceName,
reducer as notificationsSliceReducer,
- addNotification,
} from '@desktop-client/notifications/notificationsSlice';
import {
name as payeesSliceName,
diff --git a/packages/desktop-client/src/spreadsheet/bindings.ts b/packages/desktop-client/src/spreadsheet/bindings.ts
index c4f2683175..8ff7a93e47 100644
--- a/packages/desktop-client/src/spreadsheet/bindings.ts
+++ b/packages/desktop-client/src/spreadsheet/bindings.ts
@@ -3,8 +3,8 @@ import type { AccountEntity, CategoryEntity } from 'loot-core/types/models';
import {
parametrizedField,
- type SheetFields,
type Binding,
+ type SheetFields,
type SheetNames,
} from '.';
diff --git a/packages/desktop-client/src/style/customThemes.test.ts b/packages/desktop-client/src/style/customThemes.test.ts
index 2c650a67b3..ed0b3cfce5 100644
--- a/packages/desktop-client/src/style/customThemes.test.ts
+++ b/packages/desktop-client/src/style/customThemes.test.ts
@@ -1,9 +1,9 @@
// oxlint-disable eslint/no-script-url
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
import {
- validateThemeCss,
parseInstalledTheme,
+ validateThemeCss,
type InstalledTheme,
} from './customThemes';
diff --git a/packages/desktop-client/src/style/theme.tsx b/packages/desktop-client/src/style/theme.tsx
index 490a6d0ff6..30a41ab0e1 100644
--- a/packages/desktop-client/src/style/theme.tsx
+++ b/packages/desktop-client/src/style/theme.tsx
@@ -3,7 +3,7 @@ import { useEffect, useMemo, useState } from 'react';
import { isNonProductionEnvironment } from 'loot-core/shared/environment';
import type { DarkTheme, Theme } from 'loot-core/types/prefs';
-import { validateThemeCss, parseInstalledTheme } from './customThemes';
+import { parseInstalledTheme, validateThemeCss } from './customThemes';
import * as darkTheme from './themes/dark';
import * as developmentTheme from './themes/development';
import * as lightTheme from './themes/light';
diff --git a/packages/desktop-electron/e2e/fixtures.ts b/packages/desktop-electron/e2e/fixtures.ts
index cb5f9fce3c..8c0f31ee65 100644
--- a/packages/desktop-electron/e2e/fixtures.ts
+++ b/packages/desktop-electron/e2e/fixtures.ts
@@ -1,13 +1,13 @@
import path from 'node:path';
import {
- test as base,
_electron,
- type Page,
+ test as base,
type ElectronApplication,
+ type Page,
type TestInfo,
} from '@playwright/test';
-import { remove, ensureDir } from 'fs-extra';
+import { ensureDir, remove } from 'fs-extra';
type ElectronFixtures = {
electronApp: ElectronApplication;
diff --git a/packages/desktop-electron/index.ts b/packages/desktop-electron/index.ts
index 8cbb29c3fd..1c45bc570e 100644
--- a/packages/desktop-electron/index.ts
+++ b/packages/desktop-electron/index.ts
@@ -3,21 +3,21 @@ import { createServer, type Server } from 'http';
import path from 'path';
import {
- net,
app,
- ipcMain,
BrowserWindow,
- Menu,
dialog,
- shell,
+ ipcMain,
+ Menu,
+ net,
powerMonitor,
protocol,
+ shell,
utilityProcess,
- type UtilityProcess,
- type OpenDialogSyncOptions,
- type SaveDialogOptions,
type Env,
type ForkOptions,
+ type OpenDialogSyncOptions,
+ type SaveDialogOptions,
+ type UtilityProcess,
} from 'electron';
import { copy, exists, mkdir, remove } from 'fs-extra';
import promiseRetry from 'promise-retry';
diff --git a/packages/desktop-electron/menu.ts b/packages/desktop-electron/menu.ts
index 253115fda4..2baf191196 100644
--- a/packages/desktop-electron/menu.ts
+++ b/packages/desktop-electron/menu.ts
@@ -1,8 +1,8 @@
import {
- type MenuItemConstructorOptions,
+ app,
Menu,
type BrowserWindow,
- app,
+ type MenuItemConstructorOptions,
} from 'electron';
export function getMenu() {
diff --git a/packages/desktop-electron/preload.ts b/packages/desktop-electron/preload.ts
index 87ed004275..c67d2b7f40 100644
--- a/packages/desktop-electron/preload.ts
+++ b/packages/desktop-electron/preload.ts
@@ -1,4 +1,4 @@
-import { ipcRenderer, contextBridge, type IpcRenderer } from 'electron';
+import { contextBridge, ipcRenderer, type IpcRenderer } from 'electron';
import {
type GetBootstrapDataPayload,
diff --git a/packages/loot-core/src/mocks/setup.ts b/packages/loot-core/src/mocks/setup.ts
index b2b8b9198c..83ed3b8f09 100644
--- a/packages/loot-core/src/mocks/setup.ts
+++ b/packages/loot-core/src/mocks/setup.ts
@@ -6,8 +6,8 @@ import * as sqlite from '../platform/server/sqlite';
import * as db from '../server/db';
import type * as MigrationsType from '../server/migrate/migrations';
import {
- enableGlobalMutations,
disableGlobalMutations,
+ enableGlobalMutations,
} from '../server/mutators';
import { setServer } from '../server/server-config';
import * as sheet from '../server/sheet';
diff --git a/packages/loot-core/src/mocks/util.ts b/packages/loot-core/src/mocks/util.ts
index 0015056ef7..1e27273f47 100644
--- a/packages/loot-core/src/mocks/util.ts
+++ b/packages/loot-core/src/mocks/util.ts
@@ -1,6 +1,6 @@
// @ts-strict-ignore
import fs from 'fs/promises';
-import { join, dirname, basename } from 'path';
+import { basename, dirname, join } from 'path';
import { diff } from 'jest-diff';
diff --git a/packages/loot-core/src/platform/client/fetch/index.browser.ts b/packages/loot-core/src/platform/client/fetch/index.browser.ts
index 71bbd19816..5d50ae6867 100644
--- a/packages/loot-core/src/platform/client/fetch/index.browser.ts
+++ b/packages/loot-core/src/platform/client/fetch/index.browser.ts
@@ -2,7 +2,7 @@
import { t } from 'i18next';
import { v4 as uuidv4 } from 'uuid';
-import { captureException, captureBreadcrumb } from '../../exceptions';
+import { captureBreadcrumb, captureException } from '../../exceptions';
import * as undo from '../undo';
import type * as T from './index-types';
diff --git a/packages/loot-core/src/platform/server/connection/index.electron.ts b/packages/loot-core/src/platform/server/connection/index.electron.ts
index 3dd466cd97..a341b31efe 100644
--- a/packages/loot-core/src/platform/server/connection/index.electron.ts
+++ b/packages/loot-core/src/platform/server/connection/index.electron.ts
@@ -1,6 +1,6 @@
// @ts-strict-ignore
import { APIError } from '../../../server/errors';
-import { runHandler, isMutating } from '../../../server/mutators';
+import { isMutating, runHandler } from '../../../server/mutators';
import { captureException } from '../../exceptions';
import { logger } from '../log';
diff --git a/packages/loot-core/src/platform/server/connection/index.ts b/packages/loot-core/src/platform/server/connection/index.ts
index c67683f567..c3f55d4064 100644
--- a/packages/loot-core/src/platform/server/connection/index.ts
+++ b/packages/loot-core/src/platform/server/connection/index.ts
@@ -1,6 +1,6 @@
// @ts-strict-ignore
import { APIError } from '../../../server/errors';
-import { runHandler, isMutating } from '../../../server/mutators';
+import { isMutating, runHandler } from '../../../server/mutators';
import { captureException } from '../../exceptions';
import { logger } from '../log';
diff --git a/packages/loot-core/src/platform/server/fs/index.web.test.ts b/packages/loot-core/src/platform/server/fs/index.web.test.ts
index 6b90ce4a85..311b496199 100644
--- a/packages/loot-core/src/platform/server/fs/index.web.test.ts
+++ b/packages/loot-core/src/platform/server/fs/index.web.test.ts
@@ -6,7 +6,7 @@ import { patchFetchForSqlJS } from '../../../mocks/util';
import * as idb from '../indexeddb';
import * as sqlite from '../sqlite';
-import { init, readFile, writeFile, exists, pathToId, join } from './index';
+import { exists, init, join, pathToId, readFile, writeFile } from './index';
beforeAll(() => {
const baseURL = `${__dirname}/../../../../../../node_modules/@jlongster/sql.js/dist/`;
diff --git a/packages/loot-core/src/platform/server/sqlite/index.electron.ts b/packages/loot-core/src/platform/server/sqlite/index.electron.ts
index 29adbb41ed..c5d22a9017 100644
--- a/packages/loot-core/src/platform/server/sqlite/index.electron.ts
+++ b/packages/loot-core/src/platform/server/sqlite/index.electron.ts
@@ -2,7 +2,7 @@
import SQL from 'better-sqlite3';
import { v4 as uuidv4 } from 'uuid';
-import { removeFile, readFile } from '../fs';
+import { readFile, removeFile } from '../fs';
import { logger } from '../log';
import { normalise } from './normalise';
diff --git a/packages/loot-core/src/platform/server/sqlite/index.web.test.ts b/packages/loot-core/src/platform/server/sqlite/index.web.test.ts
index 6d58827473..85831605fd 100644
--- a/packages/loot-core/src/platform/server/sqlite/index.web.test.ts
+++ b/packages/loot-core/src/platform/server/sqlite/index.web.test.ts
@@ -3,11 +3,11 @@ import { patchFetchForSqlJS } from '../../../mocks/util';
// oxlint-disable-next-line eslint/no-restricted-imports
import {
+ execQuery,
init,
openDatabase,
- transaction,
- execQuery,
runQuery,
+ transaction,
} from './index.web';
beforeAll(async () => {
diff --git a/packages/loot-core/src/server/accounts/app.ts b/packages/loot-core/src/server/accounts/app.ts
index 1bdc1afa2a..26eb65b779 100644
--- a/packages/loot-core/src/server/accounts/app.ts
+++ b/packages/loot-core/src/server/accounts/app.ts
@@ -12,12 +12,12 @@ import { amountToInteger } from '../../shared/util';
import {
type AccountEntity,
type CategoryEntity,
- type SyncServerGoCardlessAccount,
- type TransactionEntity,
- type SyncServerSimpleFinAccount,
- type SyncServerPluggyAiAccount,
type GoCardlessToken,
type ImportTransactionEntity,
+ type SyncServerGoCardlessAccount,
+ type SyncServerPluggyAiAccount,
+ type SyncServerSimpleFinAccount,
+ type TransactionEntity,
} from '../../types/models';
import { createApp } from '../app';
import * as db from '../db';
diff --git a/packages/loot-core/src/server/accounts/sync.test.ts b/packages/loot-core/src/server/accounts/sync.test.ts
index 59dff999c0..bae2c5d00d 100644
--- a/packages/loot-core/src/server/accounts/sync.test.ts
+++ b/packages/loot-core/src/server/accounts/sync.test.ts
@@ -5,9 +5,9 @@ import * as db from '../db';
import { loadMappings } from '../db/mappings';
import { post } from '../post';
import { getServer } from '../server-config';
-import { loadRules, insertRule } from '../transactions/transaction-rules';
+import { insertRule, loadRules } from '../transactions/transaction-rules';
-import { reconcileTransactions, addTransactions } from './sync';
+import { addTransactions, reconcileTransactions } from './sync';
vi.mock('../../shared/months', async () => ({
...(await vi.importActual('../../shared/months')),
diff --git a/packages/loot-core/src/server/accounts/sync.ts b/packages/loot-core/src/server/accounts/sync.ts
index 22bc76f3cd..46327d0394 100644
--- a/packages/loot-core/src/server/accounts/sync.ts
+++ b/packages/loot-core/src/server/accounts/sync.ts
@@ -11,8 +11,8 @@ import {
recalculateSplit,
} from '../../shared/transactions';
import {
- hasFieldsChanged,
amountToInteger,
+ hasFieldsChanged,
integerToAmount,
} from '../../shared/util';
import {
diff --git a/packages/loot-core/src/server/admin/app.ts b/packages/loot-core/src/server/admin/app.ts
index 3cb043f532..eb76c029d4 100644
--- a/packages/loot-core/src/server/admin/app.ts
+++ b/packages/loot-core/src/server/admin/app.ts
@@ -1,9 +1,9 @@
// @ts-strict-ignore
import * as asyncStorage from '../../platform/server/asyncStorage';
import {
+ type NewUserAccessEntity,
type UserAvailable,
type UserEntity,
- type NewUserAccessEntity,
} from '../../types/models';
import { createApp } from '../app';
import { del, get, patch, post } from '../post';
diff --git a/packages/loot-core/src/server/api.ts b/packages/loot-core/src/server/api.ts
index e9b5eef767..d71881fec2 100644
--- a/packages/loot-core/src/server/api.ts
+++ b/packages/loot-core/src/server/api.ts
@@ -12,9 +12,9 @@ import {
import * as monthUtils from '../shared/months';
import { q } from '../shared/query';
import {
+ deleteTransaction,
ungroupTransactions,
updateTransaction,
- deleteTransaction,
} from '../shared/transactions';
import { integerToAmount } from '../shared/util';
import { type Handlers } from '../types/handlers';
@@ -29,13 +29,13 @@ import { addTransactions } from './accounts/sync';
import {
accountModel,
budgetModel,
- categoryModel,
categoryGroupModel,
+ categoryModel,
payeeModel,
remoteFileModel,
scheduleModel,
- type APIScheduleEntity,
type AmountOPType,
+ type APIScheduleEntity,
} from './api-models';
import { aqlQuery } from './aql';
import * as cloudStorage from './cloud-storage';
@@ -45,7 +45,7 @@ import { APIError } from './errors';
import { runMutator } from './mutators';
import * as prefs from './prefs';
import * as sheet from './sheet';
-import { setSyncingMode, batchMessages } from './sync';
+import { batchMessages, setSyncingMode } from './sync';
let IMPORT_MODE = false;
diff --git a/packages/loot-core/src/server/aql/exec.ts b/packages/loot-core/src/server/aql/exec.ts
index a83b397659..d770aac1bf 100644
--- a/packages/loot-core/src/server/aql/exec.ts
+++ b/packages/loot-core/src/server/aql/exec.ts
@@ -4,8 +4,8 @@ import * as db from '../db';
import {
compileQuery,
- type CompilerState,
defaultConstructQuery,
+ type CompilerState,
type OutputTypes,
type SchemaConfig,
type SqlPieces,
diff --git a/packages/loot-core/src/server/aql/index.ts b/packages/loot-core/src/server/aql/index.ts
index dd3fde0183..fd32aa8715 100644
--- a/packages/loot-core/src/server/aql/index.ts
+++ b/packages/loot-core/src/server/aql/index.ts
@@ -2,9 +2,9 @@ import { Query, type QueryState } from '../../shared/query';
import { type CompilerState, type SqlPieces } from './compiler';
import {
- type AqlQueryParams,
compileAndRunAqlQuery,
runCompiledAqlQuery,
+ type AqlQueryParams,
} from './exec';
import { schema, schemaConfig } from './schema';
import { schemaExecutors } from './schema/executors';
diff --git a/packages/loot-core/src/server/aql/schema-helpers.ts b/packages/loot-core/src/server/aql/schema-helpers.ts
index 523f69c6e9..5ac02a184e 100644
--- a/packages/loot-core/src/server/aql/schema-helpers.ts
+++ b/packages/loot-core/src/server/aql/schema-helpers.ts
@@ -1,6 +1,6 @@
// @ts-strict-ignore
import { dayFromDate } from '../../shared/months';
-import { toDateRepr, fromDateRepr } from '../models';
+import { fromDateRepr, toDateRepr } from '../models';
function isRequired(name, fieldDesc) {
return fieldDesc.required || name === 'id';
diff --git a/packages/loot-core/src/server/aql/schema/executors.ts b/packages/loot-core/src/server/aql/schema/executors.ts
index 49bd8bdecc..1031629843 100644
--- a/packages/loot-core/src/server/aql/schema/executors.ts
+++ b/packages/loot-core/src/server/aql/schema/executors.ts
@@ -6,12 +6,12 @@ import { type CategoryEntity } from '../../../types/models';
import * as db from '../../db';
import { whereIn } from '../../db/util';
import {
- type CompilerState,
isAggregateQuery,
+ type CompilerState,
type OutputTypes,
type SqlPieces,
} from '../compiler';
-import { type AqlQueryExecutor, execQuery } from '../exec';
+import { execQuery, type AqlQueryExecutor } from '../exec';
import { convertOutputType } from '../schema-helpers';
// Transactions executor
diff --git a/packages/loot-core/src/server/budget/actions.ts b/packages/loot-core/src/server/budget/actions.ts
index e1c27b17ed..b1601e3384 100644
--- a/packages/loot-core/src/server/budget/actions.ts
+++ b/packages/loot-core/src/server/budget/actions.ts
@@ -6,9 +6,9 @@ import * as asyncStorage from '../../platform/server/asyncStorage';
import { getLocale } from '../../shared/locale';
import * as monthUtils from '../../shared/months';
import {
- type IntegerAmount,
integerToCurrency,
safeNumber,
+ type IntegerAmount,
} from '../../shared/util';
import { type CategoryEntity } from '../../types/models';
import * as db from '../db';
diff --git a/packages/loot-core/src/server/budget/category-template-context.ts b/packages/loot-core/src/server/budget/category-template-context.ts
index d93ae79449..c57ab7da49 100644
--- a/packages/loot-core/src/server/budget/category-template-context.ts
+++ b/packages/loot-core/src/server/budget/category-template-context.ts
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import { type Currency, getCurrency } from 'loot-core/shared/currencies';
+import { getCurrency, type Currency } from 'loot-core/shared/currencies';
import { q } from 'loot-core/shared/query';
import * as monthUtils from '../../shared/months';
@@ -11,16 +11,16 @@ import {
type CopyTemplate,
type GoalTemplate,
type PercentageTemplate,
+ type PeriodicTemplate,
type RemainderTemplate,
type SimpleTemplate,
type SpendTemplate,
type Template,
- type PeriodicTemplate,
} from '../../types/models/templates';
import { aqlQuery } from '../aql';
import * as db from '../db';
-import { getSheetValue, getSheetBoolean } from './actions';
+import { getSheetBoolean, getSheetValue } from './actions';
import { runSchedule } from './schedule-template';
import { getActiveSchedules } from './statements';
diff --git a/packages/loot-core/src/server/budget/cleanup-template.ts b/packages/loot-core/src/server/budget/cleanup-template.ts
index b882de0be0..340dfa8f93 100644
--- a/packages/loot-core/src/server/budget/cleanup-template.ts
+++ b/packages/loot-core/src/server/budget/cleanup-template.ts
@@ -2,7 +2,7 @@
import * as monthUtils from '../../shared/months';
import * as db from '../db';
-import { setBudget, getSheetValue, setGoal } from './actions';
+import { getSheetValue, setBudget, setGoal } from './actions';
import { parse } from './cleanup-template.pegjs';
type Notification = {
diff --git a/packages/loot-core/src/server/budget/envelope.ts b/packages/loot-core/src/server/budget/envelope.ts
index a1ab3f3d13..eae8a94683 100644
--- a/packages/loot-core/src/server/budget/envelope.ts
+++ b/packages/loot-core/src/server/budget/envelope.ts
@@ -6,7 +6,7 @@ import * as sheet from '../sheet';
import { resolveName } from '../spreadsheet/util';
import { createCategory as createCategoryFromBase } from './base';
-import { number, sumAmounts, flatten2, unflatten2 } from './util';
+import { flatten2, number, sumAmounts, unflatten2 } from './util';
function getBlankSheet(months) {
const blankMonth = monthUtils.prevMonth(months[0]);
diff --git a/packages/loot-core/src/server/budget/goal-template.ts b/packages/loot-core/src/server/budget/goal-template.ts
index 3e143d428b..213a4f641a 100644
--- a/packages/loot-core/src/server/budget/goal-template.ts
+++ b/packages/loot-core/src/server/budget/goal-template.ts
@@ -10,7 +10,7 @@ import { aqlQuery } from '../aql';
import * as db from '../db';
import { batchMessages } from '../sync';
-import { isReflectBudget, getSheetValue, setGoal, setBudget } from './actions';
+import { getSheetValue, isReflectBudget, setBudget, setGoal } from './actions';
import { CategoryTemplateContext } from './category-template-context';
import { checkTemplateNotes, storeNoteTemplates } from './template-notes';
diff --git a/packages/loot-core/src/server/budget/schedule-template.ts b/packages/loot-core/src/server/budget/schedule-template.ts
index 3e9154d2f4..4b8910c7ad 100644
--- a/packages/loot-core/src/server/budget/schedule-template.ts
+++ b/packages/loot-core/src/server/budget/schedule-template.ts
@@ -1,9 +1,9 @@
// @ts-strict-ignore
import * as monthUtils from '../../shared/months';
import {
- getNextDate,
- getDateWithSkippedWeekend,
extractScheduleConds,
+ getDateWithSkippedWeekend,
+ getNextDate,
} from '../../shared/schedules';
import { type CategoryEntity } from '../../types/models';
import {
diff --git a/packages/loot-core/src/server/budget/template-notes.test.ts b/packages/loot-core/src/server/budget/template-notes.test.ts
index 9cd0110f99..9178063956 100644
--- a/packages/loot-core/src/server/budget/template-notes.test.ts
+++ b/packages/loot-core/src/server/budget/template-notes.test.ts
@@ -3,10 +3,10 @@ import * as db from '../db';
import { parse } from './goal-template.pegjs';
import {
- type CategoryWithTemplateNote,
getActiveSchedules,
getCategoriesWithTemplateNotes,
resetCategoryGoalDefsWithNoTemplates,
+ type CategoryWithTemplateNote,
} from './statements';
import {
checkTemplateNotes,
diff --git a/packages/loot-core/src/server/budget/template-notes.ts b/packages/loot-core/src/server/budget/template-notes.ts
index 7d2db66c5b..ed7ccb4064 100644
--- a/packages/loot-core/src/server/budget/template-notes.ts
+++ b/packages/loot-core/src/server/budget/template-notes.ts
@@ -3,10 +3,10 @@ import type { Template } from '../../types/models/templates';
import { storeTemplates } from './goal-template';
import { parse } from './goal-template.pegjs';
import {
- type CategoryWithTemplateNote,
getActiveSchedules,
getCategoriesWithTemplateNotes,
resetCategoryGoalDefsWithNoTemplates,
+ type CategoryWithTemplateNote,
} from './statements';
type Notification = {
diff --git a/packages/loot-core/src/server/budgetfiles/app.ts b/packages/loot-core/src/server/budgetfiles/app.ts
index 6f3e909d5f..d995d35877 100644
--- a/packages/loot-core/src/server/budgetfiles/app.ts
+++ b/packages/loot-core/src/server/budgetfiles/app.ts
@@ -2,7 +2,7 @@
import * as CRDT from '@actual-app/crdt';
import { createTestBudget } from '../../mocks/budget';
-import { captureException, captureBreadcrumb } from '../../platform/exceptions';
+import { captureBreadcrumb, captureException } from '../../platform/exceptions';
import * as asyncStorage from '../../platform/server/asyncStorage';
import * as connection from '../../platform/server/connection';
import * as fs from '../../platform/server/fs';
@@ -20,7 +20,7 @@ import { mutator } from '../mutators';
import * as prefs from '../prefs';
import { getServer } from '../server-config';
import * as sheet from '../sheet';
-import { setSyncingMode, initialFullSync, clearFullSyncTimeout } from '../sync';
+import { clearFullSyncTimeout, initialFullSync, setSyncingMode } from '../sync';
import * as syncMigrations from '../sync/migrate';
import * as rules from '../transactions/transaction-rules';
import { clearUndo } from '../undo';
@@ -32,9 +32,9 @@ import {
} from '../util/budget-name';
import {
- getAvailableBackups,
- makeBackup as _makeBackup,
loadBackup as _loadBackup,
+ makeBackup as _makeBackup,
+ getAvailableBackups,
startBackupService,
stopBackupService,
} from './backups';
diff --git a/packages/loot-core/src/server/cloud-storage.ts b/packages/loot-core/src/server/cloud-storage.ts
index fda7dd4275..d9c667e5db 100644
--- a/packages/loot-core/src/server/cloud-storage.ts
+++ b/packages/loot-core/src/server/cloud-storage.ts
@@ -11,10 +11,10 @@ import * as monthUtils from '../shared/months';
import * as encryption from './encryption';
import {
- HTTPError,
- PostError,
FileDownloadError,
FileUploadError,
+ HTTPError,
+ PostError,
} from './errors';
import { runMutator } from './mutators';
import { post } from './post';
diff --git a/packages/loot-core/src/server/dashboard/app.ts b/packages/loot-core/src/server/dashboard/app.ts
index d409763723..d4def2d032 100644
--- a/packages/loot-core/src/server/dashboard/app.ts
+++ b/packages/loot-core/src/server/dashboard/app.ts
@@ -6,9 +6,9 @@ import * as fs from '../../platform/server/fs';
import { DEFAULT_DASHBOARD_STATE } from '../../shared/dashboard';
import { q } from '../../shared/query';
import {
+ type ExportImportCustomReportWidget,
type ExportImportDashboard,
type ExportImportDashboardWidget,
- type ExportImportCustomReportWidget,
type Widget,
} from '../../types/models';
import { type EverythingButIdOptional } from '../../types/util';
diff --git a/packages/loot-core/src/server/db/index.ts b/packages/loot-core/src/server/db/index.ts
index 8b0070f102..282d317b44 100644
--- a/packages/loot-core/src/server/db/index.ts
+++ b/packages/loot-core/src/server/db/index.ts
@@ -1,10 +1,10 @@
// @ts-strict-ignore
import {
- makeClock,
- setClock,
- serializeClock,
deserializeClock,
makeClientId,
+ makeClock,
+ serializeClock,
+ setClock,
Timestamp,
} from '@actual-app/crdt';
import { type Database } from '@jlongster/sql.js';
@@ -18,20 +18,20 @@ import { groupById } from '../../shared/util';
import { type TransactionEntity } from '../../types/models';
import { type WithRequired } from '../../types/util';
import {
- schema,
- schemaConfig,
convertForInsert,
convertForUpdate,
convertFromSelect,
+ schema,
+ schemaConfig,
} from '../aql';
import {
- toDateRepr,
accountModel,
- categoryModel,
categoryGroupModel,
+ categoryModel,
payeeModel,
+ toDateRepr,
} from '../models';
-import { sendMessages, batchMessages } from '../sync';
+import { batchMessages, sendMessages } from '../sync';
import { shoveSortOrders, SORT_INCREMENT } from './sort';
import {
diff --git a/packages/loot-core/src/server/importers/ynab5.ts b/packages/loot-core/src/server/importers/ynab5.ts
index 48e213e7b6..786d86a5d1 100644
--- a/packages/loot-core/src/server/importers/ynab5.ts
+++ b/packages/loot-core/src/server/importers/ynab5.ts
@@ -9,7 +9,7 @@ import { v4 as uuidv4 } from 'uuid';
import { logger } from '../../platform/server/log';
import * as monthUtils from '../../shared/months';
-import { sortByKey, groupBy } from '../../shared/util';
+import { groupBy, sortByKey } from '../../shared/util';
import type * as YNAB5 from './ynab5-types';
diff --git a/packages/loot-core/src/server/main.test.ts b/packages/loot-core/src/server/main.test.ts
index 9f12e47558..9a06e47000 100644
--- a/packages/loot-core/src/server/main.test.ts
+++ b/packages/loot-core/src/server/main.test.ts
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import { getClock, deserializeClock } from '@actual-app/crdt';
+import { deserializeClock, getClock } from '@actual-app/crdt';
import { v4 as uuidv4 } from 'uuid';
import { expectSnapshotWithDiffer } from '../mocks/util';
@@ -12,10 +12,10 @@ import * as budget from './budget/base';
import * as db from './db';
import { handlers } from './main';
import {
- runHandler,
- runMutator,
disableGlobalMutations,
enableGlobalMutations,
+ runHandler,
+ runMutator,
} from './mutators';
import * as prefs from './prefs';
import * as sheet from './sheet';
diff --git a/packages/loot-core/src/server/main.ts b/packages/loot-core/src/server/main.ts
index c6703977b9..16df0b11d6 100644
--- a/packages/loot-core/src/server/main.ts
+++ b/packages/loot-core/src/server/main.ts
@@ -42,7 +42,7 @@ import { app as tagsApp } from './tags/app';
import { app as toolsApp } from './tools/app';
import { app as transactionsApp } from './transactions/app';
import * as rules from './transactions/transaction-rules';
-import { undo, redo } from './undo';
+import { redo, undo } from './undo';
// handlers
diff --git a/packages/loot-core/src/server/migrate/cli.ts b/packages/loot-core/src/server/migrate/cli.ts
index 4919303fc2..665b6c750c 100755
--- a/packages/loot-core/src/server/migrate/cli.ts
+++ b/packages/loot-core/src/server/migrate/cli.ts
@@ -9,13 +9,13 @@ import { logger } from '../../platform/server/log';
import * as sqlite from '../../platform/server/sqlite';
import {
- getMigrationsDir,
- withMigrationsDir,
- getUpMigration,
- getMigrationList,
getAppliedMigrations,
+ getMigrationList,
+ getMigrationsDir,
getPending,
+ getUpMigration,
migrate,
+ withMigrationsDir,
} from './migrations';
const argv = yargs()
diff --git a/packages/loot-core/src/server/migrate/migrations.test.ts b/packages/loot-core/src/server/migrate/migrations.test.ts
index ba6f4fdd31..6cc4467677 100644
--- a/packages/loot-core/src/server/migrate/migrations.test.ts
+++ b/packages/loot-core/src/server/migrate/migrations.test.ts
@@ -2,11 +2,11 @@
import * as db from '../db';
import {
- migrate,
- withMigrationsDir,
getAppliedMigrations,
getMigrationList,
getPending,
+ migrate,
+ withMigrationsDir,
} from './migrations';
beforeEach(global.emptyDatabase(true));
diff --git a/packages/loot-core/src/server/mutators.ts b/packages/loot-core/src/server/mutators.ts
index f5eac7b1d8..0559924253 100644
--- a/packages/loot-core/src/server/mutators.ts
+++ b/packages/loot-core/src/server/mutators.ts
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import { captureException, captureBreadcrumb } from '../platform/exceptions';
+import { captureBreadcrumb, captureException } from '../platform/exceptions';
import { sequential } from '../shared/async';
import { type HandlerFunctions, type Handlers } from '../types/handlers';
diff --git a/packages/loot-core/src/server/prefs.ts b/packages/loot-core/src/server/prefs.ts
index 8b96af27e0..cd3d728459 100644
--- a/packages/loot-core/src/server/prefs.ts
+++ b/packages/loot-core/src/server/prefs.ts
@@ -4,7 +4,7 @@ import { Timestamp } from '@actual-app/crdt';
import * as fs from '../platform/server/fs';
import type { MetadataPrefs } from '../types/prefs';
-import { type Message, sendMessages } from './sync';
+import { sendMessages, type Message } from './sync';
export const BUDGET_TYPES = ['tracking', 'envelope'] as const;
export type BudgetType = (typeof BUDGET_TYPES)[number];
diff --git a/packages/loot-core/src/server/rules/action.ts b/packages/loot-core/src/server/rules/action.ts
index dab6fd4895..fb1ba58f1c 100644
--- a/packages/loot-core/src/server/rules/action.ts
+++ b/packages/loot-core/src/server/rules/action.ts
@@ -6,7 +6,7 @@ import { HyperFormula } from 'hyperformula';
import { amountToInteger } from 'loot-core/shared/util';
import { logger } from '../../platform/server/log';
-import { parseDate, format, currentDay } from '../../shared/months';
+import { currentDay, format, parseDate } from '../../shared/months';
import { FIELD_TYPES } from '../../shared/rules';
import { type TransactionForRules } from '../transactions/transaction-rules';
diff --git a/packages/loot-core/src/server/rules/app.ts b/packages/loot-core/src/server/rules/app.ts
index 9e2d6993bc..a0d0b906c6 100644
--- a/packages/loot-core/src/server/rules/app.ts
+++ b/packages/loot-core/src/server/rules/app.ts
@@ -2,8 +2,8 @@
import { logger } from '../../platform/server/log';
import {
type RuleActionEntity,
- type TransactionEntity,
type RuleEntity,
+ type TransactionEntity,
} from '../../types/models';
import { createApp } from '../app';
import { RuleError } from '../errors';
@@ -12,7 +12,7 @@ import { batchMessages } from '../sync';
import * as rules from '../transactions/transaction-rules';
import { undoable } from '../undo';
-import { Condition, Action, rankRules } from '.';
+import { Action, Condition, rankRules } from '.';
function validateRule(rule: Partial<RuleEntity>) {
// Returns an array of errors, the array is the same link as the
diff --git a/packages/loot-core/src/server/rules/condition.ts b/packages/loot-core/src/server/rules/condition.ts
index 26acbcedcb..fb280feb49 100644
--- a/packages/loot-core/src/server/rules/condition.ts
+++ b/packages/loot-core/src/server/rules/condition.ts
@@ -3,19 +3,19 @@ import * as dateFns from 'date-fns';
import { logger } from '../../platform/server/log';
import {
- monthFromDate,
- yearFromDate,
- isBefore,
- isAfter,
addDays,
- subDays,
+ isAfter,
+ isBefore,
+ monthFromDate,
parseDate,
+ subDays,
+ yearFromDate,
} from '../../shared/months';
import {
- sortNumbers,
+ FIELD_TYPES,
getApproxNumberThreshold,
isValidOp,
- FIELD_TYPES,
+ sortNumbers,
} from '../../shared/rules';
import {
diff --git a/packages/loot-core/src/server/rules/customFunctions.ts b/packages/loot-core/src/server/rules/customFunctions.ts
index 90d576c474..f8af1aeb2d 100644
--- a/packages/loot-core/src/server/rules/customFunctions.ts
+++ b/packages/loot-core/src/server/rules/customFunctions.ts
@@ -1,4 +1,4 @@
-import { FunctionPlugin, FunctionArgumentType } from 'hyperformula';
+import { FunctionArgumentType, FunctionPlugin } from 'hyperformula';
import { type InterpreterState } from 'hyperformula/typings/interpreter/InterpreterState';
import { type ProcedureAst } from 'hyperformula/typings/parser';
diff --git a/packages/loot-core/src/server/rules/formula-action.test.ts b/packages/loot-core/src/server/rules/formula-action.test.ts
index c980c1289f..4cb63f4bdb 100644
--- a/packages/loot-core/src/server/rules/formula-action.test.ts
+++ b/packages/loot-core/src/server/rules/formula-action.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
import { type TransactionForRules } from '../transactions/transaction-rules';
diff --git a/packages/loot-core/src/server/rules/handlebars-helpers.ts b/packages/loot-core/src/server/rules/handlebars-helpers.ts
index eabbade831..eee932062d 100644
--- a/packages/loot-core/src/server/rules/handlebars-helpers.ts
+++ b/packages/loot-core/src/server/rules/handlebars-helpers.ts
@@ -9,7 +9,7 @@ import {
import * as Handlebars from 'handlebars';
import { logger } from '../../platform/server/log';
-import { addDays, subDays, parseDate, format } from '../../shared/months';
+import { addDays, format, parseDate, subDays } from '../../shared/months';
export function registerHandlebarsHelpers() {
const regexTest = /^\/(.*)\/([gimuy]*)$/;
diff --git a/packages/loot-core/src/server/rules/index.test.ts b/packages/loot-core/src/server/rules/index.test.ts
index 1526e283bd..3a5c10a429 100644
--- a/packages/loot-core/src/server/rules/index.test.ts
+++ b/packages/loot-core/src/server/rules/index.test.ts
@@ -1,10 +1,10 @@
// @ts-strict-ignore
import {
+ Action,
+ Condition,
+ iterateIds,
parseDateString,
rankRules,
- iterateIds,
- Condition,
- Action,
Rule,
RuleIndexer,
} from '.';
diff --git a/packages/loot-core/src/server/rules/index.ts b/packages/loot-core/src/server/rules/index.ts
index bcc2c84b53..aad1dcc5a6 100644
--- a/packages/loot-core/src/server/rules/index.ts
+++ b/packages/loot-core/src/server/rules/index.ts
@@ -1,13 +1,13 @@
import { Action } from './action';
import { Condition } from './condition';
import { registerHandlebarsHelpers } from './handlebars-helpers';
-import { Rule, execActions } from './rule';
+import { execActions, Rule } from './rule';
import { RuleIndexer } from './rule-indexer';
import {
+ iterateIds,
+ migrateIds,
parseDateString,
rankRules,
- migrateIds,
- iterateIds,
} from './rule-utils';
// Ensure helpers are registered
diff --git a/packages/loot-core/src/server/schedules/app.test.ts b/packages/loot-core/src/server/schedules/app.test.ts
index ee2a7db1d1..e77db01950 100644
--- a/packages/loot-core/src/server/schedules/app.test.ts
+++ b/packages/loot-core/src/server/schedules/app.test.ts
@@ -8,11 +8,11 @@ import { loadMappings } from '../db/mappings';
import { loadRules, updateRule } from '../transactions/transaction-rules';
import {
- updateConditions,
createSchedule,
- updateSchedule,
deleteSchedule,
setNextDate,
+ updateConditions,
+ updateSchedule,
} from './app';
beforeEach(async () => {
diff --git a/packages/loot-core/src/server/spreadsheet/spreadsheet.ts b/packages/loot-core/src/server/spreadsheet/spreadsheet.ts
index 40ae747ba5..4af439f033 100644
--- a/packages/loot-core/src/server/spreadsheet/spreadsheet.ts
+++ b/packages/loot-core/src/server/spreadsheet/spreadsheet.ts
@@ -3,11 +3,11 @@ import mitt from 'mitt';
import { logger } from '../../platform/server/log';
import { type QueryState } from '../../shared/query';
-import { compileQuery, aqlCompiledQuery, schema, schemaConfig } from '../aql';
+import { aqlCompiledQuery, compileQuery, schema, schemaConfig } from '../aql';
import { type BudgetType } from '../prefs';
import { Graph } from './graph-data-structure';
-import { unresolveName, resolveName } from './util';
+import { resolveName, unresolveName } from './util';
export type Node = {
name: string;
diff --git a/packages/loot-core/src/server/sync/encoder.ts b/packages/loot-core/src/server/sync/encoder.ts
index 2f3ca0549d..6549632d86 100644
--- a/packages/loot-core/src/server/sync/encoder.ts
+++ b/packages/loot-core/src/server/sync/encoder.ts
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import { Timestamp, SyncProtoBuf } from '@actual-app/crdt';
+import { SyncProtoBuf, Timestamp } from '@actual-app/crdt';
import { logger } from '../../platform/server/log';
import * as encryption from '../encryption';
diff --git a/packages/loot-core/src/server/sync/index.ts b/packages/loot-core/src/server/sync/index.ts
index 06a545bc92..882870c9ad 100644
--- a/packages/loot-core/src/server/sync/index.ts
+++ b/packages/loot-core/src/server/sync/index.ts
@@ -1,20 +1,20 @@
// @ts-strict-ignore
import {
- serializeClock,
deserializeClock,
getClock,
- Timestamp,
merkle,
+ serializeClock,
+ Timestamp,
} from '@actual-app/crdt';
import { captureException } from '../../platform/exceptions';
import * as asyncStorage from '../../platform/server/asyncStorage';
import * as connection from '../../platform/server/connection';
import { logger } from '../../platform/server/log';
-import { sequential, once } from '../../shared/async';
-import { setIn, getIn } from '../../shared/util';
+import { once, sequential } from '../../shared/async';
+import { getIn, setIn } from '../../shared/util';
import { type MetadataPrefs } from '../../types/prefs';
-import { triggerBudgetChanges, setType as setBudgetType } from '../budget/base';
+import { setType as setBudgetType, triggerBudgetChanges } from '../budget/base';
import * as db from '../db';
import { PostError, SyncError } from '../errors';
import { app } from '../main-app';
diff --git a/packages/loot-core/src/server/sync/migrate.test.ts b/packages/loot-core/src/server/sync/migrate.test.ts
index 7f2355786e..1d20b89eca 100644
--- a/packages/loot-core/src/server/sync/migrate.test.ts
+++ b/packages/loot-core/src/server/sync/migrate.test.ts
@@ -9,7 +9,7 @@ import * as db from '../db';
import { listen, unlisten } from './migrate';
-import { type Message, addSyncListener, sendMessages } from './index';
+import { addSyncListener, sendMessages, type Message } from './index';
beforeEach(() => {
listen();
diff --git a/packages/loot-core/src/server/sync/migrate.ts b/packages/loot-core/src/server/sync/migrate.ts
index f622ba5eff..ca5638ac65 100644
--- a/packages/loot-core/src/server/sync/migrate.ts
+++ b/packages/loot-core/src/server/sync/migrate.ts
@@ -1,7 +1,7 @@
// @ts-strict-ignore
import { Timestamp } from '@actual-app/crdt';
-import { type Message, addSyncListener, applyMessages } from './index';
+import { addSyncListener, applyMessages, type Message } from './index';
function migrateParentIds(_oldValues, newValues) {
newValues.forEach((items, table) => {
diff --git a/packages/loot-core/src/server/sync/repair.ts b/packages/loot-core/src/server/sync/repair.ts
index 2d94bd509b..ea619d5b16 100644
--- a/packages/loot-core/src/server/sync/repair.ts
+++ b/packages/loot-core/src/server/sync/repair.ts
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import { serializeClock, getClock, Timestamp, merkle } from '@actual-app/crdt';
+import { getClock, merkle, serializeClock, Timestamp } from '@actual-app/crdt';
import * as db from '../db';
diff --git a/packages/loot-core/src/server/sync/sync.property.test.ts b/packages/loot-core/src/server/sync/sync.property.test.ts
index ba558537b4..ba049e984e 100644
--- a/packages/loot-core/src/server/sync/sync.property.test.ts
+++ b/packages/loot-core/src/server/sync/sync.property.test.ts
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import { merkle, getClock, Timestamp } from '@actual-app/crdt';
+import { getClock, merkle, Timestamp } from '@actual-app/crdt';
import jsc, { type Arbitrary } from 'jsverify';
import * as db from '../db';
diff --git a/packages/loot-core/src/server/sync/sync.test.ts b/packages/loot-core/src/server/sync/sync.test.ts
index 459912ee99..d96dd35a9e 100644
--- a/packages/loot-core/src/server/sync/sync.test.ts
+++ b/packages/loot-core/src/server/sync/sync.test.ts
@@ -9,7 +9,7 @@ import * as mockSyncServer from '../tests/mockSyncServer';
import * as encoder from './encoder';
import { isError } from './utils';
-import { setSyncingMode, sendMessages, applyMessages, fullSync } from './index';
+import { applyMessages, fullSync, sendMessages, setSyncingMode } from './index';
beforeEach(() => {
mockSyncServer.reset();
diff --git a/packages/loot-core/src/server/tests/mockSyncServer.ts b/packages/loot-core/src/server/tests/mockSyncServer.ts
index e66c053146..bd1c511379 100644
--- a/packages/loot-core/src/server/tests/mockSyncServer.ts
+++ b/packages/loot-core/src/server/tests/mockSyncServer.ts
@@ -1,10 +1,10 @@
// @ts-strict-ignore
import {
- type Clock,
makeClock,
- Timestamp,
merkle,
SyncProtoBuf,
+ Timestamp,
+ type Clock,
} from '@actual-app/crdt';
import { type Message } from '../sync';
diff --git a/packages/loot-core/src/server/transactions/merge.ts b/packages/loot-core/src/server/transactions/merge.ts
index d503ae55d2..9dba07859c 100644
--- a/packages/loot-core/src/server/transactions/merge.ts
+++ b/packages/loot-core/src/server/transactions/merge.ts
@@ -1,7 +1,7 @@
import { q } from '../../shared/query';
import {
- ungroupTransactions,
deleteTransaction as sharedDeleteTransaction,
+ ungroupTransactions,
} from '../../shared/transactions';
import { type TransactionEntity } from '../../types/models';
import { aqlQuery } from '../aql';
diff --git a/packages/loot-core/src/server/transactions/transaction-rules.test.ts b/packages/loot-core/src/server/transactions/transaction-rules.test.ts
index a5062bb434..949f16d8eb 100644
--- a/packages/loot-core/src/server/transactions/transaction-rules.test.ts
+++ b/packages/loot-core/src/server/transactions/transaction-rules.test.ts
@@ -5,17 +5,17 @@ import * as db from '../db';
import { loadMappings } from '../db/mappings';
import {
+ conditionsToAQL,
+ deleteRule,
+ getProbableCategory,
getRules,
- loadRules,
insertRule,
- updateRule,
- deleteRule,
+ loadRules,
makeRule,
- runRules,
- conditionsToAQL,
resetState,
- getProbableCategory,
+ runRules,
updateCategoryRules,
+ updateRule,
} from './transaction-rules';
// TODO: write tests to make sure payee renaming is "pre" and category
diff --git a/packages/loot-core/src/server/transactions/transaction-rules.ts b/packages/loot-core/src/server/transactions/transaction-rules.ts
index 94d5fed77e..a0d88a62fa 100644
--- a/packages/loot-core/src/server/transactions/transaction-rules.ts
+++ b/packages/loot-core/src/server/transactions/transaction-rules.ts
@@ -2,44 +2,44 @@
import { logger } from '../../platform/server/log';
import {
- currentDay,
addDays,
- subDays,
- parseDate,
+ currentDay,
dayFromDate,
+ parseDate,
+ subDays,
} from '../../shared/months';
import { q } from '../../shared/query';
-import { sortNumbers, getApproxNumberThreshold } from '../../shared/rules';
+import { getApproxNumberThreshold, sortNumbers } from '../../shared/rules';
import { ungroupTransaction } from '../../shared/transactions';
-import { partitionByField, fastSetMerge } from '../../shared/util';
+import { fastSetMerge, partitionByField } from '../../shared/util';
import {
- type TransactionEntity,
type RuleActionEntity,
type RuleEntity,
+ type TransactionEntity,
} from '../../types/models';
import { aqlQuery, schemaConfig } from '../aql';
import * as db from '../db';
import {
+ getAccount,
+ getCategory,
getPayee,
getPayeeByName,
insertPayee,
- getAccount,
- getCategory,
} from '../db';
import { getMappings } from '../db/mappings';
import { RuleError } from '../errors';
import { requiredFields, toDateRepr } from '../models';
import {
- Condition,
Action,
+ Condition,
+ execActions,
+ iterateIds,
+ migrateIds,
+ rankRules,
Rule,
RuleIndexer,
- rankRules,
- migrateIds,
- iterateIds,
- execActions,
} from '../rules';
-import { batchMessages, addSyncListener } from '../sync';
+import { addSyncListener, batchMessages } from '../sync';
import { batchUpdateTransactions } from '.';
diff --git a/packages/loot-core/src/server/undo.ts b/packages/loot-core/src/server/undo.ts
index a31ee699c3..6ba88c4faa 100644
--- a/packages/loot-core/src/server/undo.ts
+++ b/packages/loot-core/src/server/undo.ts
@@ -5,8 +5,8 @@ import * as connection from '../platform/server/connection';
import { getIn } from '../shared/util';
import { type HandlerFunctions } from '../types/handlers';
-import { withMutatorContext, getMutatorContext } from './mutators';
-import { type Message, sendMessages } from './sync';
+import { getMutatorContext, withMutatorContext } from './mutators';
+import { sendMessages, type Message } from './sync';
// A marker always sits as the first entry to simplify logic
type MarkerMessage = { type: 'marker'; meta?: unknown };
diff --git a/packages/loot-core/src/server/update.ts b/packages/loot-core/src/server/update.ts
index a8a1b1c89f..9caf6d3e19 100644
--- a/packages/loot-core/src/server/update.ts
+++ b/packages/loot-core/src/server/update.ts
@@ -1,7 +1,7 @@
// @ts-strict-ignore
import md5 from 'md5';
-import { schema, schemaConfig, makeViews } from './aql';
+import { makeViews, schema, schemaConfig } from './aql';
import * as db from './db';
import * as migrations from './migrate/migrations';
diff --git a/packages/loot-core/src/shared/async.test.ts b/packages/loot-core/src/shared/async.test.ts
index 41043b6df5..dd9c017add 100644
--- a/packages/loot-core/src/shared/async.test.ts
+++ b/packages/loot-core/src/shared/async.test.ts
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import { sequential, once } from './async';
+import { once, sequential } from './async';
function timeout(n) {
return new Promise(resolve => setTimeout(resolve, n));
diff --git a/packages/loot-core/src/shared/transactions.test.ts b/packages/loot-core/src/shared/transactions.test.ts
index aa5d6edbe1..d3680bb712 100644
--- a/packages/loot-core/src/shared/transactions.test.ts
+++ b/packages/loot-core/src/shared/transactions.test.ts
@@ -4,12 +4,12 @@ import { v4 as uuidv4 } from 'uuid';
import { type TransactionEntity } from '../types/models';
import {
- splitTransaction,
- updateTransaction,
- deleteTransaction,
addSplitTransaction,
- makeChild,
+ deleteTransaction,
makeAsNonChildTransactions,
+ makeChild,
+ splitTransaction,
+ updateTransaction,
} from './transactions';
function makeTransaction(data: Partial<TransactionEntity>): TransactionEntity {
diff --git a/packages/loot-core/src/shared/transactions.ts b/packages/loot-core/src/shared/transactions.ts
index 4b9d1b54d3..6f391d8fac 100644
--- a/packages/loot-core/src/shared/transactions.ts
+++ b/packages/loot-core/src/shared/transactions.ts
@@ -3,7 +3,7 @@ import { v4 as uuidv4 } from 'uuid';
import { logger } from '../platform/server/log';
import { type TransactionEntity } from '../types/models';
-import { last, diffItems, applyChanges } from './util';
+import { applyChanges, diffItems, last } from './util';
export function isTemporaryId(id: string) {
return id.indexOf('temp') !== -1;
diff --git a/packages/loot-core/src/shared/util.test.ts b/packages/loot-core/src/shared/util.test.ts
index 53dd46af81..ab1ff7ab3d 100644
--- a/packages/loot-core/src/shared/util.test.ts
+++ b/packages/loot-core/src/shared/util.test.ts
@@ -1,8 +1,8 @@
import {
- looselyParseAmount,
+ currencyToAmount,
getNumberFormat,
+ looselyParseAmount,
setNumberFormat,
- currencyToAmount,
stringToInteger,
titleFirst,
} from './util';
diff --git a/packages/loot-core/src/shared/util.ts b/packages/loot-core/src/shared/util.ts
index 1c38f4c7b0..c281fad99c 100644
--- a/packages/loot-core/src/shared/util.ts
+++ b/packages/loot-core/src/shared/util.ts
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import { type Locale, formatDistanceToNow } from 'date-fns';
+import { formatDistanceToNow, type Locale } from 'date-fns';
export function last<T>(arr: Array<T>) {
return arr[arr.length - 1];
diff --git a/packages/loot-core/src/types/api-handlers.ts b/packages/loot-core/src/types/api-handlers.ts
index 9ac3d1681d..3312be6b10 100644
--- a/packages/loot-core/src/types/api-handlers.ts
+++ b/packages/loot-core/src/types/api-handlers.ts
@@ -18,8 +18,8 @@ import type {
ImportTransactionEntity,
NewRuleEntity,
RuleEntity,
- TransactionEntity,
ScheduleEntity,
+ TransactionEntity,
} from './models';
export type ApiHandlers = {
diff --git a/packages/sync-server/bin/add-import-extensions.mjs b/packages/sync-server/bin/add-import-extensions.mjs
index 54e0308080..4005b2a604 100644
--- a/packages/sync-server/bin/add-import-extensions.mjs
+++ b/packages/sync-server/bin/add-import-extensions.mjs
@@ -1,7 +1,7 @@
#!/usr/bin/env node
import { existsSync } from 'node:fs';
import { readdir, readFile, writeFile } from 'node:fs/promises';
-import { join, dirname, extname, relative, resolve } from 'node:path';
+import { dirname, extname, join, relative, resolve } from 'node:path';
import { fileURLToPath } from 'node:url';
const __filename = fileURLToPath(import.meta.url);
diff --git a/packages/sync-server/loader.mjs b/packages/sync-server/loader.mjs
index 485024e9f6..b0e6c19f22 100644
--- a/packages/sync-server/loader.mjs
+++ b/packages/sync-server/loader.mjs
@@ -1,5 +1,5 @@
import { existsSync } from 'node:fs';
-import { resolve as nodeResolve, dirname, extname } from 'node:path';
+import { dirname, extname, resolve as nodeResolve } from 'node:path';
import { pathToFileURL } from 'node:url';
const extensions = ['.ts', '.js', '.mts', '.mjs'];
diff --git a/packages/sync-server/register-loader.mjs b/packages/sync-server/register-loader.mjs
index 0302328ef9..1e7fd4cc5e 100644
--- a/packages/sync-server/register-loader.mjs
+++ b/packages/sync-server/register-loader.mjs
@@ -1,6 +1,6 @@
import { register } from 'node:module';
import { dirname, resolve } from 'node:path';
-import { pathToFileURL, fileURLToPath } from 'node:url';
+import { fileURLToPath, pathToFileURL } from 'node:url';
const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);
diff --git a/packages/sync-server/src/app-account.js b/packages/sync-server/src/app-account.js
index 7b3cd2745b..14eefc1d2e 100644
--- a/packages/sync-server/src/app-account.js
+++ b/packages/sync-server/src/app-account.js
@@ -2,14 +2,14 @@ import express from 'express';
import {
bootstrap,
- needsBootstrap,
- getLoginMethod,
- listLoginMethods,
- getUserInfo,
getActiveLoginMethod,
+ getLoginMethod,
getServerPrefs,
- setServerPrefs,
+ getUserInfo,
isAdmin,
+ listLoginMethods,
+ needsBootstrap,
+ setServerPrefs,
} from './account-db';
import { isValidRedirectUrl, loginWithOpenIdSetup } from './accounts/openid';
import { changePassword, loginWithPassword } from './accounts/password';
diff --git a/packages/sync-server/src/app-cors-proxy.test.js b/packages/sync-server/src/app-cors-proxy.test.js
index dae9cc123a..ef39e98893 100644
--- a/packages/sync-server/src/app-cors-proxy.test.js
+++ b/packages/sync-server/src/app-cors-proxy.test.js
@@ -1,6 +1,6 @@
import ipaddr from 'ipaddr.js';
import request from 'supertest';
-import { vi, describe, it, expect, beforeEach, beforeAll } from 'vitest';
+import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
import { handlers as app, clearAllowlistCache } from './app-cors-proxy';
import { config } from './load-config';
diff --git a/packages/sync-server/src/app-gocardless/banks/bank.interface.ts b/packages/sync-server/src/app-gocardless/banks/bank.interface.ts
index 5fd799b006..e9448a0aad 100644
--- a/packages/sync-server/src/app-gocardless/banks/bank.interface.ts
+++ b/packages/sync-server/src/app-gocardless/banks/bank.interface.ts
@@ -1,4 +1,4 @@
-import { type Transaction, type Balance } from '../gocardless-node.types';
+import { type Balance, type Transaction } from '../gocardless-node.types';
import {
type DetailedAccountWithInstitution,
type NormalizedAccountDetails,
diff --git a/packages/sync-server/src/app-gocardless/gocardless.types.ts b/packages/sync-server/src/app-gocardless/gocardless.types.ts
index 7314fef7b2..61fc8882b6 100644
--- a/packages/sync-server/src/app-gocardless/gocardless.types.ts
+++ b/packages/sync-server/src/app-gocardless/gocardless.types.ts
@@ -1,10 +1,10 @@
import {
- type GoCardlessAccountMetadata,
+ type Balance,
type GoCardlessAccountDetails,
+ type GoCardlessAccountMetadata,
type Institution,
- type Transactions,
- type Balance,
type Transaction,
+ type Transactions,
} from './gocardless-node.types';
export type DetailedAccount = Omit<GoCardlessAccountDetails, 'status'> &
diff --git a/packages/sync-server/src/app-gocardless/services/gocardless-service.js b/packages/sync-server/src/app-gocardless/services/gocardless-service.js
index 1dce95f0ae..8da4220179 100644
--- a/packages/sync-server/src/app-gocardless/services/gocardless-service.js
+++ b/packages/sync-server/src/app-gocardless/services/gocardless-service.js
@@ -8,12 +8,12 @@ import {
AccessDeniedError,
AccountNotLinkedToRequisition,
GenericGoCardlessError,
- InvalidInputDataError,
InvalidGoCardlessTokenError,
+ InvalidInputDataError,
NotFoundError,
RateLimitError,
- ResourceSuspended,
RequisitionNotLinked,
+ ResourceSuspended,
ServiceError,
UnknownError,
} from '../errors';
diff --git a/packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.js b/packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.js
index 9d77460b8f..a2c81bd1ff 100644
--- a/packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.js
+++ b/packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.js
@@ -2,35 +2,35 @@ import {
AccessDeniedError,
AccountNotLinkedToRequisition,
GenericGoCardlessError,
- InvalidInputDataError,
InvalidGoCardlessTokenError,
+ InvalidInputDataError,
NotFoundError,
RateLimitError,
- ResourceSuspended,
RequisitionNotLinked,
+ ResourceSuspended,
ServiceError,
UnknownError,
} from '../../errors';
import {
+ client,
goCardlessService,
handleGoCardlessError,
- client,
} from '../gocardless-service';
import {
- mockedBalances,
- mockTransactions,
- mockDetailedAccount,
- mockInstitution,
- mockAccountMetaData,
mockAccountDetails,
- mockRequisition,
- mockDeleteRequisition,
+ mockAccountMetaData,
mockCreateRequisition,
- mockRequisitionWithExampleAccounts,
+ mockDeleteRequisition,
+ mockDetailedAccount,
mockDetailedAccountExample1,
mockDetailedAccountExample2,
+ mockedBalances,
mockExtendAccountsAboutInstitutions,
+ mockInstitution,
+ mockRequisition,
+ mockRequisitionWithExampleAccounts,
+ mockTransactions,
} from './fixtures';
describe('goCardlessService', () => {
diff --git a/packages/sync-server/src/app-sync.ts b/packages/sync-server/src/app-sync.ts
index 11a8611094..91c9bab4c3 100644
--- a/packages/sync-server/src/app-sync.ts
+++ b/packages/sync-server/src/app-sync.ts
@@ -25,7 +25,7 @@ import {
requestLoggerMiddleware,
validateSessionMiddleware,
} from './util/middlewares';
-import { getPathForUserFile, getPathForGroupFile } from './util/paths';
+import { getPathForGroupFile, getPathForUserFile } from './util/paths';
const app = express();
app.use(validateSessionMiddleware);
diff --git a/packages/sync-server/src/app-sync/tests/services/files-service.test.js b/packages/sync-server/src/app-sync/tests/services/files-service.test.js
index 76d7371c10..91f9a6214f 100644
--- a/packages/sync-server/src/app-sync/tests/services/files-service.test.js
+++ b/packages/sync-server/src/app-sync/tests/services/files-service.test.js
@@ -2,7 +2,7 @@ import crypto from 'node:crypto';
import { getAccountDb } from '../../../account-db';
import { FileNotFound } from '../../errors';
-import { FilesService, File, FileUpdate } from '../../services/files-service'; // Adjust the path as necessary
+import { File, FilesService, FileUpdate } from '../../services/files-service'; // Adjust the path as necessary
describe('FilesService', () => {
let filesService;
let accountDb;
diff --git a/packages/sync-server/src/load-config.test.js b/packages/sync-server/src/load-config.test.js
index b6dafd7092..a1dc7b13f8 100644
--- a/packages/sync-server/src/load-config.test.js
+++ b/packages/sync-server/src/load-config.test.js
@@ -1,5 +1,5 @@
import convict from 'convict';
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
// Import the custom format
import './load-config';
diff --git a/upcoming-release-notes/6680.md b/upcoming-release-notes/6680.md
new file mode 100644
index 0000000000..7f47d9e4b5
--- /dev/null
+++ b/upcoming-release-notes/6680.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MatissJanis]
+---
+
+lint: sort named imports