Skip to content

remove policyID from searchTransaction and use policyID of report instead of that #74158

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
luacmartins merged 1 commit into from
Nov 5, 2025
Merged

remove policyID from searchTransaction and use policyID of report instead of that #74158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/Search/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/components/Search/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions src/types/onyx/SearchResults.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
16 changes: 2 additions & 14 deletions tests/unit/Search/SearchUIUtilsTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,6 @@ const searchResults: OnyxTypes.SearchResults = {
modifiedMerchant: 'Expense',
parentTransactionID: '',
pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
policyID,
reportID,
reportType: 'expense',
tag: '',
Expand Down Expand Up @@ -440,7 +439,6 @@ const searchResults: OnyxTypes.SearchResults = {
modifiedCurrency: '',
modifiedMerchant: 'Expense',
parentTransactionID: '',
policyID,
reportID: reportID2,
reportType: 'expense',
tag: '',
Expand Down Expand Up @@ -485,7 +483,6 @@ const searchResults: OnyxTypes.SearchResults = {
modifiedCurrency: '',
modifiedMerchant: '',
parentTransactionID: '',
policyID,
reportID: reportID3,
reportType: 'iou',
tag: '',
Expand Down Expand Up @@ -531,7 +528,6 @@ const searchResults: OnyxTypes.SearchResults = {
modifiedCurrency: '',
modifiedMerchant: '',
parentTransactionID: '',
policyID,
reportID: reportID3,
reportType: 'iou',
tag: '',
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -902,7 +897,6 @@ const transactionsListItems = [
modifiedCurrency: '',
modifiedMerchant: 'Expense',
parentTransactionID: '',
policyID: 'A1B2C3',
reportID: '11111',
reportType: 'expense',
shouldShowMerchant: true,
Expand Down Expand Up @@ -965,7 +959,6 @@ const transactionsListItems = [
modifiedCurrency: '',
modifiedMerchant: '',
parentTransactionID: '',
policyID: 'A1B2C3',
reportID: '99999',
reportType: 'iou',
tag: '',
Expand Down Expand Up @@ -1035,7 +1028,6 @@ const transactionsListItems = [
modifiedCurrency: '',
modifiedMerchant: '',
parentTransactionID: '',
policyID: 'A1B2C3',
reportID: '99999',
reportType: 'iou',
tag: '',
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -1270,7 +1261,6 @@ const transactionReportGroupListItems = [
modifiedCurrency: '',
modifiedMerchant: 'Expense',
parentTransactionID: '',
policyID: 'A1B2C3',
reportID: '11111',
reportType: 'expense',
shouldShowMerchant: true,
Expand Down Expand Up @@ -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);
});

Expand Down Expand Up @@ -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);
});

Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
Loading