A local-first personal finance app
Spending Report: card fix (#3135)
Neil536cabb75b02
diff --git a/packages/desktop-client/src/components/reports/graphs/SpendingGraph.tsx b/packages/desktop-client/src/components/reports/graphs/SpendingGraph.tsxindex 60b2b4f78a..1592e0b99b 100644--- a/packages/desktop-client/src/components/reports/graphs/SpendingGraph.tsx+++ b/packages/desktop-client/src/components/reports/graphs/SpendingGraph.tsx@@ -140,7 +140,7 @@ export function SpendingGraph({const lastYear = monthUtils.prevYear(monthUtils.currentMonth());let selection;switch (mode) {- case 'Average':+ case 'average':selection = 'average';break;case 'lastYear':diff --git a/packages/desktop-client/src/components/reports/reports/Spending.tsx b/packages/desktop-client/src/components/reports/reports/Spending.tsxindex 0800df9e34..529c62c06f 100644--- a/packages/desktop-client/src/components/reports/reports/Spending.tsx+++ b/packages/desktop-client/src/components/reports/reports/Spending.tsx@@ -321,8 +321,8 @@ export function Spending() {)}{showAverage && (<ModeButton- selected={mode === 'Average'}- onSelect={() => setMode('Average')}+ selected={mode === 'average'}+ onSelect={() => setMode('average')}>Average</ModeButton>diff --git a/packages/desktop-client/src/components/reports/reports/SpendingCard.tsx b/packages/desktop-client/src/components/reports/reports/SpendingCard.tsxindex 57bbf6ad1c..94deb49fb3 100644--- a/packages/desktop-client/src/components/reports/reports/SpendingCard.tsx+++ b/packages/desktop-client/src/components/reports/reports/SpendingCard.tsx@@ -40,7 +40,7 @@ export function SpendingCard() {: monthUtils.getDay(monthUtils.currentDay()) - 1;const difference =data &&- data.intervalData[todayDay].lastMonth -+ data.intervalData[todayDay][spendingReportTime] -data.intervalData[todayDay].thisMonth;const showLastMonth = data && Math.abs(data.intervalData[27].lastMonth) > 0;diff --git a/packages/loot-core/src/types/models/reports.d.ts b/packages/loot-core/src/types/models/reports.d.tsindex da64527861..3fd9a0a424 100644--- a/packages/loot-core/src/types/models/reports.d.ts+++ b/packages/loot-core/src/types/models/reports.d.ts@@ -32,6 +32,8 @@ export type balanceTypeOpType =| 'netAssets'| 'netDebts';+export type spendingReportTimeType = 'lastMonth' | 'lastYear' | 'average';+export type SpendingMonthEntity = Record<string | number,{diff --git a/packages/loot-core/src/types/prefs.d.ts b/packages/loot-core/src/types/prefs.d.tsindex 82cd445a04..b859d537f7 100644--- a/packages/loot-core/src/types/prefs.d.ts+++ b/packages/loot-core/src/types/prefs.d.ts@@ -1,5 +1,7 @@import { type numberFormats } from '../shared/util';+import { spendingReportTimeType } from './models/reports';+export type FeatureFlag =| 'reportBudget'| 'goalTemplatesEnabled'@@ -51,7 +53,7 @@ export type LocalPrefs = Partial<reportsViewSummary: boolean;reportsViewLabel: boolean;spendingReportFilter: string;- spendingReportTime: string;+ spendingReportTime: spendingReportTimeType;sidebarWidth: number;'mobile.showSpentColumn': boolean;} & Record<`flags.${FeatureFlag}`, boolean>diff --git a/upcoming-release-notes/3135.md b/upcoming-release-notes/3135.mdnew file mode 100644index 0000000000..6f890d1a6d--- /dev/null+++ b/upcoming-release-notes/3135.md@@ -0,0 +1,6 @@+---+category: Bugfix+authors: [carkom]+---++Fixes spending card that doesn't show the correct difference number.