From ac9b5cd976d6a4aff3e820dcdb39a6a8e0255486 Mon Sep 17 00:00:00 2001
From: Dmitry Novotochinov <trybeee@gmail.com>
Date: Thu, 15 Feb 2018 13:39:41 +0300
Subject: [PATCH] Use re-frame fork with js/setTimeout as next-tick

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

Signed-off-by: Dmitry Novotochinov <trybeee@gmail.com>
---
 project.clj                                         | 2 +-
 src/status_im/core.cljs                             | 4 +---
 src/status_im/native_module/impl/module.cljs        | 5 +++--
 src/status_im/ui/screens/accounts/login/events.cljs | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/project.clj b/project.clj
index 63e01c2add..ddd056acae 100644
--- a/project.clj
+++ b/project.clj
@@ -6,7 +6,7 @@
                  [org.clojure/clojurescript "1.9.946"]
                  [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]]
-                 [re-frame "0.10.2"]
+                 [status-im/re-frame "0.10.2"]
                  [com.andrewmcveigh/cljs-time "0.5.2"]
                  [com.taoensso/timbre "4.10.0"]
                  [hickory "0.7.1"]
diff --git a/src/status_im/core.cljs b/src/status_im/core.cljs
index cbbfd437a7..fc7c8f5b8c 100644
--- a/src/status_im/core.cljs
+++ b/src/status_im/core.cljs
@@ -1,7 +1,6 @@
 (ns status-im.core
   (:require [status-im.utils.error-handler :as error-handler]
             [status-im.ui.components.react :as react]
-            [re-frame.core :as re-frame]
             [reagent.core :as reagent]
             [status-im.native-module.core :as status]
             [taoensso.timbre :as log]
@@ -15,5 +14,4 @@
   (log/set-level! config/log-level)
   (error-handler/register-exception-handler!)
   (status/init-jail)
-  (.registerComponent react/app-registry "StatusIm" #(reagent/reactify-component app-root))
-  (re-frame/dispatch-sync [:initialize-app]))
+  (.registerComponent react/app-registry "StatusIm" #(reagent/reactify-component app-root)))
diff --git a/src/status_im/native_module/impl/module.cljs b/src/status_im/native_module/impl/module.cljs
index eba732773f..aa36b70ccd 100644
--- a/src/status_im/native_module/impl/module.cljs
+++ b/src/status_im/native_module/impl/module.cljs
@@ -2,7 +2,7 @@
   (:require-macros
    [cljs.core.async.macros :refer [go-loop go]])
   (: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]
             [cljs.core.async :as async :refer [<!]]
             [status-im.utils.js-resources :as js-res]
@@ -63,7 +63,8 @@
                                  "JavaScriptCore"
                                  "OttoVM")
                                " 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))
 
diff --git a/src/status_im/ui/screens/accounts/login/events.cljs b/src/status_im/ui/screens/accounts/login/events.cljs
index 80c5eb2ff9..8f25b76235 100644
--- a/src/status_im/ui/screens/accounts/login/events.cljs
+++ b/src/status_im/ui/screens/accounts/login/events.cljs
@@ -33,10 +33,10 @@
       (utils/set-timeout
         (fn []
           (data-store/change-account address new-account?
-                                     #(dispatch [:change-account-handler % address new-account?])))
+                                     #(dispatch [:change-account-handler % address])))
         300)
       (data-store/change-account address new-account?
-                                 #(dispatch [:change-account-handler % address new-account?])))))
+                                 #(dispatch [:change-account-handler % address])))))
 
 ;;;; Handlers