diff --git a/.re-natal b/.re-natal index 2fca09b323..0292c842d3 100644 --- a/.re-natal +++ b/.re-natal @@ -7,7 +7,8 @@ "react-native-invertible-scroll-view", "awesome-phonenumber", "realm", - "react-native-loading-spinner-overlay" + "react-native-loading-spinner-overlay", + "react-native-i18n" ], "imageDirs": [ "images" diff --git a/src/messenger/android/login.cljs b/src/messenger/android/login.cljs index 17ab669894..9795b41e26 100644 --- a/src/messenger/android/login.cljs +++ b/src/messenger/android/login.cljs @@ -8,6 +8,7 @@ [messenger.state :as state] [messenger.comm.intercom :as intercom :refer [set-user-phone-number]] [messenger.utils.utils :refer [log toast http-post]] + [messenger.utils.phone-number :refer [format-phone-number]] [messenger.utils.resources :as res] [messenger.components.spinner :refer [spinner]] [messenger.android.sign-up-confirm :refer [sign-up-confirm]] @@ -15,9 +16,6 @@ (def nav-atom (atom nil)) -(set! js/PhoneNumber (js/require "awesome-phonenumber")) -(def country-code "US") - (defn show-confirm-view [] (swap! state/app-state assoc :loading false) (binding [state/*nav-render* false] @@ -32,7 +30,7 @@ (intercom/sign-up phone-number whisper-identity show-confirm-view))) (defn update-phone-number [value] - (let [formatted (str (.getNumber (js/PhoneNumber. value country-code "international")))] + (let [formatted (format-phone-number value)] (set-user-phone-number formatted))) (defui Login diff --git a/src/messenger/services/contacts.cljs b/src/messenger/services/contacts.cljs index 4cfa08d784..715991d965 100644 --- a/src/messenger/services/contacts.cljs +++ b/src/messenger/services/contacts.cljs @@ -4,16 +4,11 @@ [cljs.core.async :as async :refer [chan put!