[Part 13] Remove Onyx.connect from LocalePhoneNumber

src/libs/actions/IOU/Duplicate.ts

@@ -7,6 +7,7 @@ import {WRITE_COMMANDS} from '@libs/API/types';
 import DateUtils from '@libs/DateUtils';
 import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils';
 import {getExistingTransactionID} from '@libs/IOUUtils';
+import {formatPhoneNumber} from '@libs/LocalePhoneNumber';
 import * as NumberUtils from '@libs/NumberUtils';
 import Parser from '@libs/Parser';
 import {isInstantSubmitEnabled, isPolicyAccessible, isSubmitAndClose} from '@libs/PolicyUtils';
@@ -701,6 +702,7 @@ function createExpenseByType({
                 customUnitPolicyID,
                 personalDetails,
                 recentWaypoints,
+                formatPhoneNumber,
             };
             return createDistanceRequest(distanceParams);
         }

src/libs/actions/IOU/Split.ts

@@ -1,5 +1,7 @@
 import ReceiptGeneric from '@assets/images/receipt-generic.png';
 
+import type {LocaleContextProps} from '@components/LocaleContextProvider';
+
 import * as API from '@libs/API';
 import type {CompleteSplitBillParams, CreateDistanceRequestParams, SplitBillParams, StartSplitBillParams} from '@libs/API/parameters';
 import {WRITE_COMMANDS} from '@libs/API/types';
