From 564090d7e6be97945fa057c4102b6075d553531c Mon Sep 17 00:00:00 2001
From: Andrea Maria Piana <andrea.maria.piana@gmail.com>
Date: Wed, 21 Aug 2019 11:18:48 +0200
Subject: [PATCH] upgrade status-protocol-go

Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>
---
 src/status_im/chat/models/message.cljs     | 2 +-
 src/status_im/pairing/core.cljs            | 4 ++--
 status-go-version.json                     | 6 +++---
 test/cljs/status_im/test/pairing/core.cljs | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/status_im/chat/models/message.cljs b/src/status_im/chat/models/message.cljs
index 9849d6e008..87fc786e30 100644
--- a/src/status_im/chat/models/message.cljs
+++ b/src/status_im/chat/models/message.cljs
@@ -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
diff --git a/src/status_im/pairing/core.cljs b/src/status_im/pairing/core.cljs
index e02d5cf2fb..854e752637 100644
--- a/src/status_im/pairing/core.cljs
+++ b/src/status_im/pairing/core.cljs
@@ -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
diff --git a/status-go-version.json b/status-go-version.json
index b194143391..9982cd56eb 100644
--- a/status-go-version.json
+++ b/status-go-version.json
@@ -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"
 }
diff --git a/test/cljs/status_im/test/pairing/core.cljs b/test/cljs/status_im/test/pairing/core.cljs
index 2f78490eb9..c363d03382 100644
--- a/test/cljs/status_im/test/pairing/core.cljs
+++ b/test/cljs/status_im/test/pairing/core.cljs
@@ -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"