Merge pull request #645 from FitseTLT/add-support-for-phone-mention-w…

…ithout-sms-suffix Added support for phone mention without `expensify.sms` suffix
Expensify · Feb 8, 2024 · 7aa1d42 · 7aa1d42
2 parents c85dc9b + c0d4a94
commit 7aa1d42
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/CONST.d.ts b/lib/CONST.d.ts
@@ -251,6 +251,10 @@ export declare const CONST: {
          * Regex matching an text containing an email
          */
         readonly EMAIL_PART: "([\\w\\-\\+\\'#]+(?:\\.[\\w\\-\\'\\+]+)*@(?:[\\w\\-]+\\.)+[a-z]{2,})";
+        /**
+        * Regex matching a text containing an e164 format phone number
+        */
+        readonly PHONE_PART: "\\+?[1-9]\\d{1,14}";
         /**
          * Regular expression to check that a basic name is valid
          */

diff --git a/lib/ExpensiMark.js b/lib/ExpensiMark.js
@@ -162,7 +162,7 @@ export default class ExpensiMark {
              */
             {
                 name: 'userMentions',
-                regex: new RegExp(`(@here|[a-zA-Z0-9.!$%&+=?^\`{|}-]?)(@${CONST.REG_EXP.EMAIL_PART})(?!((?:(?!<a).)+)?<\\/a>|[^<]*(<\\/pre>|<\\/code>))`, 'gim'),
+                regex: new RegExp(`(@here|[a-zA-Z0-9.!$%&+=?^\`{|}-]?)(@${CONST.REG_EXP.EMAIL_PART}|@${CONST.REG_EXP.PHONE_PART})(?!((?:(?!<a).)+)?<\\/a>|[^<]*(<\\/pre>|<\\/code>))`, 'gim'),
                 replacement: (match, g1, g2) => {
                     if (!Str.isValidMention(match)) {
                         return match;