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

Setup cljsjs/web dependency 

Former-commit-id: 8d7a57e6d4
This commit is contained in:
virvar 2016-03-07 20:00:30 +03:00
parent 7beec7dfe9
commit 577cf4e93c
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.re-natal
View File

@ -5,8 +5,7 @@
"modules": [ "modules": [
"react-native-contacts", "react-native-contacts",
"react-native-invertible-scroll-view", "react-native-invertible-scroll-view",
"awesome-phonenumber", "awesome-phonenumber"
"web3"
], ],
"imageDirs": [ "imageDirs": [
"images" "images"

3
package.json
View File

@ -10,7 +10,6 @@
"react-native": "^0.21.0", "react-native": "^0.21.0",
"react-native-contacts": "^0.2.1", "react-native-contacts": "^0.2.1",
"react-native-i18n": "0.0.8", "react-native-i18n": "0.0.8",
"react-native-invertible-scroll-view": "^0.2.0", "react-native-invertible-scroll-view": "^0.2.0"
"web3": "^0.15.3"
} }
} }

6
project.clj
View File

@ -7,6 +7,7 @@
[org.clojure/clojurescript "1.7.170"] [org.clojure/clojurescript "1.7.170"]
[org.omcljs/om "1.0.0-alpha28" :exclusions [cljsjs/react cljsjs/react-dom]] [org.omcljs/om "1.0.0-alpha28" :exclusions [cljsjs/react cljsjs/react-dom]]
[natal-shell "0.1.6"] [natal-shell "0.1.6"]
[cljsjs/web3 "0.15.3-0"]
[syng-im/protocol "0.1.0"]] [syng-im/protocol "0.1.0"]]
:plugins [[lein-cljsbuild "1.1.1"] :plugins [[lein-cljsbuild "1.1.1"]
[lein-figwheel "0.5.0-2"]] [lein-figwheel "0.5.0-2"]]
@ -31,10 +32,7 @@
:compiler {:output-to "target/android/not-used.js" :compiler {:output-to "target/android/not-used.js"
:main "env.android.main" :main "env.android.main"
:output-dir "target/android" :output-dir "target/android"
:optimizations :none :optimizations :none}}}}
:foreign-libs [{:file "resources/vendor/js/web3.js"
:file-min "resources/vendor/js/web3.min.js"
:provides ["cljsjs.web3"]}]}}}}
:repl-options {:nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]}} :repl-options {:nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]}}
:prod {:cljsbuild {:builds :prod {:cljsbuild {:builds
{:ios {:source-paths ["src" "env/prod"] {:ios {:source-paths ["src" "env/prod"]

3
src/messenger/android/login.cljs
View File

@ -43,7 +43,8 @@
(defn get-whisper-identity-handler [phone-number] (defn get-whisper-identity-handler [phone-number]
(fn [identity] (fn [identity]
(if identity ;; TODO to test newIdentity. Change to 'identity' to use saved identity.
(if false ;; identity
(sign-in phone-number identity) (sign-in phone-number identity)
(get-identity (fn [error identity] (get-identity (fn [error identity]
(if (not error) (if (not error)