Skip to content

fix: Category of track expense moved to 1:1 chat is visible on Reports #77203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deetergp merged 13 commits into from
Jan 7, 2026
Merged

fix: Category of track expense moved to 1:1 chat is visible on Reports #77203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a1497d8
fix: Category of track expense moved to 1:1 chat is not visiblon chat
nkdengineer Dec 10, 2025
6b8c845
Merge branch 'main' into fix/75503
nkdengineer Dec 11, 2025
bc903eb
hide category for 1:1 expense
nkdengineer Dec 11, 2025
9e0afd3
fix lint
nkdengineer Dec 11, 2025
d84227c
resolve conflict
nkdengineer Dec 16, 2025
1255241
resolve conflict
nkdengineer Dec 17, 2025
1831c29
merge main
nkdengineer Dec 17, 2025
bec8a52
resolve conflict
nkdengineer Dec 17, 2025
cfed4ed
fix category is shown
nkdengineer Dec 17, 2025
56c52ee
resolve conflict
nkdengineer Dec 18, 2025
3483a0d
resolve conflict
nkdengineer Dec 18, 2025
449b84b
resolve conflict
nkdengineer Dec 22, 2025
6851458
Merge branch 'main' into fix/75503
nkdengineer Jan 6, 2026
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
6 changes: 3 additions & 3 deletions src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@

const addExpenseDropdownOptions = useMemo(
() => getAddExpenseDropdownOptions(expensifyIcons, report?.reportID, policy, undefined, undefined, lastDistanceExpenseType),
[report?.reportID, policy, lastDistanceExpenseType, expensifyIcons],
[report?.reportID, policy, lastDistanceExpenseType, expensifyIcons.Location],

Check warning on line 191 in src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx

View workflow job for this annotation

GitHub Actions / ESLint check 

React Hook useMemo has a missing dependency: 'expensifyIcons'. Either include it or remove the dependency array

Check warning on line 191 in src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

React Hook useMemo has a missing dependency: 'expensifyIcons'. Either include it or remove the dependency array
);

const hasPendingAction = useMemo(() => {
Expand Down Expand Up @@ -276,8 +276,8 @@

// Always use default columns for money request report view (don't use user-customized search columns)
const columnsToShow = useMemo(() => {
return getColumnsToShow(currentUserDetails?.accountID, transactions, [], true);
}, [transactions, currentUserDetails?.accountID]);
return getColumnsToShow(currentUserDetails?.accountID, transactions, [], true, undefined, undefined, isIOUReport(report));
}, [transactions, currentUserDetails?.accountID, report]);

const currentGroupBy = getReportLayoutGroupBy(reportLayoutGroupBy);

