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
1 change: 1 addition & 0 deletions src/libs/SearchUIUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -938,6 +938,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,
Expand Down
4 changes: 4 additions & 0 deletions src/types/onyx/SearchResults.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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;

Expand Down
63 changes: 62 additions & 1 deletion tests/unit/Search/SearchUIUtilsTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import TransactionListItem from '@components/SelectionList/Search/TransactionLis
import type {
ReportActionListItemType,
TransactionCardGroupListItemType,
TransactionGroupListItemType,
TransactionListItemType,
TransactionMemberGroupListItemType,
TransactionReportGroupListItemType,
Expand Down Expand Up @@ -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', () => {
Expand Down