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

upgrade status-protocol-go 

Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>
This commit is contained in:
Andrea Maria Piana 2019-08-21 11:18:48 +02:00
parent 5dbac2b1d9
commit 564090d7e6
No known key found for this signature in database
GPG Key ID: AA6CCA6DE0E06424
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/status_im/chat/models/message.cljs
View File

@ -383,7 +383,7 @@
(wrap-group-message cofx chat-id send-record) (wrap-group-message cofx chat-id send-record)
send-record)] send-record)]
(fx/merge cofx (fx/merge cofx
(send chat-id message-id wrapped-record) (send chat-id message wrapped-record)
(update-message-status chat-id message-id :sending)))) (update-message-status chat-id message-id :sending))))
(fx/defn remove-message-from-group (fx/defn remove-message-from-group

4
src/status_im/pairing/core.cljs
View File

@ -326,7 +326,7 @@
contacts)) contacts))
(defn handle-sync-installation (defn handle-sync-installation
[{:keys [db] :as cofx} {:keys [contacts multiaccount chat]} sender] [{:keys [db] :as cofx} {:keys [contacts account chat]} sender]
(let [confirmation (:metadata cofx)] (let [confirmation (:metadata cofx)]
(if (= sender (multiaccounts.model/current-public-key cofx)) (if (= sender (multiaccounts.model/current-public-key cofx))
(let [on-success #(re-frame/dispatch [:message/messages-persisted [confirmation]]) (let [on-success #(re-frame/dispatch [:message/messages-persisted [confirmation]])
@ -334,7 +334,7 @@
(vals (merge-contacts (:contacts/contacts db) (vals (merge-contacts (:contacts/contacts db)
((comp ensure-photo-path ((comp ensure-photo-path
ensure-system-tags) contacts)))) ensure-system-tags) contacts))))
new-multiaccount (merge-multiaccount (:multiaccount db) multiaccount) new-multiaccount (merge-multiaccount (:multiaccount db) account)
contacts-fx (when new-contacts (mapv contact/upsert-contact new-contacts))] contacts-fx (when new-contacts (mapv contact/upsert-contact new-contacts))]
(apply fx/merge (apply fx/merge
cofx cofx

6
status-go-version.json
View File

@ -2,7 +2,7 @@
"_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead", "_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead",
"owner": "status-im", "owner": "status-im",
"repo": "status-go", "repo": "status-go",
"version": "develop", "version": "042182031f9cc7b13d5f69d4c9fab01942ac8de0",
"commit-sha1": "be9c55bc16ca035ca9bfc0586b6c9298a91bdcd4", "commit-sha1": "042182031f9cc7b13d5f69d4c9fab01942ac8de0",
"src-sha256": "1a499mi1xg1ryl8bjg0kiww6s1vdykhrl11sk0h649ajfcaak1jb" "src-sha256": "1zbf0sn9j887s07qq7hsjlvw1hmkciw4nbndg7ajpszfjj2zmrzd"
} }

2
test/cljs/status_im/test/pairing/core.cljs
View File

@ -200,7 +200,7 @@
:last-updated 1}] :last-updated 1}]
(testing "newer update" (testing "newer update"
(let [cofx {:db {:multiaccount old-multiaccount}} (let [cofx {:db {:multiaccount old-multiaccount}}
sync-message {:multiaccount new-multiaccount}] sync-message {:account new-multiaccount}]
(is (= new-multiaccount (get-in (pairing/handle-sync-installation cofx sync-message "us") (is (= new-multiaccount (get-in (pairing/handle-sync-installation cofx sync-message "us")
[:db :multiaccount]))))) [:db :multiaccount])))))
(testing "older update" (testing "older update"