From 2c1e8d8273f8bb9c5e5a4b9975e40edcd6515559 Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Mon, 9 May 2016 14:28:10 +0300 Subject: [PATCH 1/4] change deps repo url from https to ssh Former-commit-id: 4acaab890f0988af080b10307210ed47b65eec4c --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 6c68c58041..361e813dd6 100644 --- a/project.clj +++ b/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"]] From 006792d0c4157a206bb97fbb0bccb3e246a1cf37 Mon Sep 17 00:00:00 2001 From: Jarrad Hope Date: Mon, 9 May 2016 13:31:59 +0200 Subject: [PATCH 2/4] add lein voom build-deps to run-osx.sh Former-commit-id: 4938d1f4103f47083f5909165ab3eab707627b07 --- run-osx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-osx.sh b/run-osx.sh index 7fde17010b..9f89a05857 100755 --- a/run-osx.sh +++ b/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" From 4b29cb407069fbcc1a715493df45da87413721cb Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Mon, 9 May 2016 18:39:10 +0300 Subject: [PATCH 3/4] fix :chat-properties Former-commit-id: 4c4e27267aaba3b9d663f47f3773ff52c09c11ae --- src/syng_im/subs.cljs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/syng_im/subs.cljs b/src/syng_im/subs.cljs index 91a01b5f80..fbfecbcb9e 100644 --- a/src/syng_im/subs.cljs +++ b/src/syng_im/subs.cljs @@ -102,9 +102,9 @@ (get @db :signed-up)))) (register-sub - :show-actions - (fn [db _] - (reaction (get-in @db db/show-actions-path)))) + :show-actions + (fn [db _] + (reaction (get-in @db db/show-actions-path)))) (register-sub :get-contacts @@ -159,10 +159,10 @@ (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 {})))) From 42503f149140f531a363053b9879549911b60521 Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Mon, 9 May 2016 18:41:42 +0300 Subject: [PATCH 4/4] fix :navigation-stack sub Former-commit-id: 4eac55e756eca74391c2e5f5268ea18a2c54f6b4 --- src/syng_im/subs.cljs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/syng_im/subs.cljs b/src/syng_im/subs.cljs index fbfecbcb9e..2d877d06ff 100644 --- a/src/syng_im/subs.cljs +++ b/src/syng_im/subs.cljs @@ -153,7 +153,7 @@ (register-sub :navigation-stack (fn [db _] - (:navigation-stack @db))) + (reaction (:navigation-stack @db)))) (register-sub :db (fn [db _] (reaction @db)))