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
19 changes: 13 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.4.1] - 2025-12-22

### Fixed
- Fixed total balance calculation to properly convert transaction amounts from their currency to account currency before summing.

## [1.4.0] - 2025-12-21

### Added
- Negative balance display in red color for visual warning

Expand All @@ -16,14 +23,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fixed negative number formatting to properly display minus sign with thousands separators
- GitHub Actions now use full commit SHA instead of version tags for third-party dependencies

## [1.3.1] - 2024-12-13
## [1.3.1] - 2025-12-13

### Fixed
- Hotfix: Removed problematic backport workflow that was causing deployment failures
- Backport action had recurring merge conflict issues
- Workflow temporarily disabled until a more robust solution is implemented

## [1.3.0] - 2024-12-11
## [1.3.0] - 2025-12-11

### Added
- Enhanced transaction notifications with detailed information
Expand All @@ -36,7 +43,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Most recently created transactions appear first within each date
- Uses transaction ID for consistent ordering

## [1.2.0] - 2024-12-11
## [1.2.0] - 2025-12-11

### Added
- Date navigation buttons in transaction forms (create and edit)
Expand All @@ -57,7 +64,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Automatic backport workflow no longer requires manual label
- All merged PRs to main are automatically backported to develop

## [1.1.1] - 2024-12-11
## [1.1.1] - 2025-12-11

### Fixed
- Fixed date timezone issues causing transactions to appear in wrong month filters
Expand All @@ -69,7 +76,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Automatic backport workflow for merging changes from main to develop
- CHANGELOG.md file to track version history and changes

## [1.1.0] - 2024-12-11
## [1.1.0] - 2025-12-11

### Added
- Auto-update functionality for exchange rates
Expand All @@ -81,7 +88,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Exchange rates can now be automatically refreshed from external API
- Settings page shows remaining cooldown time before next manual update

## [1.0.0] - 2024-12-XX
## [1.0.0] - 2025-12-XX

### Added
- Progressive Web App (PWA) support with offline functionality
Expand Down
15 changes: 12 additions & 3 deletions src/pages/HomePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { getAllAccounts } from '../stores/accountsStore';
import { getAllCategories } from '../stores/categoriesStore';
import { getAllTransactions } from '../stores/transactionsStore';
import { autoUpdateExchangeRates, fetchAndUpdateExchangeRates, getSettings, initializeSettings } from '../stores/settingsStore';
import { convertToARS } from '../utils/currency';
import { convertAmount, convertToARS } from '../utils/currency';
import { formatMonetaryValue } from '../utils/formatters';
import { formatPeriodLabel } from '../utils/dateFormatters';
import type { Account, AppSettings, Category, Currency, ExchangeRates, Transaction, TransactionType, TimeWindow } from '../types';
Expand Down Expand Up @@ -45,10 +45,18 @@ export const HomePage = () => {
// Add/subtract transactions for this account
const accountTransactions = transactionsList.filter(tx => tx.accountId === acc.id);
for (const tx of accountTransactions) {
// Convert transaction amount to account currency
const amountInAccountCurrency = convertAmount(
tx.amount,
tx.currency,
acc.currency,
rates
);

if (tx.type === 'income') {
balance += tx.amount;
balance += amountInAccountCurrency;
} else {
balance -= tx.amount;
balance -= amountInAccountCurrency;
}
}

Expand Down Expand Up @@ -300,6 +308,7 @@ export const HomePage = () => {

const total = computeTotal(
accounts,
transactions,
newRates,
settings?.displayCurrency ?? 'ARS',
);
Expand Down