upgrade status-protocol-go
Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>
This commit is contained in:
parent
5dbac2b1d9
commit
564090d7e6
|
@ -383,7 +383,7 @@
|
|||
(wrap-group-message cofx chat-id send-record)
|
||||
send-record)]
|
||||
(fx/merge cofx
|
||||
(send chat-id message-id wrapped-record)
|
||||
(send chat-id message wrapped-record)
|
||||
(update-message-status chat-id message-id :sending))))
|
||||
|
||||
(fx/defn remove-message-from-group
|
||||
|
|
|
@ -326,7 +326,7 @@
|
|||
contacts))
|
||||
|
||||
(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)]
|
||||
(if (= sender (multiaccounts.model/current-public-key cofx))
|
||||
(let [on-success #(re-frame/dispatch [:message/messages-persisted [confirmation]])
|
||||
|
@ -334,7 +334,7 @@
|
|||
(vals (merge-contacts (:contacts/contacts db)
|
||||
((comp ensure-photo-path
|
||||
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))]
|
||||
(apply fx/merge
|
||||
cofx
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
"_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh <tag>' instead",
|
||||
"owner": "status-im",
|
||||
"repo": "status-go",
|
||||
"version": "develop",
|
||||
"commit-sha1": "be9c55bc16ca035ca9bfc0586b6c9298a91bdcd4",
|
||||
"src-sha256": "1a499mi1xg1ryl8bjg0kiww6s1vdykhrl11sk0h649ajfcaak1jb"
|
||||
"version": "042182031f9cc7b13d5f69d4c9fab01942ac8de0",
|
||||
"commit-sha1": "042182031f9cc7b13d5f69d4c9fab01942ac8de0",
|
||||
"src-sha256": "1zbf0sn9j887s07qq7hsjlvw1hmkciw4nbndg7ajpszfjj2zmrzd"
|
||||
}
|
||||
|
|
|
@ -200,7 +200,7 @@
|
|||
:last-updated 1}]
|
||||
(testing "newer update"
|
||||
(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")
|
||||
[:db :multiaccount])))))
|
||||
(testing "older update"
|
||||
|
|
Loading…
Reference in New Issue