Skip to content

Commit b291973

Browse files
danieldoglasdanieldoglas
authored
Revert "[Part 6]: Remove usage of Onyx.connect for ONYXKEYS.COUNTRY_CODE"
1 parent 83602f3 commit b291973

16 files changed

Lines changed: 71 additions & 182 deletions

‎src/components/ReportActionAvatars/useReportActionAvatars.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import type {OnyxEntry} from 'react-native-onyx';
22
import type {ValueOf} from 'type-fest';
33
import {FallbackAvatar} from '@components/Icon/Expensicons';
4-
import useLocalize from '@hooks/useLocalize';
54
import useOnyx from '@hooks/useOnyx';
65
import usePolicy from '@hooks/usePolicy';
76
import useReportIsArchived from '@hooks/useReportIsArchived';
@@ -45,7 +44,6 @@ function useReportActionAvatars({
4544
const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
4645
canBeMissing: true,
4746
});
48-
const {formatPhoneNumber} = useLocalize();
4947

5048
const isReportAChatReport = report?.type === CONST.REPORT.TYPE.CHAT && report?.chatType !== CONST.REPORT.CHAT_TYPE.TRIP_ROOM;
5149

@@ -182,7 +180,8 @@ function useReportActionAvatars({
182180
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
183181
const accountID = reportPreviewSenderID || (actorAccountID ?? CONST.DEFAULT_NUMBER_ID);
184182
const {avatar, fallbackIcon, login} = personalDetails?.[delegatePersonalDetails ? delegatePersonalDetails.accountID : accountID] ?? {};
185-
const defaultDisplayName = getDisplayNameForParticipant({formatPhoneNumber, accountID, personalDetailsData: personalDetails}) ?? '';
183+
184+
const defaultDisplayName = getDisplayNameForParticipant({accountID, personalDetailsData: personalDetails}) ?? '';
186185
const invoiceReport = [iouReport, chatReport, reportChatReport].find((susReport) => isInvoiceReport(susReport) || susReport?.chatType === CONST.REPORT.TYPE.INVOICE);
187186
const isNestedInInvoiceReport = !!invoiceReport;
188187
const isWorkspaceActor = isAInvoiceReport || (isAWorkspaceChat && (!actorAccountID || displayAllActors));

‎src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ function MoneyRequestReportPreviewContent({
120120
const theme = useTheme();
121121
const styles = useThemeStyles();
122122
const StyleUtils = useStyleUtils();
123-
const {translate, formatPhoneNumber} = useLocalize();
123+
const {translate} = useLocalize();
124124
const {isOffline} = useNetwork();
125125
const {shouldUseNarrowLayout} = useResponsiveLayout();
126126

@@ -249,7 +249,7 @@ function MoneyRequestReportPreviewContent({
249249
} else if (isInvoiceRoom) {
250250
payerOrApproverName = getInvoicePayerName(chatReport, invoiceReceiverPolicy, invoiceReceiverPersonalDetail);
251251
} else {
252-
payerOrApproverName = getDisplayNameForParticipant({accountID: managerID, shouldUseShortForm: true, formatPhoneNumber});
252+
payerOrApproverName = getDisplayNameForParticipant({accountID: managerID, shouldUseShortForm: true});
253253
}
254254

255255
if (isApproved) {
@@ -260,7 +260,7 @@ function MoneyRequestReportPreviewContent({
260260
paymentVerb = 'iou.payerPaid';
261261
} else if (hasNonReimbursableTransactions) {
262262
paymentVerb = 'iou.payerSpent';
263-
payerOrApproverName = getDisplayNameForParticipant({accountID: chatReport?.ownerAccountID, shouldUseShortForm: true, formatPhoneNumber});
263+
payerOrApproverName = getDisplayNameForParticipant({accountID: chatReport?.ownerAccountID, shouldUseShortForm: true});
264264
}
265265
return translate(paymentVerb, {payer: payerOrApproverName});
266266
}, [
@@ -282,7 +282,6 @@ function MoneyRequestReportPreviewContent({
282282
invoiceReceiverPolicy,
283283
invoiceReceiverPersonalDetail,
284284
managerID,
285-
formatPhoneNumber,
286285
]);
287286

288287
/*

‎src/components/ReportActionItem/TaskView.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ type TaskViewProps = {
4444
};
4545

4646
function TaskView({report, parentReport, action}: TaskViewProps) {
47-
const {translate, localeCompare, formatPhoneNumber} = useLocalize();
47+
const {translate, localeCompare} = useLocalize();
4848
const styles = useThemeStyles();
4949
const StyleUtils = useStyleUtils();
5050
const currentUserPersonalDetails = useCurrentUserPersonalDetails();
@@ -178,7 +178,7 @@ function TaskView({report, parentReport, action}: TaskViewProps) {
178178
{report?.managerID ? (
179179
<MenuItem
180180
label={translate('task.assignee')}
181-
title={getDisplayNameForParticipant({formatPhoneNumber, accountID: report.managerID})}
181+
title={getDisplayNameForParticipant({accountID: report.managerID})}
182182
iconAccountID={report.managerID}
183183
iconType={CONST.ICON_TYPE_AVATAR}
184184
avatarSize={CONST.AVATAR_SIZE.SMALLER}

‎src/components/Search/SearchFiltersParticipantsSelector.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ type SearchFiltersParticipantsSelectorProps = {
3939
};
4040

4141
function SearchFiltersParticipantsSelector({initialAccountIDs, onFiltersUpdate}: SearchFiltersParticipantsSelectorProps) {
42-
const {translate, formatPhoneNumber} = useLocalize();
42+
const {translate} = useLocalize();
4343
const personalDetails = usePersonalDetails();
4444
const {didScreenTransitionEnd} = useScreenWrapperTransitionStatus();
4545
const {options, areOptionsInitialized} = useOptionsList({
@@ -118,7 +118,6 @@ function SearchFiltersParticipantsSelector({initialAccountIDs, onFiltersUpdate}:
118118
// If the current user is not selected, add them to the top of the list
119119
if (!selectedCurrentUser && chatOptions.currentUserOption) {
120120
const formattedName = getDisplayNameForParticipant({
121-
formatPhoneNumber,
122121
accountID: chatOptions.currentUserOption.accountID,
123122
shouldAddCurrentUserPostfix: true,
124123
personalDetailsData: personalDetails,
@@ -153,7 +152,7 @@ function SearchFiltersParticipantsSelector({initialAccountIDs, onFiltersUpdate}:
153152
sections: newSections,
154153
headerMessage: message,
155154
};
156-
}, [areOptionsInitialized, cleanSearchTerm, selectedOptions, chatOptions, personalDetails, reportAttributesDerived, translate, formatPhoneNumber]);
155+
}, [areOptionsInitialized, cleanSearchTerm, selectedOptions, chatOptions, personalDetails, reportAttributesDerived, translate]);
157156

158157
const resetChanges = useCallback(() => {
159158
setSelectedOptions([]);

‎src/components/SelectionList/Search/UserSelectionListItem.tsx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import BaseListItem from '@components/SelectionList/BaseListItem';
99
import type {ListItem, UserSelectionListItemProps} from '@components/SelectionList/types';
1010
import TextWithTooltip from '@components/TextWithTooltip';
1111
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
12-
import useLocalize from '@hooks/useLocalize';
1312
import useStyleUtils from '@hooks/useStyleUtils';
1413
import useTheme from '@hooks/useTheme';
1514
import useThemeStyles from '@hooks/useThemeStyles';
@@ -37,7 +36,7 @@ function UserSelectionListItem<TItem extends ListItem>({
3736
const theme = useTheme();
3837
const StyleUtils = useStyleUtils();
3938
const currentUserPersonalDetails = useCurrentUserPersonalDetails();
40-
const {formatPhoneNumber} = useLocalize();
39+
4140
const handleCheckboxPress = useCallback(() => {
4241
if (onCheckboxPress) {
4342
onCheckboxPress(item);
@@ -60,10 +59,9 @@ function UserSelectionListItem<TItem extends ListItem>({
6059

6160
const userDisplayName = useMemo(() => {
6261
return getDisplayNameForParticipant({
63-
formatPhoneNumber,
6462
accountID: item.accountID ?? CONST.DEFAULT_NUMBER_ID,
6563
});
66-
}, [item.accountID, formatPhoneNumber]);
64+
}, [item.accountID]);
6765

6866
return (
6967
<BaseListItem

‎src/libs/NextStepUtils.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import type {Beta, Policy, Report, ReportNextStep, Transaction, TransactionViola
99
import type {Message} from '@src/types/onyx/ReportNextStep';
1010
import type DeepValueOf from '@src/types/utils/DeepValueOf';
1111
import EmailUtils from './EmailUtils';
12-
import {formatPhoneNumber} from './LocalePhoneNumber';
1312
import Permissions from './Permissions';
1413
import {getLoginsByAccountIDs, getPersonalDetailsByIDs} from './PersonalDetailsUtils';
1514
import {getApprovalWorkflow, getCorrectedAutoReportingFrequency, getReimburserAccountID} from './PolicyUtils';
@@ -98,7 +97,7 @@ function parseMessage(messages: Message[] | undefined) {
9897
function getNextApproverDisplayName(report: OnyxEntry<Report>, isUnapprove?: boolean) {
9998
const approverAccountID = getNextApproverAccountID(report, isUnapprove);
10099

101-
return getDisplayNameForParticipant({formatPhoneNumber, accountID: approverAccountID}) ?? getPersonalDetailsForAccountID(approverAccountID).login;
100+
return getDisplayNameForParticipant({accountID: approverAccountID}) ?? getPersonalDetailsForAccountID(approverAccountID).login;
102101
}
103102

104103
function buildOptimisticNextStepForPreventSelfApprovalsEnabled() {
@@ -217,9 +216,8 @@ function buildNextStep(
217216
(report.unheldNonReimbursableTotal !== 0 && report.unheldNonReimbursableTotal !== undefined));
218217
const {reimbursableSpend} = getMoneyRequestSpendBreakdown(report);
219218

220-
const ownerDisplayName = ownerPersonalDetails?.displayName ?? ownerPersonalDetails?.login ?? getDisplayNameForParticipant({formatPhoneNumber, accountID: ownerAccountID});
221-
const policyOwnerDisplayName =
222-
policyOwnerPersonalDetails?.displayName ?? policyOwnerPersonalDetails?.login ?? getDisplayNameForParticipant({formatPhoneNumber, accountID: policy.ownerAccountID});
219+
const ownerDisplayName = ownerPersonalDetails?.displayName ?? ownerPersonalDetails?.login ?? getDisplayNameForParticipant({accountID: ownerAccountID});
220+
const policyOwnerDisplayName = policyOwnerPersonalDetails?.displayName ?? policyOwnerPersonalDetails?.login ?? getDisplayNameForParticipant({accountID: policy.ownerAccountID});
223221
const nextApproverDisplayName = getNextApproverDisplayName(report, isUnapprove);
224222
const approverAccountID = getNextApproverAccountID(report, isUnapprove);
225223
const approvers = getLoginsByAccountIDs([approverAccountID ?? CONST.DEFAULT_NUMBER_ID]);
@@ -527,7 +525,7 @@ function buildNextStep(
527525
text: 'an admin',
528526
}
529527
: {
530-
text: getDisplayNameForParticipant({formatPhoneNumber, accountID: reimburserAccountID}),
528+
text: getDisplayNameForParticipant({accountID: reimburserAccountID}),
531529
type: 'strong',
532530
},
533531
{

‎src/libs/OptionsListUtils.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,11 +1004,11 @@ function createOption(
10041004
result.alternateText = showPersonalDetails && personalDetail?.login ? personalDetail.login : getAlternateText(result, {showChatPreviewLine, forcePolicyNamePreview});
10051005

10061006
reportName = showPersonalDetails
1007-
? getDisplayNameForParticipant({formatPhoneNumber, accountID: accountIDs.at(0)}) || formatPhoneNumber(personalDetail?.login ?? '')
1007+
? getDisplayNameForParticipant({accountID: accountIDs.at(0)}) || formatPhoneNumber(personalDetail?.login ?? '')
10081008
: getReportName(report, undefined, undefined, undefined, undefined, undefined, transactions);
10091009
} else {
10101010
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
1011-
reportName = getDisplayNameForParticipant({formatPhoneNumber, accountID: accountIDs.at(0)}) || formatPhoneNumber(personalDetail?.login ?? '');
1011+
reportName = getDisplayNameForParticipant({accountID: accountIDs.at(0)}) || formatPhoneNumber(personalDetail?.login ?? '');
10121012
result.keyForList = String(accountIDs.at(0));
10131013

10141014
result.alternateText = formatPhoneNumber(personalDetails?.[accountIDs[0]]?.login ?? '');

0 commit comments

Comments
 (0)