Merge branch 'develop' into structure

Former-commit-id: 410a06c07c

project.clj

@@ -8,7 +8,7 @@
                  [reagent "0.5.1" :exclusions [cljsjs/react]]
                  [re-frame "0.6.0"]
                  [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"}}
                  [syng-im/protocol "0.1.1-20160430_080316-gf359cb7"]
                  [natal-shell "0.1.6"]]

run-osx.sh

@@ -45,7 +45,7 @@ open -a /Applications/Genymotion.app/Contents/MacOS/player.app --args --vm-name
 fi
 
 # 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
 tab "lein figwheel android"

src/syng_im/subs.cljs

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