- {importProgress} of {importTotal}
+ {importProgress} of {importTotal}{' '}
{__('transactions imported')}
{Math.round(percentage)}%
diff --git a/resources/js/lib/file-parser.test.ts b/resources/js/lib/file-parser.test.ts
index 6b328a58..2580cc4f 100644
--- a/resources/js/lib/file-parser.test.ts
+++ b/resources/js/lib/file-parser.test.ts
@@ -2,9 +2,12 @@ import { DateFormat } from '@/types/import';
import { describe, expect, it } from 'vitest';
import {
autoDetectDateFormat,
+ calculateBalancesFromTransactions,
convertRowsToTransactions,
+ getLatestTransactionDate,
getLocaleDateFormat,
} from './file-parser';
+import type { ColumnMapping, ParsedTransaction } from '@/types/import';
describe('getLocaleDateFormat', () => {
it('returns null for undefined locale', () => {
@@ -151,3 +154,97 @@ describe('autoDetectDateFormat', () => {
);
});
});
+
+describe('getLatestTransactionDate', () => {
+ const mapping: ColumnMapping = {
+ transaction_date: 'date',
+ description: 'desc',
+ amount: 'amount',
+ balance: null,
+ };
+
+ it('returns null when no date column set', () => {
+ expect(
+ getLatestTransactionDate(
+ [{ date: '2024-01-01' }],
+ { ...mapping, transaction_date: null },
+ DateFormat.YearMonthDay,
+ ),
+ ).toBeNull();
+ });
+
+ it('returns latest date across rows in YYYY-MM-DD', () => {
+ const rows = [
+ { date: '2024-01-15' },
+ { date: '2024-03-02' },
+ { date: '2024-02-10' },
+ ];
+ expect(
+ getLatestTransactionDate(rows, mapping, DateFormat.YearMonthDay),
+ ).toBe('2024-03-02');
+ });
+
+ it('returns null when rows have no parseable date', () => {
+ const rows = [{ date: '' }, { date: null }];
+ expect(
+ getLatestTransactionDate(rows, mapping, DateFormat.YearMonthDay),
+ ).toBeNull();
+ });
+});
+
+describe('calculateBalancesFromTransactions', () => {
+ function txn(
+ date: string,
+ amount: number,
+ ): ParsedTransaction {
+ return {
+ transaction_date: date,
+ description: 'x',
+ amount,
+ };
+ }
+
+ it('walks balances back across distinct dates', () => {
+ const txns = [
+ txn('2024-01-01', 1000),
+ txn('2024-01-02', -500),
+ txn('2024-01-02', -200),
+ txn('2024-01-03', 300),
+ ];
+ const balances = calculateBalancesFromTransactions(
+ txns,
+ '2024-01-03',
+ 10000,
+ );
+ expect(balances.get('2024-01-03')).toBe(10000);
+ // before 03 net (+300): end of 02 = 9700
+ expect(balances.get('2024-01-02')).toBe(9700);
+ // before 02 net (-700): end of 01 = 10400
+ expect(balances.get('2024-01-01')).toBe(10400);
+ });
+
+ it('handles reference date with no transactions on it', () => {
+ const txns = [
+ txn('2024-01-01', 1000),
+ txn('2024-01-02', -200),
+ ];
+ const balances = calculateBalancesFromTransactions(
+ txns,
+ '2024-01-05',
+ 5000,
+ );
+ expect(balances.get('2024-01-05')).toBe(5000);
+ expect(balances.get('2024-01-02')).toBe(5000);
+ expect(balances.get('2024-01-01')).toBe(5200);
+ });
+
+ it('returns only reference when no transactions provided', () => {
+ const balances = calculateBalancesFromTransactions(
+ [],
+ '2024-01-05',
+ 5000,
+ );
+ expect(balances.size).toBe(1);
+ expect(balances.get('2024-01-05')).toBe(5000);
+ });
+});
diff --git a/resources/js/lib/file-parser.ts b/resources/js/lib/file-parser.ts
index ccc2aef1..dbf8fb8b 100644
--- a/resources/js/lib/file-parser.ts
+++ b/resources/js/lib/file-parser.ts
@@ -603,3 +603,84 @@ export function convertRowsToTransactions(
return results;
}
+
+/**
+ * Find the latest transaction date (YYYY-MM-DD) from parsed rows using the
+ * provided column mapping and date format. Returns null if no valid dates.
+ */
+export function getLatestTransactionDate(
+ rows: ParsedRow[],
+ mapping: ColumnMapping,
+ dateFormat: DateFormat,
+): string | null {
+ if (!mapping.transaction_date) {
+ return null;
+ }
+
+ let latest: Date | null = null;
+
+ for (const row of rows) {
+ const raw = row[mapping.transaction_date];
+ if (raw === null || raw === undefined || raw === '') {
+ continue;
+ }
+ const parsed = parseDate(raw as string | number, dateFormat);
+ if (!parsed) {
+ continue;
+ }
+ if (!latest || parsed.getTime() > latest.getTime()) {
+ latest = parsed;
+ }
+ }
+
+ return latest ? formatLocalDate(latest) : null;
+}
+
+/**
+ * Given a chronologically sorted list of transactions (any order) and the
+ * balance as of the latest transaction date, compute the end-of-day balance
+ * for every distinct date by walking backwards: subtract each day's net
+ * movement from the next day's balance.
+ *
+ * All amounts/balances are in cents.
+ */
+export function calculateBalancesFromTransactions(
+ transactions: ParsedTransaction[],
+ latestDate: string,
+ referenceBalance: number,
+): Map {
+ const dailyNet = new Map();
+
+ for (const txn of transactions) {
+ dailyNet.set(
+ txn.transaction_date,
+ (dailyNet.get(txn.transaction_date) ?? 0) + txn.amount,
+ );
+ }
+
+ const dates = Array.from(dailyNet.keys()).sort();
+ const balances = new Map();
+
+ if (dates.length === 0) {
+ balances.set(latestDate, referenceBalance);
+ return balances;
+ }
+
+ if (!dailyNet.has(latestDate)) {
+ dates.push(latestDate);
+ dates.sort();
+ }
+
+ balances.set(latestDate, referenceBalance);
+
+ const latestIndex = dates.indexOf(latestDate);
+
+ for (let i = latestIndex - 1; i >= 0; i--) {
+ const nextDate = dates[i + 1];
+ const nextNet = dailyNet.get(nextDate) ?? 0;
+ const nextBalance = balances.get(nextDate) ?? 0;
+ balances.set(dates[i], nextBalance - nextNet);
+ }
+
+ return balances;
+}
diff --git a/resources/js/types/import.ts b/resources/js/types/import.ts
index b32d678f..e69d35a2 100644
--- a/resources/js/types/import.ts
+++ b/resources/js/types/import.ts
@@ -51,4 +51,8 @@ export interface ImportState {
dateFormat: DateFormat;
dateFormatDetected: boolean;
transactions: ParsedTransaction[];
+ calculateBalances: boolean;
+ referenceBalance: number | null;
+ referenceBalanceDate: string | null;
+ referenceBalancePrefilled: boolean;
}
diff --git a/resources/js/types/index.d.ts b/resources/js/types/index.d.ts
index 05aae7c3..9e969cbb 100644
--- a/resources/js/types/index.d.ts
+++ b/resources/js/types/index.d.ts
@@ -41,6 +41,7 @@ export interface NavDivider {
export interface Features {
cashflow: boolean;
+ calculateBalancesOnImport: boolean;
}
export interface ExpiredBankingConnectionNotification {
diff --git a/resources/js/utils/date.ts b/resources/js/utils/date.ts
index 8204a15d..f8f70659 100644
--- a/resources/js/utils/date.ts
+++ b/resources/js/utils/date.ts
@@ -1,5 +1,10 @@
-import { format as dateFnsFormat } from 'date-fns';
+import {
+ format as dateFnsFormat,
+ isToday as dateFnsIsToday,
+ isYesterday as dateFnsIsYesterday,
+} from 'date-fns';
import { es } from 'date-fns/locale';
+import { __ } from '@/utils/i18n';
/**
* Get the date-fns locale object based on locale code
@@ -99,6 +104,35 @@ export function formatDateMedium(
return formatted.charAt(0).toUpperCase() + formatted.slice(1);
}
+/**
+ * Format a date from YYYY-MM-DD string using relative wording when close to
+ * the current date. Returns "Today" or "Yesterday" when appropriate, otherwise
+ * a long weekday-based label like "Monday, 3 of Jun".
+ */
+export function formatRelativeDate(
+ dateStr: string,
+ locale: string = 'en-US',
+): string {
+ const date = new Date(dateStr + 'T00:00:00');
+
+ if (dateFnsIsToday(date)) {
+ return __('Today');
+ }
+
+ if (dateFnsIsYesterday(date)) {
+ return __('Yesterday');
+ }
+
+ const weekday = formatDate(date, 'EEEE', locale);
+ const day = formatDate(date, 'd', locale);
+ const month = formatDate(date, 'MMM', locale);
+ const capitalizedWeekday =
+ weekday.charAt(0).toUpperCase() + weekday.slice(1);
+ const capitalizedMonth = month.charAt(0).toUpperCase() + month.slice(1);
+
+ return `${capitalizedWeekday}, ${day} ${__('of')} ${capitalizedMonth}`;
+}
+
/**
* Format a date from YYYY-MM-DD string for daily chart X-axis labels
* Shows "MMM d" (e.g., "Feb 14") for current year, or "MMM d 'YY" for other years
diff --git a/tests/Feature/InertiaSharedDataTest.php b/tests/Feature/InertiaSharedDataTest.php
index 07c48b70..e8ee5c7d 100644
--- a/tests/Feature/InertiaSharedDataTest.php
+++ b/tests/Feature/InertiaSharedDataTest.php
@@ -42,6 +42,7 @@ test('shared feature flags do not include coinbase flag', function () {
expect($props['features'])->toBe([
'cashflow' => true,
+ 'calculateBalancesOnImport' => false,
]);
});