Expand Down
4 changes: 2 additions & 2 deletions src/components/TransactionItemRow/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
import {isCategoryMissing} from '@libs/CategoryUtils';
import getBase62ReportID from '@libs/getBase62ReportID';
import {computeReportName} from '@libs/ReportNameUtils';
import {isExpenseReport, isSettled} from '@libs/ReportUtils';
import {isExpenseReport, isIOUReport, isSettled} from '@libs/ReportUtils';
import StringUtils from '@libs/StringUtils';
import {
getDescription,
Expand Down Expand Up @@ -685,7 +685,7 @@ function TransactionItemRow({
</View>
<View style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsStart]}>
<View style={[styles.flexColumn, styles.flex1]}>
{hasCategoryOrTag && (
{hasCategoryOrTag && !isIOUReport(report) && (
<View style={[styles.flexRow, styles.alignItemsCenter, styles.gap2, styles.mt2, styles.minHeight4]}>
<CategoryCell
transactionItem={transactionItem}
Expand Down
13 changes: 11 additions & 2 deletions src/libs/SearchUIUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ import {
isArchivedReport,
isClosedReport,
isInvoiceReport,
isIOUReport as isIOUReportReportUtil,
isMoneyRequestReport,
isOneTransactionReport,
isOpenExpenseReport,
Expand Down Expand Up @@ -1275,6 +1276,7 @@ function getTransactionsSections(
const fromAccountID = reportAction?.actorAccountID ?? report?.ownerAccountID;
const from = fromAccountID ? (personalDetailsMap.get(fromAccountID.toString()) ?? emptyPersonalDetails) : emptyPersonalDetails;
const to = getToFieldValueForTransaction(transactionItem, report, data.personalDetailsList, reportAction);
const isIOUReport = report?.type === CONST.REPORT.TYPE.IOU;

const {formattedFrom, formattedTo, formattedTotal, formattedMerchant, date, submitted, approved, posted} = getTransactionItemCommonFormattedProperties(
transactionItem,
Expand Down Expand Up @@ -1314,6 +1316,7 @@ function getTransactionsSections(
isAmountColumnWide: shouldShowAmountInWideColumn,
isTaxAmountColumnWide: shouldShowTaxAmountInWideColumn,
violations: transactionViolations,
category: isIOUReport ? '' : transactionItem?.category,
};

transactionsSections.push(transactionSection);
Expand Down Expand Up @@ -1820,6 +1823,7 @@ function getReportSections(
const actions = Object.values(reportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionItem.reportID}`] ?? {});
const from = reportAction?.actorAccountID ? (data.personalDetailsList?.[reportAction.actorAccountID] ?? emptyPersonalDetails) : emptyPersonalDetails;
const to = getToFieldValueForTransaction(transactionItem, report, data.personalDetailsList, reportAction);
const isIOUReport = report?.type === CONST.REPORT.TYPE.IOU;

const {formattedFrom, formattedTo, formattedTotal, formattedMerchant, date} = getTransactionItemCommonFormattedProperties(
transactionItem,
Expand Down Expand Up @@ -1857,6 +1861,7 @@ function getReportSections(
violations: transactionViolations,
isAmountColumnWide: shouldShowAmountInWideColumn,
isTaxAmountColumnWide: shouldShowTaxAmountInWideColumn,
category: isIOUReport ? '' : transactionItem?.category,
};
if (reportIDToTransactions[reportKey]?.transactions) {
reportIDToTransactions[reportKey].transactions.push(transaction);
Expand Down Expand Up @@ -3022,6 +3027,7 @@ function getColumnsToShow(
isExpenseReportView = false,
type?: SearchDataTypes,
groupBy?: SearchGroupBy,
isExpenseReportViewFromIOUReport = false,
): SearchColumnType[] {
if (type === CONST.SEARCH.DATA_TYPES.EXPENSE_REPORT) {
const defaultReportColumns: SearchColumnType[] = [
Expand Down Expand Up @@ -3222,12 +3228,12 @@ function getColumnsToShow(

const category = getCategory(transaction);
if (category !== '' && category !== CONST.SEARCH.CATEGORY_EMPTY_VALUE) {
columns[CONST.SEARCH.TABLE_COLUMNS.CATEGORY] = true;
columns[CONST.SEARCH.TABLE_COLUMNS.CATEGORY] = !isExpenseReportViewFromIOUReport;
}

const tag = getTag(transaction);
if (tag !== '' && tag !== CONST.SEARCH.TAG_EMPTY_VALUE) {
columns[CONST.SEARCH.TABLE_COLUMNS.TAG] = true;
columns[CONST.SEARCH.TABLE_COLUMNS.TAG] = !isExpenseReportViewFromIOUReport;
}

if (isExpenseReportView) {
Expand All @@ -3246,6 +3252,9 @@ function getColumnsToShow(
columns[CONST.SEARCH.TABLE_COLUMNS.FROM] = true;
}

columns[CONST.SEARCH.TABLE_COLUMNS.CATEGORY] = columns[CONST.SEARCH.TABLE_COLUMNS.CATEGORY] && !isIOUReportReportUtil(report);
columns[CONST.SEARCH.TABLE_COLUMNS.TAG] = columns[CONST.SEARCH.TABLE_COLUMNS.TAG] && !isIOUReportReportUtil(report);

// eslint-disable-next-line @typescript-eslint/no-deprecated
const toFieldValue = getToFieldValueForTransaction(transaction as SearchTransaction, report, data.personalDetailsList, reportAction);
if (toFieldValue.accountID && toFieldValue.accountID !== currentAccountID && !columns[CONST.SEARCH.TABLE_COLUMNS.TO]) {
Expand Down
Loading