Merge pull request #2687 from Expensify/joe-exclude-domain-emails

Don't allow users to create chats with domain accounts
Expensify · May 7, 2021 · 3971b96 · 3971b96
2 parents a22e73d + d5a8e30
commit 3971b96
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
     "electron-log": "^4.2.4",
     "electron-serve": "^1.0.0",
     "electron-updater": "^4.3.4",
-    "expensify-common": "git+https://github.com/Expensify/expensify-common.git#d5edd0a956ef5c12fb6e9493d1f4608289f82a0e",
+    "expensify-common": "git+https://github.com/Expensify/expensify-common.git#05b8a007e9faa8e3b7a1ddd7348503acca6f4e95",
     "file-loader": "^6.0.0",
     "html-entities": "^1.3.1",
     "lodash": "4.17.21",

diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
@@ -287,7 +287,7 @@ function getOptions(reports, personalDetails, draftComments, activeReportID, {
             && recentReportOptions.length === 0
             && personalDetailsOptions.length === 0
             && _.every(selectedOptions, option => option.login !== searchValue)
-            && (Str.isValidEmail(searchValue) || Str.isValidPhone(searchValue))
+            && ((Str.isValidEmail(searchValue) && !Str.isDomainEmail(searchValue)) || Str.isValidPhone(searchValue))
             && (searchValue !== CONST.EMAIL.CHRONOS || Permissions.canUseChronos())
     ) {
         // If the phone number doesn't have an international code then let's prefix it with the