diff --git a/packages/desktop-client/src/components/ThemeSelector.tsx b/packages/desktop-client/src/components/ThemeSelector.tsx index 1127ec128bc0b1171f305c70801c1c546c28a918..e07bcd13ac2dc07827f38809b0cabb72a18c6e9f 100644 --- a/packages/desktop-client/src/components/ThemeSelector.tsx +++ b/packages/desktop-client/src/components/ThemeSelector.tsx @@ -26,6 +26,7 @@ export function ThemeSelector({ style }: ThemeSelectorProps) { dark: SvgMoonStars, auto: SvgSystem, midnight: SvgMoonStars, + development: SvgMoonStars, } as const; function onMenuSelect(newTheme: Theme) { diff --git a/packages/desktop-client/src/style/theme.tsx b/packages/desktop-client/src/style/theme.tsx index da0e68dbe497e0291146c816012dcafed40530fe..96a7e95950945c542dbdabbc269ee19321a5a99a 100644 --- a/packages/desktop-client/src/style/theme.tsx +++ b/packages/desktop-client/src/style/theme.tsx @@ -33,7 +33,11 @@ export function useTheme() { export function ThemeStyle() { const [theme] = useTheme(); const [themeColors, setThemeColors] = useState< - typeof lightTheme | typeof darkTheme | typeof midnightTheme | undefined + | typeof lightTheme + | typeof darkTheme + | typeof midnightTheme + | typeof developmentTheme + | undefined >(undefined); useEffect(() => { diff --git a/packages/loot-core/src/types/models/index.d.ts b/packages/loot-core/src/types/models/index.d.ts index 2b16ebf4ca89e3c2ed9fdae9608fd22cb96d9a25..1e08cb06a26b34cedf3f0555d52c9fb7b657f34d 100644 --- a/packages/loot-core/src/types/models/index.d.ts +++ b/packages/loot-core/src/types/models/index.d.ts @@ -2,6 +2,7 @@ export type * from './account'; export type * from './category'; export type * from './category-group'; export type * from './gocardless'; +export type * from './simplefin'; export type * from './note'; export type * from './payee'; export type * from './reports'; diff --git a/packages/loot-core/src/types/models/transaction.d.ts b/packages/loot-core/src/types/models/transaction.d.ts index bc145b5244088a14394d0ce447015aaba41992f3..93699a59bfa1f7fdade2ac7e9d7febe669762770 100644 --- a/packages/loot-core/src/types/models/transaction.d.ts +++ b/packages/loot-core/src/types/models/transaction.d.ts @@ -26,7 +26,11 @@ export interface NewTransactionEntity { subtransactions?: Omit<NewTransactionEntity, 'account' | 'date'>[]; } -export interface TransactionEntity extends NewTransactionEntity { +export interface TransactionEntity + extends Omit< + NewTransactionEntity, + 'account' | 'category' | 'payee' | 'schedule' | 'subtransactions' + > { id: string; account: AccountEntity; category?: CategoryEntity; diff --git a/packages/loot-core/src/types/prefs.d.ts b/packages/loot-core/src/types/prefs.d.ts index 63e20d2cdbd6d64c8ad65833302a5c0bc03b6123..d3632e0308a6bef52a886ee36e26dc60c6631b39 100644 --- a/packages/loot-core/src/types/prefs.d.ts +++ b/packages/loot-core/src/types/prefs.d.ts @@ -58,10 +58,12 @@ export type LocalPrefs = Partial< } & Record<`flags.${FeatureFlag}`, boolean> >; -export type Theme = 'light' | 'dark' | 'auto' | 'midnight'; +export type Theme = 'light' | 'dark' | 'auto' | 'midnight' | 'development'; export type GlobalPrefs = Partial<{ floatingSidebar: boolean; maxMonths: number; + autoUpdate: boolean; + keyId?: string; theme: Theme; documentDir: string; // Electron only }>; diff --git a/packages/loot-core/src/types/server-handlers.d.ts b/packages/loot-core/src/types/server-handlers.d.ts index 9610727fb9dd667788ddf0e63ee6b2f7539db69b..f03c088aa467eaa99a6e1cc9e50419806e0ff6e1 100644 --- a/packages/loot-core/src/types/server-handlers.d.ts +++ b/packages/loot-core/src/types/server-handlers.d.ts @@ -1,4 +1,3 @@ -import { GlobalPrefs, LocalPrefs } from '../client/state-types/prefs'; import { ParseFileResult } from '../server/accounts/parse-file'; import { batchUpdateTransactions } from '../server/accounts/transactions'; import { Backup } from '../server/backups'; @@ -17,6 +16,7 @@ import { SimpleFinAccount, PayeeEntity, } from './models'; +import { GlobalPrefs, LocalPrefs } from './prefs'; import { EmptyObject } from './util'; export interface ServerHandlers { diff --git a/upcoming-release-notes/2676.md b/upcoming-release-notes/2676.md new file mode 100644 index 0000000000000000000000000000000000000000..9fe93d35eb719d9e152ef748fb737331a2d5cc36 --- /dev/null +++ b/upcoming-release-notes/2676.md @@ -0,0 +1,6 @@ +--- +category: Maintenance +authors: [twk3] +--- + +Fix some type errors found by the API packaging