diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx index f38a39ed881d..23344cc3376a 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx @@ -1,13 +1,14 @@ 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 CONST from '@src/CONST'; import type {GroupedTransactions} from '@src/types/onyx'; // Height constants @@ -22,6 +23,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; @@ -34,22 +38,23 @@ 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; - - /** Additional styles to apply */ - style?: StyleProp; }; function MoneyRequestReportGroupHeader({ group, groupKey, + currency, isGroupedByTag = false, isSelectionModeEnabled = false, isSelected = false, isIndeterminate = false, + isDisabled = false, onToggleSelection, - style, }: MoneyRequestReportGroupHeaderProps) { const styles = useThemeStyles(); const {translate} = useLocalize(); @@ -57,6 +62,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,12 +84,13 @@ function MoneyRequestReportGroupHeader({ }, [onToggleSelection, groupKey]); return ( - + {shouldShowCheckbox && ( {displayName} + {CONST.DOT_SEPARATOR} + {formattedAmount} ); diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx index 8e5c43470c1e..b38c6f04995f 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx @@ -298,13 +298,13 @@ function MoneyRequestReportTransactionList({ }, [sortedTransactions]); const groupSelectionState = useMemo(() => { - 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) => { const originalTransaction = sortedTransactionsMap.get(transaction.transactionID) ?? transaction; diff --git a/src/libs/ReportLayoutUtils.ts b/src/libs/ReportLayoutUtils.ts index 78708c2b5685..879a4207f07c 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 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.currency === reportCurrency) { + total += getAmount(transaction, true, false, true); + } else if (transaction.convertedAmount) { + total += getConvertedAmount(transaction); + } + } + 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 { - Navigation.dismissModal(); + Navigation.goBack(); }, []); const onSelectGroupBy = useCallback( diff --git a/src/types/onyx/ReportLayout.ts b/src/types/onyx/ReportLayout.ts index 85389b2a193b..546da6dc5217 100644 --- a/src/types/onyx/ReportLayout.ts +++ b/src/types/onyx/ReportLayout.ts @@ -16,6 +16,9 @@ type GroupedTransactions = { /** Transactions in this group */ transactions: Transaction[]; + /** Subtotal amount for all transactions in this group */ + subTotalAmount: number; + /** Whether the group is currently expanded */ isExpanded: boolean; };