diff --git a/src/libs/PersonalDetailsUtils.ts b/src/libs/PersonalDetailsUtils.ts index 7568be651762..4dfe2bf7f07b 100644 --- a/src/libs/PersonalDetailsUtils.ts +++ b/src/libs/PersonalDetailsUtils.ts @@ -1,14 +1,13 @@ import {Str} from 'expensify-common'; import type {OnyxEntry, OnyxUpdate} from 'react-native-onyx'; import Onyx from 'react-native-onyx'; -import type {LocaleContextProps} from '@components/LocaleContextProvider'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type {OnyxInputOrEntry, PersonalDetails, PersonalDetailsList, PrivatePersonalDetails} from '@src/types/onyx'; import type {Address} from '@src/types/onyx/PrivatePersonalDetails'; import type {OnyxData} from '@src/types/onyx/Request'; import {isEmptyObject} from '@src/types/utils/EmptyObject'; -import {formatPhoneNumber as formatPhoneNumberUtils} from './LocalePhoneNumber'; +import {formatPhoneNumber} from './LocalePhoneNumber'; import {translateLocal} from './Localize'; import {areEmailsFromSamePrivateDomain} from './LoginUtils'; import {parsePhoneNumber} from './PhoneNumber'; @@ -220,11 +219,7 @@ function getNewAccountIDsAndLogins(logins: string[], accountIDs: number[]) { * Given a list of logins and accountIDs, return Onyx data for users with no existing personal details stored. These users might be brand new or unknown. * They will have an "optimistic" accountID that must be cleaned up later. */ -function getPersonalDetailsOnyxDataForOptimisticUsers( - newLogins: string[], - newAccountIDs: number[], - formatPhoneNumber: LocaleContextProps['formatPhoneNumber'], -): Required> { +function getPersonalDetailsOnyxDataForOptimisticUsers(newLogins: string[], newAccountIDs: number[]): Required> { const personalDetailsNew: PersonalDetailsList = {}; const personalDetailsCleanup: PersonalDetailsList = {}; @@ -330,7 +325,7 @@ function getFormattedAddress(privatePersonalDetails: OnyxEntry | OnyxInputOrEntry): string { // If we have a number like +15857527441@expensify.sms then let's remove @expensify.sms and format it // so that the option looks cleaner in our UI. - const userLogin = formatPhoneNumberUtils(login); + const userLogin = formatPhoneNumber(login); if (!passedPersonalDetails) { return userLogin; diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 7a638c064890..7eaa22d158a3 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -5313,7 +5313,7 @@ function shareTrackedExpense(trackedExpenseParams: TrackedExpenseParams) { optimisticData: addAccountantToWorkspaceOptimisticData, successData: addAccountantToWorkspaceSuccessData, failureData: addAccountantToWorkspaceFailureData, - } = buildAddMembersToWorkspaceOnyxData({[accountantEmail]: accountantAccountID}, policyID, policyMemberAccountIDs, CONST.POLICY.ROLE.ADMIN, formatPhoneNumber); + } = buildAddMembersToWorkspaceOnyxData({[accountantEmail]: accountantAccountID}, policyID, policyMemberAccountIDs, CONST.POLICY.ROLE.ADMIN); optimisticData?.push(...addAccountantToWorkspaceOptimisticData); successData?.push(...addAccountantToWorkspaceSuccessData); failureData?.push(...addAccountantToWorkspaceFailureData); @@ -5334,7 +5334,7 @@ function shareTrackedExpense(trackedExpenseParams: TrackedExpenseParams) { optimisticData: inviteAccountantToRoomOptimisticData, successData: inviteAccountantToRoomSuccessData, failureData: inviteAccountantToRoomFailureData, - } = buildInviteToRoomOnyxData(chatReportID, {[accountantEmail]: accountantAccountID}, formatPhoneNumber); + } = buildInviteToRoomOnyxData(chatReportID, {[accountantEmail]: accountantAccountID}); optimisticData?.push(...inviteAccountantToRoomOptimisticData); successData?.push(...inviteAccountantToRoomSuccessData); failureData?.push(...inviteAccountantToRoomFailureData); diff --git a/src/libs/actions/Policy/Member.ts b/src/libs/actions/Policy/Member.ts index 8dc578a4abb6..fc4c83cb92b5 100644 --- a/src/libs/actions/Policy/Member.ts +++ b/src/libs/actions/Policy/Member.ts @@ -1,7 +1,6 @@ import type {NullishDeep, OnyxCollection, OnyxCollectionInputValue, OnyxEntry, OnyxUpdate} from 'react-native-onyx'; import Onyx from 'react-native-onyx'; import type {ValueOf} from 'type-fest'; -import type {LocaleContextProps} from '@components/LocaleContextProvider'; import * as API from '@libs/API'; import type { AddMembersToWorkspaceParams, @@ -874,20 +873,14 @@ function clearWorkspaceOwnerChangeFlow(policyID: string) { }); } -function buildAddMembersToWorkspaceOnyxData( - invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs, - policyID: string, - policyMemberAccountIDs: number[], - role: string, - formatPhoneNumber: LocaleContextProps['formatPhoneNumber'], -) { +function buildAddMembersToWorkspaceOnyxData(invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs, policyID: string, policyMemberAccountIDs: number[], role: string) { const logins = Object.keys(invitedEmailsToAccountIDs).map((memberLogin) => PhoneNumber.addSMSDomainIfPhoneNumber(memberLogin)); const accountIDs = Object.values(invitedEmailsToAccountIDs); const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const; const {newAccountIDs, newLogins} = PersonalDetailsUtils.getNewAccountIDsAndLogins(logins, accountIDs); - const newPersonalDetailsOnyxData = PersonalDetailsUtils.getPersonalDetailsOnyxDataForOptimisticUsers(newLogins, newAccountIDs, formatPhoneNumber); + const newPersonalDetailsOnyxData = PersonalDetailsUtils.getPersonalDetailsOnyxDataForOptimisticUsers(newLogins, newAccountIDs); const announceRoomMembers = buildRoomMembersOnyxData(CONST.REPORT.CHAT_TYPE.POLICY_ANNOUNCE, policyID, accountIDs); const adminRoomMembers = buildRoomMembersOnyxData( @@ -974,20 +967,12 @@ function buildAddMembersToWorkspaceOnyxData( * Adds members to the specified workspace/policyID * Please see https://github.com/Expensify/App/blob/main/README.md#Security for more details */ -function addMembersToWorkspace( - invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs, - welcomeNote: string, - policyID: string, - policyMemberAccountIDs: number[], - role: string, - formatPhoneNumber: LocaleContextProps['formatPhoneNumber'], -) { +function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs, welcomeNote: string, policyID: string, policyMemberAccountIDs: number[], role: string) { const {optimisticData, successData, failureData, optimisticAnnounceChat, membersChats, logins} = buildAddMembersToWorkspaceOnyxData( invitedEmailsToAccountIDs, policyID, policyMemberAccountIDs, role, - formatPhoneNumber, ); const params: AddMembersToWorkspaceParams = { diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts index fa09c86997e9..a168a81e4ba5 100644 --- a/src/libs/actions/Report.ts +++ b/src/libs/actions/Report.ts @@ -7,7 +7,6 @@ import type {NullishDeep, OnyxCollection, OnyxCollectionInputValue, OnyxEntry, O import Onyx from 'react-native-onyx'; import type {PartialDeep, ValueOf} from 'type-fest'; import type {Emoji} from '@assets/emojis/types'; -import type {LocaleContextProps} from '@components/LocaleContextProvider'; import * as ActiveClientManager from '@libs/ActiveClientManager'; import addEncryptedAuthTokenToURL from '@libs/addEncryptedAuthTokenToURL'; import * as API from '@libs/API'; @@ -3706,7 +3705,7 @@ function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = fal navigateToMostRecentReport(report); } -function buildInviteToRoomOnyxData(reportID: string, inviteeEmailsToAccountIDs: InvitedEmailsToAccountIDs, formatPhoneNumber: LocaleContextProps['formatPhoneNumber']) { +function buildInviteToRoomOnyxData(reportID: string, inviteeEmailsToAccountIDs: InvitedEmailsToAccountIDs) { const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]; const reportMetadata = getReportMetadata(reportID); const isGroupChat = isGroupChatReportUtils(report); @@ -3732,7 +3731,7 @@ function buildInviteToRoomOnyxData(reportID: string, inviteeEmailsToAccountIDs: {...report?.participants}, ); - const newPersonalDetailsOnyxData = PersonalDetailsUtils.getPersonalDetailsOnyxDataForOptimisticUsers(newLogins, newAccountIDs, formatPhoneNumber); + const newPersonalDetailsOnyxData = PersonalDetailsUtils.getPersonalDetailsOnyxDataForOptimisticUsers(newLogins, newAccountIDs); const pendingChatMembers = getPendingChatMembers(inviteeAccountIDs, reportMetadata?.pendingChatMembers ?? [], CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD); const newParticipantAccountCleanUp = newAccountIDs.reduce>((participantCleanUp, newAccountID) => { @@ -3805,8 +3804,8 @@ function buildInviteToRoomOnyxData(reportID: string, inviteeEmailsToAccountIDs: } /** Invites people to a room */ -function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: InvitedEmailsToAccountIDs, formatPhoneNumber: LocaleContextProps['formatPhoneNumber']) { - const {optimisticData, successData, failureData, isGroupChat, inviteeEmails, newAccountIDs} = buildInviteToRoomOnyxData(reportID, inviteeEmailsToAccountIDs, formatPhoneNumber); +function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: InvitedEmailsToAccountIDs) { + const {optimisticData, successData, failureData, isGroupChat, inviteeEmails, newAccountIDs} = buildInviteToRoomOnyxData(reportID, inviteeEmailsToAccountIDs); if (isGroupChat) { const parameters: InviteToGroupChatParams = { @@ -3886,8 +3885,8 @@ function updateGroupChatMemberRoles(reportID: string, accountIDList: number[], r } /** Invites people to a group chat */ -function inviteToGroupChat(reportID: string, inviteeEmailsToAccountIDs: InvitedEmailsToAccountIDs, formatPhoneNumber: LocaleContextProps['formatPhoneNumber']) { - inviteToRoom(reportID, inviteeEmailsToAccountIDs, formatPhoneNumber); +function inviteToGroupChat(reportID: string, inviteeEmailsToAccountIDs: InvitedEmailsToAccountIDs) { + inviteToRoom(reportID, inviteeEmailsToAccountIDs); } /** Removes people from a room @@ -5208,7 +5207,7 @@ function moveIOUReportToPolicy(reportID: string, policyID: string) { * @param reportID - The ID of the IOU report to move * @param policyID - The ID of the policy to move the report to */ -function moveIOUReportToPolicyAndInviteSubmitter(reportID: string, policyID: string, formatPhoneNumber: LocaleContextProps['formatPhoneNumber']) { +function moveIOUReportToPolicyAndInviteSubmitter(reportID: string, policyID: string) { const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]; // This will be fixed as part of https://github.com/Expensify/Expensify/issues/507850 // eslint-disable-next-line deprecation/deprecation @@ -5250,7 +5249,7 @@ function moveIOUReportToPolicyAndInviteSubmitter(reportID: string, policyID: str // Get personal details onyx data (similar to addMembersToWorkspace) const {newAccountIDs, newLogins} = PersonalDetailsUtils.getNewAccountIDsAndLogins([submitterLogin], [submitterAccountID]); - const newPersonalDetailsOnyxData = PersonalDetailsUtils.getPersonalDetailsOnyxDataForOptimisticUsers(newLogins, newAccountIDs, formatPhoneNumber); + const newPersonalDetailsOnyxData = PersonalDetailsUtils.getPersonalDetailsOnyxDataForOptimisticUsers(newLogins, newAccountIDs); // Build announce room members data for the new member const announceRoomMembers = buildRoomMembersOnyxData(CONST.REPORT.CHAT_TYPE.POLICY_ANNOUNCE, policyID, [submitterAccountID]); @@ -5772,7 +5771,7 @@ function changeReportPolicy(report: Report, policyID: string, reportNextStep?: R /** * Invites the submitter to the new report policy, changes the policy of a report and all its child reports, and moves the report to the new policy's expense chat */ -function changeReportPolicyAndInviteSubmitter(report: Report, policyID: string, employeeList: PolicyEmployeeList | undefined, formatPhoneNumber: LocaleContextProps['formatPhoneNumber']) { +function changeReportPolicyAndInviteSubmitter(report: Report, policyID: string, employeeList: PolicyEmployeeList | undefined) { if (!report.reportID || !policyID || report.policyID === policyID || !isExpenseReport(report) || !report.ownerAccountID) { return; } @@ -5788,7 +5787,6 @@ function changeReportPolicyAndInviteSubmitter(report: Report, policyID: string, policyID, policyMemberAccountIDs, CONST.POLICY.ROLE.USER, - formatPhoneNumber, ); const optimisticPolicyExpenseChatReportID = membersChats.reportCreationData[submitterEmail].reportID; const optimisticPolicyExpenseChatCreatedReportActionID = membersChats.reportCreationData[submitterEmail].reportActionID; diff --git a/src/pages/InviteReportParticipantsPage.tsx b/src/pages/InviteReportParticipantsPage.tsx index 85f1e613e454..71f77826c7ed 100644 --- a/src/pages/InviteReportParticipantsPage.tsx +++ b/src/pages/InviteReportParticipantsPage.tsx @@ -55,7 +55,7 @@ function InviteReportParticipantsPage({betas, report, didScreenTransitionEnd}: I }); const styles = useThemeStyles(); - const {translate, formatPhoneNumber} = useLocalize(); + const {translate} = useLocalize(); const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {canBeMissing: false}); const [userSearchPhrase] = useOnyx(ONYXKEYS.ROOM_MEMBERS_USER_SEARCH_PHRASE, {canBeMissing: true}); const [searchValue, debouncedSearchTerm, setSearchValue] = useDebouncedState(userSearchPhrase ?? ''); @@ -198,7 +198,7 @@ function InviteReportParticipantsPage({betas, report, didScreenTransitionEnd}: I } invitedEmailsToAccountIDs[login] = accountID; }); - inviteToGroupChat(reportID, invitedEmailsToAccountIDs, formatPhoneNumber); + inviteToGroupChat(reportID, invitedEmailsToAccountIDs); goBack(); }, [selectedOptions, goBack, reportID, validate]); diff --git a/src/pages/OnboardingWorkspaceInvite/BaseOnboardingWorkspaceInvite.tsx b/src/pages/OnboardingWorkspaceInvite/BaseOnboardingWorkspaceInvite.tsx index ec8e3df2eaeb..7f34bd4d484e 100644 --- a/src/pages/OnboardingWorkspaceInvite/BaseOnboardingWorkspaceInvite.tsx +++ b/src/pages/OnboardingWorkspaceInvite/BaseOnboardingWorkspaceInvite.tsx @@ -43,7 +43,7 @@ type MembersSection = SectionListData>; function BaseOnboardingWorkspaceInvite({shouldUseNativeStyles}: BaseOnboardingWorkspaceInviteProps) { const styles = useThemeStyles(); - const {translate, formatPhoneNumber} = useLocalize(); + const {translate} = useLocalize(); const [onboardingPolicyID] = useOnyx(ONYXKEYS.ONBOARDING_POLICY_ID, {canBeMissing: true}); const [onboardingAdminsChatReportID] = useOnyx(ONYXKEYS.ONBOARDING_ADMINS_CHAT_REPORT_ID, {canBeMissing: true}); const policy = usePolicy(onboardingPolicyID); @@ -271,9 +271,9 @@ function BaseOnboardingWorkspaceInvite({shouldUseNativeStyles}: BaseOnboardingWo invitedEmailsToAccountIDs[login] = Number(accountID); }); const policyMemberAccountIDs = Object.values(getMemberAccountIDsForWorkspace(policy?.employeeList, false, false)); - addMembersToWorkspace(invitedEmailsToAccountIDs, `${welcomeNoteSubject}\n\n${welcomeNote}`, onboardingPolicyID, policyMemberAccountIDs, CONST.POLICY.ROLE.USER, formatPhoneNumber); + addMembersToWorkspace(invitedEmailsToAccountIDs, `${welcomeNoteSubject}\n\n${welcomeNote}`, onboardingPolicyID, policyMemberAccountIDs, CONST.POLICY.ROLE.USER); completeOnboarding(); - }, [completeOnboarding, onboardingPolicyID, policy?.employeeList, selectedOptions, welcomeNote, welcomeNoteSubject, formatPhoneNumber]); + }, [completeOnboarding, onboardingPolicyID, policy?.employeeList, selectedOptions, welcomeNote, welcomeNoteSubject]); useEffect(() => { searchInServer(debouncedSearchTerm); diff --git a/src/pages/ReportChangeWorkspacePage.tsx b/src/pages/ReportChangeWorkspacePage.tsx index 9b8e0f61fe93..80bf2a5375d0 100644 --- a/src/pages/ReportChangeWorkspacePage.tsx +++ b/src/pages/ReportChangeWorkspacePage.tsx @@ -31,7 +31,7 @@ function ReportChangeWorkspacePage({report, route}: ReportChangeWorkspacePagePro const {isOffline} = useNetwork(); const styles = useThemeStyles(); const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState(''); - const {translate, formatPhoneNumber} = useLocalize(); + const {translate} = useLocalize(); const [policies, fetchStatus] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: true}); const [reportNextStep] = useOnyx(`${ONYXKEYS.COLLECTION.NEXT_STEP}${reportID}`, {canBeMissing: true}); @@ -49,19 +49,19 @@ function ReportChangeWorkspacePage({report, route}: ReportChangeWorkspacePagePro // This will be fixed as part of https://github.com/Expensify/Expensify/issues/507850 // eslint-disable-next-line deprecation/deprecation if (isIOUReport(reportID) && isPolicyAdmin(getPolicy(policyID)) && report.ownerAccountID && !isPolicyMember(getLoginByAccountID(report.ownerAccountID), policyID)) { - moveIOUReportToPolicyAndInviteSubmitter(reportID, policyID, formatPhoneNumber); + moveIOUReportToPolicyAndInviteSubmitter(reportID, policyID); } else if (isIOUReport(reportID) && isPolicyMember(session?.email, policyID)) { moveIOUReportToPolicy(reportID, policyID); // This will be fixed as part of https://github.com/Expensify/Expensify/issues/507850 // eslint-disable-next-line deprecation/deprecation } else if (isExpenseReport(report) && isPolicyAdmin(getPolicy(policyID)) && report.ownerAccountID && !isPolicyMember(getLoginByAccountID(report.ownerAccountID), policyID)) { const employeeList = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]?.employeeList; - changeReportPolicyAndInviteSubmitter(report, policyID, employeeList, formatPhoneNumber); + changeReportPolicyAndInviteSubmitter(report, policyID, employeeList); } else { changeReportPolicy(report, policyID, reportNextStep); } }, - [session?.email, route.params, report, reportID, reportNextStep, policies, formatPhoneNumber], + [session?.email, route.params, report, reportID, reportNextStep, policies], ); const {sections, shouldShowNoResultsFoundMessage, shouldShowSearchInput} = useWorkspaceList({ diff --git a/src/pages/RoomInvitePage.tsx b/src/pages/RoomInvitePage.tsx index 6499e08d5810..c45dee1f7d80 100644 --- a/src/pages/RoomInvitePage.tsx +++ b/src/pages/RoomInvitePage.tsx @@ -53,7 +53,7 @@ function RoomInvitePage({ }, }: RoomInvitePageProps) { const styles = useThemeStyles(); - const {translate, formatPhoneNumber} = useLocalize(); + const {translate} = useLocalize(); const [userSearchPhrase] = useOnyx(ONYXKEYS.ROOM_MEMBERS_USER_SEARCH_PHRASE, {canBeMissing: true}); const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState(userSearchPhrase ?? ''); const [selectedOptions, setSelectedOptions] = useState([]); @@ -203,11 +203,11 @@ function RoomInvitePage({ invitedEmailsToAccountIDs[login] = Number(accountID); }); if (reportID) { - inviteToRoom(reportID, invitedEmailsToAccountIDs, formatPhoneNumber); + inviteToRoom(reportID, invitedEmailsToAccountIDs); } clearUserSearchPhrase(); Navigation.goBack(backRoute); - }, [selectedOptions, backRoute, reportID, validate, formatPhoneNumber]); + }, [selectedOptions, backRoute, reportID, validate]); const goBack = useCallback(() => { Navigation.goBack(backRoute); diff --git a/src/pages/workspace/WorkspaceInviteMessagePage.tsx b/src/pages/workspace/WorkspaceInviteMessagePage.tsx index a1b8b40e90f1..6276855e1435 100644 --- a/src/pages/workspace/WorkspaceInviteMessagePage.tsx +++ b/src/pages/workspace/WorkspaceInviteMessagePage.tsx @@ -48,7 +48,7 @@ type WorkspaceInviteMessagePageProps = WithPolicyAndFullscreenLoadingProps & function WorkspaceInviteMessagePage({policy, route, currentUserPersonalDetails}: WorkspaceInviteMessagePageProps) { const styles = useThemeStyles(); - const {translate, formatPhoneNumber} = useLocalize(); + const {translate} = useLocalize(); const [formData, formDataResult] = useOnyx(ONYXKEYS.FORMS.WORKSPACE_INVITE_MESSAGE_FORM_DRAFT, {canBeMissing: true}); const viewportOffsetTop = useViewportOffsetTop(); @@ -101,14 +101,7 @@ function WorkspaceInviteMessagePage({policy, route, currentUserPersonalDetails}: Keyboard.dismiss(); const policyMemberAccountIDs = Object.values(getMemberAccountIDsForWorkspace(policy?.employeeList, false, false)); // Please see https://github.com/Expensify/App/blob/main/README.md#Security for more details - addMembersToWorkspace( - invitedEmailsToAccountIDsDraft ?? {}, - `${welcomeNoteSubject}\n\n${welcomeNote}`, - route.params.policyID, - policyMemberAccountIDs, - workspaceInviteRoleDraft, - formatPhoneNumber, - ); + addMembersToWorkspace(invitedEmailsToAccountIDsDraft ?? {}, `${welcomeNoteSubject}\n\n${welcomeNote}`, route.params.policyID, policyMemberAccountIDs, workspaceInviteRoleDraft); setWorkspaceInviteMessageDraft(route.params.policyID, welcomeNote ?? null); clearDraftValues(ONYXKEYS.FORMS.WORKSPACE_INVITE_MESSAGE_FORM); if ((route.params?.backTo as string)?.endsWith('members')) { diff --git a/tests/actions/PolicyMemberTest.ts b/tests/actions/PolicyMemberTest.ts index 92f4fe6e2fec..f86100a41a71 100644 --- a/tests/actions/PolicyMemberTest.ts +++ b/tests/actions/PolicyMemberTest.ts @@ -287,7 +287,7 @@ describe('actions/PolicyMember', () => { }); mockFetch?.pause?.(); - Member.addMembersToWorkspace({[newUserEmail]: 1234}, 'Welcome', policyID, [], CONST.POLICY.ROLE.USER, TestHelper.formatPhoneNumber); + Member.addMembersToWorkspace({[newUserEmail]: 1234}, 'Welcome', policyID, [], CONST.POLICY.ROLE.USER); await waitForBatchedUpdates(); @@ -337,9 +337,9 @@ describe('actions/PolicyMember', () => { }); // When adding a new admin, auditor, and user members - Member.addMembersToWorkspace({[adminEmail]: adminAccountID}, 'Welcome', policyID, [], CONST.POLICY.ROLE.ADMIN, TestHelper.formatPhoneNumber); - Member.addMembersToWorkspace({[auditorEmail]: auditorAccountID}, 'Welcome', policyID, [], CONST.POLICY.ROLE.AUDITOR, TestHelper.formatPhoneNumber); - Member.addMembersToWorkspace({[userEmail]: userAccountID}, 'Welcome', policyID, [], CONST.POLICY.ROLE.USER, TestHelper.formatPhoneNumber); + Member.addMembersToWorkspace({[adminEmail]: adminAccountID}, 'Welcome', policyID, [], CONST.POLICY.ROLE.ADMIN); + Member.addMembersToWorkspace({[auditorEmail]: auditorAccountID}, 'Welcome', policyID, [], CONST.POLICY.ROLE.AUDITOR); + Member.addMembersToWorkspace({[userEmail]: userAccountID}, 'Welcome', policyID, [], CONST.POLICY.ROLE.USER); await waitForBatchedUpdates(); @@ -388,7 +388,7 @@ describe('actions/PolicyMember', () => { }); // When adding the user to the workspace - Member.addMembersToWorkspace({[userEmail]: userAccountID}, 'Welcome', policyID, [], CONST.POLICY.ROLE.USER, TestHelper.formatPhoneNumber); + Member.addMembersToWorkspace({[userEmail]: userAccountID}, 'Welcome', policyID, [], CONST.POLICY.ROLE.USER); await waitForBatchedUpdates(); diff --git a/tests/actions/ReportTest.ts b/tests/actions/ReportTest.ts index e0075dc95a7a..df24f11b3a06 100644 --- a/tests/actions/ReportTest.ts +++ b/tests/actions/ReportTest.ts @@ -1889,14 +1889,9 @@ describe('actions/Report', () => { }); // When moving to another workspace - Report.changeReportPolicyAndInviteSubmitter( - expenseReport, - '2', - { - [adminEmail]: {role: CONST.POLICY.ROLE.ADMIN}, - }, - TestHelper.formatPhoneNumber, - ); + Report.changeReportPolicyAndInviteSubmitter(expenseReport, '2', { + [adminEmail]: {role: CONST.POLICY.ROLE.ADMIN}, + }); await waitForBatchedUpdates(); // Then the expense report should not be archived anymore diff --git a/tests/unit/libs/PersonalDetailsUtilsTest.ts b/tests/unit/libs/PersonalDetailsUtilsTest.ts deleted file mode 100644 index a521848ad961..000000000000 --- a/tests/unit/libs/PersonalDetailsUtilsTest.ts +++ /dev/null @@ -1,58 +0,0 @@ -import Onyx from 'react-native-onyx'; -import {getPersonalDetailsOnyxDataForOptimisticUsers} from '@libs/PersonalDetailsUtils'; -import ONYXKEYS from '@src/ONYXKEYS'; -import {formatPhoneNumber} from '../../utils/TestHelper'; - -describe('PersonalDetailsUtils', () => { - test('getPersonalDetailsOnyxDataForOptimisticUsers should return correct optimistic and finally data', () => { - const newLogins = ['3322076524', 'test2@test.com', '+14185438090']; - const newAccountIDs = [1, 2, 3]; - const result = getPersonalDetailsOnyxDataForOptimisticUsers(newLogins, newAccountIDs, formatPhoneNumber); - const expected = { - optimisticData: [ - { - key: ONYXKEYS.PERSONAL_DETAILS_LIST, - onyxMethod: 'merge', - value: { - // eslint-disable-next-line @typescript-eslint/naming-convention - '1': { - accountID: 1, - displayName: '3322076524', - isOptimisticPersonalDetail: true, - login: '3322076524', - }, - // eslint-disable-next-line @typescript-eslint/naming-convention - '2': { - accountID: 2, - displayName: 'test2@test.com', - isOptimisticPersonalDetail: true, - login: 'test2@test.com', - }, - // eslint-disable-next-line @typescript-eslint/naming-convention - '3': { - accountID: 3, - displayName: '(418) 543-8090', - isOptimisticPersonalDetail: true, - login: '+14185438090', - }, - }, - }, - ], - finallyData: [ - { - key: ONYXKEYS.PERSONAL_DETAILS_LIST, - onyxMethod: Onyx.METHOD.MERGE, - value: { - // eslint-disable-next-line @typescript-eslint/naming-convention - '1': null, - // eslint-disable-next-line @typescript-eslint/naming-convention - '2': null, - // eslint-disable-next-line @typescript-eslint/naming-convention - '3': null, - }, - }, - ], - }; - expect(result).toEqual(expected); - }); -}); diff --git a/tests/utils/TestHelper.ts b/tests/utils/TestHelper.ts index baa37128d567..549b3ea97851 100644 --- a/tests/utils/TestHelper.ts +++ b/tests/utils/TestHelper.ts @@ -4,7 +4,6 @@ import {Linking} from 'react-native'; import Onyx from 'react-native-onyx'; import type {ConnectOptions, OnyxKey} from 'react-native-onyx/dist/types'; import type {ApiCommand, ApiRequestCommandParameters} from '@libs/API/types'; -import {formatPhoneNumberWithCountryCode} from '@libs/LocalePhoneNumber'; import {translateLocal} from '@libs/Localize'; import Pusher from '@libs/Pusher'; import PusherConnectionManager from '@libs/PusherConnectionManager'; @@ -40,10 +39,6 @@ type FormData = { entries: () => Array<[string, string | Blob]>; }; -function formatPhoneNumber(phoneNumber: string) { - return formatPhoneNumberWithCountryCode(phoneNumber, 1); -} - function setupApp() { beforeAll(() => { Linking.setInitialURL('https://new.expensify.com/'); @@ -368,5 +363,4 @@ export { navigateToSidebarOption, getOnyxData, getNavigateToChatHintRegex, - formatPhoneNumber, };