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
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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;

Expand All @@ -34,29 +38,31 @@ 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<ViewStyle>;
};

function MoneyRequestReportGroupHeader({
group,
groupKey,
currency,
isGroupedByTag = false,
isSelectionModeEnabled = false,
isSelected = false,
isIndeterminate = false,
isDisabled = false,
onToggleSelection,
style,
}: MoneyRequestReportGroupHeaderProps) {
const styles = useThemeStyles();
const {translate} = useLocalize();
const {shouldUseNarrowLayout} = useResponsiveLayout();

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;

Expand All @@ -78,24 +84,26 @@ function MoneyRequestReportGroupHeader({
}, [onToggleSelection, groupKey]);

return (
<View style={[styles.reportLayoutGroupHeader, conditionalHeight, style]}>
<View style={[styles.reportLayoutGroupHeader, conditionalHeight]}>
<View style={[styles.flexRow, styles.alignItemsCenter, styles.flex1]}>
{shouldShowCheckbox && (
<Checkbox
isChecked={isSelected}
isIndeterminate={isIndeterminate}
disabled={isDisabled}
onPress={handleToggleSelection}
accessibilityLabel={translate('reportLayout.selectGroup', {groupName: displayName})}
style={styles.mr2}
/>
)}
<Text
style={[styles.textBold, textStyle, styles.flexShrink1, shouldShowCheckbox && styles.ml2]}
shouldUseDefaultLineHeight={false}
numberOfLines={1}
>
{displayName}
</Text>
<Text style={[styles.textBold, textStyle, styles.mh1]}>{CONST.DOT_SEPARATOR}</Text>
<Text style={[styles.textBold, textStyle]}>{formattedAmount}</Text>
</View>
</View>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -298,20 +298,21 @@ function MoneyRequestReportTransactionList({
}, [sortedTransactions]);

const groupSelectionState = useMemo(() => {
const state = new Map<string, {isSelected: boolean; isIndeterminate: boolean}>();
const state = new Map<string, {isSelected: boolean; isIndeterminate: boolean; isDisabled: boolean}>();

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;
}

const selectedCount = groupTransactionIDs.filter((id) => selectedTransactionIDs.includes(id)).length;
state.set(group.groupKey, {
isSelected: selectedCount === groupTransactionIDs.length,
isIndeterminate: selectedCount > 0 && selectedCount < groupTransactionIDs.length,
isDisabled: false,
});
}

Expand All @@ -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);
},
Expand Down Expand Up @@ -487,7 +487,7 @@ function MoneyRequestReportTransactionList({
<View style={[listHorizontalPadding, styles.gap2, styles.pb4]}>
{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 (
<View
Expand All @@ -496,12 +496,14 @@ function MoneyRequestReportTransactionList({
>
<MoneyRequestReportGroupHeader
group={group}
groupKey={group.groupKey}
currency={report?.currency ?? ''}
isGroupedByTag={currentGroupBy === CONST.REPORT_LAYOUT.GROUP_BY.TAG}
isSelectionModeEnabled={isMobileSelectionModeEnabled}
isSelected={selectionState.isSelected}
isIndeterminate={selectionState.isIndeterminate}
isDisabled={selectionState.isDisabled}
onToggleSelection={toggleGroupSelection}
groupKey={group.groupKey}
/>
{group.transactions.map((transaction) => {
const originalTransaction = sortedTransactionsMap.get(transaction.transactionID) ?? transaction;
Expand Down
33 changes: 29 additions & 4 deletions src/libs/ReportLayoutUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand All @@ -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<Report>, localeCompare: LocaleContextProps['localeCompare']): GroupedTransactions[] {
if (!report) {
return [];
}

const reportCurrency = report.currency ?? '';
const groups = new Map<string, Transaction[]>();

for (const transaction of transactions) {
Expand All @@ -49,6 +72,7 @@ function groupTransactionsByCategory(transactions: Transaction[], report: OnyxEn
groupName: categoryKey,
groupKey: categoryKey,
transactions: transactionList,
subTotalAmount: calculateGroupTotal(transactionList, reportCurrency),
isExpanded: true,
});
}
Expand All @@ -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<Report>, localeCompare: LocaleContextProps['localeCompare']): GroupedTransactions[] {
if (!report) {
return [];
}

const reportCurrency = report.currency ?? '';
const groups = new Map<string, Transaction[]>();

for (const transaction of transactions) {
Expand All @@ -83,6 +107,7 @@ function groupTransactionsByTag(transactions: Transaction[], report: OnyxEntry<R
groupName: tagKey,
groupKey: tagKey,
transactions: transactionList,
subTotalAmount: calculateGroupTotal(transactionList, reportCurrency),
isExpanded: true,
});
}
Expand Down
8 changes: 4 additions & 4 deletions src/libs/ReportSecondaryActionUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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);
}
Expand Down
7 changes: 6 additions & 1 deletion src/libs/actions/IOU.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3621,10 +3621,15 @@ 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);
}

if (isSplitExpense && existingTransaction) {
const {convertedAmount: omittedConvertedAmount, ...existingTransactionWithoutConvertedAmount} = existingTransaction;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TaduJR Can you make the similar changes when editing amount of a transaction?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, when we merge transactions too.

@TaduJR TaduJR Nov 28, 2025 •

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shubham1206agra Could you clarify what specific issue you're seeing with editing amount or merging transactions? The current fix targets the split expense flow where fastMerge copies convertedAmount to each split, causing doubled totals. The edit amount and merge duplicates flows don't use the same fastMerge(existingTransaction, optimisticTransaction) pattern, so I'm not sure what change would be needed there.

optimisticTransaction = fastMerge(existingTransactionWithoutConvertedAmount, optimisticTransaction, false);
Comment on lines +3629 to +3630

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coming from #78814 checklist: we’re missing logic to recalculate convertedAmount for optimistic data in split expenses. Instead of omitting convertedAmount, we should calculate it based on the split amount.

}
Comment thread
TaduJR marked this conversation as resolved.
Resolved

// STEP 4: Build optimistic reportActions. We need:
// 1. CREATED action for the chatReport
// 2. CREATED action for the iouReport
Expand Down
2 changes: 1 addition & 1 deletion src/pages/settings/Report/ReportLayoutPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function ReportLayoutPage() {
const currentGroupBy = getReportLayoutGroupBy(reportLayoutGroupByNVP);

const goBack = useCallback(() => {
Navigation.dismissModal();
Navigation.goBack();
}, []);

const onSelectGroupBy = useCallback(
Expand Down
3 changes: 3 additions & 0 deletions src/types/onyx/ReportLayout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down