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

Fixing fx arguments and event dispatches 

Signed-off-by: Eric Dvorsak <eric@dvorsak.fr>
This commit is contained in:
Eric Dvorsak 2018-03-03 20:09:12 +01:00
parent 7efcdcb150
commit e9e1456afc
No known key found for this signature in database
GPG Key ID: 932AC1CE5F05DE0C
3 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/status_im/ui/screens/accounts/events.cljs
View File

@ -83,7 +83,7 @@
(handlers/register-handler-fx
:create-account
(fn [{{:accounts/keys [create] :as db} :db}]
(fn [{{:accounts/keys [create] :as db} :db} _]
{:db (update db :accounts/create assoc :step :account-creating :error nil)
::create-account (:password create)}))
@ -123,7 +123,7 @@
(log/debug "account-created")
(when-not (str/blank? pubkey)
(-> (add-account db account)
(assoc :dispatch [:login-account normalized-address password true]))))))
(assoc :dispatch [:login-account normalized-address password]))))))
(handlers/register-handler-fx
:load-accounts
@ -209,4 +209,4 @@
(handlers/register-handler-fx
:reset-account-creation
(fn [{db :db} _]
{:db (update db :accounts/create assoc :step :enter-password :password nil :password-confirm nil :error nil)}))
{:db (update db :accounts/create assoc :step :enter-password :password nil :password-confirm nil :error nil)}))

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

@ -26,17 +26,16 @@
(reg-fx
::change-account
(fn [[address new-account?]]
(fn [[address]]
;; if we don't add delay when running app without status-go
;; "null is not an object (evaluating 'realm.schema')" error appears
(if config/stub-status-go?
(utils/set-timeout
(fn []
(data-store/change-account address new-account?
#(dispatch [:change-account-handler % address])))
300)
(data-store/change-account address new-account?
#(dispatch [:change-account-handler % address])))))
(let [change-account-fn (fn [] (data-store/change-account address
false
#(dispatch [:change-account-handler % address])))]
(if config/stub-status-go?
(utils/set-timeout change-account-fn
300)
(change-account-fn)))))
;;;; Handlers
@ -90,8 +89,7 @@
(register-handler-fx
:login-account
(fn [{{:keys [network status-node-started?] :as db} :db}
[_ address password]]
(fn [{{:keys [network status-node-started?] :as db} :db} [_ address password]]
(let [{account-network :network} (get-network-by-address db address)
wnode (get-wnode-by-address db address)
db' (-> db

51
src/status_im/ui/screens/events.cljs
View File

@ -293,12 +293,11 @@
[:update-transactions]
[:get-fcm-token]
[:update-sign-in-time]]
(seq events-after)
(into events-after))}))
(seq events-after) (into events-after))}))
(handlers/register-handler-fx
:initialize-views
(fn [{{:accounts/keys [accounts] :as db} :db}]
(fn [{{:accounts/keys [accounts] :as db} :db} _]
{:db (if (empty? accounts)
(assoc db :view-id :intro :navigation-stack (list :intro))
(let [{:keys [address photo-path name]} (first (sort-by :last-sign-in > (vals accounts)))]
@ -348,17 +347,17 @@
(defn handle-jail-signal [{:keys [chat_id data]}]
(let [{:keys [event data]} (types/json->clj data)]
(case event
"local-storage" (re-frame/dispatch [:set-local-storage {:chat-id chat_id
:data data}])
"show-suggestions" (re-frame/dispatch [:show-suggestions-from-jail {:chat-id chat_id
:markup data}])
"send-message" (re-frame/dispatch [:chat-send-message/from-jail {:chat-id chat_id
:message data}])
"handler-result" (let [orig-params (:origParams data)]
;; TODO(janherich): figure out and fix chat_id from event
(re-frame/dispatch [:command-handler! (:chat-id orig-params)
(restore-command-ref-keyword orig-params)
{:result {:returned (dissoc data :origParams)}}]))
"local-storage" [:set-local-storage {:chat-id chat_id
:data data}]
"show-suggestions" [:show-suggestions-from-jail {:chat-id chat_id
:markup data}]
"send-message" [:chat-send-message/from-jail {:chat-id chat_id
:message data}]
"handler-result" (let [orig-params (:origParams data)]
;; TODO(janherich): figure out and fix chat_id from event
[:command-handler! (:chat-id orig-params)
(restore-command-ref-keyword orig-params)
{:result {:returned (dissoc data :origParams)}}])
(log/debug "Unknown jail signal " event))))
(handlers/register-handler-fx
@ -366,15 +365,17 @@
(fn [_ [_ event-str]]
(log/debug :event-str event-str)
(inst/log (str "Signal event: " event-str))
(let [{:keys [type event]} (types/json->clj event-str)]
(case type
"transaction.queued" (re-frame/dispatch [:transaction-queued event])
"transaction.failed" (re-frame/dispatch [:transaction-failed event])
"node.started" (re-frame/dispatch [:status-node-started])
"node.stopped" (re-frame/dispatch [:status-node-stopped])
"module.initialized" (re-frame/dispatch [:status-module-initialized])
"jail.signal" (handle-jail-signal event)
(log/debug "Event " type " not handled")))))
(let [{:keys [type event]} (types/json->clj event-str)
to-dispatch (case type
"transaction.queued" [:transaction-queued event]
"transaction.failed" [:transaction-failed event]
"node.started" [:status-node-started]
"node.stopped" [:status-node-stopped]
"module.initialized" [:status-module-initialized]
"jail.signal" (handle-jail-signal event)
(log/debug "Event " type " not handled"))]
(when to-dispatch
{:dispatch to-dispatch}))))
(handlers/register-handler-fx
:status-module-initialized
@ -384,13 +385,13 @@
(handlers/register-handler-fx
:status-node-started
(fn [{{:node/keys [after-start] :as db} :db}]
(fn [{{:node/keys [after-start] :as db} :db} _]
(merge {:db (assoc db :status-node-started? true)}
(when after-start {:dispatch-n [after-start]}))))
(handlers/register-handler-fx
:status-node-stopped
(fn [{{:node/keys [after-stop]} :db}]
(fn [{{:node/keys [after-stop]} :db} _]
(when after-stop {:dispatch-n [after-stop]})))
(handlers/register-handler-fx