From 9c6fb804f035baf76c6733fc1ec326070a92b391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Acosta?= <96029181+tomas2305@users.noreply.github.com> Date: Mon, 22 Dec 2025 18:07:42 -0300 Subject: [PATCH 1/3] Update CHANGELOG.md --- CHANGELOG.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74f8745..28b3e97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.4.0] - 2025-12-21 + ### Added - Negative balance display in red color for visual warning @@ -16,14 +18,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 @@ -36,7 +38,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) @@ -57,7 +59,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 @@ -69,7 +71,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 @@ -81,7 +83,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 From 9afea5c92ade403d5e52caed8aed244849d78cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Acosta?= <96029181+tomas2305@users.noreply.github.com> Date: Mon, 22 Dec 2025 18:18:45 -0300 Subject: [PATCH 2/3] Update HomePage.tsx --- src/pages/HomePage.tsx | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx index 058bfc0..7a66bc4 100644 --- a/src/pages/HomePage.tsx +++ b/src/pages/HomePage.tsx @@ -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'; @@ -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; } } @@ -300,6 +308,7 @@ export const HomePage = () => { const total = computeTotal( accounts, + transactions, newRates, settings?.displayCurrency ?? 'ARS', ); From 31331a4e968152d9b61c2d173fce4aabe499a258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Acosta?= <96029181+tomas2305@users.noreply.github.com> Date: Mon, 22 Dec 2025 18:19:39 -0300 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28b3e97..4d49314 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ 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