Merge pull request #697 from nkdengineer/fix/valid-phone-number

lib/ExpensiMark.js

@@ -190,7 +190,10 @@ export default class ExpensiMark {
                     'gim',
                 ),
                 replacement: (match, g1, g2) => {
-                    if (!Str.isValidMention(match)) {
+                    const phoneNumberRegex = new RegExp(`^${Constants.CONST.REG_EXP.PHONE_PART}$`);
+                    const mention = g2.slice(1);
+                    const mentionWithoutSMSDomain = Str.removeSMSDomain(mention);
+                    if (!Str.isValidMention(match) || (phoneNumberRegex.test(mentionWithoutSMSDomain) && !Str.isValidPhoneNumber(mentionWithoutSMSDomain))) {
                         return match;
                     }
                     const phoneRegex = new RegExp(`^@${Constants.CONST.REG_EXP.PHONE_PART}$`);

lib/str.d.ts

@@ -478,9 +478,14 @@ declare const Str: {
     /**
      * Check for whether a phone number is valid.
      * @param phone
-     * @deprecated use isValidE164Phone to validate E.164 phone numbers or isValidPhoneFormat to validate phone numbers in general
+     * @deprecated use isValidE164Phone to validate E.164 phone numbers, isValidPhoneFormat to validate phone number format, or isValidPhoneNumber to validate phone numbers in general
      */
     isValidPhone(phone: string): boolean;
+    /**
+     * Check for whether a phone number is valid.
+     * @param phone
+     */
+    isValidPhoneNumber(phone: string): boolean;
     /**
      * Check for whether a phone number is valid according to E.164 standard.
      * @param phone

lib/str.js

@@ -1,5 +1,6 @@
 /* eslint-disable no-control-regex */
 import _ from 'underscore';
+import {parsePhoneNumber} from 'awesome-phonenumber';
 import * as HtmlEntities from 'html-entities';
 import * as Constants from './CONST';
 import * as UrlPatterns from './Url';
@@ -930,6 +931,16 @@ const Str = {
         return Constants.CONST.SMS.E164_REGEX.test(phone);
     },
 
+    /**
+     * Check for whether a phone number is valid.
+     * @param {String} phone
+     *
+     * @return {bool}
+     */
+    isValidPhoneNumber(phone) {
+        return parsePhoneNumber(phone).possible;
+    },
+
     /**
      * Check for whether a phone number is valid according to E.164 standard.
      * @param {String} phone

package.json

@@ -28,6 +28,7 @@
     "url": "git+ssh://[email protected]/Expensify/JS-Libs.git"
   },
   "dependencies": {
+    "awesome-phonenumber": "^5.4.0",
     "classnames": "2.5.0",
     "clipboard": "2.0.11",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0",