From 93e33514d38ac72062a8acda5b0129626c79ad2b Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Tue, 3 Jun 2025 13:09:46 -0600 Subject: [PATCH 1/4] add receipt --- src/libs/SearchUIUtils.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts index b20217981453..e1706467b2f4 100644 --- a/src/libs/SearchUIUtils.ts +++ b/src/libs/SearchUIUtils.ts @@ -414,6 +414,7 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata transactionThreadReportID: transactionItem.transactionThreadReportID, isFromOneTransactionReport: transactionItem.isFromOneTransactionReport, tag: transactionItem.tag, + receipt: transactionItem.receipt, }; transactionsSections.push(transactionSection); From 20dc931e10c7d6cf3a4fa96c39cbdd4da702d2cf Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Tue, 3 Jun 2025 13:17:49 -0600 Subject: [PATCH 2/4] add missing transaction keys --- src/libs/SearchUIUtils.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts index e1706467b2f4..62902df71b34 100644 --- a/src/libs/SearchUIUtils.ts +++ b/src/libs/SearchUIUtils.ts @@ -415,6 +415,15 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata isFromOneTransactionReport: transactionItem.isFromOneTransactionReport, tag: transactionItem.tag, receipt: transactionItem.receipt, + taxAmount: transactionItem.taxAmount, + description: transactionItem.description, + mccGroup: transactionItem.mccGroup, + modifiedMCCGroup: transactionItem.modifiedMCCGroup, + moneyRequestReportActionID: transactionItem.moneyRequestReportActionID, + pendingAction: transactionItem.pendingAction, + errors: transactionItem.errors, + isActionLoading: transactionItem.isActionLoading, + hasViolation: transactionItem.hasViolation, }; transactionsSections.push(transactionSection); From 04366d4f89cec21fd3fa24d73764d184965e2640 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Tue, 3 Jun 2025 13:41:05 -0600 Subject: [PATCH 3/4] update tests --- src/libs/SearchUIUtils.ts | 2 +- tests/unit/Search/SearchUIUtilsTest.ts | 92 ++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 1 deletion(-) diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts index 62902df71b34..17e8114a98a4 100644 --- a/src/libs/SearchUIUtils.ts +++ b/src/libs/SearchUIUtils.ts @@ -371,7 +371,7 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata const to = transactionItem.managerID && !shouldShowBlankTo ? (personalDetailsMap.get(transactionItem.managerID.toString()) ?? emptyPersonalDetails) : emptyPersonalDetails; const {formattedFrom, formattedTo, formattedTotal, formattedMerchant, date} = getTransactionItemCommonFormattedProperties(transactionItem, from, to, policy); - + console.log('over here', transactionItem); const transactionSection: TransactionListItemType = { action: getAction(data, key), from, diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts index 397948a33aed..f0c1a2325f0a 100644 --- a/tests/unit/Search/SearchUIUtilsTest.ts +++ b/tests/unit/Search/SearchUIUtilsTest.ts @@ -239,6 +239,14 @@ const searchResults: OnyxTypes.SearchResults = { transactionID, transactionThreadReportID: '456', transactionType: 'cash', + receipt: undefined, + taxAmount: undefined, + mccGroup: undefined, + modifiedMCCGroup: undefined, + moneyRequestReportActionID: undefined, + pendingAction: undefined, + errors: undefined, + isActionLoading: false, }, [`transactions_${transactionID2}`]: { accountID: adminAccountID, @@ -271,6 +279,14 @@ const searchResults: OnyxTypes.SearchResults = { transactionID: transactionID2, transactionThreadReportID: '456', transactionType: 'cash', + receipt: undefined, + taxAmount: undefined, + mccGroup: undefined, + modifiedMCCGroup: undefined, + moneyRequestReportActionID: undefined, + pendingAction: undefined, + errors: undefined, + isActionLoading: false, }, [`transactionViolations_${transactionID2}`]: [ { @@ -307,6 +323,16 @@ const searchResults: OnyxTypes.SearchResults = { transactionID: transactionID3, transactionThreadReportID: '8287398995021380', transactionType: 'cash', + receipt: undefined, + taxAmount: undefined, + description: '', + mccGroup: undefined, + modifiedMCCGroup: undefined, + moneyRequestReportActionID: undefined, + pendingAction: undefined, + errors: undefined, + isActionLoading: false, + hasViolation: undefined, }, [`transactions_${transactionID4}`]: { accountID: adminAccountID, @@ -337,6 +363,16 @@ const searchResults: OnyxTypes.SearchResults = { transactionID: transactionID3, transactionThreadReportID: '1014872441234902', transactionType: 'cash', + description: '', + receipt: undefined, + taxAmount: undefined, + mccGroup: undefined, + modifiedMCCGroup: undefined, + moneyRequestReportActionID: undefined, + pendingAction: undefined, + errors: undefined, + isActionLoading: false, + hasViolation: undefined, }, }, search: { @@ -438,6 +474,16 @@ const transactionsListItems = [ transactionID: '1', transactionThreadReportID: '456', transactionType: 'cash', + receipt: undefined, + taxAmount: undefined, + description: '', + mccGroup: undefined, + modifiedMCCGroup: undefined, + moneyRequestReportActionID: undefined, + pendingAction: undefined, + errors: undefined, + isActionLoading: false, + hasViolation: false, }, { accountID: 18439984, @@ -489,6 +535,16 @@ const transactionsListItems = [ transactionID: '2', transactionThreadReportID: '456', transactionType: 'cash', + receipt: undefined, + taxAmount: undefined, + description: '', + mccGroup: undefined, + modifiedMCCGroup: undefined, + moneyRequestReportActionID: undefined, + pendingAction: undefined, + errors: undefined, + isActionLoading: false, + hasViolation: true, }, { accountID: 18439984, @@ -540,6 +596,16 @@ const transactionsListItems = [ shouldShowTax: false, keyForList: '3', shouldShowYear: true, + receipt: undefined, + taxAmount: undefined, + description: '', + mccGroup: undefined, + modifiedMCCGroup: undefined, + moneyRequestReportActionID: undefined, + pendingAction: undefined, + errors: undefined, + isActionLoading: false, + hasViolation: undefined, }, { accountID: 18439984, @@ -591,6 +657,16 @@ const transactionsListItems = [ shouldShowTax: false, keyForList: '3', shouldShowYear: true, + receipt: undefined, + taxAmount: undefined, + description: '', + mccGroup: undefined, + modifiedMCCGroup: undefined, + moneyRequestReportActionID: undefined, + pendingAction: undefined, + errors: undefined, + isActionLoading: false, + hasViolation: undefined, }, ] as TransactionListItemType[]; @@ -679,6 +755,14 @@ const reportsListItems = [ transactionID: '1', transactionThreadReportID: '456', transactionType: 'cash', + receipt: undefined, + taxAmount: undefined, + mccGroup: undefined, + modifiedMCCGroup: undefined, + moneyRequestReportActionID: undefined, + pendingAction: undefined, + errors: undefined, + isActionLoading: false, }, ], type: 'expense', @@ -768,6 +852,14 @@ const reportsListItems = [ transactionID: '2', transactionThreadReportID: '456', transactionType: 'cash', + receipt: undefined, + taxAmount: undefined, + mccGroup: undefined, + modifiedMCCGroup: undefined, + moneyRequestReportActionID: undefined, + pendingAction: undefined, + errors: undefined, + isActionLoading: false, }, ], type: 'expense', From 6c6d4a3e35b8eab5fdee4543b06127a22147dc44 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Tue, 3 Jun 2025 13:41:21 -0600 Subject: [PATCH 4/4] rm log --- src/libs/SearchUIUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts index 17e8114a98a4..62902df71b34 100644 --- a/src/libs/SearchUIUtils.ts +++ b/src/libs/SearchUIUtils.ts @@ -371,7 +371,7 @@ function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata const to = transactionItem.managerID && !shouldShowBlankTo ? (personalDetailsMap.get(transactionItem.managerID.toString()) ?? emptyPersonalDetails) : emptyPersonalDetails; const {formattedFrom, formattedTo, formattedTotal, formattedMerchant, date} = getTransactionItemCommonFormattedProperties(transactionItem, from, to, policy); - console.log('over here', transactionItem); + const transactionSection: TransactionListItemType = { action: getAction(data, key), from,