Skip to content

[Part 16] Remove Onyx.connect from LocalePhoneNumber #96446

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

Draft
marufsharifi wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[Part 16] Remove Onyx.connect from LocalePhoneNumber #96446

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
7 changes: 3 additions & 4 deletions src/libs/actions/IOU/TrackExpense.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import getWorkspaceCreatedAnalyticsEvent from '@libs/getWorkspaceCreatedAnalytic
import GoogleTagManager from '@libs/GoogleTagManager';
import {isMovingTransactionFromTrackExpense as isMovingTransactionFromTrackExpenseIOUUtils} from '@libs/IOUUtils';
import isFileUploadable from '@libs/isFileUploadable';
import {formatPhoneNumber} from '@libs/LocalePhoneNumber';
import Log from '@libs/Log';
import Navigation from '@libs/Navigation/Navigation';
import {roundToTwoDecimalPlaces} from '@libs/NumberUtils';
Expand Down Expand Up @@ -2271,7 +2270,7 @@ function shareTrackedExpense(trackedExpenseParams: TrackedExpenseParams) {
const accountantEmail = addSMSDomainIfPhoneNumber(accountantParams?.accountant?.login);
const accountantAccountID = accountantParams?.accountant?.accountID;

if (!policyID || !chatReportID || !accountantEmail || !accountantAccountID || !accountantParams.newLogins || !accountantParams.newAccountIDs) {
if (!policyID || !chatReportID || !accountantEmail || !accountantAccountID || !accountantParams || !accountantParams.newLogins || !accountantParams.newAccountIDs) {
return;
}

Expand Down Expand Up @@ -2327,7 +2326,7 @@ function shareTrackedExpense(trackedExpenseParams: TrackedExpenseParams) {
failureData: addAccountantToWorkspaceFailureData,
} = buildAddMembersToWorkspaceOnyxData(
{[accountantEmail]: accountantAccountID},
getPersonalDetailsOnyxDataForOptimisticUsers(accountantParams.newLogins, accountantParams.newAccountIDs, formatPhoneNumber),
getPersonalDetailsOnyxDataForOptimisticUsers(accountantParams.newLogins, accountantParams.newAccountIDs, accountantParams.formatPhoneNumber),
policyParams.policy,
policyMemberAccountIDs,
CONST.POLICY.ROLE.ADMIN,
Expand Down Expand Up @@ -2355,7 +2354,7 @@ function shareTrackedExpense(trackedExpenseParams: TrackedExpenseParams) {
optimisticData: inviteAccountantToRoomOptimisticData,
successData: inviteAccountantToRoomSuccessData,
failureData: inviteAccountantToRoomFailureData,
} = buildInviteToRoomOnyxData(chatReport, {[accountantEmail]: accountantAccountID}, accountantParams.newAccountIDs, accountantParams.newLogins, formatPhoneNumber);
} = buildInviteToRoomOnyxData(chatReport, {[accountantEmail]: accountantAccountID}, accountantParams.newAccountIDs, accountantParams.newLogins, accountantParams.formatPhoneNumber);
onyxData.optimisticData?.push(...inviteAccountantToRoomOptimisticData);
onyxData.successData?.push(...inviteAccountantToRoomSuccessData);
onyxData.failureData?.push(...inviteAccountantToRoomFailureData);
Expand Down
3 changes: 3 additions & 0 deletions src/libs/actions/IOU/types/CreateTrackExpenseParams.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import type {LocaleContextProps} from '@components/LocaleContextProvider';

import type {CurrentUser} from '@userActions/Policy/Policy';

import type {IOUAction} from '@src/CONST';
Expand All @@ -14,6 +16,7 @@ type TrackExpenseAccountantParams = {
accountant?: Accountant;
newAccountIDs: number[] | undefined;
newLogins: string[] | undefined;
formatPhoneNumber: LocaleContextProps['formatPhoneNumber'];
};

type CreateTrackExpenseParams = {
Expand Down
3 changes: 2 additions & 1 deletion src/pages/iou/request/step/confirmation/useExpenseSubmission.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ function useExpenseSubmission(params: UseExpenseSubmissionParams) {
} = params;

// Localization
const {translate, toLocaleDigit} = useLocalize();
const {translate, toLocaleDigit, formatPhoneNumber} = useLocalize();
const delegateAccountID = useDelegateAccountID();

// Permissions
Expand Down Expand Up @@ -743,6 +743,7 @@ function useExpenseSubmission(params: UseExpenseSubmissionParams) {
accountant: item.accountant,
newLogins,
newAccountIDs,
formatPhoneNumber,
},
optimisticChatReportID: optimisticSelfDMReportID,
optimisticTransactionID: lastOptimisticTransactionID,
Expand Down
6 changes: 4 additions & 2 deletions tests/actions/IOU/RequestMoneyTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import currencyList from '../../unit/currencyList.json';
import createPersonalDetails from '../../utils/collections/personalDetails';
import {createRandomReport} from '../../utils/collections/reports';
import getOnyxValue from '../../utils/getOnyxValue';
import {getGlobalFetchMock, getOnyxData, setPersonalDetails, signInWithTestUser, translateLocal} from '../../utils/TestHelper';
import {formatPhoneNumber, getGlobalFetchMock, getOnyxData, setPersonalDetails, signInWithTestUser, translateLocal} from '../../utils/TestHelper';
import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';
import waitForNetworkPromises from '../../utils/waitForNetworkPromises';

Expand Down Expand Up @@ -1362,6 +1362,7 @@ describe('actions/IOU', () => {
accountant,
newAccountIDs: [],
newLogins: [],
formatPhoneNumber,
},
isASAPSubmitBetaEnabled: false,
currentUser: {accountID: RORY_ACCOUNT_ID, email: RORY_EMAIL},
Expand Down Expand Up @@ -2764,7 +2765,8 @@ describe('actions/IOU', () => {
},
linkedTrackedExpenseReportID: '1',
},
accountantParams: action === CONST.IOU.ACTION.SHARE ? {accountant: {accountID: VIT_ACCOUNT_ID, login: VIT_EMAIL}, newAccountIDs: [], newLogins: []} : undefined,
accountantParams:
action === CONST.IOU.ACTION.SHARE ? {accountant: {accountID: VIT_ACCOUNT_ID, login: VIT_EMAIL}, newAccountIDs: [], newLogins: [], formatPhoneNumber} : undefined,
isASAPSubmitBetaEnabled: false,
currentUser: {accountID: RORY_ACCOUNT_ID, email: RORY_EMAIL},
introSelected: undefined,
Expand Down
7 changes: 6 additions & 1 deletion tests/actions/IOUTest/TrackExpenseTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ import getOnyxValue from '../../utils/getOnyxValue';
import initCurrencyListContext from '../../utils/initCurrencyListContext';
import PusherHelper from '../../utils/PusherHelper';
import * as TestHelper from '../../utils/TestHelper';
import {getGlobalFetchMock, getOnyxData, setPersonalDetails, signInWithTestUser} from '../../utils/TestHelper';
import {formatPhoneNumber, getGlobalFetchMock, getOnyxData, setPersonalDetails, signInWithTestUser} from '../../utils/TestHelper';
import waitForBatchedUpdates from '../../utils/waitForBatchedUpdates';

jest.mock('@src/libs/Navigation/Navigation', () => ({
Expand Down Expand Up @@ -585,6 +585,7 @@ describe('actions/IOU/TrackExpense', () => {
accountant,
newAccountIDs: [],
newLogins: [],
formatPhoneNumber,
},
isASAPSubmitBetaEnabled: false,
currentUser: {accountID: RORY_ACCOUNT_ID, email: RORY_EMAIL},
Expand Down Expand Up @@ -727,6 +728,7 @@ describe('actions/IOU/TrackExpense', () => {
accountant,
newAccountIDs: [],
newLogins: [],
formatPhoneNumber,
},
isASAPSubmitBetaEnabled: false,
currentUser: {accountID: RORY_ACCOUNT_ID, email: RORY_EMAIL},
Expand Down Expand Up @@ -871,6 +873,7 @@ describe('actions/IOU/TrackExpense', () => {
accountant,
newAccountIDs: [],
newLogins: [],
formatPhoneNumber,
},
isASAPSubmitBetaEnabled: false,
currentUser: {accountID: RORY_ACCOUNT_ID, email: RORY_EMAIL},
Expand Down Expand Up @@ -1015,6 +1018,7 @@ describe('actions/IOU/TrackExpense', () => {
accountant,
newAccountIDs: [],
newLogins: [],
formatPhoneNumber,
},
isASAPSubmitBetaEnabled: false,
currentUser: {accountID: RORY_ACCOUNT_ID, email: RORY_EMAIL},
Expand Down Expand Up @@ -1179,6 +1183,7 @@ describe('actions/IOU/TrackExpense', () => {
accountant,
newAccountIDs: [],
newLogins: [],
formatPhoneNumber,
},
reportActionsList: explicitReportActionsList,
isASAPSubmitBetaEnabled: false,
Expand Down
Loading