From 68d5b5017ac0a612cac4712e996e0f91297d7c8a Mon Sep 17 00:00:00 2001 From: Burhan-Rashid Date: Tue, 4 Nov 2025 12:15:04 +0530 Subject: [PATCH] remove policyID from searchTransaction and use policyID of report instead of that --- src/components/Search/index.tsx | 6 +++--- src/components/Search/types.ts | 2 +- src/types/onyx/SearchResults.ts | 3 --- tests/unit/Search/SearchUIUtilsTest.ts | 16 ++-------------- 4 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx index 9db4efbf345e..7aebcdd1a557 100644 --- a/src/components/Search/index.tsx +++ b/src/components/Search/index.tsx @@ -113,7 +113,7 @@ function mapTransactionItemToSelectedEntry(item: TransactionListItemType, outsta action: item.action, convertedCurrency: item.convertedCurrency, reportID: item.reportID, - policyID: item.policyID, + policyID: item.report?.policyID, amount: item.modifiedAmount ?? item.amount, convertedAmount: item.convertedAmount, currency: item.currency, @@ -471,7 +471,7 @@ function Search({ isSelected: areAllMatchingItemsSelected || selectedTransactions[transactionItem.transactionID].isSelected, canDelete: transactionItem.canDelete, reportID: transactionItem.reportID, - policyID: transactionItem.policyID, + policyID: transactionItem.report?.policyID, amount: transactionItem.modifiedAmount ?? transactionItem.amount, convertedAmount: transactionItem.convertedAmount, convertedCurrency: transactionItem.convertedCurrency, @@ -508,7 +508,7 @@ function Search({ isSelected: areAllMatchingItemsSelected || selectedTransactions[transactionItem.transactionID].isSelected, canDelete: transactionItem.canDelete, reportID: transactionItem.reportID, - policyID: transactionItem.policyID, + policyID: transactionItem.report?.policyID, amount: transactionItem.modifiedAmount ?? transactionItem.amount, convertedAmount: transactionItem.convertedAmount, convertedCurrency: transactionItem.convertedCurrency, diff --git a/src/components/Search/types.ts b/src/components/Search/types.ts index 95bf13722c3e..feabcad37fff 100644 --- a/src/components/Search/types.ts +++ b/src/components/Search/types.ts @@ -33,7 +33,7 @@ type SelectedTransactionInfo = { reportID: string; /** The policyID tied to the report the transaction is reported on */ - policyID: string; + policyID: string | undefined; /** The transaction amount */ amount: number; diff --git a/src/types/onyx/SearchResults.ts b/src/types/onyx/SearchResults.ts index d8ceb87a1db0..64b6fa400d47 100644 --- a/src/types/onyx/SearchResults.ts +++ b/src/types/onyx/SearchResults.ts @@ -366,9 +366,6 @@ type SearchTransaction = { /** The type of report the transaction is associated with */ reportType: string; - /** The ID of the policy the transaction is associated with */ - policyID: string; - /** The ID of the parent of the transaction */ parentTransactionID?: string; diff --git a/tests/unit/Search/SearchUIUtilsTest.ts b/tests/unit/Search/SearchUIUtilsTest.ts index 5027b2d3cac4..94d7e85ef76b 100644 --- a/tests/unit/Search/SearchUIUtilsTest.ts +++ b/tests/unit/Search/SearchUIUtilsTest.ts @@ -395,7 +395,6 @@ const searchResults: OnyxTypes.SearchResults = { modifiedMerchant: 'Expense', parentTransactionID: '', pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, - policyID, reportID, reportType: 'expense', tag: '', @@ -440,7 +439,6 @@ const searchResults: OnyxTypes.SearchResults = { modifiedCurrency: '', modifiedMerchant: 'Expense', parentTransactionID: '', - policyID, reportID: reportID2, reportType: 'expense', tag: '', @@ -485,7 +483,6 @@ const searchResults: OnyxTypes.SearchResults = { modifiedCurrency: '', modifiedMerchant: '', parentTransactionID: '', - policyID, reportID: reportID3, reportType: 'iou', tag: '', @@ -531,7 +528,6 @@ const searchResults: OnyxTypes.SearchResults = { modifiedCurrency: '', modifiedMerchant: '', parentTransactionID: '', - policyID, reportID: reportID3, reportType: 'iou', tag: '', @@ -833,7 +829,6 @@ const transactionsListItems = [ modifiedMerchant: 'Expense', parentTransactionID: '', pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, - policyID: 'A1B2C3', reportID: '123456789', reportType: 'expense', shouldShowMerchant: true, @@ -902,7 +897,6 @@ const transactionsListItems = [ modifiedCurrency: '', modifiedMerchant: 'Expense', parentTransactionID: '', - policyID: 'A1B2C3', reportID: '11111', reportType: 'expense', shouldShowMerchant: true, @@ -965,7 +959,6 @@ const transactionsListItems = [ modifiedCurrency: '', modifiedMerchant: '', parentTransactionID: '', - policyID: 'A1B2C3', reportID: '99999', reportType: 'iou', tag: '', @@ -1035,7 +1028,6 @@ const transactionsListItems = [ modifiedCurrency: '', modifiedMerchant: '', parentTransactionID: '', - policyID: 'A1B2C3', reportID: '99999', reportType: 'iou', tag: '', @@ -1157,7 +1149,6 @@ const transactionReportGroupListItems = [ modifiedMerchant: 'Expense', parentTransactionID: '', pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, - policyID: 'A1B2C3', reportID: '123456789', reportType: 'expense', shouldShowMerchant: true, @@ -1270,7 +1261,6 @@ const transactionReportGroupListItems = [ modifiedCurrency: '', modifiedMerchant: 'Expense', parentTransactionID: '', - policyID: 'A1B2C3', reportID: '11111', reportType: 'expense', shouldShowMerchant: true, @@ -1861,7 +1851,7 @@ describe('SearchUIUtils', () => { expect(distanceTransaction).toBeDefined(); expect(distanceTransaction?.iouRequestType).toBe(CONST.IOU.REQUEST_TYPE.DISTANCE); - const expectedPropertyCount = 59; + const expectedPropertyCount = 58; expect(Object.keys(distanceTransaction ?? {}).length).toBe(expectedPropertyCount); }); @@ -1889,7 +1879,7 @@ describe('SearchUIUtils', () => { expect(distanceTransaction).toBeDefined(); expect(distanceTransaction?.iouRequestType).toBe(CONST.IOU.REQUEST_TYPE.DISTANCE); - const expectedPropertyCount = 59; + const expectedPropertyCount = 58; expect(Object.keys(distanceTransaction ?? {}).length).toBe(expectedPropertyCount); }); @@ -2422,7 +2412,6 @@ describe('SearchUIUtils', () => { modifiedCurrency: 'USD', modifiedMerchant: 'Costco Wholesale', parentTransactionID: '', - policyID: '137DA25D273F2423', receipt: { source: 'https://www.expensify.com/receipts/fake.jpg', state: CONST.IOU.RECEIPT_STATE.SCAN_COMPLETE, @@ -2560,7 +2549,6 @@ describe('SearchUIUtils', () => { modifiedCurrency: 'USD', modifiedMerchant: 'Costco Wholesale', parentTransactionID: '', - policyID: '137DA25D273F2423', receipt: { source: 'https://www.expensify.com/receipts/fake.jpg', state: CONST.IOU.RECEIPT_STATE.SCAN_COMPLETE,