From 24fefcb01603c9091f9cef87863019a18625a5ca Mon Sep 17 00:00:00 2001 From: TaduJR Date: Thu, 27 Nov 2025 16:09:43 +0300 Subject: [PATCH 01/10] fix: Expense - Back button on Report layout RHP closes expense report RHP --- src/pages/settings/Report/ReportLayoutPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/settings/Report/ReportLayoutPage.tsx b/src/pages/settings/Report/ReportLayoutPage.tsx index 60b935ea697a..8856f9d5ce26 100644 --- a/src/pages/settings/Report/ReportLayoutPage.tsx +++ b/src/pages/settings/Report/ReportLayoutPage.tsx @@ -26,7 +26,7 @@ function ReportLayoutPage() { const currentGroupBy = getReportLayoutGroupBy(reportLayoutGroupByNVP); const goBack = useCallback(() => { - Navigation.dismissModal(); + Navigation.goBack(); }, []); const onSelectGroupBy = useCallback( From 7e0a85d4039c21550dc76f41d8f59c996889ed95 Mon Sep 17 00:00:00 2001 From: TaduJR Date: Thu, 27 Nov 2025 18:00:01 +0300 Subject: [PATCH 02/10] fix: group subtotals with multi-currency and offline support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #76075 - Negative amounts displaying incorrectly - Fixed with getConvertedAmount() that flips the sign - Stored negative → displayed positive #76077 - Offline transactions showing $0 - Fixed with fallback logic in calculateGroupTotal() - If convertedAmount exists → use it - Else if same currency → use amount --- .../MoneyRequestReportGroupHeader.tsx | 16 +++++---- .../MoneyRequestReportTransactionList.tsx | 3 +- src/libs/ReportLayoutUtils.ts | 33 ++++++++++++++++--- src/types/onyx/ReportLayout.ts | 3 ++ 4 files changed, 43 insertions(+), 12 deletions(-) diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx index f38a39ed881d..93c02cf7b6bc 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx @@ -1,11 +1,11 @@ import React, {useCallback, useMemo} from 'react'; import {View} from 'react-native'; -import type {StyleProp, ViewStyle} from 'react-native'; import Checkbox from '@components/Checkbox'; import Text from '@components/Text'; import useLocalize from '@hooks/useLocalize'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useThemeStyles from '@hooks/useThemeStyles'; +import {convertToDisplayString} from '@libs/CurrencyUtils'; import {getCommaSeparatedTagNameWithSanitizedColons} from '@libs/PolicyUtils'; import variables from '@styles/variables'; import type {GroupedTransactions} from '@src/types/onyx'; @@ -22,6 +22,9 @@ type MoneyRequestReportGroupHeaderProps = { /** The group key for toggle callback */ groupKey: string; + /** Currency code for amount formatting */ + currency: string; + /** Whether grouping by tag (if false, grouping by category) */ isGroupedByTag?: boolean; @@ -36,20 +39,17 @@ type MoneyRequestReportGroupHeaderProps = { /** Callback when group checkbox is toggled - receives groupKey */ onToggleSelection?: (groupKey: string) => void; - - /** Additional styles to apply */ - style?: StyleProp; }; function MoneyRequestReportGroupHeader({ group, groupKey, + currency, isGroupedByTag = false, isSelectionModeEnabled = false, isSelected = false, isIndeterminate = false, onToggleSelection, - style, }: MoneyRequestReportGroupHeaderProps) { const styles = useThemeStyles(); const {translate} = useLocalize(); @@ -57,6 +57,7 @@ function MoneyRequestReportGroupHeader({ const cleanedGroupName = isGroupedByTag && group.groupName ? getCommaSeparatedTagNameWithSanitizedColons(group.groupName) : group.groupName; const displayName = cleanedGroupName || translate(isGroupedByTag ? 'reportLayout.noTag' : 'reportLayout.uncategorized'); + const formattedAmount = convertToDisplayString(group.subTotalAmount, currency); const shouldShowCheckbox = isSelectionModeEnabled || !shouldUseNarrowLayout; @@ -78,7 +79,7 @@ function MoneyRequestReportGroupHeader({ }, [onToggleSelection, groupKey]); return ( - + {shouldShowCheckbox && ( {displayName} + • + {formattedAmount} ); diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx index 8e5c43470c1e..70a1dc4ec049 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx @@ -496,12 +496,13 @@ function MoneyRequestReportTransactionList({ > {group.transactions.map((transaction) => { const originalTransaction = sortedTransactionsMap.get(transaction.transactionID) ?? transaction; diff --git a/src/libs/ReportLayoutUtils.ts b/src/libs/ReportLayoutUtils.ts index 78708c2b5685..c1c54b7afa6c 100644 --- a/src/libs/ReportLayoutUtils.ts +++ b/src/libs/ReportLayoutUtils.ts @@ -5,10 +5,10 @@ import type Report from '@src/types/onyx/Report'; import type Transaction from '@src/types/onyx/Transaction'; import {isCategoryMissing} from './CategoryUtils'; import isTagMissing from './TagUtils'; -import {getCategory, getTag} from './TransactionUtils'; +import {getAmount, getCategory, getTag} from './TransactionUtils'; /** - * Sorts grouped transactions alphabetically (A→Z) with empty keys at the end + * Sorts groups alphabetically (A→Z) with empty keys at the end */ function sortGroupedTransactions(groups: GroupedTransactions[], localeCompare: LocaleContextProps['localeCompare']): GroupedTransactions[] { return groups.sort((a, b) => { @@ -22,15 +22,38 @@ function sortGroupedTransactions(groups: GroupedTransactions[], localeCompare: L }); } +/** + * Returns convertedAmount with sign flipped for display (stored negative, displayed positive) + */ +function getConvertedAmount(transaction: Transaction): number { + const convertedAmount = transaction.convertedAmount ?? 0; + return convertedAmount ? -convertedAmount : 0; +} + +/** + * Calculates group total using convertedAmount when available, falls back to amount for same-currency offline transactions + */ +function calculateGroupTotal(transactionList: Transaction[], reportCurrency: string): number { + let total = 0; + for (const transaction of transactionList) { + if (transaction.convertedAmount) { + total += getConvertedAmount(transaction); + } else if (transaction.currency === reportCurrency) { + total += getAmount(transaction, true, false, true); + } + } + return total; +} + /** * Groups transactions by category - * @returns Array of grouped transactions sorted alphabetically (A→Z) */ function groupTransactionsByCategory(transactions: Transaction[], report: OnyxEntry, localeCompare: LocaleContextProps['localeCompare']): GroupedTransactions[] { if (!report) { return []; } + const reportCurrency = report.currency ?? ''; const groups = new Map(); for (const transaction of transactions) { @@ -49,6 +72,7 @@ function groupTransactionsByCategory(transactions: Transaction[], report: OnyxEn groupName: categoryKey, groupKey: categoryKey, transactions: transactionList, + subTotalAmount: calculateGroupTotal(transactionList, reportCurrency), isExpanded: true, }); } @@ -58,13 +82,13 @@ function groupTransactionsByCategory(transactions: Transaction[], report: OnyxEn /** * Groups transactions by tag - * @returns Array of grouped transactions sorted alphabetically (A→Z) */ function groupTransactionsByTag(transactions: Transaction[], report: OnyxEntry, localeCompare: LocaleContextProps['localeCompare']): GroupedTransactions[] { if (!report) { return []; } + const reportCurrency = report.currency ?? ''; const groups = new Map(); for (const transaction of transactions) { @@ -83,6 +107,7 @@ function groupTransactionsByTag(transactions: Transaction[], report: OnyxEntry Date: Thu, 27 Nov 2025 19:36:15 +0300 Subject: [PATCH 03/10] fix: omit amount fields when merging split expense transactions (#76078, #76093) --- src/libs/actions/IOU.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 14909655a4f5..abd1aaefa8db 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -2,6 +2,7 @@ import {format} from 'date-fns'; import {fastMerge, Str} from 'expensify-common'; import cloneDeep from 'lodash/cloneDeep'; +import omit from 'lodash/omit'; // eslint-disable-next-line you-dont-need-lodash-underscore/union-by import lodashUnionBy from 'lodash/unionBy'; import {InteractionManager} from 'react-native'; @@ -3613,10 +3614,18 @@ function getMoneyRequestInformation(moneyRequestInformation: MoneyRequestInforma // data. This is a big can of worms to change it to `Onyx.merge()` as explored in https://expensify.slack.com/archives/C05DWUDHVK7/p1692139468252109. // I want to clean this up at some point, but it's possible this will live in the code for a while so I've created https://github.com/Expensify/App/issues/25417 // to remind me to do this. - if ((!!isSplitExpense || isDistanceRequest) && existingTransaction) { + if (isDistanceRequest && existingTransaction) { optimisticTransaction = fastMerge(existingTransaction, optimisticTransaction, false); } + // For split expenses, merge the existing transaction but omit amount-related fields. + // These fields should not be inherited from the original as they need to reflect the split values. + // Using fastMerge with all fields would copy convertedAmount, causing split totals to double (see issue #76078). + if (isSplitExpense && existingTransaction) { + const existingTransactionWithoutAmounts = omit(existingTransaction, ['amount', 'modifiedAmount', 'convertedAmount', 'taxAmount', 'originalAmount']); + optimisticTransaction = fastMerge(existingTransactionWithoutAmounts, optimisticTransaction, false); + } + // STEP 4: Build optimistic reportActions. We need: // 1. CREATED action for the chatReport // 2. CREATED action for the iouReport From 73e85baf2faa0fa5a1fe4a3941ea792031573ba2 Mon Sep 17 00:00:00 2001 From: TaduJR Date: Thu, 27 Nov 2025 21:32:06 +0300 Subject: [PATCH 04/10] refactor: only omit convertedAmount when merging split transactions --- src/libs/actions/IOU.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index abd1aaefa8db..2599a6b8606d 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -2,7 +2,6 @@ import {format} from 'date-fns'; import {fastMerge, Str} from 'expensify-common'; import cloneDeep from 'lodash/cloneDeep'; -import omit from 'lodash/omit'; // eslint-disable-next-line you-dont-need-lodash-underscore/union-by import lodashUnionBy from 'lodash/unionBy'; import {InteractionManager} from 'react-native'; @@ -3618,12 +3617,11 @@ function getMoneyRequestInformation(moneyRequestInformation: MoneyRequestInforma optimisticTransaction = fastMerge(existingTransaction, optimisticTransaction, false); } - // For split expenses, merge the existing transaction but omit amount-related fields. - // These fields should not be inherited from the original as they need to reflect the split values. - // Using fastMerge with all fields would copy convertedAmount, causing split totals to double (see issue #76078). + // For split expenses, merge the existing transaction but remove convertedAmount. + // Using fastMerge would copy convertedAmount from the original, causing split totals to double. if (isSplitExpense && existingTransaction) { - const existingTransactionWithoutAmounts = omit(existingTransaction, ['amount', 'modifiedAmount', 'convertedAmount', 'taxAmount', 'originalAmount']); - optimisticTransaction = fastMerge(existingTransactionWithoutAmounts, optimisticTransaction, false); + const {convertedAmount: _, ...existingTransactionWithoutConvertedAmount} = existingTransaction; + optimisticTransaction = fastMerge(existingTransactionWithoutConvertedAmount, optimisticTransaction, false); } // STEP 4: Build optimistic reportActions. We need: From f01f51fcebc6699a49be0b8356b85482be08bc90 Mon Sep 17 00:00:00 2001 From: TaduJR Date: Thu, 27 Nov 2025 21:43:09 +0300 Subject: [PATCH 05/10] chore: move Report layout menu item below View details --- src/libs/ReportSecondaryActionUtils.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts index 82f34bd3b03c..d4017de4028e 100644 --- a/src/libs/ReportSecondaryActionUtils.ts +++ b/src/libs/ReportSecondaryActionUtils.ts @@ -706,10 +706,6 @@ function getSecondaryReportActions({ options.push(CONST.REPORT.SECONDARY_ACTIONS.EXPORT); - if (isReportLayoutAction(report, reportTransactions)) { - options.push(CONST.REPORT.SECONDARY_ACTIONS.REPORT_LAYOUT); - } - options.push(CONST.REPORT.SECONDARY_ACTIONS.DOWNLOAD_PDF); if (isChangeWorkspaceAction(report, policies, reportActions)) { @@ -722,6 +718,10 @@ function getSecondaryReportActions({ options.push(CONST.REPORT.SECONDARY_ACTIONS.VIEW_DETAILS); + if (isReportLayoutAction(report, reportTransactions)) { + options.push(CONST.REPORT.SECONDARY_ACTIONS.REPORT_LAYOUT); + } + if (isDeleteAction(report, reportTransactions, reportActions ?? [])) { options.push(CONST.REPORT.SECONDARY_ACTIONS.DELETE); } From f4cf08cb2d8f44ef6548e2bb095aca3fea7d08be Mon Sep 17 00:00:00 2001 From: TaduJR Date: Fri, 28 Nov 2025 02:32:44 +0300 Subject: [PATCH 06/10] fix: disable group checkbox when all expenses pending delete and fix indeterminate toggle behavior (#76191, #76210) --- .../MoneyRequestReportGroupHeader.tsx | 5 +++++ .../MoneyRequestReportTransactionList.tsx | 15 ++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx index 93c02cf7b6bc..c5b6b01d4d9c 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx @@ -37,6 +37,9 @@ type MoneyRequestReportGroupHeaderProps = { /** Whether some (but not all) transactions in this group are selected */ isIndeterminate?: boolean; + /** Whether the checkbox should be disabled (e.g., all transactions are pending delete) */ + isDisabled?: boolean; + /** Callback when group checkbox is toggled - receives groupKey */ onToggleSelection?: (groupKey: string) => void; }; @@ -49,6 +52,7 @@ function MoneyRequestReportGroupHeader({ isSelectionModeEnabled = false, isSelected = false, isIndeterminate = false, + isDisabled = false, onToggleSelection, }: MoneyRequestReportGroupHeaderProps) { const styles = useThemeStyles(); @@ -85,6 +89,7 @@ function MoneyRequestReportGroupHeader({ { - const state = new Map(); + const state = new Map(); for (const group of groupedTransactions) { const groupTransactionIDs = group.transactions.filter((t) => !isTransactionPendingDelete(t)).map((t) => t.transactionID); if (groupTransactionIDs.length === 0) { - state.set(group.groupKey, {isSelected: false, isIndeterminate: false}); + state.set(group.groupKey, {isSelected: false, isIndeterminate: false, isDisabled: true}); continue; } @@ -312,6 +312,7 @@ function MoneyRequestReportTransactionList({ state.set(group.groupKey, { isSelected: selectedCount === groupTransactionIDs.length, isIndeterminate: selectedCount > 0 && selectedCount < groupTransactionIDs.length, + isDisabled: false, }); } @@ -325,14 +326,13 @@ function MoneyRequestReportTransactionList({ return; } const groupTransactionIDs = group.transactions.filter((t) => !isTransactionPendingDelete(t)).map((t) => t.transactionID); - const allSelected = groupTransactionIDs.every((id) => selectedTransactionIDs.includes(id)); + const anySelected = groupTransactionIDs.some((id) => selectedTransactionIDs.includes(id)); let newSelectedTransactionIDs = selectedTransactionIDs; - if (allSelected) { + if (anySelected) { newSelectedTransactionIDs = selectedTransactionIDs.filter((id) => !groupTransactionIDs.includes(id)); } else { - const idsToAdd = groupTransactionIDs.filter((id) => !selectedTransactionIDs.includes(id)); - newSelectedTransactionIDs = [...selectedTransactionIDs, ...idsToAdd]; + newSelectedTransactionIDs = [...selectedTransactionIDs, ...groupTransactionIDs]; } setSelectedTransactions(newSelectedTransactionIDs); }, @@ -487,7 +487,7 @@ function MoneyRequestReportTransactionList({ {shouldShowGroupedTransactions ? groupedTransactions.map((group) => { - const selectionState = groupSelectionState.get(group.groupKey) ?? {isSelected: false, isIndeterminate: false}; + const selectionState = groupSelectionState.get(group.groupKey) ?? {isSelected: false, isIndeterminate: false, isDisabled: false}; return ( {group.transactions.map((transaction) => { From a32f5cab64ec63769618fc418229c0392e32539f Mon Sep 17 00:00:00 2001 From: TaduJR Date: Fri, 28 Nov 2025 12:55:36 +0300 Subject: [PATCH 07/10] fix: rename unused variable to satisfy naming convention --- src/libs/actions/IOU.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 2599a6b8606d..c9472ea87ac7 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -3620,7 +3620,7 @@ function getMoneyRequestInformation(moneyRequestInformation: MoneyRequestInforma // For split expenses, merge the existing transaction but remove convertedAmount. // Using fastMerge would copy convertedAmount from the original, causing split totals to double. if (isSplitExpense && existingTransaction) { - const {convertedAmount: _, ...existingTransactionWithoutConvertedAmount} = existingTransaction; + const {convertedAmount: omittedConvertedAmount, ...existingTransactionWithoutConvertedAmount} = existingTransaction; optimisticTransaction = fastMerge(existingTransactionWithoutConvertedAmount, optimisticTransaction, false); } From 31f1b14abf1115d6bbad538bd08bbadd29e28471 Mon Sep 17 00:00:00 2001 From: TaduJR Date: Fri, 28 Nov 2025 14:30:42 +0300 Subject: [PATCH 08/10] fix: copy only card fields when splitting expenses (#76005, #76078) --- src/libs/actions/IOU.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index c9472ea87ac7..9ef8332bddfb 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -3617,11 +3617,19 @@ function getMoneyRequestInformation(moneyRequestInformation: MoneyRequestInforma optimisticTransaction = fastMerge(existingTransaction, optimisticTransaction, false); } - // For split expenses, merge the existing transaction but remove convertedAmount. - // Using fastMerge would copy convertedAmount from the original, causing split totals to double. + // For split expenses, only copy card-related fields from the existing transaction. + // Using fastMerge would copy all fields, causing issues like duplicated hold messages (#76005) + // and incorrect amounts (#76078). We only need to preserve card data for offline splits. if (isSplitExpense && existingTransaction) { - const {convertedAmount: omittedConvertedAmount, ...existingTransactionWithoutConvertedAmount} = existingTransaction; - optimisticTransaction = fastMerge(existingTransactionWithoutConvertedAmount, optimisticTransaction, false); + optimisticTransaction = { + ...optimisticTransaction, + managedCard: existingTransaction.managedCard, + bank: existingTransaction.bank, + cardName: existingTransaction.cardName, + cardNumber: existingTransaction.cardNumber, + cardID: existingTransaction.cardID, + posted: existingTransaction.posted, + }; } // STEP 4: Build optimistic reportActions. We need: From 6105a434accee6d0694c530f6df2d4fcc4ae65b1 Mon Sep 17 00:00:00 2001 From: TaduJR Date: Fri, 28 Nov 2025 17:09:01 +0300 Subject: [PATCH 09/10] fix: use CONST.DOT_SEPARATOR in group header and omit only convertedAmount for split expenses --- .../MoneyRequestReportGroupHeader.tsx | 3 ++- src/libs/actions/IOU.ts | 14 ++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx index c5b6b01d4d9c..23344cc3376a 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx @@ -8,6 +8,7 @@ import useThemeStyles from '@hooks/useThemeStyles'; import {convertToDisplayString} from '@libs/CurrencyUtils'; import {getCommaSeparatedTagNameWithSanitizedColons} from '@libs/PolicyUtils'; import variables from '@styles/variables'; +import CONST from '@src/CONST'; import type {GroupedTransactions} from '@src/types/onyx'; // Height constants @@ -101,7 +102,7 @@ function MoneyRequestReportGroupHeader({ > {displayName} - • + {CONST.DOT_SEPARATOR} {formattedAmount} diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 9ef8332bddfb..f779d737b860 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -3617,19 +3617,9 @@ function getMoneyRequestInformation(moneyRequestInformation: MoneyRequestInforma optimisticTransaction = fastMerge(existingTransaction, optimisticTransaction, false); } - // For split expenses, only copy card-related fields from the existing transaction. - // Using fastMerge would copy all fields, causing issues like duplicated hold messages (#76005) - // and incorrect amounts (#76078). We only need to preserve card data for offline splits. if (isSplitExpense && existingTransaction) { - optimisticTransaction = { - ...optimisticTransaction, - managedCard: existingTransaction.managedCard, - bank: existingTransaction.bank, - cardName: existingTransaction.cardName, - cardNumber: existingTransaction.cardNumber, - cardID: existingTransaction.cardID, - posted: existingTransaction.posted, - }; + const {convertedAmount: omittedConvertedAmount, ...existingTransactionWithoutConvertedAmount} = existingTransaction; + optimisticTransaction = fastMerge(existingTransactionWithoutConvertedAmount, optimisticTransaction, false); } // STEP 4: Build optimistic reportActions. We need: From cca9d686884c63b1ea95723671b799df714648ba Mon Sep 17 00:00:00 2001 From: TaduJR Date: Mon, 1 Dec 2025 15:16:15 +0300 Subject: [PATCH 10/10] fix: correct group total calculation for split expenses (#76093) --- src/libs/ReportLayoutUtils.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/ReportLayoutUtils.ts b/src/libs/ReportLayoutUtils.ts index c1c54b7afa6c..879a4207f07c 100644 --- a/src/libs/ReportLayoutUtils.ts +++ b/src/libs/ReportLayoutUtils.ts @@ -31,15 +31,15 @@ function getConvertedAmount(transaction: Transaction): number { } /** - * Calculates group total using convertedAmount when available, falls back to amount for same-currency offline transactions + * Calculates group total using amount for same-currency transactions, falls back to convertedAmount for multi-currency */ function calculateGroupTotal(transactionList: Transaction[], reportCurrency: string): number { let total = 0; for (const transaction of transactionList) { - if (transaction.convertedAmount) { - total += getConvertedAmount(transaction); - } else if (transaction.currency === reportCurrency) { + if (transaction.currency === reportCurrency) { total += getAmount(transaction, true, false, true); + } else if (transaction.convertedAmount) { + total += getConvertedAmount(transaction); } } return total;