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

updating cljs compiler 

Signed-off-by: yenda <eric@status.im>
This commit is contained in:
yenda 2018-11-15 14:03:19 +01:00
parent 9f350765e9
commit b41df3b3c2
No known key found for this signature in database
GPG Key ID: 0095623C0069DCE6
10 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deps.edn
View File

@ -1,6 +1,6 @@
{:paths ["components/src" "src" "react-native/src/cljsjs" "resources"]
:deps {org.clojure/clojure {:mvn/version "1.9.0"}
org.clojure/clojurescript {:mvn/version "1.10.238"}
org.clojure/clojurescript {:mvn/version "1.10.439"}
org.clojure/core.async {:mvn/version "0.4.474"}
reagent {:mvn/version "0.7.0"
:exclusions [cljsjs/react cljsjs/react-dom cljsjs/react-dom-server cljsjs/create-react-class]}
@ -12,8 +12,7 @@
hickory {:mvn/version "0.7.1"}
com.cognitect/transit-cljs {:mvn/version "0.8.248"}
status-im/pluto {:mvn/version "iteration-4-1"}
mvxcvi/alphabase {:mvn/version "1.0.0"}
rasom/cljs-react-navigation {:mvn/version "0.1.4"}}
mvxcvi/alphabase {:mvn/version "1.0.0"}}
:aliases
{:dev {:extra-deps
@ -23,8 +22,7 @@
;; Figwheel ClojureScript REPL
cider/piggieback {:mvn/version "0.3.9"
:exclusions [com.google.javascript/closure-compiler]}
figwheel-sidecar {:mvn/version "0.5.16"
:exclusions [com.google.javascript/closure-compiler]}
figwheel-sidecar {:mvn/version "0.5.18-SNAPSHOT"}
re-frisk-remote {:mvn/version "0.5.5"}
re-frisk-sidecar {:mvn/version "0.5.7"}
hawk {:mvn/version "0.2.11"}

6
project.clj
View File

@ -34,8 +34,8 @@
["do" "clean"
["with-profile" "prod" "cljsbuild" "once" "ios"]]
"prod-build-desktop" ^{:doc "Recompile code for desktop with prod profile."}
["do" "clean"
["with-profile" "prod" "cljsbuild" "once" "desktop"]]
["do" "clean"
["with-profile" "prod" "cljsbuild" "once" "desktop"]]
"figwheel-repl" ["with-profile" "+figwheel" "run" "-m" "clojure.main" "env/dev/run.clj"]
"test-cljs" ["with-profile" "test" "doo" "node" "test" "once"]
"test-protocol" ["with-profile" "test" "doo" "node" "protocol" "once"]
@ -64,7 +64,7 @@
:repl-options {:nrepl-middleware [cider.piggieback/wrap-cljs-repl]
:timeout 240000}}
:figwheel [:dev
{:dependencies [[figwheel-sidecar "0.5.16-SNAPSHOT"]
{:dependencies [[figwheel-sidecar "0.5.18-SNAPSHOT"]
[re-frisk-remote "0.5.5"]
[re-frisk-sidecar "0.5.7"]
[day8.re-frame/tracing "0.5.0"]

8
src/status_im/data_store/realm/core.cljs
View File

@ -69,11 +69,11 @@
(str realm-dir
"default.realm"))
(defn- delete-realms []
(defn delete-realms []
(log/warn "realm: deleting all realms")
(fs/unlink realm-dir))
(defn- ensure-directories []
(defn ensure-directories []
(..
(fs/mkdir realm-dir)
(then #(fs/mkdir accounts-realm-dir))))
@ -88,7 +88,7 @@
(fs/unlink path)
(fs/move-file path new-path))))
(defn- move-realms []
(defn move-realms []
(log/info "realm: moving all realms")
(..
(fs/read-dir old-realm-dir)
@ -265,7 +265,7 @@
(when realm-list
(into coll (map map-fn) (range 0 (.-length realm-list)))))
(defn- list->clj [realm-list]
(defn list->clj [realm-list]
(realm-list->clj-coll realm-list [] #(object/get realm-list %)))
(defn- object-list->clj [realm-object-list entity-name]

2
src/status_im/models/wallet.cljs
View File

@ -18,7 +18,7 @@
(defmethod invalid-send-parameter? :gas-price [_ value]
(cond
(not value) :invalid-number
(< (money/->wei :gwei value) min-gas-price-wei) :not-enough-wei
(.lt (money/->wei :gwei value) min-gas-price-wei) :not-enough-wei
(-> (money/->wei :gwei value) .decimalPlaces pos?) :invalid-number))
(defmethod invalid-send-parameter? :default [_ value]

2
src/status_im/ui/components/list_selection.cljs
View File

@ -7,7 +7,7 @@
[status-im.utils.platform :as platform]
[status-im.utils.http :as http]))
(defn- open-share [content]
(defn open-share [content]
(when (or (:message content)
(:url content))
(.share react/sharing (clj->js content))))

2
src/status_im/ui/screens/group/db.cljs
View File

@ -1,4 +1,4 @@
(ns status-im.ui.screens.group.db
(:require [cljs.spec.alpha :as spec]))
(spec/def :group/selected-contacts (spec/nilable (spec/* string?)))
(spec/def :group/selected-contacts (spec/nilable (spec/coll-of string? :kind set?)))

2
src/status_im/ui/screens/hardwallet/components.cljs
View File

@ -40,7 +40,7 @@
:number-of-lines 2}
(i18n/label :t/maintain-card-to-phone-contact)]])})))
(defn- wizard-step [step-number]
(defn wizard-step [step-number]
(when step-number
[react/text {:style styles/wizard-step-text}
(i18n/label :wizard-step {:current step-number

8
src/status_im/ui/screens/wallet/components/views.cljs
View File

@ -44,7 +44,7 @@
(def default-action (actions/back-white actions/default-handler))
(defn- toolbar
(defn toolbar
([title] (toolbar {} title))
([props title] (toolbar props default-action title))
([props action title] (toolbar props action title nil))
@ -94,7 +94,7 @@
[react/text {:style styles/cartouche-primary-text}
s])
(defn- cartouche-secondary-text [s]
(defn cartouche-secondary-text [s]
[react/text {:style styles/cartouche-secondary-text}
s])
@ -273,8 +273,8 @@
[recipient-contact address name request?]
[recipient-address address modal?])]])
(defn- amount-input [{:keys [input-options amount amount-text disabled?]}
{:keys [symbol decimals]}]
(defn amount-input [{:keys [input-options amount amount-text disabled?]}
{:keys [symbol decimals]}]
[react/view {:style components.styles/flex
:accessibility-label :specify-amount-button}
[text-input

2
src/status_im/utils/clocks.cljs
View File

@ -84,7 +84,7 @@
; We should never receive messages from untrusted peers with a timestamp greater
; then now + 20s.
; We cap the timestamp to time now + 1 month to give some room for trusted peers
(defn- safe-timestamp [t]
(defn safe-timestamp [t]
(min t (max-timestamp)))
(defn safe-timestamp? [t]

4
src/status_im/utils/ethereum/mnemonic.cljs
View File

@ -6,7 +6,7 @@
(defn sanitize-passphrase [s]
(-> (string/trim s)
(string/replace-all #"\s+" " ")))
(string/replace #"\s+" " ")))
(defn passphrase->words [s]
(when s
@ -34,4 +34,4 @@
valid-words?))
(defn status-generated-phrase? [s]
(every? dictionary (passphrase->words s)))
(every? dictionary (passphrase->words s)))