status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-02-02 22:25:12 +00:00
Code Issues Projects Releases Wiki Activity

Use re-frame fork with js/setTimeout as next-tick

Browse Source 
Change app initialization process. Dispatch :initialize-app
only when jail has been initialized.

Signed-off-by: Dmitry Novotochinov <trybeee@gmail.com>
This commit is contained in:
Dmitry Novotochinov 2018-02-15 13:39:41 +03:00
parent 1905530044
commit ac9b5cd976
No known key found for this signature in database
GPG Key ID: 267674DCC86628D9
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project.clj
View File

@ -6,7 +6,7 @@
[org.clojure/clojurescript "1.9.946"] [org.clojure/clojurescript "1.9.946"]
[org.clojure/core.async "0.4.474"] [org.clojure/core.async "0.4.474"]
[reagent "0.7.0" :exclusions [cljsjs/react cljsjs/react-dom cljsjs/react-dom-server cljsjs/create-react-class]] [reagent "0.7.0" :exclusions [cljsjs/react cljsjs/react-dom cljsjs/react-dom-server cljsjs/create-react-class]]
[re-frame "0.10.2"] [status-im/re-frame "0.10.2"]
[com.andrewmcveigh/cljs-time "0.5.2"] [com.andrewmcveigh/cljs-time "0.5.2"]
[com.taoensso/timbre "4.10.0"] [com.taoensso/timbre "4.10.0"]
[hickory "0.7.1"] [hickory "0.7.1"]

4
src/status_im/core.cljs
View File

@ -1,7 +1,6 @@
(ns status-im.core (ns status-im.core
(:require [status-im.utils.error-handler :as error-handler] (:require [status-im.utils.error-handler :as error-handler]
[status-im.ui.components.react :as react] [status-im.ui.components.react :as react]
[re-frame.core :as re-frame]
[reagent.core :as reagent] [reagent.core :as reagent]
[status-im.native-module.core :as status] [status-im.native-module.core :as status]
[taoensso.timbre :as log] [taoensso.timbre :as log]
@ -15,5 +14,4 @@
(log/set-level! config/log-level) (log/set-level! config/log-level)
(error-handler/register-exception-handler!) (error-handler/register-exception-handler!)
(status/init-jail) (status/init-jail)
(.registerComponent react/app-registry "StatusIm" #(reagent/reactify-component app-root)) (.registerComponent react/app-registry "StatusIm" #(reagent/reactify-component app-root)))
(re-frame/dispatch-sync [:initialize-app]))

5
src/status_im/native_module/impl/module.cljs
View File

@ -2,7 +2,7 @@
(:require-macros (:require-macros
[cljs.core.async.macros :refer [go-loop go]]) [cljs.core.async.macros :refer [go-loop go]])
(:require [status-im.ui.components.react :as r] (:require [status-im.ui.components.react :as r]
[re-frame.core :refer [dispatch]] [re-frame.core :refer [dispatch] :as re-frame]
[taoensso.timbre :as log] [taoensso.timbre :as log]
[cljs.core.async :as async :refer [<!]] [cljs.core.async :as async :refer [<!]]
[status-im.utils.js-resources :as js-res] [status-im.utils.js-resources :as js-res]
@ -63,7 +63,8 @@
"JavaScriptCore" "JavaScriptCore"
"OttoVM") "OttoVM")
" jail initialized")] " jail initialized")]
(.initJail status init-js' #(log/debug log-message))))))) (.initJail status init-js' #(do (re-frame/dispatch [:initialize-app])
(log/debug log-message))))))))
(defonce listener-initialized (atom false)) (defonce listener-initialized (atom false))

4
src/status_im/ui/screens/accounts/login/events.cljs
View File

@ -33,10 +33,10 @@
(utils/set-timeout (utils/set-timeout
(fn [] (fn []
(data-store/change-account address new-account? (data-store/change-account address new-account?
#(dispatch [:change-account-handler % address new-account?]))) #(dispatch [:change-account-handler % address])))
300) 300)
(data-store/change-account address new-account? (data-store/change-account address new-account?
#(dispatch [:change-account-handler % address new-account?]))))) #(dispatch [:change-account-handler % address])))))
;;;; Handlers ;;;; Handlers