diff --git a/src/components/MoneyRequestHeaderSecondaryActions.tsx b/src/components/MoneyRequestHeaderSecondaryActions.tsx index dc640cf73251..ea24887129b9 100644 --- a/src/components/MoneyRequestHeaderSecondaryActions.tsx +++ b/src/components/MoneyRequestHeaderSecondaryActions.tsx @@ -110,7 +110,7 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money >(); const styles = useThemeStyles(); const theme = useTheme(); - const {translate, localeCompare} = useLocalize(); + const {translate, localeCompare, formatPhoneNumber} = useLocalize(); const {login: currentUserLogin, accountID, localCurrencyCode} = useCurrentUserPersonalDetails(); const delegateAccountID = useDelegateAccountID(); const personalDetails = usePersonalDetails(); @@ -270,6 +270,7 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money isTrackIntentUser, delegateAccountID, policyTagList, + formatPhoneNumber, }); } }; diff --git a/src/hooks/useBulkDuplicateAction.ts b/src/hooks/useBulkDuplicateAction.ts index 4136ed96550b..c28cf74a11eb 100644 --- a/src/hooks/useBulkDuplicateAction.ts +++ b/src/hooks/useBulkDuplicateAction.ts @@ -16,6 +16,7 @@ import {validTransactionDraftsSelector} from '@selectors/TransactionDraft'; import useCurrentUserPersonalDetails from './useCurrentUserPersonalDetails'; import useDefaultExpensePolicy from './useDefaultExpensePolicy'; import useDelegateAccountID from './useDelegateAccountID'; +import useLocalize from './useLocalize'; import useMoneyRequestPolicyTagsForReport from './useMoneyRequestPolicyTagsForReport'; import useOnyx from './useOnyx'; import usePermissions from './usePermissions'; @@ -36,6 +37,7 @@ type UseBulkDuplicateActionParams = { function useBulkDuplicateAction({selectedTransactionsKeys, allTransactions, allReports, searchData, onAfterDuplicate}: UseBulkDuplicateActionParams) { const {accountID, login: currentUserLogin, localCurrencyCode} = useCurrentUserPersonalDetails(); const delegateAccountID = useDelegateAccountID(); + const {formatPhoneNumber} = useLocalize(); const {clearSelectedTransactions} = useSearchSelectionActions(); const defaultExpensePolicy = useDefaultExpensePolicy(); const {isBetaEnabled} = usePermissions(); @@ -90,6 +92,7 @@ function useBulkDuplicateAction({selectedTransactionsKeys, allTransactions, allR isTrackIntentUser, delegateAccountID, policyTagList, + formatPhoneNumber, }); if (onAfterDuplicate) { diff --git a/src/hooks/useBulkDuplicateReportAction.ts b/src/hooks/useBulkDuplicateReportAction.ts index de09344c4e83..d97aac284e27 100644 --- a/src/hooks/useBulkDuplicateReportAction.ts +++ b/src/hooks/useBulkDuplicateReportAction.ts @@ -32,7 +32,7 @@ function useBulkDuplicateReportAction({selectedReports, allReports, searchData}: const defaultExpensePolicy = useDefaultExpensePolicy(); const {isBetaEnabled} = usePermissions(); const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT); - const {translate} = useLocalize(); + const {translate, formatPhoneNumber} = useLocalize(); const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE); const [policyRecentlyUsedCurrencies] = useOnyx(ONYXKEYS.RECENTLY_USED_CURRENCIES); @@ -72,6 +72,7 @@ function useBulkDuplicateReportAction({selectedReports, allReports, searchData}: currentUserAccountID: currentUserPersonalDetails?.accountID, isTrackIntentUser, delegateAccountID, + formatPhoneNumber, }); clearSelectedTransactions(undefined, true); diff --git a/src/hooks/useExpenseActions.ts b/src/hooks/useExpenseActions.ts index d4b0b7f1906a..d2fe99385687 100644 --- a/src/hooks/useExpenseActions.ts +++ b/src/hooks/useExpenseActions.ts @@ -98,7 +98,7 @@ type UseExpenseActionsReturn = { function useExpenseActions({reportID, isReportInSearch = false, backTo, onDuplicateReset}: UseExpenseActionsParams): UseExpenseActionsReturn { const theme = useTheme(); - const {translate, localeCompare} = useLocalize(); + const {translate, localeCompare, formatPhoneNumber} = useLocalize(); const {isProduction} = useEnvironment(); const {isBetaEnabled} = usePermissions(); const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT); @@ -279,6 +279,7 @@ function useExpenseActions({reportID, isReportInSearch = false, backTo, onDuplic isTrackIntentUser, delegateAccountID, policyTagList, + formatPhoneNumber, }); } }; @@ -439,6 +440,7 @@ function useExpenseActions({reportID, isReportInSearch = false, backTo, onDuplic currentUserLogin: currentUserPersonalDetails?.email ?? '', isTrackIntentUser, delegateAccountID, + formatPhoneNumber, }); }, }, diff --git a/src/libs/actions/IOU/Duplicate.ts b/src/libs/actions/IOU/Duplicate.ts index 16ec5d43afc5..8a80219cc518 100644 --- a/src/libs/actions/IOU/Duplicate.ts +++ b/src/libs/actions/IOU/Duplicate.ts @@ -1,4 +1,4 @@ -import type {LocalizedTranslate} from '@components/LocaleContextProvider'; +import type {LocaleContextProps, LocalizedTranslate} from '@components/LocaleContextProvider'; import type {SelectedReports} from '@components/Search/types'; import * as API from '@libs/API'; @@ -652,6 +652,7 @@ function createExpenseByType({ personalDetails, recentWaypoints, isTrackIntentUser, + formatPhoneNumber, }: { transactionType: string; params: RequestMoneyInformation; @@ -665,6 +666,7 @@ function createExpenseByType({ personalDetails: OnyxEntry; recentWaypoints: OnyxEntry; isTrackIntentUser: boolean | undefined; + formatPhoneNumber: LocaleContextProps['formatPhoneNumber']; }) { switch (transactionType) { case CONST.SEARCH.TRANSACTION_TYPE.DISTANCE: { @@ -701,6 +703,7 @@ function createExpenseByType({ customUnitPolicyID, personalDetails, recentWaypoints, + formatPhoneNumber, }; return createDistanceRequest(distanceParams); } @@ -752,6 +755,7 @@ type DuplicateExpenseTransactionParams = { isTrackIntentUser: boolean | undefined; delegateAccountID: number | undefined; policyTagList: OnyxTypes.PolicyTagLists; + formatPhoneNumber: LocaleContextProps['formatPhoneNumber']; }; function duplicateExpenseTransaction({ @@ -780,6 +784,7 @@ function duplicateExpenseTransaction({ isTrackIntentUser, delegateAccountID, policyTagList, + formatPhoneNumber, }: DuplicateExpenseTransactionParams) { if (!transaction) { return; @@ -893,6 +898,7 @@ function duplicateExpenseTransaction({ personalDetails, recentWaypoints, isTrackIntentUser, + formatPhoneNumber, }); } @@ -919,6 +925,7 @@ type DuplicateReportParams = { shouldPlaySound?: boolean; isTrackIntentUser: boolean | undefined; delegateAccountID: number | undefined; + formatPhoneNumber: LocaleContextProps['formatPhoneNumber']; }; function duplicateReport({ @@ -944,6 +951,7 @@ function duplicateReport({ shouldPlaySound = true, isTrackIntentUser, delegateAccountID, + formatPhoneNumber, }: DuplicateReportParams) { if (!targetPolicy || !parentChatReport) { return; @@ -1061,6 +1069,7 @@ function duplicateReport({ personalDetails, recentWaypoints, isTrackIntentUser, + formatPhoneNumber, }); if (result?.iouReport) { @@ -1095,6 +1104,7 @@ type BulkDuplicateExpensesParams = { isTrackIntentUser: boolean | undefined; delegateAccountID: number | undefined; policyTagList: OnyxTypes.PolicyTagLists; + formatPhoneNumber: LocaleContextProps['formatPhoneNumber']; }; function bulkDuplicateExpenses({ @@ -1119,6 +1129,7 @@ function bulkDuplicateExpenses({ isTrackIntentUser, delegateAccountID, policyTagList, + formatPhoneNumber, }: BulkDuplicateExpensesParams) { const transactionsToDuplicate = transactionIDs.map((id) => allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${id}`]).filter((t): t is OnyxTypes.Transaction => !!t); @@ -1217,6 +1228,7 @@ function bulkDuplicateExpenses({ isTrackIntentUser, delegateAccountID, policyTagList, + formatPhoneNumber, }); if (result?.iouReport) { @@ -1254,6 +1266,7 @@ type BulkDuplicateReportsParams = { currentUserAccountID: number; isTrackIntentUser: boolean | undefined; delegateAccountID: number | undefined; + formatPhoneNumber: LocaleContextProps['formatPhoneNumber']; }; function bulkDuplicateReports({ @@ -1279,6 +1292,7 @@ function bulkDuplicateReports({ currentUserAccountID, isTrackIntentUser, delegateAccountID, + formatPhoneNumber, }: BulkDuplicateReportsParams) { const allTransactionsMap = getAllTransactions(); const transactionsByReportID = new Map(); @@ -1355,6 +1369,7 @@ function bulkDuplicateReports({ currentUserLogin, isTrackIntentUser, delegateAccountID, + formatPhoneNumber, }); } diff --git a/src/libs/actions/IOU/Split.ts b/src/libs/actions/IOU/Split.ts index 91911fa04a02..15370d7f6ef2 100644 --- a/src/libs/actions/IOU/Split.ts +++ b/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'; @@ -7,7 +9,6 @@ import DateUtils from '@libs/DateUtils'; import {deferOrExecuteWrite} from '@libs/deferredLayoutWrite'; import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils'; import {calculateAmount as calculateIOUAmount, updateIOUOwnerAndTotal} from '@libs/IOUUtils'; -import {formatPhoneNumber} from '@libs/LocalePhoneNumber'; import * as Localize from '@libs/Localize'; import Navigation from '@libs/Navigation/Navigation'; import TransitionTracker from '@libs/Navigation/TransitionTracker'; @@ -143,6 +144,7 @@ type CreateDistanceRequestInformation = { previousOdometerDraft?: OnyxEntry; delegateAccountID: number | undefined; isTrackIntentUser: boolean | undefined; + formatPhoneNumber: LocaleContextProps['formatPhoneNumber']; }; type CreateSplitsTransactionParams = Omit & { @@ -168,6 +170,7 @@ type CreateSplitsAndOnyxDataParams = { participantsPolicyTags: Record; delegateAccountID: number | undefined; isTrackIntentUser: boolean | undefined; + formatPhoneNumber: LocaleContextProps['formatPhoneNumber']; }; type StartSplitBilActionParams = { @@ -194,6 +197,7 @@ type StartSplitBilActionParams = { policyRecentlyUsedCurrencies: string[]; participantsPolicyTags: Record; delegateAccountID: number | undefined; + formatPhoneNumber: LocaleContextProps['formatPhoneNumber']; }; type CompleteSplitBillActionParams = { @@ -209,6 +213,7 @@ type CompleteSplitBillActionParams = { delegateAccountID: number | undefined; isTrackIntentUser: boolean | undefined; sessionEmail?: string; + formatPhoneNumber: LocaleContextProps['formatPhoneNumber']; }; type SplitBillActionsParams = { @@ -243,6 +248,7 @@ type SplitBillActionsParams = { shouldDeferForSearch?: boolean; delegateAccountID: number | undefined; isTrackIntentUser: boolean | undefined; + formatPhoneNumber: LocaleContextProps['formatPhoneNumber']; }; /** @@ -280,6 +286,7 @@ function splitBill({ shouldDeferForSearch = false, delegateAccountID, isTrackIntentUser, + formatPhoneNumber, }: SplitBillActionsParams) { const parsedComment = getParsedComment(comment); const {splitData, splits, onyxData} = createSplitsAndOnyxData({ @@ -315,6 +322,7 @@ function splitBill({ participantsPolicyTags: buildParticipantsPolicyTags(participants), delegateAccountID, isTrackIntentUser, + formatPhoneNumber, }); const parameters: SplitBillParams = { @@ -394,6 +402,7 @@ function splitBillAndOpenReport({ shouldDeferForSearch = false, delegateAccountID, isTrackIntentUser, + formatPhoneNumber, }: SplitBillActionsParams) { const parsedComment = getParsedComment(comment); const {splitData, splits, onyxData} = createSplitsAndOnyxData({ @@ -429,6 +438,7 @@ function splitBillAndOpenReport({ participantsPolicyTags: buildParticipantsPolicyTags(participants), delegateAccountID, isTrackIntentUser, + formatPhoneNumber, }); const parameters: SplitBillParams = { @@ -502,6 +512,7 @@ function startSplitBill({ shouldHandleNavigation = true, shouldDeferForSearch = false, delegateAccountID, + formatPhoneNumber, }: StartSplitBilActionParams) { const currentUserEmailForIOUSplit = addSMSDomainIfPhoneNumber(currentUserLogin); const participantAccountIDs = participants.map((participant) => Number(participant.accountID)); @@ -693,6 +704,7 @@ function startSplitBill({ policyRecentlyUsedTags, participantsPolicyTags, delegateAccountID, + formatPhoneNumber, }; if (existingSplitChatReport) { @@ -1424,6 +1436,7 @@ function createSplitsAndOnyxData({ participantsPolicyTags, delegateAccountID, isTrackIntentUser, + formatPhoneNumber, }: CreateSplitsAndOnyxDataParams): SplitsAndOnyxData { const currentUserEmailForIOUSplit = addSMSDomainIfPhoneNumber(currentUserLogin); const participantAccountIDs = participants.map((participant) => Number(participant.accountID)); @@ -1958,6 +1971,7 @@ function createDistanceRequest(distanceRequestInformation: CreateDistanceRequest previousOdometerDraft, delegateAccountID, isTrackIntentUser, + formatPhoneNumber, } = distanceRequestInformation; const {policy, policyCategories, policyTagList, policyRecentlyUsedCategories, policyRecentlyUsedTags} = policyParams; const parsedComment = getParsedComment(transactionParams.comment); @@ -2050,6 +2064,7 @@ function createDistanceRequest(distanceRequestInformation: CreateDistanceRequest participantsPolicyTags: buildParticipantsPolicyTags(participants), delegateAccountID, isTrackIntentUser, + formatPhoneNumber, }); onyxData = splitOnyxData; diff --git a/src/pages/iou/DynamicSplitBillDetailsPage.tsx b/src/pages/iou/DynamicSplitBillDetailsPage.tsx index e6285867e022..ee0d2e423a87 100644 --- a/src/pages/iou/DynamicSplitBillDetailsPage.tsx +++ b/src/pages/iou/DynamicSplitBillDetailsPage.tsx @@ -48,7 +48,7 @@ type SplitBillDetailsPageProps = WithReportAndReportActionOrNotFoundProps & Plat function DynamicSplitBillDetailsPage({report, reportAction}: SplitBillDetailsPageProps) { const styles = useThemeStyles(); - const {translate} = useLocalize(); + const {translate, formatPhoneNumber} = useLocalize(); const theme = useTheme(); const {isBetaEnabled} = usePermissions(); const icons = useMemoizedLazyExpensifyIcons(['ReceiptScan']); @@ -110,6 +110,7 @@ function DynamicSplitBillDetailsPage({report, reportAction}: SplitBillDetailsPag delegateAccountID, isTrackIntentUser, sessionEmail: session?.email, + formatPhoneNumber, }); }, [ reportID, @@ -124,6 +125,7 @@ function DynamicSplitBillDetailsPage({report, reportAction}: SplitBillDetailsPag personalDetails, delegateAccountID, isTrackIntentUser, + formatPhoneNumber, ]); return ( diff --git a/src/pages/iou/request/step/IOURequestStepDistance/handleMoneyRequestStepDistanceNavigation.ts b/src/pages/iou/request/step/IOURequestStepDistance/handleMoneyRequestStepDistanceNavigation.ts index 4244211a0834..94b77632a435 100644 --- a/src/pages/iou/request/step/IOURequestStepDistance/handleMoneyRequestStepDistanceNavigation.ts +++ b/src/pages/iou/request/step/IOURequestStepDistance/handleMoneyRequestStepDistanceNavigation.ts @@ -1,3 +1,5 @@ +import type {LocaleContextProps} from '@components/LocaleContextProvider'; + import { getMoneyRequestParticipantOptions, setCustomUnitRateID, @@ -104,6 +106,7 @@ type MoneyRequestStepDistanceNavigationParams = { isTrackIntentUser: boolean | undefined; delegateAccountID: number | undefined; policyTagList: PolicyTagLists; + formatPhoneNumber: LocaleContextProps['formatPhoneNumber']; }; /** Amount + merchant for a manual-distance submit; pending placeholders otherwise (waypoint/GPS distance is computed server-side). */ @@ -201,6 +204,7 @@ function handleMoneyRequestStepDistanceNavigation({ isTrackIntentUser, delegateAccountID, policyTagList, + formatPhoneNumber, }: MoneyRequestStepDistanceNavigationParams): void { const isManualDistance = manualDistance !== undefined; const isOdometerDistance = odometerDistance !== undefined; @@ -404,6 +408,7 @@ function handleMoneyRequestStepDistanceNavigation({ }, isTrackIntentUser, delegateAccountID, + formatPhoneNumber, }); cleanupAfterSkipConfirmSubmit(overrides.shouldHandleNavigation, { report, diff --git a/src/pages/iou/request/step/IOURequestStepDistance/hooks/useDistanceNavigation.ts b/src/pages/iou/request/step/IOURequestStepDistance/hooks/useDistanceNavigation.ts index b96ae0e3b4cd..dfdeddd92339 100644 --- a/src/pages/iou/request/step/IOURequestStepDistance/hooks/useDistanceNavigation.ts +++ b/src/pages/iou/request/step/IOURequestStepDistance/hooks/useDistanceNavigation.ts @@ -1,6 +1,7 @@ import type {LocaleContextProps} from '@components/LocaleContextProvider'; import useDelegateAccountID from '@hooks/useDelegateAccountID'; +import useLocalize from '@hooks/useLocalize'; import useMoneyRequestPolicyTagsForReport from '@hooks/useMoneyRequestPolicyTagsForReport'; import useOnyx from '@hooks/useOnyx'; @@ -149,6 +150,7 @@ function useDistanceNavigation({ const [isTrackIntentUser] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {selector: isTrackIntentUserSelector}); const delegateAccountID = useDelegateAccountID(); + const {formatPhoneNumber} = useLocalize(); const policyTagList = useMoneyRequestPolicyTagsForReport({report, currentUserAccountID}); return () => { const optimisticTransactionID = rand64(); @@ -198,6 +200,7 @@ function useDistanceNavigation({ isTrackIntentUser, delegateAccountID, policyTagList, + formatPhoneNumber, }); }; } diff --git a/src/pages/iou/request/step/IOURequestStepDistance/hooks/useOdometerNavigation.ts b/src/pages/iou/request/step/IOURequestStepDistance/hooks/useOdometerNavigation.ts index 90bc2807c0f0..a0dcabca201b 100644 --- a/src/pages/iou/request/step/IOURequestStepDistance/hooks/useOdometerNavigation.ts +++ b/src/pages/iou/request/step/IOURequestStepDistance/hooks/useOdometerNavigation.ts @@ -1,6 +1,7 @@ import type {LocaleContextProps} from '@components/LocaleContextProvider'; import useDelegateAccountID from '@hooks/useDelegateAccountID'; +import useLocalize from '@hooks/useLocalize'; import useMoneyRequestPolicyTagsForReport from '@hooks/useMoneyRequestPolicyTagsForReport'; import useOnyx from '@hooks/useOnyx'; @@ -153,6 +154,7 @@ function useOdometerNavigation({ const policyTagList = useMoneyRequestPolicyTagsForReport({report, currentUserAccountID}); const delegateAccountID = useDelegateAccountID(); + const {formatPhoneNumber} = useLocalize(); return ({odometerStart, odometerEnd, odometerDistance, unit, previousOdometerDraft}: NavigateOptions) => { const optimisticTransactionID = rand64(); @@ -205,6 +207,7 @@ function useOdometerNavigation({ isTrackIntentUser, delegateAccountID, policyTagList, + formatPhoneNumber, }); }; } diff --git a/src/pages/iou/request/step/IOURequestStepDistanceGPS/index.native.tsx b/src/pages/iou/request/step/IOURequestStepDistanceGPS/index.native.tsx index 991198073ef6..29d921b1f9b6 100644 --- a/src/pages/iou/request/step/IOURequestStepDistanceGPS/index.native.tsx +++ b/src/pages/iou/request/step/IOURequestStepDistanceGPS/index.native.tsx @@ -60,7 +60,7 @@ function IOURequestStepDistanceGPS({ const styles = useThemeStyles(); const delegateAccountID = useDelegateAccountID(); - const {translate} = useLocalize(); + const {translate, formatPhoneNumber} = useLocalize(); const {isBetaEnabled} = usePermissions(); const isInLandscapeMode = useIsInLandscapeMode(); @@ -174,6 +174,7 @@ function IOURequestStepDistanceGPS({ isTrackIntentUser, delegateAccountID, policyTagList, + formatPhoneNumber, }); }; diff --git a/src/pages/iou/request/step/IOURequestStepDistanceManual.tsx b/src/pages/iou/request/step/IOURequestStepDistanceManual.tsx index 1fc2ae19097f..2a56210e7519 100644 --- a/src/pages/iou/request/step/IOURequestStepDistanceManual.tsx +++ b/src/pages/iou/request/step/IOURequestStepDistanceManual.tsx @@ -72,7 +72,7 @@ function IOURequestStepDistanceManual({ transaction, currentUserPersonalDetails, }: IOURequestStepDistanceManualProps) { - const {translate} = useLocalize(); + const {translate, formatPhoneNumber} = useLocalize(); const styles = useThemeStyles(); const {isBetaEnabled} = usePermissions(); const {isExtraSmallScreenHeight} = useResponsiveLayout(); @@ -296,6 +296,7 @@ function IOURequestStepDistanceManual({ isTrackIntentUser, delegateAccountID, policyTagList, + formatPhoneNumber, }); }; diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx index a3e90a130f0e..0fb03f852873 100644 --- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx +++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx @@ -108,7 +108,7 @@ function ScanSkipConfirmation({report, action, iouType, reportID, transactionID, const [transactions] = useOptimisticDraftTransactions(transaction); const {isMultiScanEnabled} = useMultiScanState(); - const {translate} = useLocalize(); + const {translate, formatPhoneNumber} = useLocalize(); const {disableMultiScan} = useMultiScanActions(); const {setIsLoaderVisible} = useFullScreenLoaderActions(); const [startLocationPermissionFlow, setStartLocationPermissionFlow] = useState(false); @@ -227,6 +227,7 @@ function ScanSkipConfirmation({report, action, iouType, reportID, transactionID, policyRecentlyUsedTags: undefined, participantsPolicyTags, delegateAccountID, + formatPhoneNumber, }; submitWithDismissFirst({ diff --git a/src/pages/iou/request/step/confirmation/useExpenseSubmission.ts b/src/pages/iou/request/step/confirmation/useExpenseSubmission.ts index e3944a166934..4b428d7e761f 100644 --- a/src/pages/iou/request/step/confirmation/useExpenseSubmission.ts +++ b/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); @@ -875,6 +876,7 @@ function useExpenseSubmission(params: UseExpenseSubmissionParams) { shouldHandleNavigation, shouldDeferForSearch: shouldDeferSplitForSearch, delegateAccountID, + formatPhoneNumber, }); } } @@ -917,6 +919,7 @@ function useExpenseSubmission(params: UseExpenseSubmissionParams) { shouldDeferForSearch: shouldDeferSplitForSearch, delegateAccountID, isTrackIntentUser, + formatPhoneNumber, }); } markSubmitExpenseEnd(); @@ -956,6 +959,7 @@ function useExpenseSubmission(params: UseExpenseSubmissionParams) { shouldDeferForSearch: shouldDeferSplitForSearch, delegateAccountID, isTrackIntentUser, + formatPhoneNumber, }); } markSubmitExpenseEnd(); diff --git a/tests/actions/IOU/MoneyRequestTest.ts b/tests/actions/IOU/MoneyRequestTest.ts index 6c4c0337198c..b9878d2a5592 100644 --- a/tests/actions/IOU/MoneyRequestTest.ts +++ b/tests/actions/IOU/MoneyRequestTest.ts @@ -26,7 +26,7 @@ import createRandomPolicy from '../../utils/collections/policies'; import {createRandomReport, createSelfDM} from '../../utils/collections/reports'; import createRandomTransaction from '../../utils/collections/transaction'; import getOnyxValue from '../../utils/getOnyxValue'; -import {translateLocal} from '../../utils/TestHelper'; +import {formatPhoneNumber, translateLocal} from '../../utils/TestHelper'; import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates'; jest.mock('@libs/actions/IOU', () => { @@ -143,6 +143,7 @@ describe('MoneyRequest', () => { currentUserLocalCurrency: undefined, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }; beforeEach(async () => { @@ -677,6 +678,7 @@ describe('MoneyRequest', () => { currentUserLocalCurrency: undefined, policyTagList: {}, isTrackIntentUser: false, + formatPhoneNumber, }; const splitShares: SplitShares = { [firstSplitParticipantID]: { diff --git a/tests/actions/IOU/SplitReportTotalsTest.ts b/tests/actions/IOU/SplitReportTotalsTest.ts index cd313606a8d0..0db4c8b418ef 100644 --- a/tests/actions/IOU/SplitReportTotalsTest.ts +++ b/tests/actions/IOU/SplitReportTotalsTest.ts @@ -23,7 +23,7 @@ import type {OnyxEntry, OnyxMergeCollectionInput} from 'react-native-onyx'; import Onyx from 'react-native-onyx'; import currencyList from '../../unit/currencyList.json'; -import {getGlobalFetchMock} from '../../utils/TestHelper'; +import {getGlobalFetchMock, formatPhoneNumber} from '../../utils/TestHelper'; import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates'; const topMostReportID = '23423423'; @@ -507,6 +507,7 @@ describe('actions/IOU', () => { participantsPolicyTags: overrides.participantsPolicyTags ?? {}, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); it('returns valid splitData with chatReportID, transactionID, and reportActionID', () => { diff --git a/tests/actions/IOUTest/DuplicateTest.ts b/tests/actions/IOUTest/DuplicateTest.ts index b5f5a0f7bcc2..52852a0e839a 100644 --- a/tests/actions/IOUTest/DuplicateTest.ts +++ b/tests/actions/IOUTest/DuplicateTest.ts @@ -37,7 +37,7 @@ import createRandomTransaction from '../../utils/collections/transaction'; import createMock from '../../utils/createMock'; import getOnyxValue from '../../utils/getOnyxValue'; import initCurrencyListContext from '../../utils/initCurrencyListContext'; -import {getGlobalFetchMock, getOnyxData} from '../../utils/TestHelper'; +import {formatPhoneNumber, getGlobalFetchMock, getOnyxData} from '../../utils/TestHelper'; import {isObject} from '../../utils/typeGuards'; import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates'; @@ -1353,6 +1353,7 @@ describe('actions/Duplicate', () => { currentUserLocalCurrency: undefined, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -1420,6 +1421,7 @@ describe('actions/Duplicate', () => { currentUserLocalCurrency: undefined, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -1479,6 +1481,7 @@ describe('actions/Duplicate', () => { currentUserLocalCurrency: undefined, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -1531,6 +1534,7 @@ describe('actions/Duplicate', () => { currentUserLocalCurrency: undefined, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -1583,6 +1587,7 @@ describe('actions/Duplicate', () => { currentUserLocalCurrency: undefined, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -1638,6 +1643,7 @@ describe('actions/Duplicate', () => { currentUserLocalCurrency: undefined, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -1703,6 +1709,7 @@ describe('actions/Duplicate', () => { currentUserLocalCurrency: undefined, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -1753,6 +1760,7 @@ describe('actions/Duplicate', () => { currentUserLocalCurrency: undefined, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -1796,6 +1804,7 @@ describe('actions/Duplicate', () => { currentUserLocalCurrency: undefined, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -1842,6 +1851,7 @@ describe('actions/Duplicate', () => { currentUserLocalCurrency: undefined, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -1894,6 +1904,7 @@ describe('actions/Duplicate', () => { currentUserLocalCurrency: undefined, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -1962,6 +1973,7 @@ describe('actions/Duplicate', () => { currentUserLocalCurrency: undefined, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -2030,6 +2042,7 @@ describe('actions/Duplicate', () => { currentUserLocalCurrency: undefined, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -2081,6 +2094,7 @@ describe('actions/Duplicate', () => { currentUserLocalCurrency: undefined, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -2144,6 +2158,7 @@ describe('actions/Duplicate', () => { currentUserLocalCurrency: undefined, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -2317,6 +2332,7 @@ describe('actions/Duplicate', () => { recentWaypoints: [], isTrackIntentUser: false, delegateAccountID: undefined, + formatPhoneNumber, ...overrides, }); @@ -2889,6 +2905,7 @@ describe('actions/Duplicate', () => { currentUserLocalCurrency: undefined, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -3001,6 +3018,7 @@ describe('actions/Duplicate', () => { recentWaypoints: [], delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, ...overrides, }); diff --git a/tests/actions/IOUTest/SplitTest.ts b/tests/actions/IOUTest/SplitTest.ts index 4aabd56cfbef..1348e9aa9271 100644 --- a/tests/actions/IOUTest/SplitTest.ts +++ b/tests/actions/IOUTest/SplitTest.ts @@ -56,7 +56,7 @@ import {createRandomReport} from '../../utils/collections/reports'; import createRandomTransaction from '../../utils/collections/transaction'; import getOnyxValue from '../../utils/getOnyxValue'; import initCurrencyListContext from '../../utils/initCurrencyListContext'; -import {getGlobalFetchMock, getOnyxData, translateLocal} from '../../utils/TestHelper'; +import {formatPhoneNumber, getGlobalFetchMock, getOnyxData, translateLocal} from '../../utils/TestHelper'; import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates'; import waitForNetworkPromises from '../../utils/waitForNetworkPromises'; @@ -414,6 +414,7 @@ describe('split expense', () => { personalDetails: mockPersonalDetails, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }, ); return waitForBatchedUpdates(); @@ -751,6 +752,7 @@ describe('split expense', () => { personalDetails: mockPersonalDetails, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -802,6 +804,7 @@ describe('split expense', () => { personalDetails: mockPersonalDetails, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -827,6 +830,7 @@ describe('split expense', () => { personalDetails: mockPersonalDetails, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -859,6 +863,7 @@ describe('split expense', () => { personalDetails: mockPersonalDetails, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -896,6 +901,7 @@ describe('split expense', () => { personalDetails: mockPersonalDetails, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -919,6 +925,7 @@ describe('split expense', () => { personalDetails: mockPersonalDetails, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -986,6 +993,7 @@ describe('split expense', () => { personalDetails: mockPersonalDetails, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -1038,6 +1046,7 @@ describe('split expense', () => { personalDetails: mockPersonalDetails, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -1101,6 +1110,7 @@ describe('split expense', () => { personalDetails: mockPersonalDetails, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); waitForBatchedUpdates(); @@ -1152,6 +1162,7 @@ describe('split expense', () => { policyRecentlyUsedTags: undefined, participantsPolicyTags, delegateAccountID: undefined, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -1187,6 +1198,7 @@ describe('split expense', () => { delegateAccountID: undefined, isTrackIntentUser: false, sessionEmail: RORY_EMAIL, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -1400,6 +1412,7 @@ describe('split expense', () => { personalDetails: testPersonalDetails, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -1463,6 +1476,7 @@ describe('split expense', () => { personalDetails: participantPersonalDetails, delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -1533,6 +1547,7 @@ describe('split expense', () => { policyRecentlyUsedCurrencies: [], participantsPolicyTags, delegateAccountID: undefined, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -1604,6 +1619,7 @@ describe('split expense', () => { delegateAccountID: undefined, isTrackIntentUser: false, sessionEmail: RORY_EMAIL, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -1650,6 +1666,7 @@ describe('startSplitBill', () => { policyRecentlyUsedCurrencies: [], participantsPolicyTags, delegateAccountID: undefined, + formatPhoneNumber, }); waitForBatchedUpdates(); @@ -1695,6 +1712,7 @@ describe('startSplitBill', () => { policyRecentlyUsedTags: undefined, participantsPolicyTags, delegateAccountID: undefined, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -1743,6 +1761,7 @@ describe('startSplitBill', () => { policyRecentlyUsedTags: undefined, participantsPolicyTags, delegateAccountID: undefined, + formatPhoneNumber, }); await waitForBatchedUpdates(); @@ -7619,6 +7638,7 @@ describe('createDistanceRequest', () => { betas: [CONST.BETAS.ALL], delegateAccountID: undefined, isTrackIntentUser: false, + formatPhoneNumber, }; } @@ -8156,6 +8176,7 @@ describe('startSplitBill delegateAccountID forwarding', () => { policyRecentlyUsedTags: undefined, participantsPolicyTags, delegateAccountID: DELEGATE_ACCOUNT_ID, + formatPhoneNumber, }); await waitForBatchedUpdates();