Skip to content

A local-first personal finance app

fix live report time ranges (#5790)

Matt Fiddaman14426b64fdf5
diff --git a/packages/desktop-client/src/components/reports/reportRanges.ts b/packages/desktop-client/src/components/reports/reportRanges.ts
index 89aaa76d86..45f172c095 100644
--- a/packages/desktop-client/src/components/reports/reportRanges.ts
+++ b/packages/desktop-client/src/components/reports/reportRanges.ts
@@ -175,6 +175,7 @@ export function getLatestRange(offset: number) {
export function calculateTimeRange(
timeFrame?: Partial<TimeFrame>,
defaultTimeFrame?: TimeFrame,
+ latestTransaction?: string,
) {
const start =
timeFrame?.start ??
@@ -185,7 +186,16 @@ export function calculateTimeRange(
const mode = timeFrame?.mode ?? defaultTimeFrame?.mode ?? 'sliding-window';
if (mode === 'full') {
- return getFullRange(start, end);
+ const latestTransactionMonth = latestTransaction
+ ? monthUtils.monthFromDate(latestTransaction)
+ : null;
+ const currentMonth = monthUtils.currentMonth();
+ const fullEnd =
+ latestTransactionMonth &&
+ monthUtils.isAfter(latestTransactionMonth, currentMonth)
+ ? latestTransactionMonth
+ : currentMonth;
+ return getFullRange(start, fullEnd);
}
if (mode === 'sliding-window') {
const offset = monthUtils.differenceInCalendarMonths(end, start);
diff --git a/packages/desktop-client/src/components/reports/reports/Calendar.tsx b/packages/desktop-client/src/components/reports/reports/Calendar.tsx
index af55e57d61..ac63244721 100644
--- a/packages/desktop-client/src/components/reports/reports/Calendar.tsx
+++ b/packages/desktop-client/src/components/reports/reports/Calendar.tsx
@@ -106,19 +106,14 @@ function CalendarInner({ widget, parameters }: CalendarInnerProps) {
const { t } = useTranslation();
const format = useFormat();
- const [initialStart, initialEnd, initialMode] = calculateTimeRange(
- widget?.meta?.timeFrame,
- {
- start: monthUtils.dayFromDate(monthUtils.currentMonth()),
- end: monthUtils.currentDay(),
- mode: 'full',
- },
+ const [start, setStart] = useState(
+ monthUtils.dayFromDate(monthUtils.currentMonth()),
);
- const [start, setStart] = useState(initialStart);
- const [end, setEnd] = useState(initialEnd);
- const [mode, setMode] = useState(initialMode);
+ const [end, setEnd] = useState(monthUtils.currentDay());
+ const [mode, setMode] = useState<TimeFrame['mode']>('full');
const [query, setQuery] = useState<Query | undefined>(undefined);
const [dirty, setDirty] = useState(false);
+ const [latestTransaction, setLatestTransaction] = useState('');
const { transactions: transactionsGrouped, loadMore: loadMoreTransactions } =
useTransactions({ query });
@@ -305,6 +300,23 @@ function CalendarInner({ widget, parameters }: CalendarInnerProps) {
run();
}, [locale]);
+ useEffect(() => {
+ if (latestTransaction) {
+ const [initialStart, initialEnd, initialMode] = calculateTimeRange(
+ widget?.meta?.timeFrame,
+ {
+ start: monthUtils.dayFromDate(monthUtils.currentMonth()),
+ end: monthUtils.currentDay(),
+ mode: 'full',
+ },
+ latestTransaction,
+ );
+ setStart(initialStart);
+ setEnd(initialEnd);
+ setMode(initialMode);
+ }
+ }, [latestTransaction, widget?.meta?.timeFrame]);
+
const dispatch = useDispatch();
const navigate = useNavigate();
const { isNarrowWidth } = useResponsive();
@@ -492,7 +504,6 @@ function CalendarInner({ widget, parameters }: CalendarInnerProps) {
);
const [earliestTransaction, setEarliestTransaction] = useState('');
- const [latestTransaction, setLatestTransaction] = useState('');
return (
<Page
diff --git a/packages/desktop-client/src/components/reports/reports/CalendarCard.tsx b/packages/desktop-client/src/components/reports/reports/CalendarCard.tsx
index 65330a6f21..2265262322 100644
--- a/packages/desktop-client/src/components/reports/reports/CalendarCard.tsx
+++ b/packages/desktop-client/src/components/reports/reports/CalendarCard.tsx
@@ -24,6 +24,7 @@ import { View } from '@actual-app/components/view';
import { format as formatDate } from 'date-fns';
import debounce from 'lodash/debounce';
+import { send } from 'loot-core/platform/client/fetch';
import * as monthUtils from 'loot-core/shared/months';
import { type CalendarWidget } from 'loot-core/types/models';
import { type SyncedPrefs } from 'loot-core/types/prefs';
@@ -66,11 +67,27 @@ export function CalendarCard({
const { t } = useTranslation();
const format = useFormat();
- const [start, end] = calculateTimeRange(meta?.timeFrame, {
- start: monthUtils.dayFromDate(monthUtils.currentMonth()),
- end: monthUtils.currentDay(),
- mode: 'full',
- });
+ const [latestTransaction, setLatestTransaction] = useState<string>('');
+
+ useEffect(() => {
+ async function fetchLatestTransaction() {
+ const latestTrans = await send('get-latest-transaction');
+ setLatestTransaction(
+ latestTrans ? latestTrans.date : monthUtils.currentDay(),
+ );
+ }
+ fetchLatestTransaction();
+ }, []);
+
+ const [start, end] = calculateTimeRange(
+ meta?.timeFrame,
+ {
+ start: monthUtils.dayFromDate(monthUtils.currentMonth()),
+ end: monthUtils.currentDay(),
+ mode: 'full',
+ },
+ latestTransaction,
+ );
const params = useMemo(
() =>
calendarSpreadsheet(
diff --git a/packages/desktop-client/src/components/reports/reports/CashFlow.tsx b/packages/desktop-client/src/components/reports/reports/CashFlow.tsx
index ea006d6587..530a59cdaf 100644
--- a/packages/desktop-client/src/components/reports/reports/CashFlow.tsx
+++ b/packages/desktop-client/src/components/reports/reports/CashFlow.tsx
@@ -91,16 +91,13 @@ function CashFlowInner({ widget }: CashFlowInnerProps) {
pretty: string;
}>>(null);
- const [initialStart, initialEnd, initialMode] = calculateTimeRange(
- widget?.meta?.timeFrame,
- defaultTimeFrame,
- );
- const [start, setStart] = useState(initialStart);
- const [end, setEnd] = useState(initialEnd);
- const [mode, setMode] = useState(initialMode);
+ const [start, setStart] = useState(monthUtils.currentMonth());
+ const [end, setEnd] = useState(monthUtils.currentMonth());
+ const [mode, setMode] = useState<TimeFrame['mode']>('sliding-window');
const [showBalance, setShowBalance] = useState(
widget?.meta?.showBalance ?? true,
);
+ const [latestTransaction, setLatestTransaction] = useState('');
const [isConcise, setIsConcise] = useState(() => {
const numDays = d.differenceInCalendarDays(
@@ -159,6 +156,19 @@ function CashFlowInner({ widget }: CashFlowInnerProps) {
run();
}, [locale]);
+ useEffect(() => {
+ if (latestTransaction) {
+ const [initialStart, initialEnd, initialMode] = calculateTimeRange(
+ widget?.meta?.timeFrame,
+ defaultTimeFrame,
+ latestTransaction,
+ );
+ setStart(initialStart);
+ setEnd(initialEnd);
+ setMode(initialMode);
+ }
+ }, [latestTransaction, widget?.meta?.timeFrame]);
+
function onChangeDates(start: string, end: string, mode: TimeFrame['mode']) {
const numDays = d.differenceInCalendarDays(
d.parseISO(end),
@@ -221,7 +231,6 @@ function CashFlowInner({ widget }: CashFlowInnerProps) {
};
const [earliestTransaction, setEarliestTransaction] = useState('');
- const [latestTransaction, setLatestTransaction] = useState('');
const [_firstDayOfWeekIdx] = useSyncedPref('firstDayOfWeekIdx');
const firstDayOfWeekIdx = _firstDayOfWeekIdx || '0';
diff --git a/packages/desktop-client/src/components/reports/reports/CashFlowCard.tsx b/packages/desktop-client/src/components/reports/reports/CashFlowCard.tsx
index 03da14607d..b182bcfcdb 100644
--- a/packages/desktop-client/src/components/reports/reports/CashFlowCard.tsx
+++ b/packages/desktop-client/src/components/reports/reports/CashFlowCard.tsx
@@ -2,6 +2,7 @@ import React, {
useState,
useMemo,
useCallback,
+ useEffect,
type SVGAttributes,
} from 'react';
import { useTranslation } from 'react-i18next';
@@ -10,6 +11,8 @@ import { theme } from '@actual-app/components/theme';
import { View } from '@actual-app/components/view';
import { Bar, BarChart, LabelList, ResponsiveContainer } from 'recharts';
+import { send } from 'loot-core/platform/client/fetch';
+import * as monthUtils from 'loot-core/shared/months';
import { type CashFlowWidget } from 'loot-core/types/models';
import { defaultTimeFrame } from './CashFlow';
@@ -108,10 +111,25 @@ export function CashFlowCard({
onRemove,
}: CashFlowCardProps) {
const { t } = useTranslation();
-
- const [start, end] = calculateTimeRange(meta?.timeFrame, defaultTimeFrame);
+ const [latestTransaction, setLatestTransaction] = useState<string>('');
const [nameMenuOpen, setNameMenuOpen] = useState(false);
+ useEffect(() => {
+ async function fetchLatestTransaction() {
+ const latestTrans = await send('get-latest-transaction');
+ setLatestTransaction(
+ latestTrans ? latestTrans.date : monthUtils.currentDay(),
+ );
+ }
+ fetchLatestTransaction();
+ }, []);
+
+ const [start, end] = calculateTimeRange(
+ meta?.timeFrame,
+ defaultTimeFrame,
+ latestTransaction,
+ );
+
const params = useMemo(
() => simpleCashFlow(start, end, meta?.conditions, meta?.conditionsOp),
[start, end, meta?.conditions, meta?.conditionsOp],
diff --git a/packages/desktop-client/src/components/reports/reports/NetWorth.tsx b/packages/desktop-client/src/components/reports/reports/NetWorth.tsx
index 229d341d39..d4ef6c7b79 100644
--- a/packages/desktop-client/src/components/reports/reports/NetWorth.tsx
+++ b/packages/desktop-client/src/components/reports/reports/NetWorth.tsx
@@ -86,13 +86,11 @@ function NetWorthInner({ widget }: NetWorthInnerProps) {
pretty: string;
}> | null>(null);
- const [initialStart, initialEnd, initialMode] = calculateTimeRange(
- widget?.meta?.timeFrame,
- );
- const [start, setStart] = useState(initialStart);
- const [end, setEnd] = useState(initialEnd);
- const [mode, setMode] = useState(initialMode);
+ const [start, setStart] = useState(monthUtils.currentMonth());
+ const [end, setEnd] = useState(monthUtils.currentMonth());
+ const [mode, setMode] = useState<TimeFrame['mode']>('sliding-window');
const [interval, setInterval] = useState(widget?.meta?.interval || 'Monthly');
+ const [latestTransaction, setLatestTransaction] = useState('');
const [_firstDayOfWeekIdx] = useSyncedPref('firstDayOfWeekIdx');
const firstDayOfWeekIdx = _firstDayOfWeekIdx || '0';
@@ -170,6 +168,19 @@ function NetWorthInner({ widget }: NetWorthInnerProps) {
run();
}, [locale]);
+ useEffect(() => {
+ if (latestTransaction) {
+ const [initialStart, initialEnd, initialMode] = calculateTimeRange(
+ widget?.meta?.timeFrame,
+ undefined,
+ latestTransaction,
+ );
+ setStart(initialStart);
+ setEnd(initialEnd);
+ setMode(initialMode);
+ }
+ }, [latestTransaction, widget?.meta?.timeFrame]);
+
function onChangeDates(start: string, end: string, mode: TimeFrame['mode']) {
setStart(start);
setEnd(end);
@@ -225,7 +236,6 @@ function NetWorthInner({ widget }: NetWorthInnerProps) {
};
const [earliestTransaction, setEarliestTransaction] = useState('');
- const [latestTransaction, setLatestTransaction] = useState('');
if (!allMonths || !data) {
return null;
diff --git a/packages/desktop-client/src/components/reports/reports/NetWorthCard.tsx b/packages/desktop-client/src/components/reports/reports/NetWorthCard.tsx
index 66ea922d49..02a078cf4d 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 } from 'react';
+import React, { useState, useMemo, useCallback, useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { Block } from '@actual-app/components/block';
@@ -6,6 +6,8 @@ import { useResponsive } from '@actual-app/components/hooks/useResponsive';
import { styles } from '@actual-app/components/styles';
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 AccountEntity,
type NetWorthWidget,
@@ -47,13 +49,27 @@ export function NetWorthCard({
const { isNarrowWidth } = useResponsive();
const [_firstDayOfWeekIdx] = useSyncedPref('firstDayOfWeekIdx');
const firstDayOfWeekIdx = _firstDayOfWeekIdx || '0';
-
const format = useFormat();
+ const [latestTransaction, setLatestTransaction] = useState<string>('');
const [nameMenuOpen, setNameMenuOpen] = useState(false);
-
- const [start, end] = calculateTimeRange(meta?.timeFrame);
const [isCardHovered, setIsCardHovered] = useState(false);
+
+ useEffect(() => {
+ async function fetchLatestTransaction() {
+ const latestTrans = await send('get-latest-transaction');
+ setLatestTransaction(
+ latestTrans ? latestTrans.date : monthUtils.currentDay(),
+ );
+ }
+ fetchLatestTransaction();
+ }, []);
+
+ const [start, end] = calculateTimeRange(
+ meta?.timeFrame,
+ undefined,
+ latestTransaction,
+ );
const onCardHover = useCallback(() => setIsCardHovered(true), []);
const onCardHoverEnd = useCallback(() => setIsCardHovered(false), []);
diff --git a/packages/desktop-client/src/components/reports/reports/SpendingCard.tsx b/packages/desktop-client/src/components/reports/reports/SpendingCard.tsx
index 5eddaccb71..14b90e1624 100644
--- a/packages/desktop-client/src/components/reports/reports/SpendingCard.tsx
+++ b/packages/desktop-client/src/components/reports/reports/SpendingCard.tsx
@@ -38,12 +38,11 @@ export function SpendingCard({
const { t } = useTranslation();
const format = useFormat();
- const [compare, compareTo] = calculateSpendingReportTimeRange(meta ?? {});
-
const [isCardHovered, setIsCardHovered] = useState(false);
+ const [nameMenuOpen, setNameMenuOpen] = useState(false);
const spendingReportMode = meta?.mode ?? 'single-month';
- const [nameMenuOpen, setNameMenuOpen] = useState(false);
+ const [compare, compareTo] = calculateSpendingReportTimeRange(meta ?? {});
const selection =
spendingReportMode === 'single-month' ? 'compareTo' : spendingReportMode;
diff --git a/packages/desktop-client/src/components/reports/reports/Summary.tsx b/packages/desktop-client/src/components/reports/reports/Summary.tsx
index b7c8464cc7..0e7677cebb 100644
--- a/packages/desktop-client/src/components/reports/reports/Summary.tsx
+++ b/packages/desktop-client/src/components/reports/reports/Summary.tsx
@@ -76,17 +76,11 @@ function SummaryInner({ widget }: SummaryInnerProps) {
const { t } = useTranslation();
const format = useFormat();
- const [initialStart, initialEnd, initialMode] = calculateTimeRange(
- widget?.meta?.timeFrame,
- {
- start: monthUtils.dayFromDate(monthUtils.currentMonth()),
- end: monthUtils.currentDay(),
- mode: 'full',
- },
+ const [start, setStart] = useState(
+ monthUtils.dayFromDate(monthUtils.currentMonth()),
);
- const [start, setStart] = useState(initialStart);
- const [end, setEnd] = useState(initialEnd);
- const [mode, setMode] = useState(initialMode);
+ const [end, setEnd] = useState(monthUtils.currentDay());
+ const [mode, setMode] = useState<TimeFrame['mode']>('full');
const dividendFilters: FilterObject = useRuleConditionFilters(
widget?.meta?.conditions ?? [],
@@ -212,6 +206,23 @@ function SummaryInner({ widget }: SummaryInnerProps) {
run();
}, [locale]);
+ useEffect(() => {
+ if (latestTransaction) {
+ const [initialStart, initialEnd, initialMode] = calculateTimeRange(
+ widget?.meta?.timeFrame,
+ {
+ start: monthUtils.dayFromDate(monthUtils.currentMonth()),
+ end: monthUtils.currentDay(),
+ mode: 'full',
+ },
+ latestTransaction,
+ );
+ setStart(initialStart);
+ setEnd(initialEnd);
+ setMode(initialMode);
+ }
+ }, [latestTransaction, widget?.meta?.timeFrame]);
+
const dispatch = useDispatch();
const navigate = useNavigate();
const { isNarrowWidth } = useResponsive();
diff --git a/packages/desktop-client/src/components/reports/reports/SummaryCard.tsx b/packages/desktop-client/src/components/reports/reports/SummaryCard.tsx
index f7544a8129..592e074042 100644
--- a/packages/desktop-client/src/components/reports/reports/SummaryCard.tsx
+++ b/packages/desktop-client/src/components/reports/reports/SummaryCard.tsx
@@ -1,8 +1,9 @@
-import React, { useState, useMemo } from 'react';
+import React, { useState, useMemo, useEffect } from 'react';
import { useTranslation } from 'react-i18next';
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 SummaryContent,
@@ -36,12 +37,28 @@ export function SummaryCard({
}: SummaryCardProps) {
const locale = useLocale();
const { t } = useTranslation();
+ const [latestTransaction, setLatestTransaction] = useState<string>('');
+ const [nameMenuOpen, setNameMenuOpen] = useState(false);
+
+ useEffect(() => {
+ async function fetchLatestTransaction() {
+ const latestTrans = await send('get-latest-transaction');
+ setLatestTransaction(
+ latestTrans ? latestTrans.date : monthUtils.currentDay(),
+ );
+ }
+ fetchLatestTransaction();
+ }, []);
- const [start, end] = calculateTimeRange(meta?.timeFrame, {
- start: monthUtils.dayFromDate(monthUtils.currentMonth()),
- end: monthUtils.currentDay(),
- mode: 'full',
- });
+ const [start, end] = calculateTimeRange(
+ meta?.timeFrame,
+ {
+ start: monthUtils.dayFromDate(monthUtils.currentMonth()),
+ end: monthUtils.currentDay(),
+ mode: 'full',
+ },
+ latestTransaction,
+ );
const content = useMemo(
() =>
@@ -73,8 +90,6 @@ export function SummaryCard({
const data = useReport('summary', params);
- const [nameMenuOpen, setNameMenuOpen] = useState(false);
-
return (
<ReportCard
isEditing={isEditing}
diff --git a/upcoming-release-notes/5790.md b/upcoming-release-notes/5790.md
new file mode 100644
index 0000000000..6197685350
--- /dev/null
+++ b/upcoming-release-notes/5790.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [matt-fidd]
+---
+
+Fix live report time ranges