rm types

Author: luacmartins

src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx

@@ -9,14 +9,14 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
-import type {SearchAccountDetails, SearchTransactionAction} from '@src/types/onyx/SearchResults';
+import type {SearchPersonalDetails, SearchTransactionAction} from '@src/types/onyx/SearchResults';
 import ActionCell from './ActionCell';
 import UserInfoCell from './UserInfoCell';
 
 type ExpenseItemHeaderNarrowProps = {
     text?: string;
-    participantFrom: SearchAccountDetails;
-    participantTo: SearchAccountDetails;
+    participantFrom: SearchPersonalDetails;
+    participantTo: SearchPersonalDetails;
     participantFromDisplayName: string;
     participantToDisplayName: string;
     action?: SearchTransactionAction;

src/components/SelectionList/Search/UserInfoCell.tsx

@@ -5,10 +5,10 @@ import Text from '@components/Text';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import CONST from '@src/CONST';
-import type {SearchAccountDetails} from '@src/types/onyx/SearchResults';
+import type {SearchPersonalDetails} from '@src/types/onyx/SearchResults';
 
 type UserInfoCellProps = {
-    participant: SearchAccountDetails;
+    participant: SearchPersonalDetails;
     displayName: string;
 };
 

src/components/SelectionList/types.ts

@@ -5,7 +5,7 @@ import type {BrickRoad} from '@libs/WorkspacesSettingsUtils';
 import type CursorStyles from '@styles/utils/cursor/types';
 import type CONST from '@src/CONST';
 import type {Errors, Icon, PendingAction} from '@src/types/onyx/OnyxCommon';
-import type {SearchAccountDetails, SearchReport, SearchTransaction} from '@src/types/onyx/SearchResults';
+import type {SearchPersonalDetails, SearchReport, SearchTransaction} from '@src/types/onyx/SearchResults';
 import type {ReceiptErrors} from '@src/types/onyx/Transaction';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
 import type IconAsset from '@src/types/utils/IconAsset';
@@ -156,10 +156,10 @@ type ListItem = {
 type TransactionListItemType = ListItem &
     SearchTransaction & {
         /** The personal details of the user requesting money */
-        from: SearchAccountDetails;
+        from: SearchPersonalDetails;
 
         /** The personal details of the user paying the request */
-        to: SearchAccountDetails;
+        to: SearchPersonalDetails;
 
         /** final and formatted "from" value used for displaying and sorting */
         formattedFrom: string;
@@ -200,10 +200,10 @@ type TransactionListItemType = ListItem &
 type ReportListItemType = ListItem &
     SearchReport & {
         /** The personal details of the user requesting money */
-        from: SearchAccountDetails;
+        from: SearchPersonalDetails;
 
         /** The personal details of the user paying the request */
-        to: SearchAccountDetails;
+        to: SearchPersonalDetails;
 
         transactions: TransactionListItemType[];
     };

src/libs/SearchUtils.ts

@@ -11,7 +11,7 @@ import type {SearchAdvancedFiltersForm} from '@src/types/form';
 import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
 import type * as OnyxTypes from '@src/types/onyx';
 import type SearchResults from '@src/types/onyx/SearchResults';
-import type {ListItemDataType, ListItemType, SearchAccountDetails, SearchDataTypes, SearchPersonalDetails, SearchTransaction} from '@src/types/onyx/SearchResults';
+import type {ListItemDataType, ListItemType, SearchDataTypes, SearchPersonalDetails, SearchTransaction} from '@src/types/onyx/SearchResults';
 import DateUtils from './DateUtils';
 import navigationRef from './Navigation/navigationRef';
 import type {AuthScreensParamList, BottomTabNavigatorParamList, RootStackParamList, State} from './Navigation/types';
@@ -54,12 +54,12 @@ const operatorToSignMap = {
 function getTransactionItemCommonFormattedProperties(
     transactionItem: SearchTransaction,
     from: SearchPersonalDetails,
-    to: SearchAccountDetails,
+    to: SearchPersonalDetails,
 ): Pick<TransactionListItemType, 'formattedFrom' | 'formattedTo' | 'formattedTotal' | 'formattedMerchant' | 'date'> {
     const isExpenseReport = transactionItem.reportType === CONST.REPORT.TYPE.EXPENSE;
 
     const formattedFrom = from?.displayName ?? from?.login ?? '';
-    const formattedTo = to?.name ?? to?.displayName ?? to?.login ?? '';
+    const formattedTo = to?.displayName ?? to?.login ?? '';
     const formattedTotal = TransactionUtils.getAmount(transactionItem, isExpenseReport);
     const date = transactionItem?.modifiedCreated ? transactionItem.modifiedCreated : transactionItem?.created;
     const merchant = TransactionUtils.getMerchant(transactionItem);
@@ -181,17 +181,12 @@ function getReportSections(data: OnyxTypes.SearchResults['data'], metadata: Onyx
             const reportItem = {...data[key]};
             const reportKey = `${ONYXKEYS.COLLECTION.REPORT}${reportItem.reportID}`;
             const transactions = reportIDToTransactions[reportKey]?.transactions ?? [];
-            const isExpenseReport = reportItem.type === CONST.REPORT.TYPE.EXPENSE;
-
-            const to = isExpenseReport
-                ? (data[`${ONYXKEYS.COLLECTION.POLICY}${reportItem.policyID}`] as SearchAccountDetails)
-                : (data.personalDetailsList?.[reportItem.managerID] as SearchAccountDetails);
 
             reportIDToTransactions[reportKey] = {
                 ...reportItem,
                 keyForList: reportItem.reportID,
                 from: data.personalDetailsList?.[reportItem.accountID],
-                to,
+                to: data.personalDetailsList?.[reportItem.managerID],
                 transactions,
             };
         } else if (key.startsWith(ONYXKEYS.COLLECTION.TRANSACTION)) {

src/types/onyx/SearchResults.ts

@@ -66,18 +66,6 @@ type SearchPersonalDetails = {
     login?: string;
 };
 
-/** Model of policy details search result */
-type SearchPolicyDetails = {
-    /** ID of the policy */
-    id: string;
-
-    /** Policy avatar URL */
-    avatarURL: string;
-
-    /** Policy name */
-    name: string;
-};
-
 /** The action that can be performed for the transaction */
 type SearchTransactionAction = ValueOf<typeof CONST.SEARCH.ACTION_TYPES>;
 
@@ -225,9 +213,6 @@ type SearchTransaction = {
     isFromOneTransactionReport?: boolean;
 };
 
-/** Model of account details search result */
-type SearchAccountDetails = Partial<SearchPolicyDetails & SearchPersonalDetails>;
-
 /** Types of searchable transactions */
 type SearchTransactionType = ValueOf<typeof CONST.SEARCH.TRANSACTION_TYPE>;
 
@@ -237,24 +222,12 @@ type SearchResults = {
     search: SearchResultsInfo;
 
     /** Search results data */
-    data: Record<string, SearchTransaction & Record<string, SearchPersonalDetails>> & Record<string, SearchPolicyDetails> & Record<string, SearchReport>;
+    data: Record<string, SearchTransaction & Record<string, SearchPersonalDetails>> & Record<string, SearchReport>;
 
     /** Whether search data is being fetched from server */
     isLoading?: boolean;
 };
 
 export default SearchResults;
 
-export type {
-    ListItemType,
-    ListItemDataType,
-    SearchTransaction,
-    SearchTransactionType,
-    SearchTransactionAction,
-    SearchPersonalDetails,
-    SearchPolicyDetails,
-    SearchAccountDetails,
-    SearchDataTypes,
-    SearchReport,
-    SectionsType,
-};
+export type {ListItemType, ListItemDataType, SearchTransaction, SearchTransactionType, SearchTransactionAction, SearchPersonalDetails, SearchDataTypes, SearchReport, SectionsType};