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

Merge branch 'feature/#123' into feature/command-suggestions-animation

This commit is contained in:
Roman Volosovskyi 2016-06-27 10:25:58 +03:00
parent 7f156a69cf a3de75127a
commit ce57ab19c8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/status_im/commands/handlers/loading.cljs
View File

@ -1,4 +1,5 @@
(ns status-im.commands.handlers.loading (ns status-im.commands.handlers.loading
(:require-macros [status-im.utils.slurp :refer [slurp]])
(:require [re-frame.core :refer [register-handler after dispatch subscribe (:require [re-frame.core :refer [register-handler after dispatch subscribe
trim-v debug]] trim-v debug]]
[status-im.utils.handlers :as u] [status-im.utils.handlers :as u]
@ -23,9 +24,11 @@
(defn fetch-commands! (defn fetch-commands!
[db [identity]] [db [identity]]
(when-let [url (:dapp-url (get-in db [:chats identity]))] (when-let [url (:dapp-url (get-in db [:chats identity]))]
(http-get (s/join "/" [url commands-js]) (if (= "console" identity)
#(dispatch [::validate-hash identity %]) (dispatch [::validate-hash identity (slurp "resources/commands.js")])
#(dispatch [::loading-failed! identity ::file-was-not-found])))) (http-get (s/join "/" [url commands-js])
#(dispatch [::validate-hash identity %])
#(dispatch [::loading-failed! identity ::file-was-not-found])))))
(defn dispatch-loaded! (defn dispatch-loaded!
[db [identity file]] [db [identity file]]