@@ -143,6 +145,7 @@ type CreateDistanceRequestInformation = {
     previousOdometerDraft?: OnyxEntry<OnyxTypes.OdometerDraft>;
     delegateAccountID: number | undefined;
     isTrackIntentUser: boolean | undefined;
+    formatPhoneNumber: LocaleContextProps['formatPhoneNumber'];
 };
 
 type CreateSplitsTransactionParams = Omit<BaseTransactionParams, 'customUnitRateID'> & {
@@ -168,6 +171,7 @@ type CreateSplitsAndOnyxDataParams = {
     participantsPolicyTags: Record<string, OnyxTypes.PolicyTagLists>;
     delegateAccountID: number | undefined;
     isTrackIntentUser: boolean | undefined;
+    formatPhoneNumber: LocaleContextProps['formatPhoneNumber'];
 };
 
 type StartSplitBilActionParams = {
@@ -243,6 +247,7 @@ type SplitBillActionsParams = {
     shouldDeferForSearch?: boolean;
     delegateAccountID: number | undefined;
     isTrackIntentUser: boolean | undefined;
+    formatPhoneNumber: LocaleContextProps['formatPhoneNumber'];
 };
 
 /**
@@ -280,6 +285,7 @@ function splitBill({
     shouldDeferForSearch = false,
     delegateAccountID,
     isTrackIntentUser,
+    formatPhoneNumber: formatPhoneNumberParam,
 }: SplitBillActionsParams) {
     const parsedComment = getParsedComment(comment);
     const {splitData, splits, onyxData} = createSplitsAndOnyxData({
@@ -315,6 +321,7 @@ function splitBill({
         participantsPolicyTags: buildParticipantsPolicyTags(participants),
         delegateAccountID,
         isTrackIntentUser,
+        formatPhoneNumber: formatPhoneNumberParam,
     });
 
     const parameters: SplitBillParams = {
@@ -394,6 +401,7 @@ function splitBillAndOpenReport({
     shouldDeferForSearch = false,
     delegateAccountID,
     isTrackIntentUser,
+    formatPhoneNumber: formatPhoneNumberParam,
 }: SplitBillActionsParams) {
     const parsedComment = getParsedComment(comment);
     const {splitData, splits, onyxData} = createSplitsAndOnyxData({
@@ -429,6 +437,7 @@ function splitBillAndOpenReport({
         participantsPolicyTags: buildParticipantsPolicyTags(participants),
         delegateAccountID,
         isTrackIntentUser,
+        formatPhoneNumber: formatPhoneNumberParam,
     });
 
     const parameters: SplitBillParams = {
@@ -1424,6 +1433,7 @@ function createSplitsAndOnyxData({
     participantsPolicyTags,
     delegateAccountID,
     isTrackIntentUser,
+    formatPhoneNumber: formatPhoneNumberParam,
 }: CreateSplitsAndOnyxDataParams): SplitsAndOnyxData {
     const currentUserEmailForIOUSplit = addSMSDomainIfPhoneNumber(currentUserLogin);
     const participantAccountIDs = participants.map((participant) => Number(participant.accountID));
@@ -1806,7 +1816,7 @@ function createSplitsAndOnyxData({
                       accountID,
                       // Disabling this line since participant.displayName can be an empty string
                       // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                      displayName: formatPhoneNumber(participant.displayName || email),
+                      displayName: formatPhoneNumberParam(participant.displayName || email),
                       login: participant.login,
                       isOptimisticPersonalDetail: true,
                   },
@@ -1958,6 +1968,7 @@ function createDistanceRequest(distanceRequestInformation: CreateDistanceRequest
         previousOdometerDraft,
         delegateAccountID,
         isTrackIntentUser,
+        formatPhoneNumber: formatPhoneNumberParam,
     } = distanceRequestInformation;
     const {policy, policyCategories, policyTagList, policyRecentlyUsedCategories, policyRecentlyUsedTags} = policyParams;
     const parsedComment = getParsedComment(transactionParams.comment);
@@ -2050,6 +2061,7 @@ function createDistanceRequest(distanceRequestInformation: CreateDistanceRequest
             participantsPolicyTags: buildParticipantsPolicyTags(participants),
             delegateAccountID,
             isTrackIntentUser,
+            formatPhoneNumber: formatPhoneNumberParam,
         });
         onyxData = splitOnyxData;
 

src/pages/iou/request/step/IOURequestStepDistance/handleMoneyRequestStepDistanceNavigation.ts

@@ -12,6 +12,7 @@ import {getCurrencySymbol} from '@libs/CurrencyUtils';
 import DistanceRequestUtils from '@libs/DistanceRequestUtils';
 import {calculateDefaultReimbursable, getExistingTransactionID, navigateToConfirmationPage, navigateToParticipantPage} from '@libs/IOUUtils';
 import {toLocaleDigit} from '@libs/LocaleDigitUtils';
+import {formatPhoneNumber} from '@libs/LocalePhoneNumber';
 import cleanupAfterSkipConfirmSubmit from '@libs/Navigation/helpers/cleanupAfterSkipConfirmSubmit';
 import {submitWithDismissFirst} from '@libs/Navigation/helpers/submitWithDismissFirst';
 import Navigation from '@libs/Navigation/Navigation';
@@ -404,6 +405,7 @@ function handleMoneyRequestStepDistanceNavigation({
                         },
                         isTrackIntentUser,
                         delegateAccountID,
+                        formatPhoneNumber,
                     });
                     cleanupAfterSkipConfirmSubmit(overrides.shouldHandleNavigation, {
                         report,

src/pages/iou/request/step/confirmation/useExpenseSubmission.ts

@@ -193,7 +193,7 @@ function useExpenseSubmission(params: UseExpenseSubmissionParams) {
     } = params;
 
     // Localization
-    const {translate, toLocaleDigit} = useLocalize();
+    const {translate, toLocaleDigit, formatPhoneNumber} = useLocalize();
     const delegateAccountID = useDelegateAccountID();
 
     // Permissions
@@ -797,6 +797,7 @@ function useExpenseSubmission(params: UseExpenseSubmissionParams) {
             previousOdometerDraft: odometerDraft,
             isTrackIntentUser,
             delegateAccountID,
+            formatPhoneNumber,
         });
 
         const isExpenseReport = isMoneyRequestReportReportUtils(report);
@@ -917,6 +918,7 @@ function useExpenseSubmission(params: UseExpenseSubmissionParams) {
                     shouldDeferForSearch: shouldDeferSplitForSearch,
                     delegateAccountID,
                     isTrackIntentUser,
+                    formatPhoneNumber,
                 });
             }
             markSubmitExpenseEnd();
@@ -956,6 +958,7 @@ function useExpenseSubmission(params: UseExpenseSubmissionParams) {
                     shouldDeferForSearch: shouldDeferSplitForSearch,
                     delegateAccountID,
                     isTrackIntentUser,
+                    formatPhoneNumber,
                 });
             }
             markSubmitExpenseEnd();

tests/actions/IOU/SplitReportTotalsTest.ts

@@ -27,6 +27,7 @@ import {getGlobalFetchMock} from '../../utils/TestHelper';
 import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
 
 const topMostReportID = '23423423';
+const mockFormatPhoneNumber = (phoneNumber: string) => phoneNumber;
 jest.mock('@src/libs/Navigation/Navigation', () => ({
     navigate: jest.fn(),
     dismissModal: jest.fn(),
@@ -507,6 +508,7 @@ describe('actions/IOU', () => {
             participantsPolicyTags: overrides.participantsPolicyTags ?? {},
             delegateAccountID: undefined,
             isTrackIntentUser: false,
+            formatPhoneNumber: mockFormatPhoneNumber,
         });
 
         it('returns valid splitData with chatReportID, transactionID, and reportActionID', () => {

tests/actions/IOUTest/SplitTest.ts

@@ -110,6 +110,7 @@ jest.mock('@libs/deferredLayoutWrite', () => ({
 jest.mock('@hooks/useCardFeedsForDisplay', () => jest.fn(() => ({defaultCardFeed: null, cardFeedsByPolicy: {}})));
 
 const unapprovedCashHash = 71801560;
+const mockFormatPhoneNumber = (phoneNumber: string) => phoneNumber;
 jest.mock('@src/libs/SearchQueryUtils', () => {
     const actual = jest.requireActual('@src/libs/SearchQueryUtils');
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return
@@ -414,6 +415,7 @@ describe('split expense', () => {
                         personalDetails: mockPersonalDetails,
                         delegateAccountID: undefined,
                         isTrackIntentUser: false,
+                        formatPhoneNumber: mockFormatPhoneNumber,
                     },
                 );
                 return waitForBatchedUpdates();
@@ -751,6 +753,7 @@ describe('split expense', () => {
             personalDetails: mockPersonalDetails,
             delegateAccountID: undefined,
             isTrackIntentUser: false,
+            formatPhoneNumber: mockFormatPhoneNumber,
         });
 
         await waitForBatchedUpdates();
@@ -802,6 +805,7 @@ describe('split expense', () => {
             personalDetails: mockPersonalDetails,
             delegateAccountID: undefined,
             isTrackIntentUser: false,
+            formatPhoneNumber: mockFormatPhoneNumber,
         });
 
         await waitForBatchedUpdates();
@@ -827,6 +831,7 @@ describe('split expense', () => {
             personalDetails: mockPersonalDetails,
             delegateAccountID: undefined,
             isTrackIntentUser: false,
+            formatPhoneNumber: mockFormatPhoneNumber,
         });
         await waitForBatchedUpdates();
 
@@ -859,6 +864,7 @@ describe('split expense', () => {
             personalDetails: mockPersonalDetails,
             delegateAccountID: undefined,
             isTrackIntentUser: false,
+            formatPhoneNumber: mockFormatPhoneNumber,
         });
 
         await waitForBatchedUpdates();
@@ -896,6 +902,7 @@ describe('split expense', () => {
             personalDetails: mockPersonalDetails,
             delegateAccountID: undefined,
             isTrackIntentUser: false,
+            formatPhoneNumber: mockFormatPhoneNumber,
         });
 
         await waitForBatchedUpdates();
@@ -919,6 +926,7 @@ describe('split expense', () => {
             personalDetails: mockPersonalDetails,
             delegateAccountID: undefined,
             isTrackIntentUser: false,
+            formatPhoneNumber: mockFormatPhoneNumber,
         });
 
         await waitForBatchedUpdates();
@@ -986,6 +994,7 @@ describe('split expense', () => {
             personalDetails: mockPersonalDetails,
             delegateAccountID: undefined,
             isTrackIntentUser: false,
+            formatPhoneNumber: mockFormatPhoneNumber,
         });
 
         await waitForBatchedUpdates();
@@ -1038,6 +1047,7 @@ describe('split expense', () => {
             personalDetails: mockPersonalDetails,
             delegateAccountID: undefined,
             isTrackIntentUser: false,
+            formatPhoneNumber: mockFormatPhoneNumber,
         });
 
         await waitForBatchedUpdates();
@@ -1101,6 +1111,7 @@ describe('split expense', () => {
             personalDetails: mockPersonalDetails,
             delegateAccountID: undefined,
             isTrackIntentUser: false,
+            formatPhoneNumber: mockFormatPhoneNumber,
         });
 
         waitForBatchedUpdates();
@@ -1400,6 +1411,7 @@ describe('split expense', () => {
             personalDetails: testPersonalDetails,
             delegateAccountID: undefined,
             isTrackIntentUser: false,
+            formatPhoneNumber: mockFormatPhoneNumber,
         });
 
         await waitForBatchedUpdates();
@@ -1463,6 +1475,7 @@ describe('split expense', () => {
             personalDetails: participantPersonalDetails,
             delegateAccountID: undefined,
             isTrackIntentUser: false,
+            formatPhoneNumber: mockFormatPhoneNumber,
         });
 
         await waitForBatchedUpdates();
@@ -7619,6 +7632,7 @@ describe('createDistanceRequest', () => {
             betas: [CONST.BETAS.ALL],
             delegateAccountID: undefined,
             isTrackIntentUser: false,
+            formatPhoneNumber: mockFormatPhoneNumber,
         };
     }