Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
"date-fns-tz": "^3.2.0",
"dom-serializer": "^0.2.2",
"domhandler": "^4.3.0",
"expensify-common": "^2.0.138",
"expensify-common": "^2.0.141",
"expo": "52.0.41",
"expo-asset": "^11.0.5",
"expo-av": "^15.0.2",
Expand Down
4 changes: 2 additions & 2 deletions src/libs/LoginUtils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {PUBLIC_DOMAINS, Str} from 'expensify-common';
import {PUBLIC_DOMAINS_SET, Str} from 'expensify-common';
import Onyx from 'react-native-onyx';
import CONFIG from '@src/CONFIG';
import CONST from '@src/CONST';
Expand Down Expand Up @@ -40,7 +40,7 @@ function appendCountryCode(phone: string): string {
*/
function isEmailPublicDomain(email: string): boolean {
const emailDomain = Str.extractEmailDomain(email).toLowerCase();
return (PUBLIC_DOMAINS as readonly string[]).includes(emailDomain);
return PUBLIC_DOMAINS_SET.has(emailDomain);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/libs/ValidationUtils.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {addYears, endOfMonth, format, isAfter, isBefore, isSameDay, isValid, isWithinInterval, parse, parseISO, startOfDay, subYears} from 'date-fns';
import {PUBLIC_DOMAINS, Str, Url} from 'expensify-common';
import {PUBLIC_DOMAINS_SET, Str, Url} from 'expensify-common';
import isEmpty from 'lodash/isEmpty';
import isObject from 'lodash/isObject';
import type {OnyxCollection} from 'react-native-onyx';
Expand Down Expand Up @@ -256,7 +256,7 @@ function isValidWebsite(url: string): boolean {

/** Checks if the domain is public */
function isPublicDomain(domain: string): boolean {
return PUBLIC_DOMAINS.some((publicDomain) => publicDomain === domain.toLowerCase());
return PUBLIC_DOMAINS_SET.has(domain.toLowerCase());
}

function validateIdentity(identity: Record<string, string>): Record<string, boolean> {
Expand Down
6 changes: 3 additions & 3 deletions src/libs/actions/Policy/Policy.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {PUBLIC_DOMAINS, Str} from 'expensify-common';
import {PUBLIC_DOMAINS_SET, Str} from 'expensify-common';
import escapeRegExp from 'lodash/escapeRegExp';
import lodashUnion from 'lodash/union';
import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
Expand Down Expand Up @@ -1650,11 +1650,11 @@ function generateDefaultWorkspaceName(email = ''): string {
const displayName = userDetails?.displayName?.trim();
let displayNameForWorkspace = '';

if (!PUBLIC_DOMAINS.some((publicDomain) => publicDomain === domain.toLowerCase())) {
if (!PUBLIC_DOMAINS_SET.has(domain.toLowerCase())) {
displayNameForWorkspace = Str.UCFirst(domain.split('.').at(0) ?? '');
} else if (displayName) {
displayNameForWorkspace = Str.UCFirst(displayName);
} else if (PUBLIC_DOMAINS.some((publicDomain) => publicDomain === domain.toLowerCase())) {
} else if (PUBLIC_DOMAINS_SET.has(domain.toLowerCase())) {
displayNameForWorkspace = Str.UCFirst(username);
} else {
displayNameForWorkspace = userDetails?.phoneNumber ?? '';
Expand Down
4 changes: 2 additions & 2 deletions src/pages/OnboardingWorkEmail/BaseOnboardingWorkEmail.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {useIsFocused} from '@react-navigation/native';
import {PUBLIC_DOMAINS, Str} from 'expensify-common';
import {PUBLIC_DOMAINS_SET, Str} from 'expensify-common';
import React, {useCallback, useEffect, useState} from 'react';
import {View} from 'react-native';
import {useOnyx} from 'react-native-onyx';
Expand Down Expand Up @@ -94,7 +94,7 @@ function BaseOnboardingWorkEmail({shouldUseNativeStyles}: BaseOnboardingWorkEmai
const emailParts = userEmail.split('@');
const domain = emailParts.at(1) ?? '';

if ((PUBLIC_DOMAINS.some((publicDomain) => publicDomain === domain.toLowerCase()) || !Str.isValidEmail(userEmail)) && !isOffline) {
if ((PUBLIC_DOMAINS_SET.has(domain.toLowerCase()) || !Str.isValidEmail(userEmail)) && !isOffline) {
Log.hmmm('User is trying to add an invalid work email', {userEmail, domain});
addErrorMessage(errors, INPUT_IDS.ONBOARDING_WORK_EMAIL, translate('onboarding.workEmailValidationError.publicEmail'));
}
Expand Down