Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.5.1] - 2026-01-24

### Fixed
- Fixed number formatting display across all components showing monetary values.

## [1.5.0] - 2026-01-24

### Added
Expand Down
8 changes: 4 additions & 4 deletions src/components/IncomeOutcomeComparison.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Card, Group, Progress, Stack, Text } from '@mantine/core';
import { formatMonetaryValue } from '../utils/formatters';
import { formatNumberToMonetary } from '../utils/formatters';

interface IncomeOutcomeComparisonProps {
income: number;
Expand Down Expand Up @@ -27,7 +27,7 @@ export const IncomeOutcomeComparison = ({
<Group gap="xs">
<Text size="sm" c="dimmed">Balance:</Text>
<Text size="lg" fw={700} c={isPositive ? 'green' : 'red'}>
{isPositive ? '+' : ''}{formatMonetaryValue(balance.toFixed(2))} {currency}
{isPositive ? '+' : ''}{formatNumberToMonetary(balance)} {currency}
</Text>
</Group>
</Group>
Expand All @@ -46,7 +46,7 @@ export const IncomeOutcomeComparison = ({
<Stack gap={4}>
<Text size="xs" c="dimmed">Total Income</Text>
<Text size="lg" fw={600} c="teal">
{formatMonetaryValue(income.toFixed(2))} {currency}
{formatNumberToMonetary(income)} {currency}
</Text>
<Text size="xs" c="dimmed">{incomePercentage.toFixed(1)}% of total</Text>
</Stack>
Expand All @@ -56,7 +56,7 @@ export const IncomeOutcomeComparison = ({
<Stack gap={4}>
<Text size="xs" c="dimmed">Total Outcome</Text>
<Text size="lg" fw={600} c="red">
{formatMonetaryValue(outcome.toFixed(2))} {currency}
{formatNumberToMonetary(outcome)} {currency}
</Text>
<Text size="xs" c="dimmed">{outcomePercentage.toFixed(1)}% of total</Text>
</Stack>
Expand Down
12 changes: 6 additions & 6 deletions src/pages/HomePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { getAllTransactions } from '../stores/transactionsStore';
import { AccountIcon } from '../components/AccountIcon';
import { autoUpdateExchangeRates, fetchAndUpdateExchangeRates, getSettings, initializeSettings } from '../stores/settingsStore';
import { convertAmount, convertToARS } from '../utils/currency';
import { formatMonetaryValue } from '../utils/formatters';
import { formatNumberToMonetary } from '../utils/formatters';
import { formatPeriodLabel } from '../utils/dateFormatters';
import type { Account, AppSettings, Category, Currency, ExchangeRates, Transaction, TransactionType, TimeWindow } from '../types';

Expand Down Expand Up @@ -146,7 +146,7 @@ export const HomePage = () => {
ratesToUse,
loadedSettings.displayCurrency,
);
setTotalDisplay(formatMonetaryValue(total.toFixed(2)));
setTotalDisplay(formatNumberToMonetary(total));

if (loadedSettings.defaultAccountId && allAccounts.some(acc => acc.id === loadedSettings.defaultAccountId)) {
const selectedAccount = allAccounts.find(acc => acc.id === loadedSettings.defaultAccountId);
Expand All @@ -157,7 +157,7 @@ export const HomePage = () => {
ratesToUse,
loadedSettings.displayCurrency
);
setAccountBalanceDisplay(formatMonetaryValue(accountBalance.toFixed(2)));
setAccountBalanceDisplay(formatNumberToMonetary(accountBalance));
}
}

Expand Down Expand Up @@ -405,7 +405,7 @@ export const HomePage = () => {
newRates,
settings?.displayCurrency ?? 'ARS',
);
setTotalDisplay(formatMonetaryValue(total.toFixed(2)));
setTotalDisplay(formatNumberToMonetary(total));

if (accountFilter !== null) {
const selectedAccount = accounts.find(acc => acc.id === accountFilter);
Expand All @@ -416,7 +416,7 @@ export const HomePage = () => {
newRates,
settings?.displayCurrency ?? 'ARS'
);
setAccountBalanceDisplay(formatMonetaryValue(accountBalance.toFixed(2)));
setAccountBalanceDisplay(formatNumberToMonetary(accountBalance));
}
}
} catch (error) {
Expand Down Expand Up @@ -462,7 +462,7 @@ export const HomePage = () => {
settings.exchangeRates,
settings.displayCurrency
);
setAccountBalanceDisplay(formatMonetaryValue(accountBalance.toFixed(2)));
setAccountBalanceDisplay(formatNumberToMonetary(accountBalance));
}
}
}}
Expand Down
4 changes: 2 additions & 2 deletions src/pages/SettingsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { fetchAndUpdateExchangeRates, getSettings, initializeSettings, resetData
import { ensureDefaultCategories } from '../stores/categoriesStore';
import type { AppSettings, Account, AutoUpdateInterval, TimeWindow, Currency, ExchangeRates } from '../types';
import { SUPPORTED_CURRENCIES } from '../utils/currency';
import { formatMonetaryValue, parseMonetaryValue } from '../utils/formatters';
import { formatNumberToMonetary, parseMonetaryValue } from '../utils/formatters';
import { DatabaseImportExport } from '../components/DatabaseImportExport';

export const SettingsPage = () => {
Expand Down Expand Up @@ -191,7 +191,7 @@ export const SettingsPage = () => {
};
for (const c of SUPPORTED_CURRENCIES) {
const value = exchangeRates?.[c]?.toARS;
rates[c] = c === 'ARS' ? '1' : formatMonetaryValue(String(value ?? ''));
rates[c] = c === 'ARS' ? '1' : formatNumberToMonetary(value ?? 0);
}
return rates;
}, [exchangeRates]);
Expand Down