status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Extended phone number validation (#259)

Former-commit-id: 60a34478f8
This commit is contained in:
Roman Volosovskyi 2016-09-28 17:35:56 +03:00 committed by GitHub
parent 003d67bdff 6af3a67e9b
commit f2a29b9b78
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/status_im/chat/views/new_message.cljs
View File

@ -5,7 +5,6 @@
[status-im.components.react :refer [view]] [status-im.components.react :refer [view]]
[status-im.chat.views.message-input :refer [plain-message-input-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.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.utils.platform :refer [platform-specific]]
[status-im.chat.styles.message :as st])) [status-im.chat.styles.message :as st]))

1
src/status_im/profile/validations.cljs
View File

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

6
src/status_im/utils/phone_number.cljs
View File

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