From 2a9f657d45e5fcb224c1408f7f17a7640cd294df Mon Sep 17 00:00:00 2001 From: mkzie2 Date: Fri, 29 Aug 2025 10:17:45 +0800 Subject: [PATCH] fix: approach --- src/libs/SearchUIUtils.ts | 1 + src/types/onyx/SearchResults.ts | 4 ++ tests/unit/Search/SearchUIUtilsTest.ts | 63 +++++++++++++++++++++++++- 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts index 3e150730bc26..a4841d8e14ae 100644 --- a/src/libs/SearchUIUtils.ts +++ b/src/libs/SearchUIUtils.ts @@ -913,6 +913,7 @@ function getTransactionsSections( const allActions = getActions(data, allViolations, key, currentSearch, currentAccountID); const transactionSection: TransactionListItemType = { + iouRequestType: transactionItem.iouRequestType, action: allActions.at(0) ?? CONST.SEARCH.ACTION_TYPES.VIEW, allActions, report, diff --git a/src/types/onyx/SearchResults.ts b/src/types/onyx/SearchResults.ts index 6e848b757926..e814d2fbe269 100644 --- a/src/types/onyx/SearchResults.ts +++ b/src/types/onyx/SearchResults.ts @@ -4,6 +4,7 @@ import type ChatListItem from '@components/SelectionList/ChatListItem'; import type TransactionGroupListItem from '@components/SelectionList/Search/TransactionGroupListItem'; import type TransactionListItem from '@components/SelectionList/Search/TransactionListItem'; import type {ReportActionListItemType, TaskListItemType, TransactionGroupListItemType, TransactionListItemType} from '@components/SelectionList/types'; +import type {IOURequestType} from '@libs/actions/IOU'; import type CONST from '@src/CONST'; import type ONYXKEYS from '@src/ONYXKEYS'; import type {BankName} from './Bank'; @@ -380,6 +381,9 @@ type SearchTransaction = { /** The transaction recipient ID */ managerID: number; + /** Used during the creation flow before the transaction is saved to the server */ + iouRequestType?: IOURequestType; + /** If the transaction has violations */ hasViolation?: boolean; diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts index 3d38fbc69eda..135970c662c6 100644 --- a/tests/unit/Search/SearchUIUtilsTest.ts +++ b/tests/unit/Search/SearchUIUtilsTest.ts @@ -5,6 +5,7 @@ import TransactionListItem from '@components/SelectionList/Search/TransactionLis import type { ReportActionListItemType, TransactionCardGroupListItemType, + TransactionGroupListItemType, TransactionListItemType, TransactionMemberGroupListItemType, TransactionReportGroupListItemType, @@ -1633,7 +1634,67 @@ describe('SearchUIUtils', () => { }); it('should return getTransactionsSections result when groupBy is undefined', () => { - expect(SearchUIUtils.getSections(CONST.SEARCH.DATA_TYPES.EXPENSE, searchResults.data, 2074551, formatPhoneNumber)).toStrictEqual(transactionsListItems); + expect(SearchUIUtils.getSections(CONST.SEARCH.DATA_TYPES.EXPENSE, searchResults.data, 2074551, formatPhoneNumber)).toEqual(transactionsListItems); + }); + + it('should include iouRequestType property for distance transactions', () => { + const distanceTransactionID = 'distance_transaction_123'; + const testSearchResults = { + ...searchResults, + data: { + ...searchResults.data, + [`transactions_${distanceTransactionID}`]: { + ...searchResults.data[`transactions_${transactionID}`], + transactionID: distanceTransactionID, + transactionType: CONST.SEARCH.TRANSACTION_TYPE.DISTANCE, + iouRequestType: CONST.IOU.REQUEST_TYPE.DISTANCE, + }, + }, + }; + + const result = SearchUIUtils.getSections(CONST.SEARCH.DATA_TYPES.EXPENSE, testSearchResults.data, 2074551, formatPhoneNumber) as TransactionListItemType[]; + + const distanceTransaction = result.find((item) => item.transactionID === distanceTransactionID); + + expect(distanceTransaction).toBeDefined(); + expect(distanceTransaction?.iouRequestType).toBe(CONST.IOU.REQUEST_TYPE.DISTANCE); + + const expectedPropertyCount = 55; + expect(Object.keys(distanceTransaction ?? {}).length).toBe(expectedPropertyCount); + }); + + it('should include iouRequestType property for distance transactions in grouped results', () => { + const distanceTransactionID = 'distance_transaction_grouped_123'; + const testSearchResults = { + ...searchResults, + data: { + ...searchResults.data, + [`transactions_${distanceTransactionID}`]: { + ...searchResults.data[`transactions_${transactionID}`], + transactionID: distanceTransactionID, + transactionType: CONST.SEARCH.TRANSACTION_TYPE.DISTANCE, + iouRequestType: CONST.IOU.REQUEST_TYPE.DISTANCE, + }, + }, + }; + + const result = SearchUIUtils.getSections( + CONST.SEARCH.DATA_TYPES.EXPENSE, + testSearchResults.data, + 2074551, + formatPhoneNumber, + CONST.SEARCH.GROUP_BY.REPORTS, + ) as TransactionGroupListItemType[]; + + const reportGroup = result.find((group) => group.transactions?.some((transaction) => transaction.transactionID === distanceTransactionID)); + + const distanceTransaction = reportGroup?.transactions?.find((transaction) => transaction.transactionID === distanceTransactionID); + + expect(distanceTransaction).toBeDefined(); + expect(distanceTransaction?.iouRequestType).toBe(CONST.IOU.REQUEST_TYPE.DISTANCE); + + const expectedPropertyCount = 55; + expect(Object.keys(distanceTransaction ?? {}).length).toBe(expectedPropertyCount); }); it('should return getReportSections result when type is EXPENSE and groupBy is report', () => {