From c430d52f0ecc6463a642c55826958e2fedd226b5 Mon Sep 17 00:00:00 2001 From: TaduJR Date: Wed, 26 Nov 2025 21:32:35 +0300 Subject: [PATCH 01/10] feat: [CFI] Add group-by report layout feature --- src/CONST/index.ts | 7 + src/ONYXKEYS.ts | 4 + src/ROUTES.ts | 4 + src/SCREENS.ts | 1 + src/components/MoneyReportHeader.tsx | 11 ++ .../MoneyRequestReportGroupHeader.tsx | 97 ++++++++++ .../MoneyRequestReportTransactionList.tsx | 170 +++++++++++++++--- src/languages/de.ts | 12 ++ src/languages/en.ts | 12 ++ src/languages/es.ts | 12 ++ src/languages/fr.ts | 12 ++ src/languages/it.ts | 12 ++ src/languages/ja.ts | 12 ++ src/languages/nl.ts | 12 ++ src/languages/pl.ts | 12 ++ src/languages/pt-BR.ts | 12 ++ src/languages/zh-hans.ts | 12 ++ .../ModalStackNavigators/index.tsx | 1 + src/libs/Navigation/linkingConfig/config.ts | 3 + src/libs/Navigation/types.ts | 3 + src/libs/ReportLayoutUtils.ts | 95 ++++++++++ src/libs/ReportSecondaryActionUtils.ts | 22 +++ src/libs/TagUtils.ts | 14 ++ src/libs/actions/ReportLayout.ts | 51 ++++++ .../settings/Report/ReportLayoutPage.tsx | 79 ++++++++ src/styles/index.ts | 8 + src/types/onyx/ReportLayout.ts | 23 +++ src/types/onyx/index.ts | 3 + 28 files changed, 689 insertions(+), 27 deletions(-) create mode 100644 src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx create mode 100644 src/libs/ReportLayoutUtils.ts create mode 100644 src/libs/TagUtils.ts create mode 100644 src/libs/actions/ReportLayout.ts create mode 100644 src/pages/settings/Report/ReportLayoutPage.tsx create mode 100644 src/types/onyx/ReportLayout.ts diff --git a/src/CONST/index.ts b/src/CONST/index.ts index 991e44940386..671ddf6edff2 100755 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -1132,6 +1132,7 @@ const CONST = { EXPORT: 'export', PAY: 'pay', MERGE: 'merge', + REPORT_LAYOUT: 'reportLayout', }, PRIMARY_ACTIONS: { SUBMIT: 'submit', @@ -1560,6 +1561,12 @@ const CONST = { DATE_TIME: 'dateTime', }, }, + REPORT_LAYOUT: { + GROUP_BY: { + CATEGORY: 'mcc', + TAG: 'tag', + }, + } as const, UNREPORTED_EXPENSES_PAGE_SIZE: 50, COMPOSER: { NATIVE_ID: 'composer', diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index ca2523eb2736..57adfe535115 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -606,6 +606,9 @@ const ONYXKEYS = { /** Stores the last created distance expense type (map or manual) */ NVP_LAST_DISTANCE_EXPENSE_TYPE: 'nvp_lastDistanceExpenseType', + /** Stores the user's report layout group-by preference */ + NVP_REPORT_LAYOUT_GROUP_BY: 'nvp_expensify_groupByOption', + /** Whether the user has denied the contact import permission prompt */ HAS_DENIED_CONTACT_IMPORT_PROMPT: 'hasDeniedContactImportPrompt', @@ -1303,6 +1306,7 @@ type OnyxValuesMapping = { [ONYXKEYS.HYBRID_APP]: OnyxTypes.HybridApp; [ONYXKEYS.NVP_CSV_EXPORT_LAYOUTS]: Record; [ONYXKEYS.NVP_LAST_DISTANCE_EXPENSE_TYPE]: DistanceExpenseType; + [ONYXKEYS.NVP_REPORT_LAYOUT_GROUP_BY]: string; [ONYXKEYS.HAS_DENIED_CONTACT_IMPORT_PROMPT]: boolean | undefined; [ONYXKEYS.SELF_DM_REPORT_ID]: string | undefined; }; diff --git a/src/ROUTES.ts b/src/ROUTES.ts index bc71888fc2a6..5c9b2faacd53 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -632,6 +632,10 @@ const ROUTES = { route: 'r/:reportID/change-approver/add', getRoute: (reportID: string) => `r/${reportID}/change-approver/add` as const, }, + REPORT_SETTINGS_REPORT_LAYOUT: { + route: 'r/:reportID/settings/report-layout', + getRoute: (reportID: string) => `r/${reportID}/settings/report-layout` as const, + }, SPLIT_BILL_DETAILS: { route: 'r/:reportID/split/:reportActionID', getRoute: (reportID: string | undefined, reportActionID: string, backTo?: string) => { diff --git a/src/SCREENS.ts b/src/SCREENS.ts index 101171621872..a713e3e51cef 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -386,6 +386,7 @@ const SCREENS = { NOTIFICATION_PREFERENCES: 'Report_Settings_Notification_Preferences', WRITE_CAPABILITY: 'Report_Settings_Write_Capability', VISIBILITY: 'Report_Settings_Visibility', + REPORT_LAYOUT: 'Report_Settings_Report_Layout', }, NEW_TASK: { diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx index 42b0006e7810..cec48a68f61e 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -1143,6 +1143,17 @@ function MoneyReportHeader({ Navigation.navigate(ROUTES.REPORT_CHANGE_APPROVER.getRoute(moneyRequestReport.reportID, Navigation.getActiveRoute())); }, }, + [CONST.REPORT.SECONDARY_ACTIONS.REPORT_LAYOUT]: { + text: translate('reportLayout.reportLayout'), + icon: expensifyIcons.Filters, + value: CONST.REPORT.SECONDARY_ACTIONS.REPORT_LAYOUT, + onSelected: () => { + if (!moneyRequestReport) { + return; + } + Navigation.navigate(ROUTES.REPORT_SETTINGS_REPORT_LAYOUT.getRoute(moneyRequestReport.reportID)); + }, + }, [CONST.REPORT.SECONDARY_ACTIONS.DELETE]: { text: translate('common.delete'), icon: expensifyIcons.Trashcan, diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx new file mode 100644 index 000000000000..c225fc17b741 --- /dev/null +++ b/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx @@ -0,0 +1,97 @@ +import React 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 {getCommaSeparatedTagNameWithSanitizedColons} from '@libs/PolicyUtils'; +import variables from '@styles/variables'; +import type {GroupedTransactions} from '@src/types/onyx'; + +type MoneyRequestReportGroupHeaderProps = { + /** The grouped transaction data */ + group: GroupedTransactions; + + /** Whether grouping by tag (if false, grouping by category) */ + isGroupedByTag?: boolean; + + /** Whether selection mode is active (checkboxes should be visible) */ + isSelectionModeEnabled?: boolean; + + /** Whether all transactions in this group are selected */ + isSelected?: boolean; + + /** Whether some (but not all) transactions in this group are selected */ + isIndeterminate?: boolean; + + /** Callback when group checkbox is toggled */ + onToggleSelection?: () => void; + + /** Additional styles to apply */ + style?: StyleProp; +}; + +function MoneyRequestReportGroupHeader({ + group, + isGroupedByTag = false, + isSelectionModeEnabled = false, + isSelected = false, + isIndeterminate = false, + onToggleSelection, + style, +}: MoneyRequestReportGroupHeaderProps) { + const styles = useThemeStyles(); + const {translate} = useLocalize(); + const {shouldUseNarrowLayout} = useResponsiveLayout(); + + // Height constants for cleaner code + const DESKTOP_HEIGHT = 28; + const MOBILE_HEIGHT_WITH_CHECKBOX = 20; + const MOBILE_HEIGHT_WITHOUT_CHECKBOX = 16; + + // For tags: convert colon-separated multi-level tags to comma-separated display + const cleanedGroupName = isGroupedByTag && group.groupName ? getCommaSeparatedTagNameWithSanitizedColons(group.groupName) : group.groupName; + const displayName = cleanedGroupName || translate(isGroupedByTag ? 'reportLayout.noTag' : 'reportLayout.uncategorized'); + + // Desktop: always show checkbox, Mobile: only in selection mode + const shouldShowCheckbox = isSelectionModeEnabled || !shouldUseNarrowLayout; + + // Conditional height based on platform and checkbox visibility + const conditionalHeight = shouldUseNarrowLayout + ? {height: shouldShowCheckbox ? MOBILE_HEIGHT_WITH_CHECKBOX : MOBILE_HEIGHT_WITHOUT_CHECKBOX} + : {height: DESKTOP_HEIGHT, minHeight: DESKTOP_HEIGHT}; + + // Dynamic text style based on platform and checkbox state + const textStyle = shouldUseNarrowLayout + ? {fontSize: variables.fontSizeLabel, lineHeight: shouldShowCheckbox ? MOBILE_HEIGHT_WITH_CHECKBOX : MOBILE_HEIGHT_WITHOUT_CHECKBOX} + : {fontSize: variables.fontSizeNormal, lineHeight: DESKTOP_HEIGHT}; + + return ( + + + {shouldShowCheckbox && ( + {})} + accessibilityLabel={translate('reportLayout.selectGroup', {groupName: displayName})} + style={styles.mr2} + /> + )} + + {displayName} + + + + ); +} + +MoneyRequestReportGroupHeader.displayName = 'MoneyRequestReportGroupHeader'; + +export default MoneyRequestReportGroupHeader; diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx index 6713e7710e23..66ce6c5405d2 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx @@ -32,6 +32,8 @@ import FS from '@libs/Fullstory'; import {navigationRef} from '@libs/Navigation/Navigation'; import Parser from '@libs/Parser'; import {getIOUActionForTransactionID} from '@libs/ReportActionsUtils'; +import {getReportLayoutGroupBy} from '@libs/actions/ReportLayout'; +import {groupTransactionsByCategory, groupTransactionsByTag} from '@libs/ReportLayoutUtils'; import { canAddTransaction, getAddExpenseDropdownOptions, @@ -39,6 +41,7 @@ import { getReportOfflinePendingActionAndErrors, isCurrentUserSubmitter, isExpenseReport, + isIOUReport, } from '@libs/ReportUtils'; import {compareValues, getColumnsToShow, isTransactionAmountTooLong, isTransactionTaxAmountTooLong} from '@libs/SearchUIUtils'; import { @@ -64,6 +67,7 @@ import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; import type * as OnyxTypes from '@src/types/onyx'; +import MoneyRequestReportGroupHeader from './MoneyRequestReportGroupHeader'; import MoneyRequestReportTableHeader from './MoneyRequestReportTableHeader'; import MoneyRequestReportTotalSpend from './MoneyRequestReportTotalSpend'; import MoneyRequestReportTransactionItem from './MoneyRequestReportTransactionItem'; @@ -177,6 +181,11 @@ function MoneyRequestReportTransactionList({ const isReportArchived = useReportIsArchived(report?.reportID); const shouldShowAddExpenseButton = canAddTransaction(report, isReportArchived) && isCurrentUserSubmitter(report); const [lastDistanceExpenseType] = useOnyx(ONYXKEYS.NVP_LAST_DISTANCE_EXPENSE_TYPE, {canBeMissing: true}); + const [reportLayoutGroupBy] = useOnyx(ONYXKEYS.NVP_REPORT_LAYOUT_GROUP_BY, {canBeMissing: true}); + + // Only show grouped transactions for workspace expense reports (not IOU/DM reports) + const shouldShowGroupedTransactions = isExpenseReport(report) && !isIOUReport(report); + const addExpenseDropdownOptions = useMemo( () => getAddExpenseDropdownOptions(report?.reportID, policy, undefined, undefined, lastDistanceExpenseType), [report?.reportID, policy, lastDistanceExpenseType], @@ -230,6 +239,51 @@ function MoneyRequestReportTransactionList({ const isTransactionSelected = useCallback((transactionID: string) => selectedTransactionIDs.includes(transactionID), [selectedTransactionIDs]); + // Toggle all transactions in a group + const toggleGroupSelection = useCallback( + (groupTransactionsToToggle: OnyxTypes.Transaction[]) => { + const groupTransactionIDs = groupTransactionsToToggle.filter((t) => !isTransactionPendingDelete(t)).map((t) => t.transactionID); + const allSelected = groupTransactionIDs.every((id) => selectedTransactionIDs.includes(id)); + + let newSelectedTransactionIDs = selectedTransactionIDs; + if (allSelected) { + // Deselect all transactions in the group + newSelectedTransactionIDs = selectedTransactionIDs.filter((id) => !groupTransactionIDs.includes(id)); + } else { + // Select all transactions in the group + const idsToAdd = groupTransactionIDs.filter((id) => !selectedTransactionIDs.includes(id)); + newSelectedTransactionIDs = [...selectedTransactionIDs, ...idsToAdd]; + } + setSelectedTransactions(newSelectedTransactionIDs); + }, + [selectedTransactionIDs, setSelectedTransactions], + ); + + // Check if all transactions in a group are selected + const isGroupSelected = useCallback( + (groupTransactionsToCheck: OnyxTypes.Transaction[]) => { + const groupTransactionIDs = groupTransactionsToCheck.filter((t) => !isTransactionPendingDelete(t)).map((t) => t.transactionID); + if (groupTransactionIDs.length === 0) { + return false; + } + return groupTransactionIDs.every((id) => selectedTransactionIDs.includes(id)); + }, + [selectedTransactionIDs], + ); + + // Check if some (but not all) transactions in a group are selected + const isGroupIndeterminate = useCallback( + (groupTransactionsToCheck: OnyxTypes.Transaction[]) => { + const groupTransactionIDs = groupTransactionsToCheck.filter((t) => !isTransactionPendingDelete(t)).map((t) => t.transactionID); + if (groupTransactionIDs.length === 0) { + return false; + } + const selectedCount = groupTransactionIDs.filter((id) => selectedTransactionIDs.includes(id)).length; + return selectedCount > 0 && selectedCount < groupTransactionIDs.length; + }, + [selectedTransactionIDs], + ); + useFocusEffect( useCallback(() => { return () => { @@ -262,6 +316,29 @@ function MoneyRequestReportTransactionList({ return (Object.keys(columns) as SearchColumnType[]).filter((column) => columns[column]); }, [transactions, currentUserDetails?.accountID]); + // Get the current group-by preference + const currentGroupBy = getReportLayoutGroupBy(reportLayoutGroupBy); + + // Group transactions based on user preference (only for workspace expense reports) + const groupedTransactions = useMemo(() => { + if (!shouldShowGroupedTransactions) { + return []; + } + if (currentGroupBy === CONST.REPORT_LAYOUT.GROUP_BY.TAG) { + return groupTransactionsByTag(sortedTransactions, report, localeCompare); + } + // Default to grouping by category + return groupTransactionsByCategory(sortedTransactions, report, localeCompare); + }, [sortedTransactions, currentGroupBy, report, localeCompare, shouldShowGroupedTransactions]); + + // Generate flattened transaction IDs from grouped transactions for arrow navigation + const visualOrderTransactionIDs = useMemo(() => { + if (!shouldShowGroupedTransactions || groupedTransactions.length === 0) { + return sortedTransactions.filter((transaction) => !isTransactionPendingDelete(transaction)).map((transaction) => transaction.transactionID); + } + return groupedTransactions.flatMap((group) => group.transactions.filter((transaction) => !isTransactionPendingDelete(transaction)).map((transaction) => transaction.transactionID)); + }, [groupedTransactions, sortedTransactions, shouldShowGroupedTransactions]); + /** * Navigate to the transaction thread for a transaction, creating one optimistically if it doesn't yet exist. */ @@ -287,16 +364,15 @@ function MoneyRequestReportTransactionList({ } // Single transaction report will open in RHP, and we need to find every other report ID for the rest of transactions - // to display prev/next arrows in RHP for navigation - const sortedSiblingTransactionIDs = sortedTransactions.filter((transaction) => !isTransactionPendingDelete(transaction)).map((transaction) => transaction.transactionID); - setActiveTransactionIDs(sortedSiblingTransactionIDs).then(() => { + // to display prev/next arrows in RHP for navigation - use visual order from grouped transactions + setActiveTransactionIDs(visualOrderTransactionIDs).then(() => { if (reportIDToNavigate) { markReportIDAsExpense(reportIDToNavigate); } Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute(routeParams)); }); }, - [report, reportActions, sortedTransactions, markReportIDAsExpense], + [report, reportActions, visualOrderTransactionIDs, markReportIDAsExpense], ); const {amountColumnSize, dateColumnSize, taxAmountColumnSize} = useMemo(() => { @@ -409,29 +485,69 @@ function MoneyRequestReportTransactionList({ )} - {sortedTransactions.map((transaction) => { - return ( - - ); - })} + {shouldShowGroupedTransactions + ? groupedTransactions.map((group) => { + const groupTransactionsWithHighlight = group.transactions.map((transaction) => { + const originalTransaction = sortedTransactions.find((t) => t.transactionID === transaction.transactionID); + return originalTransaction ?? transaction; + }); + + return ( + + toggleGroupSelection(group.transactions)} + /> + {groupTransactionsWithHighlight.map((transaction) => ( + + ))} + + ); + }) + : sortedTransactions.map((transaction) => ( + + ))} `Alle Ausgaben in ${groupName} auswählen`, + groupBy: { + category: 'Kategorie', + tag: 'Tag', + }, + }, report: { newReport: { createReport: 'Bericht erstellen', diff --git a/src/languages/en.ts b/src/languages/en.ts index 532a7d684906..30faaa1461ca 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -6648,6 +6648,18 @@ const translations = { message: "We couldn't check for an update. Please try again in a bit.", }, }, + reportLayout: { + reportLayout: 'Report layout', + groupByLabel: 'Group by:', + selectGroupByOption: 'Select how to group report expenses', + uncategorized: 'Uncategorized', + noTag: 'No tag', + selectGroup: ({groupName}: {groupName: string}) => `Select all expenses in ${groupName}`, + groupBy: { + category: 'Category', + tag: 'Tag', + }, + }, report: { newReport: { createReport: 'Create report', diff --git a/src/languages/es.ts b/src/languages/es.ts index bf6e2dd8aa6a..8c62f55c3184 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -6296,6 +6296,18 @@ ${amount} para ${merchant} - ${date}`, message: 'No hemos podido comprobar si existe una actualización. ¡Inténtalo de nuevo más tarde!.', }, }, + reportLayout: { + reportLayout: 'Diseño del informe', + groupByLabel: 'Agrupar por:', + selectGroupByOption: 'Selecciona cómo agrupar los gastos del informe', + uncategorized: 'Sin categoría', + noTag: 'Sin etiqueta', + selectGroup: ({groupName}: {groupName: string}) => `Seleccionar todos los gastos en ${groupName}`, + groupBy: { + category: 'Categoría', + tag: 'Etiqueta', + }, + }, report: { newReport: { createReport: 'Crear informe', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index 1a48eabbaf3f..3eb69c0bf6c8 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -6594,6 +6594,18 @@ ${ message: "Nous n'avons pas pu vérifier la mise à jour. Veuillez réessayer dans un moment.", }, }, + reportLayout: { + reportLayout: 'Mise en page du rapport', + groupByLabel: 'Grouper par :', + selectGroupByOption: 'Sélectionnez comment grouper les dépenses du rapport', + uncategorized: 'Non catégorisé', + noTag: 'Pas de tag', + selectGroup: ({groupName}: {groupName: string}) => `Sélectionner toutes les dépenses dans ${groupName}`, + groupBy: { + category: 'Catégorie', + tag: 'Tag', + }, + }, report: { newReport: { createReport: 'Créer un rapport', diff --git a/src/languages/it.ts b/src/languages/it.ts index 56ff3ea6f0e0..bba0baf27c35 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -6574,6 +6574,18 @@ ${ message: "Non siamo riusciti a verificare la presenza di un aggiornamento. Riprova tra un po'.", }, }, + reportLayout: { + reportLayout: 'Layout del rapporto', + groupByLabel: 'Raggruppa per:', + selectGroupByOption: 'Seleziona come raggruppare le spese del rapporto', + uncategorized: 'Non categorizzato', + noTag: 'Nessun tag', + selectGroup: ({groupName}: {groupName: string}) => `Seleziona tutte le spese in ${groupName}`, + groupBy: { + category: 'Categoria', + tag: 'Tag', + }, + }, report: { newReport: { createReport: 'Crea rapporto', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 7cd1f5d84dea..b5d31b85a31f 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -6509,6 +6509,18 @@ ${ message: '更新を確認できませんでした。しばらくしてからもう一度お試しください。', }, }, + reportLayout: { + reportLayout: 'レポートレイアウト', + groupByLabel: 'グループ化:', + selectGroupByOption: 'レポート経費のグループ化方法を選択', + uncategorized: '未分類', + noTag: 'タグなし', + selectGroup: ({groupName}: {groupName: string}) => `${groupName}のすべての経費を選択`, + groupBy: { + category: 'カテゴリ', + tag: 'タグ', + }, + }, report: { newReport: { createReport: 'レポートを作成', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 02532b89f599..058c5c2ddfe3 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -6556,6 +6556,18 @@ ${ message: 'We konden niet controleren op een update. Probeer het over een tijdje opnieuw.', }, }, + reportLayout: { + reportLayout: 'Rapportindeling', + groupByLabel: 'Groeperen op:', + selectGroupByOption: 'Selecteer hoe rapportkosten worden gegroepeerd', + uncategorized: 'Niet gecategoriseerd', + noTag: 'Geen tag', + selectGroup: ({groupName}: {groupName: string}) => `Selecteer alle uitgaven in ${groupName}`, + groupBy: { + category: 'Categorie', + tag: 'Tag', + }, + }, report: { newReport: { createReport: 'Rapport maken', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index d31cae71b044..b8d84f33dc6b 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -6543,6 +6543,18 @@ ${ message: 'Nie udało nam się sprawdzić aktualizacji. Spróbuj ponownie za chwilę.', }, }, + reportLayout: { + reportLayout: 'Układ raportu', + groupByLabel: 'Grupuj według:', + selectGroupByOption: 'Wybierz sposób grupowania wydatków w raporcie', + uncategorized: 'Bez kategorii', + noTag: 'Bez tagu', + selectGroup: ({groupName}: {groupName: string}) => `Wybierz wszystkie wydatki w ${groupName}`, + groupBy: { + category: 'Kategoria', + tag: 'Tag', + }, + }, report: { newReport: { createReport: 'Utwórz raport', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index 35abb2b4e30f..bf900fd3845a 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -6555,6 +6555,18 @@ ${ message: 'Não conseguimos verificar uma atualização. Por favor, tente novamente em breve.', }, }, + reportLayout: { + reportLayout: 'Layout do relatório', + groupByLabel: 'Agrupar por:', + selectGroupByOption: 'Selecione como agrupar as despesas do relatório', + uncategorized: 'Sem categoria', + noTag: 'Sem tag', + selectGroup: ({groupName}: {groupName: string}) => `Selecionar todas as despesas em ${groupName}`, + groupBy: { + category: 'Categoria', + tag: 'Tag', + }, + }, report: { newReport: { createReport: 'Criar relatório', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 6ca051a646ef..1a1b7c96de46 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -6419,6 +6419,18 @@ ${ message: '我们无法检查更新。请稍后再试。', }, }, + reportLayout: { + reportLayout: '报告布局', + groupByLabel: '分组方式:', + selectGroupByOption: '选择如何对报告费用进行分组', + uncategorized: '未分类', + noTag: '无标签', + selectGroup: ({groupName}: {groupName: string}) => `选择 ${groupName} 中的所有费用`, + groupBy: { + category: '类别', + tag: '标签', + }, + }, report: { newReport: { createReport: '创建报告', diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index 43aa98fb2512..1b55a8080a8e 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -240,6 +240,7 @@ const ReportSettingsModalStackNavigator = createModalStackNavigator require('../../../../pages/settings/Report/NotificationPreferencePage').default, [SCREENS.REPORT_SETTINGS.WRITE_CAPABILITY]: () => require('../../../../pages/settings/Report/WriteCapabilityPage').default, [SCREENS.REPORT_SETTINGS.VISIBILITY]: () => require('../../../../pages/settings/Report/VisibilityPage').default, + [SCREENS.REPORT_SETTINGS.REPORT_LAYOUT]: () => require('../../../../pages/settings/Report/ReportLayoutPage').default, }); const WorkspaceConfirmationModalStackNavigator = createModalStackNavigator({ diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts index 06fe347e2d06..79eeb87850d5 100644 --- a/src/libs/Navigation/linkingConfig/config.ts +++ b/src/libs/Navigation/linkingConfig/config.ts @@ -1161,6 +1161,9 @@ const config: LinkingOptions['config'] = { [SCREENS.REPORT_SETTINGS.VISIBILITY]: { path: ROUTES.REPORT_SETTINGS_VISIBILITY.route, }, + [SCREENS.REPORT_SETTINGS.REPORT_LAYOUT]: { + path: ROUTES.REPORT_SETTINGS_REPORT_LAYOUT.route, + }, }, }, [SCREENS.RIGHT_MODAL.SETTINGS_CATEGORIES]: { diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index a22e8a28cc2f..962dcff253ce 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -1427,6 +1427,9 @@ type ReportSettingsNavigatorParamList = { // eslint-disable-next-line no-restricted-syntax -- `backTo` usages in this file are legacy. Do not add new `backTo` params to screens. See contributingGuides/NAVIGATION.md backTo?: Routes; }; + [SCREENS.REPORT_SETTINGS.REPORT_LAYOUT]: { + reportID: string; + }; }; type ReportDescriptionNavigatorParamList = { diff --git a/src/libs/ReportLayoutUtils.ts b/src/libs/ReportLayoutUtils.ts new file mode 100644 index 000000000000..542f8912840a --- /dev/null +++ b/src/libs/ReportLayoutUtils.ts @@ -0,0 +1,95 @@ +import type {OnyxEntry} from 'react-native-onyx'; +import type {LocaleContextProps} from '@components/LocaleContextProvider'; +import type {GroupedTransactions} from '@src/types/onyx'; +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'; + +/** + * Sorts grouped transactions alphabetically (A→Z) with empty keys at the end + */ +function sortGroupedTransactions(groups: GroupedTransactions[], localeCompare: LocaleContextProps['localeCompare']): GroupedTransactions[] { + return groups.sort((a, b) => { + if (a.groupKey === '' && b.groupKey !== '') { + return 1; + } + if (a.groupKey !== '' && b.groupKey === '') { + return -1; + } + return localeCompare(a.groupKey, b.groupKey); + }); +} + +/** + * 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 groups = new Map(); + + for (const transaction of transactions) { + const category = getCategory(transaction); + // Normalize missing categories to empty string for consistent grouping + const categoryKey = isCategoryMissing(category) ? '' : category; + + if (!groups.has(categoryKey)) { + groups.set(categoryKey, []); + } + groups.get(categoryKey)?.push(transaction); + } + + const result: GroupedTransactions[] = []; + for (const [categoryKey, transactionList] of groups) { + result.push({ + groupName: categoryKey, + groupKey: categoryKey, + transactions: transactionList, + isExpanded: true, + }); + } + + return sortGroupedTransactions(result, localeCompare); +} + +/** + * 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 groups = new Map(); + + for (const transaction of transactions) { + const tag = getTag(transaction); + // Normalize missing tags to empty string for consistent grouping + const tagKey = isTagMissing(tag) ? '' : tag; + + if (!groups.has(tagKey)) { + groups.set(tagKey, []); + } + groups.get(tagKey)?.push(transaction); + } + + const result: GroupedTransactions[] = []; + for (const [tagKey, transactionList] of groups) { + result.push({ + groupName: tagKey, + groupKey: tagKey, + transactions: transactionList, + isExpanded: true, + }); + } + + return sortGroupedTransactions(result, localeCompare); +} + +export {groupTransactionsByCategory, groupTransactionsByTag}; diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts index 6ae1e461ee0e..0a05c74c806a 100644 --- a/src/libs/ReportSecondaryActionUtils.ts +++ b/src/libs/ReportSecondaryActionUtils.ts @@ -594,6 +594,24 @@ function isRemoveHoldActionForTransaction(report: Report, reportTransaction: Tra return isOnHoldTransactionUtils(reportTransaction) && policy?.role === CONST.POLICY.ROLE.ADMIN && !isHoldCreator(reportTransaction, report.reportID); } +/** + * Checks if the report should show the "Report layout" option + * Only shows for expense reports (not IOU reports) with 2 or more transactions + */ +function isReportLayoutAction(report: Report, reportTransactions: Transaction[]): boolean { + if (!isExpenseReportUtils(report)) { + return false; + } + + // Exclude IOU reports - only show for workspace expense reports + if (isIOUReportUtils(report)) { + return false; + } + + // Only show if report has 2 or more transactions + return reportTransactions.length >= 2; +} + function getSecondaryReportActions({ currentUserEmail, report, @@ -698,6 +716,10 @@ function getSecondaryReportActions({ options.push(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_APPROVER); } + if (isReportLayoutAction(report, reportTransactions)) { + options.push(CONST.REPORT.SECONDARY_ACTIONS.REPORT_LAYOUT); + } + options.push(CONST.REPORT.SECONDARY_ACTIONS.VIEW_DETAILS); if (isDeleteAction(report, reportTransactions, reportActions ?? [])) { diff --git a/src/libs/TagUtils.ts b/src/libs/TagUtils.ts new file mode 100644 index 000000000000..4a2720a448a3 --- /dev/null +++ b/src/libs/TagUtils.ts @@ -0,0 +1,14 @@ +import CONST from '@src/CONST'; + +/** + * Checks if a tag value is missing/empty + * Similar to isCategoryMissing but for tags + */ +function isTagMissing(tag: string | undefined): boolean { + if (!tag) { + return true; + } + return tag === CONST.SEARCH.TAG_EMPTY_VALUE; +} + +export {isTagMissing}; diff --git a/src/libs/actions/ReportLayout.ts b/src/libs/actions/ReportLayout.ts new file mode 100644 index 000000000000..4a052a0cbd3e --- /dev/null +++ b/src/libs/actions/ReportLayout.ts @@ -0,0 +1,51 @@ +import Onyx from 'react-native-onyx'; +import type {OnyxUpdate} from 'react-native-onyx'; +import * as API from '@libs/API'; +import {WRITE_COMMANDS} from '@libs/API/types'; +import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; +import type {ReportLayoutGroupBy} from '@src/types/onyx'; + +/** + * Set the user's report layout group-by preference + * Uses existing SetNameValuePair API command for backward compatibility with OldDot + * Implements Pattern A (Optimistic Without Feedback) - user gets instant visual feedback + * via transaction regrouping, doesn't need to know about server sync status + */ +function setReportLayoutGroupBy(groupBy: ReportLayoutGroupBy, previousValue?: string | null) { + const optimisticData: OnyxUpdate[] = [ + { + onyxMethod: Onyx.METHOD.MERGE, + key: ONYXKEYS.NVP_REPORT_LAYOUT_GROUP_BY, + value: groupBy, + }, + ]; + + const failureData: OnyxUpdate[] = [ + { + onyxMethod: Onyx.METHOD.MERGE, + key: ONYXKEYS.NVP_REPORT_LAYOUT_GROUP_BY, + value: previousValue ?? null, + }, + ]; + + const parameters = { + name: 'expensify_groupByOption', + value: groupBy, + }; + + API.write(WRITE_COMMANDS.SET_NAME_VALUE_PAIR, parameters, {optimisticData, failureData}); +} + +/** + * Get the current group-by preference, defaulting to 'mcc' (Category) + * This matches OldDot behavior where no NVP set means Category grouping + */ +function getReportLayoutGroupBy(storedValue: string | null | undefined): ReportLayoutGroupBy { + if (!storedValue) { + return CONST.REPORT_LAYOUT.GROUP_BY.CATEGORY; + } + return storedValue as ReportLayoutGroupBy; +} + +export {setReportLayoutGroupBy, getReportLayoutGroupBy}; diff --git a/src/pages/settings/Report/ReportLayoutPage.tsx b/src/pages/settings/Report/ReportLayoutPage.tsx new file mode 100644 index 000000000000..875cf4bdd650 --- /dev/null +++ b/src/pages/settings/Report/ReportLayoutPage.tsx @@ -0,0 +1,79 @@ +import React, {useCallback} from 'react'; +import {useOnyx} from 'react-native-onyx'; +import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; +import HeaderWithBackButton from '@components/HeaderWithBackButton'; +import ScreenWrapper from '@components/ScreenWrapper'; +import SelectionList from '@components/SelectionList'; +import RadioListItem from '@components/SelectionList/ListItem/RadioListItem'; +import useLocalize from '@hooks/useLocalize'; +import Navigation from '@libs/Navigation/Navigation'; +import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; +import {isExpenseReport, isIOUReport} from '@libs/ReportUtils'; +import type {ReportSettingsNavigatorParamList} from '@navigation/types'; +import withReportOrNotFound from '@pages/home/report/withReportOrNotFound'; +import type {WithReportOrNotFoundProps} from '@pages/home/report/withReportOrNotFound'; +import {getReportLayoutGroupBy, setReportLayoutGroupBy} from '@userActions/ReportLayout'; +import CONST from '@src/CONST'; +import ONYXKEYS from '@src/ONYXKEYS'; +import type SCREENS from '@src/SCREENS'; +import type {ReportLayoutGroupBy} from '@src/types/onyx'; + +type ReportLayoutPageProps = WithReportOrNotFoundProps & PlatformStackScreenProps; + +function ReportLayoutPage({report}: ReportLayoutPageProps) { + const {translate} = useLocalize(); + const [reportLayoutGroupBy] = useOnyx(ONYXKEYS.NVP_REPORT_LAYOUT_GROUP_BY, {canBeMissing: true}); + + // Only show for expense reports that are not IOU reports (workspace expense reports) + const shouldShowNotFound = !isExpenseReport(report) || isIOUReport(report); + + const currentGroupBy = getReportLayoutGroupBy(reportLayoutGroupBy); + + const groupByOptions = [ + { + value: CONST.REPORT_LAYOUT.GROUP_BY.CATEGORY, + text: translate('reportLayout.groupBy.category'), + keyForList: CONST.REPORT_LAYOUT.GROUP_BY.CATEGORY, + isSelected: currentGroupBy === CONST.REPORT_LAYOUT.GROUP_BY.CATEGORY, + }, + { + value: CONST.REPORT_LAYOUT.GROUP_BY.TAG, + text: translate('reportLayout.groupBy.tag'), + keyForList: CONST.REPORT_LAYOUT.GROUP_BY.TAG, + isSelected: currentGroupBy === CONST.REPORT_LAYOUT.GROUP_BY.TAG, + }, + ]; + + const updateGroupBy = useCallback( + (value: ReportLayoutGroupBy) => { + setReportLayoutGroupBy(value, reportLayoutGroupBy); + Navigation.goBack(); + }, + [reportLayoutGroupBy], + ); + + return ( + + + + updateGroupBy(option.value)} + shouldSingleExecuteRowSelect + initiallyFocusedItemKey={groupByOptions.find((option) => option.isSelected)?.keyForList} + /> + + + ); +} + +ReportLayoutPage.displayName = 'ReportLayoutPage'; + +export default withReportOrNotFound()(ReportLayoutPage); diff --git a/src/styles/index.ts b/src/styles/index.ts index d1f239385771..e3d70e1aca39 100644 --- a/src/styles/index.ts +++ b/src/styles/index.ts @@ -385,6 +385,14 @@ const staticStyles = (theme: ThemeColors) => backgroundColor: theme.appBG, }, + reportLayoutGroupHeader: { + paddingHorizontal: 12, + marginTop: 16, + marginBottom: 8, + backgroundColor: theme.appBG, + justifyContent: 'center', + }, + fontSizeLabel: { fontSize: variables.fontSizeLabel, }, diff --git a/src/types/onyx/ReportLayout.ts b/src/types/onyx/ReportLayout.ts new file mode 100644 index 000000000000..85389b2a193b --- /dev/null +++ b/src/types/onyx/ReportLayout.ts @@ -0,0 +1,23 @@ +import type {ValueOf} from 'type-fest'; +import type CONST from '@src/CONST'; +import type Transaction from './Transaction'; + +/** User's report layout group-by preference */ +type ReportLayoutGroupBy = ValueOf; + +/** Grouped transactions for display */ +type GroupedTransactions = { + /** Display name of the group (category or tag name) */ + groupName: string; + + /** Key used for grouping (category or tag value) */ + groupKey: string; + + /** Transactions in this group */ + transactions: Transaction[]; + + /** Whether the group is currently expanded */ + isExpanded: boolean; +}; + +export type {ReportLayoutGroupBy, GroupedTransactions}; diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts index af3fcb2f5813..1fc413e85d46 100644 --- a/src/types/onyx/index.ts +++ b/src/types/onyx/index.ts @@ -92,6 +92,7 @@ import type ReportActionsDraft from './ReportActionsDraft'; import type ReportActionsDrafts from './ReportActionsDrafts'; import type ReportMetadata from './ReportMetadata'; import type ReportNameValuePairs from './ReportNameValuePairs'; +import type {GroupedTransactions, ReportLayoutGroupBy} from './ReportLayout'; import type LastSearchParams from './ReportNavigation'; import type ReportNextStepDeprecated from './ReportNextStepDeprecated'; import type ReportUserIsTyping from './ReportUserIsTyping'; @@ -214,6 +215,8 @@ export type { ReportViolationName, ReportViolations, ReportFieldsViolations, + ReportLayoutGroupBy, + GroupedTransactions, Request, Response, ScreenShareRequest, From 83629da16036526cff21e195ab717b8574ce5cfa Mon Sep 17 00:00:00 2001 From: TaduJR Date: Wed, 26 Nov 2025 21:42:05 +0300 Subject: [PATCH 02/10] fix: Add missing 'Filters' icon to lazy-loaded icons array --- src/components/MoneyReportHeader.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx index cec48a68f61e..f7762e574c0e 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -226,6 +226,7 @@ function MoneyReportHeader({ 'Info', 'Export', 'Document', + 'Filters', ] as const); const [lastDistanceExpenseType] = useOnyx(ONYXKEYS.NVP_LAST_DISTANCE_EXPENSE_TYPE, {canBeMissing: true}); const {translate} = useLocalize(); From 5eeede2582cb18ae4cc34b76ad4508c2a1d5529c Mon Sep 17 00:00:00 2001 From: TaduJR Date: Wed, 26 Nov 2025 21:49:29 +0300 Subject: [PATCH 03/10] fix lint errors: default export in TagUtils and rename negated variable --- .../MoneyRequestReportTransactionList.tsx | 2 +- src/libs/ReportLayoutUtils.ts | 2 +- src/libs/TagUtils.ts | 2 +- src/pages/settings/Report/ReportLayoutPage.tsx | 4 ++-- src/types/onyx/index.ts | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx index 66ce6c5405d2..50022590e07b 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx @@ -26,13 +26,13 @@ import useStyleUtils from '@hooks/useStyleUtils'; import useThemeStyles from '@hooks/useThemeStyles'; import {turnOnMobileSelectionMode} from '@libs/actions/MobileSelectionMode'; import {setOptimisticTransactionThread} from '@libs/actions/Report'; +import {getReportLayoutGroupBy} from '@libs/actions/ReportLayout'; import {setActiveTransactionIDs} from '@libs/actions/TransactionThreadNavigation'; import {convertToDisplayString} from '@libs/CurrencyUtils'; import FS from '@libs/Fullstory'; import {navigationRef} from '@libs/Navigation/Navigation'; import Parser from '@libs/Parser'; import {getIOUActionForTransactionID} from '@libs/ReportActionsUtils'; -import {getReportLayoutGroupBy} from '@libs/actions/ReportLayout'; import {groupTransactionsByCategory, groupTransactionsByTag} from '@libs/ReportLayoutUtils'; import { canAddTransaction, diff --git a/src/libs/ReportLayoutUtils.ts b/src/libs/ReportLayoutUtils.ts index 542f8912840a..aa74b3d77c0b 100644 --- a/src/libs/ReportLayoutUtils.ts +++ b/src/libs/ReportLayoutUtils.ts @@ -4,7 +4,7 @@ import type {GroupedTransactions} from '@src/types/onyx'; 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 isTagMissing from './TagUtils'; import {getCategory, getTag} from './TransactionUtils'; /** diff --git a/src/libs/TagUtils.ts b/src/libs/TagUtils.ts index 4a2720a448a3..8e5b03f587d6 100644 --- a/src/libs/TagUtils.ts +++ b/src/libs/TagUtils.ts @@ -11,4 +11,4 @@ function isTagMissing(tag: string | undefined): boolean { return tag === CONST.SEARCH.TAG_EMPTY_VALUE; } -export {isTagMissing}; +export default isTagMissing; diff --git a/src/pages/settings/Report/ReportLayoutPage.tsx b/src/pages/settings/Report/ReportLayoutPage.tsx index 875cf4bdd650..ceabeb98b9aa 100644 --- a/src/pages/settings/Report/ReportLayoutPage.tsx +++ b/src/pages/settings/Report/ReportLayoutPage.tsx @@ -25,7 +25,7 @@ function ReportLayoutPage({report}: ReportLayoutPageProps) { const [reportLayoutGroupBy] = useOnyx(ONYXKEYS.NVP_REPORT_LAYOUT_GROUP_BY, {canBeMissing: true}); // Only show for expense reports that are not IOU reports (workspace expense reports) - const shouldShowNotFound = !isExpenseReport(report) || isIOUReport(report); + const shouldShowPage = isExpenseReport(report) && !isIOUReport(report); const currentGroupBy = getReportLayoutGroupBy(reportLayoutGroupBy); @@ -57,7 +57,7 @@ function ReportLayoutPage({report}: ReportLayoutPageProps) { includeSafeAreaPaddingBottom={false} testID={ReportLayoutPage.displayName} > - + Date: Wed, 26 Nov 2025 22:23:39 +0300 Subject: [PATCH 04/10] fix Report Layout: icon, menu position, and use SingleSelectListItem --- src/components/MoneyReportHeader.tsx | 4 ++-- src/libs/ReportSecondaryActionUtils.ts | 8 ++++---- src/pages/settings/Report/ReportLayoutPage.tsx | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx index f7762e574c0e..3102252b539b 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -226,7 +226,7 @@ function MoneyReportHeader({ 'Info', 'Export', 'Document', - 'Filters', + 'Feed', ] as const); const [lastDistanceExpenseType] = useOnyx(ONYXKEYS.NVP_LAST_DISTANCE_EXPENSE_TYPE, {canBeMissing: true}); const {translate} = useLocalize(); @@ -1146,7 +1146,7 @@ function MoneyReportHeader({ }, [CONST.REPORT.SECONDARY_ACTIONS.REPORT_LAYOUT]: { text: translate('reportLayout.reportLayout'), - icon: expensifyIcons.Filters, + icon: expensifyIcons.Feed, value: CONST.REPORT.SECONDARY_ACTIONS.REPORT_LAYOUT, onSelected: () => { if (!moneyRequestReport) { diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts index 0a05c74c806a..82f34bd3b03c 100644 --- a/src/libs/ReportSecondaryActionUtils.ts +++ b/src/libs/ReportSecondaryActionUtils.ts @@ -706,6 +706,10 @@ 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)) { @@ -716,10 +720,6 @@ function getSecondaryReportActions({ options.push(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_APPROVER); } - if (isReportLayoutAction(report, reportTransactions)) { - options.push(CONST.REPORT.SECONDARY_ACTIONS.REPORT_LAYOUT); - } - options.push(CONST.REPORT.SECONDARY_ACTIONS.VIEW_DETAILS); if (isDeleteAction(report, reportTransactions, reportActions ?? [])) { diff --git a/src/pages/settings/Report/ReportLayoutPage.tsx b/src/pages/settings/Report/ReportLayoutPage.tsx index ceabeb98b9aa..70eebc70f66f 100644 --- a/src/pages/settings/Report/ReportLayoutPage.tsx +++ b/src/pages/settings/Report/ReportLayoutPage.tsx @@ -4,7 +4,7 @@ import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; import SelectionList from '@components/SelectionList'; -import RadioListItem from '@components/SelectionList/ListItem/RadioListItem'; +import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem'; import useLocalize from '@hooks/useLocalize'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; @@ -64,9 +64,10 @@ function ReportLayoutPage({report}: ReportLayoutPageProps) { /> updateGroupBy(option.value)} shouldSingleExecuteRowSelect + shouldHighlightSelectedItem={false} initiallyFocusedItemKey={groupByOptions.find((option) => option.isSelected)?.keyForList} /> From c96450163e757b4d4ede98eae8ead906882183ff Mon Sep 17 00:00:00 2001 From: TaduJR Date: Wed, 26 Nov 2025 22:57:37 +0300 Subject: [PATCH 05/10] fix: useOnyx import in ReportLayoutPage --- 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 70eebc70f66f..de5ade7fc809 100644 --- a/src/pages/settings/Report/ReportLayoutPage.tsx +++ b/src/pages/settings/Report/ReportLayoutPage.tsx @@ -1,5 +1,5 @@ import React, {useCallback} from 'react'; -import {useOnyx} from 'react-native-onyx'; +import useOnyx from '@hooks/useOnyx'; import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; From 1431f58942311836450737e36821cbf66d411fdc Mon Sep 17 00:00:00 2001 From: TaduJR Date: Wed, 26 Nov 2025 23:23:55 +0300 Subject: [PATCH 06/10] perf: memoize styles, pre-compute selection state, optimize lookups --- .../MoneyRequestReportGroupHeader.tsx | 48 ++++--- .../MoneyRequestReportTransactionList.tsx | 127 ++++++++++-------- .../settings/Report/ReportLayoutPage.tsx | 35 ++--- 3 files changed, 120 insertions(+), 90 deletions(-) diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx index c225fc17b741..ff1c108fb663 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React, {useCallback, useMemo} from 'react'; import {View} from 'react-native'; import type {StyleProp, ViewStyle} from 'react-native'; import Checkbox from '@components/Checkbox'; @@ -10,10 +10,18 @@ import {getCommaSeparatedTagNameWithSanitizedColons} from '@libs/PolicyUtils'; import variables from '@styles/variables'; import type {GroupedTransactions} from '@src/types/onyx'; +// Height constants +const DESKTOP_HEIGHT = 28; +const MOBILE_HEIGHT_WITH_CHECKBOX = 20; +const MOBILE_HEIGHT_WITHOUT_CHECKBOX = 16; + type MoneyRequestReportGroupHeaderProps = { /** The grouped transaction data */ group: GroupedTransactions; + /** The group key for toggle callback */ + groupKey: string; + /** Whether grouping by tag (if false, grouping by category) */ isGroupedByTag?: boolean; @@ -26,8 +34,8 @@ type MoneyRequestReportGroupHeaderProps = { /** Whether some (but not all) transactions in this group are selected */ isIndeterminate?: boolean; - /** Callback when group checkbox is toggled */ - onToggleSelection?: () => void; + /** Callback when group checkbox is toggled - receives groupKey */ + onToggleSelection?: (groupKey: string) => void; /** Additional styles to apply */ style?: StyleProp; @@ -35,6 +43,7 @@ type MoneyRequestReportGroupHeaderProps = { function MoneyRequestReportGroupHeader({ group, + groupKey, isGroupedByTag = false, isSelectionModeEnabled = false, isSelected = false, @@ -46,11 +55,6 @@ function MoneyRequestReportGroupHeader({ const {translate} = useLocalize(); const {shouldUseNarrowLayout} = useResponsiveLayout(); - // Height constants for cleaner code - const DESKTOP_HEIGHT = 28; - const MOBILE_HEIGHT_WITH_CHECKBOX = 20; - const MOBILE_HEIGHT_WITHOUT_CHECKBOX = 16; - // For tags: convert colon-separated multi-level tags to comma-separated display const cleanedGroupName = isGroupedByTag && group.groupName ? getCommaSeparatedTagNameWithSanitizedColons(group.groupName) : group.groupName; const displayName = cleanedGroupName || translate(isGroupedByTag ? 'reportLayout.noTag' : 'reportLayout.uncategorized'); @@ -58,15 +62,25 @@ function MoneyRequestReportGroupHeader({ // Desktop: always show checkbox, Mobile: only in selection mode const shouldShowCheckbox = isSelectionModeEnabled || !shouldUseNarrowLayout; - // Conditional height based on platform and checkbox visibility - const conditionalHeight = shouldUseNarrowLayout - ? {height: shouldShowCheckbox ? MOBILE_HEIGHT_WITH_CHECKBOX : MOBILE_HEIGHT_WITHOUT_CHECKBOX} - : {height: DESKTOP_HEIGHT, minHeight: DESKTOP_HEIGHT}; + // Memoized conditional height based on platform and checkbox visibility + const conditionalHeight = useMemo( + () => (shouldUseNarrowLayout ? {height: shouldShowCheckbox ? MOBILE_HEIGHT_WITH_CHECKBOX : MOBILE_HEIGHT_WITHOUT_CHECKBOX} : {height: DESKTOP_HEIGHT, minHeight: DESKTOP_HEIGHT}), + [shouldUseNarrowLayout, shouldShowCheckbox], + ); + + // Memoized dynamic text style based on platform and checkbox state + const textStyle = useMemo( + () => + shouldUseNarrowLayout + ? {fontSize: variables.fontSizeLabel, lineHeight: shouldShowCheckbox ? MOBILE_HEIGHT_WITH_CHECKBOX : MOBILE_HEIGHT_WITHOUT_CHECKBOX} + : {fontSize: variables.fontSizeNormal, lineHeight: DESKTOP_HEIGHT}, + [shouldUseNarrowLayout, shouldShowCheckbox], + ); - // Dynamic text style based on platform and checkbox state - const textStyle = shouldUseNarrowLayout - ? {fontSize: variables.fontSizeLabel, lineHeight: shouldShowCheckbox ? MOBILE_HEIGHT_WITH_CHECKBOX : MOBILE_HEIGHT_WITHOUT_CHECKBOX} - : {fontSize: variables.fontSizeNormal, lineHeight: DESKTOP_HEIGHT}; + // Memoized callback to avoid inline arrow function + const handleToggleSelection = useCallback(() => { + onToggleSelection?.(groupKey); + }, [onToggleSelection, groupKey]); return ( @@ -75,7 +89,7 @@ function MoneyRequestReportGroupHeader({ {})} + onPress={handleToggleSelection} accessibilityLabel={translate('reportLayout.selectGroup', {groupName: displayName})} style={styles.mr2} /> diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx index 50022590e07b..d7c1b4dff3c8 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx @@ -239,10 +239,14 @@ function MoneyRequestReportTransactionList({ const isTransactionSelected = useCallback((transactionID: string) => selectedTransactionIDs.includes(transactionID), [selectedTransactionIDs]); - // Toggle all transactions in a group + // Toggle all transactions in a group by groupKey const toggleGroupSelection = useCallback( - (groupTransactionsToToggle: OnyxTypes.Transaction[]) => { - const groupTransactionIDs = groupTransactionsToToggle.filter((t) => !isTransactionPendingDelete(t)).map((t) => t.transactionID); + (groupKey: string) => { + const group = groupedTransactions.find((g) => g.groupKey === groupKey); + if (!group) { + return; + } + const groupTransactionIDs = group.transactions.filter((t) => !isTransactionPendingDelete(t)).map((t) => t.transactionID); const allSelected = groupTransactionIDs.every((id) => selectedTransactionIDs.includes(id)); let newSelectedTransactionIDs = selectedTransactionIDs; @@ -256,32 +260,7 @@ function MoneyRequestReportTransactionList({ } setSelectedTransactions(newSelectedTransactionIDs); }, - [selectedTransactionIDs, setSelectedTransactions], - ); - - // Check if all transactions in a group are selected - const isGroupSelected = useCallback( - (groupTransactionsToCheck: OnyxTypes.Transaction[]) => { - const groupTransactionIDs = groupTransactionsToCheck.filter((t) => !isTransactionPendingDelete(t)).map((t) => t.transactionID); - if (groupTransactionIDs.length === 0) { - return false; - } - return groupTransactionIDs.every((id) => selectedTransactionIDs.includes(id)); - }, - [selectedTransactionIDs], - ); - - // Check if some (but not all) transactions in a group are selected - const isGroupIndeterminate = useCallback( - (groupTransactionsToCheck: OnyxTypes.Transaction[]) => { - const groupTransactionIDs = groupTransactionsToCheck.filter((t) => !isTransactionPendingDelete(t)).map((t) => t.transactionID); - if (groupTransactionIDs.length === 0) { - return false; - } - const selectedCount = groupTransactionIDs.filter((id) => selectedTransactionIDs.includes(id)).length; - return selectedCount > 0 && selectedCount < groupTransactionIDs.length; - }, - [selectedTransactionIDs], + [groupedTransactions, selectedTransactionIDs, setSelectedTransactions], ); useFocusEffect( @@ -320,6 +299,7 @@ function MoneyRequestReportTransactionList({ const currentGroupBy = getReportLayoutGroupBy(reportLayoutGroupBy); // Group transactions based on user preference (only for workspace expense reports) + // Note: grouping functions only use report for null check, so we use report?.reportID to avoid unnecessary re-renders const groupedTransactions = useMemo(() => { if (!shouldShowGroupedTransactions) { return []; @@ -329,7 +309,8 @@ function MoneyRequestReportTransactionList({ } // Default to grouping by category return groupTransactionsByCategory(sortedTransactions, report, localeCompare); - }, [sortedTransactions, currentGroupBy, report, localeCompare, shouldShowGroupedTransactions]); + // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps + }, [sortedTransactions, currentGroupBy, report?.reportID, localeCompare, shouldShowGroupedTransactions]); // Generate flattened transaction IDs from grouped transactions for arrow navigation const visualOrderTransactionIDs = useMemo(() => { @@ -339,6 +320,37 @@ function MoneyRequestReportTransactionList({ return groupedTransactions.flatMap((group) => group.transactions.filter((transaction) => !isTransactionPendingDelete(transaction)).map((transaction) => transaction.transactionID)); }, [groupedTransactions, sortedTransactions, shouldShowGroupedTransactions]); + // Create a Map for O(1) transaction lookups instead of O(n) find operations + const sortedTransactionsMap = useMemo(() => { + const map = new Map(); + sortedTransactions.forEach((transaction) => { + map.set(transaction.transactionID, transaction); + }); + return map; + }, [sortedTransactions]); + + // Pre-compute selection state for each group to avoid expensive array operations in render + const groupSelectionState = useMemo(() => { + const state = new Map(); + + groupedTransactions.forEach((group) => { + const groupTransactionIDs = group.transactions.filter((t) => !isTransactionPendingDelete(t)).map((t) => t.transactionID); + + if (groupTransactionIDs.length === 0) { + state.set(group.groupKey, {isSelected: false, isIndeterminate: false}); + return; + } + + const selectedCount = groupTransactionIDs.filter((id) => selectedTransactionIDs.includes(id)).length; + state.set(group.groupKey, { + isSelected: selectedCount === groupTransactionIDs.length, + isIndeterminate: selectedCount > 0 && selectedCount < groupTransactionIDs.length, + }); + }); + + return state; + }, [groupedTransactions, selectedTransactionIDs]); + /** * Navigate to the transaction thread for a transaction, creating one optimistically if it doesn't yet exist. */ @@ -487,10 +499,7 @@ function MoneyRequestReportTransactionList({ {shouldShowGroupedTransactions ? groupedTransactions.map((group) => { - const groupTransactionsWithHighlight = group.transactions.map((transaction) => { - const originalTransaction = sortedTransactions.find((t) => t.transactionID === transaction.transactionID); - return originalTransaction ?? transaction; - }); + const selectionState = groupSelectionState.get(group.groupKey) ?? {isSelected: false, isIndeterminate: false}; return ( toggleGroupSelection(group.transactions)} + isSelected={selectionState.isSelected} + isIndeterminate={selectionState.isIndeterminate} + onToggleSelection={toggleGroupSelection} + groupKey={group.groupKey} /> - {groupTransactionsWithHighlight.map((transaction) => ( - - ))} + {group.transactions.map((transaction) => { + const originalTransaction = sortedTransactionsMap.get(transaction.transactionID) ?? transaction; + return ( + + ); + })} ); }) diff --git a/src/pages/settings/Report/ReportLayoutPage.tsx b/src/pages/settings/Report/ReportLayoutPage.tsx index de5ade7fc809..a04f814f7c8b 100644 --- a/src/pages/settings/Report/ReportLayoutPage.tsx +++ b/src/pages/settings/Report/ReportLayoutPage.tsx @@ -1,11 +1,11 @@ -import React, {useCallback} from 'react'; -import useOnyx from '@hooks/useOnyx'; +import React, {useCallback, useMemo} from 'react'; import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; import SelectionList from '@components/SelectionList'; import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem'; import useLocalize from '@hooks/useLocalize'; +import useOnyx from '@hooks/useOnyx'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import {isExpenseReport, isIOUReport} from '@libs/ReportUtils'; @@ -29,20 +29,23 @@ function ReportLayoutPage({report}: ReportLayoutPageProps) { const currentGroupBy = getReportLayoutGroupBy(reportLayoutGroupBy); - const groupByOptions = [ - { - value: CONST.REPORT_LAYOUT.GROUP_BY.CATEGORY, - text: translate('reportLayout.groupBy.category'), - keyForList: CONST.REPORT_LAYOUT.GROUP_BY.CATEGORY, - isSelected: currentGroupBy === CONST.REPORT_LAYOUT.GROUP_BY.CATEGORY, - }, - { - value: CONST.REPORT_LAYOUT.GROUP_BY.TAG, - text: translate('reportLayout.groupBy.tag'), - keyForList: CONST.REPORT_LAYOUT.GROUP_BY.TAG, - isSelected: currentGroupBy === CONST.REPORT_LAYOUT.GROUP_BY.TAG, - }, - ]; + const groupByOptions = useMemo( + () => [ + { + value: CONST.REPORT_LAYOUT.GROUP_BY.CATEGORY, + text: translate('reportLayout.groupBy.category'), + keyForList: CONST.REPORT_LAYOUT.GROUP_BY.CATEGORY, + isSelected: currentGroupBy === CONST.REPORT_LAYOUT.GROUP_BY.CATEGORY, + }, + { + value: CONST.REPORT_LAYOUT.GROUP_BY.TAG, + text: translate('reportLayout.groupBy.tag'), + keyForList: CONST.REPORT_LAYOUT.GROUP_BY.TAG, + isSelected: currentGroupBy === CONST.REPORT_LAYOUT.GROUP_BY.TAG, + }, + ], + [currentGroupBy, translate], + ); const updateGroupBy = useCallback( (value: ReportLayoutGroupBy) => { From 935186be8025a12c01f4e47c474add4684d040e5 Mon Sep 17 00:00:00 2001 From: TaduJR Date: Wed, 26 Nov 2025 23:37:28 +0300 Subject: [PATCH 07/10] chore: remove staightforward comments from Report Layout changes --- .../MoneyRequestReportGroupHeader.tsx | 5 -- .../MoneyRequestReportTransactionList.tsx | 54 ++++++++----------- src/libs/ReportLayoutUtils.ts | 2 - src/libs/actions/ReportLayout.ts | 6 +-- .../settings/Report/ReportLayoutPage.tsx | 2 - 5 files changed, 22 insertions(+), 47 deletions(-) diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx index ff1c108fb663..f38a39ed881d 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportGroupHeader.tsx @@ -55,20 +55,16 @@ function MoneyRequestReportGroupHeader({ const {translate} = useLocalize(); const {shouldUseNarrowLayout} = useResponsiveLayout(); - // For tags: convert colon-separated multi-level tags to comma-separated display const cleanedGroupName = isGroupedByTag && group.groupName ? getCommaSeparatedTagNameWithSanitizedColons(group.groupName) : group.groupName; const displayName = cleanedGroupName || translate(isGroupedByTag ? 'reportLayout.noTag' : 'reportLayout.uncategorized'); - // Desktop: always show checkbox, Mobile: only in selection mode const shouldShowCheckbox = isSelectionModeEnabled || !shouldUseNarrowLayout; - // Memoized conditional height based on platform and checkbox visibility const conditionalHeight = useMemo( () => (shouldUseNarrowLayout ? {height: shouldShowCheckbox ? MOBILE_HEIGHT_WITH_CHECKBOX : MOBILE_HEIGHT_WITHOUT_CHECKBOX} : {height: DESKTOP_HEIGHT, minHeight: DESKTOP_HEIGHT}), [shouldUseNarrowLayout, shouldShowCheckbox], ); - // Memoized dynamic text style based on platform and checkbox state const textStyle = useMemo( () => shouldUseNarrowLayout @@ -77,7 +73,6 @@ function MoneyRequestReportGroupHeader({ [shouldUseNarrowLayout, shouldShowCheckbox], ); - // Memoized callback to avoid inline arrow function const handleToggleSelection = useCallback(() => { onToggleSelection?.(groupKey); }, [onToggleSelection, groupKey]); diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx index d7c1b4dff3c8..6665d964b426 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx @@ -182,8 +182,6 @@ function MoneyRequestReportTransactionList({ const shouldShowAddExpenseButton = canAddTransaction(report, isReportArchived) && isCurrentUserSubmitter(report); const [lastDistanceExpenseType] = useOnyx(ONYXKEYS.NVP_LAST_DISTANCE_EXPENSE_TYPE, {canBeMissing: true}); const [reportLayoutGroupBy] = useOnyx(ONYXKEYS.NVP_REPORT_LAYOUT_GROUP_BY, {canBeMissing: true}); - - // Only show grouped transactions for workspace expense reports (not IOU/DM reports) const shouldShowGroupedTransactions = isExpenseReport(report) && !isIOUReport(report); const addExpenseDropdownOptions = useMemo( @@ -239,30 +237,6 @@ function MoneyRequestReportTransactionList({ const isTransactionSelected = useCallback((transactionID: string) => selectedTransactionIDs.includes(transactionID), [selectedTransactionIDs]); - // Toggle all transactions in a group by groupKey - const toggleGroupSelection = useCallback( - (groupKey: string) => { - const group = groupedTransactions.find((g) => g.groupKey === groupKey); - if (!group) { - return; - } - const groupTransactionIDs = group.transactions.filter((t) => !isTransactionPendingDelete(t)).map((t) => t.transactionID); - const allSelected = groupTransactionIDs.every((id) => selectedTransactionIDs.includes(id)); - - let newSelectedTransactionIDs = selectedTransactionIDs; - if (allSelected) { - // Deselect all transactions in the group - newSelectedTransactionIDs = selectedTransactionIDs.filter((id) => !groupTransactionIDs.includes(id)); - } else { - // Select all transactions in the group - const idsToAdd = groupTransactionIDs.filter((id) => !selectedTransactionIDs.includes(id)); - newSelectedTransactionIDs = [...selectedTransactionIDs, ...idsToAdd]; - } - setSelectedTransactions(newSelectedTransactionIDs); - }, - [groupedTransactions, selectedTransactionIDs, setSelectedTransactions], - ); - useFocusEffect( useCallback(() => { return () => { @@ -295,11 +269,8 @@ function MoneyRequestReportTransactionList({ return (Object.keys(columns) as SearchColumnType[]).filter((column) => columns[column]); }, [transactions, currentUserDetails?.accountID]); - // Get the current group-by preference const currentGroupBy = getReportLayoutGroupBy(reportLayoutGroupBy); - // Group transactions based on user preference (only for workspace expense reports) - // Note: grouping functions only use report for null check, so we use report?.reportID to avoid unnecessary re-renders const groupedTransactions = useMemo(() => { if (!shouldShowGroupedTransactions) { return []; @@ -307,12 +278,10 @@ function MoneyRequestReportTransactionList({ if (currentGroupBy === CONST.REPORT_LAYOUT.GROUP_BY.TAG) { return groupTransactionsByTag(sortedTransactions, report, localeCompare); } - // Default to grouping by category return groupTransactionsByCategory(sortedTransactions, report, localeCompare); // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps }, [sortedTransactions, currentGroupBy, report?.reportID, localeCompare, shouldShowGroupedTransactions]); - // Generate flattened transaction IDs from grouped transactions for arrow navigation const visualOrderTransactionIDs = useMemo(() => { if (!shouldShowGroupedTransactions || groupedTransactions.length === 0) { return sortedTransactions.filter((transaction) => !isTransactionPendingDelete(transaction)).map((transaction) => transaction.transactionID); @@ -320,7 +289,6 @@ function MoneyRequestReportTransactionList({ return groupedTransactions.flatMap((group) => group.transactions.filter((transaction) => !isTransactionPendingDelete(transaction)).map((transaction) => transaction.transactionID)); }, [groupedTransactions, sortedTransactions, shouldShowGroupedTransactions]); - // Create a Map for O(1) transaction lookups instead of O(n) find operations const sortedTransactionsMap = useMemo(() => { const map = new Map(); sortedTransactions.forEach((transaction) => { @@ -329,7 +297,6 @@ function MoneyRequestReportTransactionList({ return map; }, [sortedTransactions]); - // Pre-compute selection state for each group to avoid expensive array operations in render const groupSelectionState = useMemo(() => { const state = new Map(); @@ -351,6 +318,27 @@ function MoneyRequestReportTransactionList({ return state; }, [groupedTransactions, selectedTransactionIDs]); + const toggleGroupSelection = useCallback( + (groupKey: string) => { + const group = groupedTransactions.find((g) => g.groupKey === groupKey); + if (!group) { + return; + } + const groupTransactionIDs = group.transactions.filter((t) => !isTransactionPendingDelete(t)).map((t) => t.transactionID); + const allSelected = groupTransactionIDs.every((id) => selectedTransactionIDs.includes(id)); + + let newSelectedTransactionIDs = selectedTransactionIDs; + if (allSelected) { + newSelectedTransactionIDs = selectedTransactionIDs.filter((id) => !groupTransactionIDs.includes(id)); + } else { + const idsToAdd = groupTransactionIDs.filter((id) => !selectedTransactionIDs.includes(id)); + newSelectedTransactionIDs = [...selectedTransactionIDs, ...idsToAdd]; + } + setSelectedTransactions(newSelectedTransactionIDs); + }, + [groupedTransactions, selectedTransactionIDs, setSelectedTransactions], + ); + /** * Navigate to the transaction thread for a transaction, creating one optimistically if it doesn't yet exist. */ diff --git a/src/libs/ReportLayoutUtils.ts b/src/libs/ReportLayoutUtils.ts index aa74b3d77c0b..78708c2b5685 100644 --- a/src/libs/ReportLayoutUtils.ts +++ b/src/libs/ReportLayoutUtils.ts @@ -35,7 +35,6 @@ function groupTransactionsByCategory(transactions: Transaction[], report: OnyxEn for (const transaction of transactions) { const category = getCategory(transaction); - // Normalize missing categories to empty string for consistent grouping const categoryKey = isCategoryMissing(category) ? '' : category; if (!groups.has(categoryKey)) { @@ -70,7 +69,6 @@ function groupTransactionsByTag(transactions: Transaction[], report: OnyxEntry Date: Wed, 26 Nov 2025 23:44:08 +0300 Subject: [PATCH 08/10] fix lint: replace forEach with for...of loops --- .../MoneyRequestReportTransactionList.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx index 6665d964b426..8e5c43470c1e 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx @@ -291,21 +291,21 @@ function MoneyRequestReportTransactionList({ const sortedTransactionsMap = useMemo(() => { const map = new Map(); - sortedTransactions.forEach((transaction) => { + for (const transaction of sortedTransactions) { map.set(transaction.transactionID, transaction); - }); + } return map; }, [sortedTransactions]); const groupSelectionState = useMemo(() => { const state = new Map(); - groupedTransactions.forEach((group) => { + 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}); - return; + continue; } const selectedCount = groupTransactionIDs.filter((id) => selectedTransactionIDs.includes(id)).length; @@ -313,7 +313,7 @@ function MoneyRequestReportTransactionList({ isSelected: selectedCount === groupTransactionIDs.length, isIndeterminate: selectedCount > 0 && selectedCount < groupTransactionIDs.length, }); - }); + } return state; }, [groupedTransactions, selectedTransactionIDs]); From 6f8b6a1fd4c610e4e088f2f1622462129d7c6b2b Mon Sep 17 00:00:00 2001 From: TaduJR Date: Thu, 27 Nov 2025 00:55:49 +0300 Subject: [PATCH 09/10] fix: add minimum transaction count check and restore Group by label in ReportLayoutPage --- .../MoneyRequestReportTransactionList.tsx | 2 +- .../settings/Report/ReportLayoutPage.tsx | 106 +++++++++--------- 2 files changed, 55 insertions(+), 53 deletions(-) diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx index 8e5c43470c1e..0ff80b4939d6 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx @@ -182,7 +182,7 @@ function MoneyRequestReportTransactionList({ const shouldShowAddExpenseButton = canAddTransaction(report, isReportArchived) && isCurrentUserSubmitter(report); const [lastDistanceExpenseType] = useOnyx(ONYXKEYS.NVP_LAST_DISTANCE_EXPENSE_TYPE, {canBeMissing: true}); const [reportLayoutGroupBy] = useOnyx(ONYXKEYS.NVP_REPORT_LAYOUT_GROUP_BY, {canBeMissing: true}); - const shouldShowGroupedTransactions = isExpenseReport(report) && !isIOUReport(report); + const shouldShowGroupedTransactions = isExpenseReport(report) && !isIOUReport(report) && transactionsWithoutPendingDelete.length >= 2; const addExpenseDropdownOptions = useMemo( () => getAddExpenseDropdownOptions(report?.reportID, policy, undefined, undefined, lastDistanceExpenseType), diff --git a/src/pages/settings/Report/ReportLayoutPage.tsx b/src/pages/settings/Report/ReportLayoutPage.tsx index a1f4101a3177..60b935ea697a 100644 --- a/src/pages/settings/Report/ReportLayoutPage.tsx +++ b/src/pages/settings/Report/ReportLayoutPage.tsx @@ -1,81 +1,83 @@ -import React, {useCallback, useMemo} from 'react'; -import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; +import React, {useCallback} from 'react'; import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; import SelectionList from '@components/SelectionList'; import SingleSelectListItem from '@components/SelectionList/ListItem/SingleSelectListItem'; +import type {ListItem} from '@components/SelectionList/types'; +import Text from '@components/Text'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; +import useThemeStyles from '@hooks/useThemeStyles'; +import {getReportLayoutGroupBy, setReportLayoutGroupBy} from '@libs/actions/ReportLayout'; import Navigation from '@libs/Navigation/Navigation'; -import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; -import {isExpenseReport, isIOUReport} from '@libs/ReportUtils'; -import type {ReportSettingsNavigatorParamList} from '@navigation/types'; -import withReportOrNotFound from '@pages/home/report/withReportOrNotFound'; -import type {WithReportOrNotFoundProps} from '@pages/home/report/withReportOrNotFound'; -import {getReportLayoutGroupBy, setReportLayoutGroupBy} from '@userActions/ReportLayout'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; -import type SCREENS from '@src/SCREENS'; import type {ReportLayoutGroupBy} from '@src/types/onyx'; -type ReportLayoutPageProps = WithReportOrNotFoundProps & PlatformStackScreenProps; +type ReportLayoutItem = ListItem & { + value: ReportLayoutGroupBy; +}; -function ReportLayoutPage({report}: ReportLayoutPageProps) { +function ReportLayoutPage() { + const styles = useThemeStyles(); const {translate} = useLocalize(); - const [reportLayoutGroupBy] = useOnyx(ONYXKEYS.NVP_REPORT_LAYOUT_GROUP_BY, {canBeMissing: true}); - const shouldShowPage = isExpenseReport(report) && !isIOUReport(report); + const [reportLayoutGroupByNVP] = useOnyx(ONYXKEYS.NVP_REPORT_LAYOUT_GROUP_BY, {canBeMissing: true}); - const currentGroupBy = getReportLayoutGroupBy(reportLayoutGroupBy); + const currentGroupBy = getReportLayoutGroupBy(reportLayoutGroupByNVP); - const groupByOptions = useMemo( - () => [ - { - value: CONST.REPORT_LAYOUT.GROUP_BY.CATEGORY, - text: translate('reportLayout.groupBy.category'), - keyForList: CONST.REPORT_LAYOUT.GROUP_BY.CATEGORY, - isSelected: currentGroupBy === CONST.REPORT_LAYOUT.GROUP_BY.CATEGORY, - }, - { - value: CONST.REPORT_LAYOUT.GROUP_BY.TAG, - text: translate('reportLayout.groupBy.tag'), - keyForList: CONST.REPORT_LAYOUT.GROUP_BY.TAG, - isSelected: currentGroupBy === CONST.REPORT_LAYOUT.GROUP_BY.TAG, - }, - ], - [currentGroupBy, translate], - ); + const goBack = useCallback(() => { + Navigation.dismissModal(); + }, []); - const updateGroupBy = useCallback( - (value: ReportLayoutGroupBy) => { - setReportLayoutGroupBy(value, reportLayoutGroupBy); - Navigation.goBack(); + const onSelectGroupBy = useCallback( + (item: ReportLayoutItem) => { + if (item.value === currentGroupBy) { + goBack(); + return; + } + setReportLayoutGroupBy(item.value, reportLayoutGroupByNVP); + goBack(); }, - [reportLayoutGroupBy], + [currentGroupBy, reportLayoutGroupByNVP, goBack], ); + const layoutOptions: ReportLayoutItem[] = [ + { + text: translate('reportLayout.groupBy.category'), + keyForList: CONST.REPORT_LAYOUT.GROUP_BY.CATEGORY, + value: CONST.REPORT_LAYOUT.GROUP_BY.CATEGORY, + isSelected: currentGroupBy === CONST.REPORT_LAYOUT.GROUP_BY.CATEGORY, + }, + { + text: translate('reportLayout.groupBy.tag'), + keyForList: CONST.REPORT_LAYOUT.GROUP_BY.TAG, + value: CONST.REPORT_LAYOUT.GROUP_BY.TAG, + isSelected: currentGroupBy === CONST.REPORT_LAYOUT.GROUP_BY.TAG, + }, + ]; + return ( - - - updateGroupBy(option.value)} - shouldSingleExecuteRowSelect - shouldHighlightSelectedItem={false} - initiallyFocusedItemKey={groupByOptions.find((option) => option.isSelected)?.keyForList} - /> - + + {translate('reportLayout.groupByLabel')} + option.isSelected)?.keyForList} + /> ); } ReportLayoutPage.displayName = 'ReportLayoutPage'; -export default withReportOrNotFound()(ReportLayoutPage); +export default ReportLayoutPage; From ec9333327bac1cc498392ea7d991fe76e86d388d Mon Sep 17 00:00:00 2001 From: TaduJR Date: Thu, 27 Nov 2025 01:05:08 +0300 Subject: [PATCH 10/10] fix: restore Group by label in ReportLayoutPage --- .../MoneyRequestReportTransactionList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx index 0ff80b4939d6..8e5c43470c1e 100644 --- a/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx +++ b/src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx @@ -182,7 +182,7 @@ function MoneyRequestReportTransactionList({ const shouldShowAddExpenseButton = canAddTransaction(report, isReportArchived) && isCurrentUserSubmitter(report); const [lastDistanceExpenseType] = useOnyx(ONYXKEYS.NVP_LAST_DISTANCE_EXPENSE_TYPE, {canBeMissing: true}); const [reportLayoutGroupBy] = useOnyx(ONYXKEYS.NVP_REPORT_LAYOUT_GROUP_BY, {canBeMissing: true}); - const shouldShowGroupedTransactions = isExpenseReport(report) && !isIOUReport(report) && transactionsWithoutPendingDelete.length >= 2; + const shouldShowGroupedTransactions = isExpenseReport(report) && !isIOUReport(report); const addExpenseDropdownOptions = useMemo( () => getAddExpenseDropdownOptions(report?.reportID, policy, undefined, undefined, lastDistanceExpenseType),