Merge branch 'develop' into structure

Former-commit-id: 410a06c07c
This commit is contained in:
Roman Volosovskyi 2016-05-09 18:46:50 +03:00
commit 5fcfd12473
3 changed files with 8 additions and 8 deletions

View File

@ -8,7 +8,7 @@
[reagent "0.5.1" :exclusions [cljsjs/react]] [reagent "0.5.1" :exclusions [cljsjs/react]]
[re-frame "0.6.0"] [re-frame "0.6.0"]
[prismatic/schema "1.0.4"] [prismatic/schema "1.0.4"]
^{:voom {:repo "https://github.com/status-im/status-lib.git" ^{:voom {:repo "git@github.com:status-im/status-lib.git"
:branch "master"}} :branch "master"}}
[syng-im/protocol "0.1.1-20160430_080316-gf359cb7"] [syng-im/protocol "0.1.1-20160430_080316-gf359cb7"]
[natal-shell "0.1.6"]] [natal-shell "0.1.6"]]

View File

@ -45,7 +45,7 @@ open -a /Applications/Genymotion.app/Contents/MacOS/player.app --args --vm-name
fi fi
# Install deps, prepare for genymotion and figwheel # Install deps, prepare for genymotion and figwheel
re-natal deps && re-natal use-android-device "${device_type}" && re-natal use-figwheel lein voom build-deps && re-natal deps && re-natal use-android-device "${device_type}" && re-natal use-figwheel
# open figwheel in new tab # open figwheel in new tab
tab "lein figwheel android" tab "lein figwheel android"

View File

@ -102,9 +102,9 @@
(get @db :signed-up)))) (get @db :signed-up))))
(register-sub (register-sub
:show-actions :show-actions
(fn [db _] (fn [db _]
(reaction (get-in @db db/show-actions-path)))) (reaction (get-in @db db/show-actions-path))))
(register-sub (register-sub
:get-contacts :get-contacts
@ -153,16 +153,16 @@
(register-sub :navigation-stack (register-sub :navigation-stack
(fn [db _] (fn [db _]
(:navigation-stack @db))) (reaction (:navigation-stack @db))))
(register-sub :db (register-sub :db
(fn [db _] (reaction @db))) (fn [db _] (reaction @db)))
(register-sub :chat-properties (register-sub :chat-properties
(fn [{:keys [current-chat-id] :as db} [_ properties]] (fn [db [_ properties]]
(->> properties (->> properties
(map (fn [k] (map (fn [k]
[k (-> @db [k (-> @db
(get-in [:cgats current-chat-id k]) (get-in [:chats (:current-chat-id @db) k])
(reaction))])) (reaction))]))
(into {})))) (into {}))))