Merge pull request #277 from status-im/bug/#259

Extended phone number validation (#259)

Former-commit-id: 60a34478f8

src/status_im/chat/views/new_message.cljs

@@ -5,7 +5,6 @@
     [status-im.components.react :refer [view]]
     [status-im.chat.views.message-input :refer [plain-message-input-view]]
     [status-im.chat.views.staged-command :refer [simple-command-staged-view]]
-    [status-im.utils.phone-number :refer [valid-mobile-number?]]
     [status-im.utils.platform :refer [platform-specific]]
     [status-im.chat.styles.message :as st]))
 

src/status_im/profile/validations.cljs

@@ -1,6 +1,5 @@
 (ns status-im.profile.validations
   (:require [cljs.spec :as s]
-            [status-im.utils.phone-number :refer [valid-mobile-number?]]
             [status-im.constants :refer [console-chat-id wallet-chat-id]]
             [clojure.string :as str]))
 

src/status_im/utils/phone_number.cljs

@@ -12,6 +12,8 @@
 
 (defn valid-mobile-number? [number]
   (when (string? number)
-    (let [number-obj (awesome-phonenumber. number country-code "international")]
-      (and (.isValid number-obj)
+    (let [pattern    #"^\s*(?:\+?(\d{1,3}))?[-. (]*(\d{3})[-. )]*(\d{3})[-. ]*(\d{2})[-. ]*(\d{2})\s*$"
+          number-obj (awesome-phonenumber. number country-code "international")]
+      (and (re-matches pattern number)
+           (.isValid number-obj)
            (.isMobile number-obj)))))