Merge branch 'main' into andrewli-parsecurrency

Expensify · Aug 1, 2023 · df708b5 · df708b5
2 parents 1fe2259 + 56db2a0
commit df708b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/__tests__/Str-test.js b/__tests__/Str-test.js
@@ -127,3 +127,11 @@ describe('Str.fromCurrencyToNumber', () => {
         expect(Str.fromCurrencyToNumber('Bs.S2')).toBe(200);
     });
 });
+
+describe('Str.isValidEmail', () => {
+    it('Correctly detects a valid email', () => {
+        expect(Str.isValidEmail('[email protected]')).toBeTruthy();
+        expect(Str.isValidEmail('test@gmail')).toBeFalsy();
+        expect(Str.isValidEmail('usernamelongerthan64charactersshouldnotworkaccordingtorfc822whichisusedbyphp@gmail.com')).toBeFalsy();
+    });
+});
diff --git a/lib/CONST.jsx b/lib/CONST.jsx
@@ -1,6 +1,6 @@
 /* eslint-disable no-useless-escape */
 
-const EMAIL_BASE_REGEX = "([\\w\\-\\+\\'#]+(?:\\.[\\w\\-\\'\\+]+)*@(?:[\\w\\-]+\\.)+[a-z]{2,})";
+const EMAIL_BASE_REGEX = "([\\w\\-\\+\\'#]{1,64}(?:\\.[\\w\\-\\'\\+]+)*@(?:[\\w\\-]+\\.)+[a-z]{2,})";
 
 const MOMENT_FORMAT_STRING = 'YYYY-MM-DD';