diff --git a/externs.js b/externs.js index ab869ae498..dc8109442b 100644 --- a/externs.js +++ b/externs.js @@ -267,6 +267,11 @@ var TopLevel = { "moveFile" : function () {}, "Multihash" : function () {}, "name" : function () {}, + "response-to": function() {}, + "content_type": function() {}, + "message_type": function() {}, + "chat_id": function() {}, + "clock": function() {}, "nativeEvent" : function () {}, "NativeEventEmitter" : function () {}, "NativeModules" : function () {}, @@ -504,6 +509,9 @@ var TopLevel = { "takePictureAsync" : function () {}, "Text" : function () {}, "text" : function () {}, + "parsedText": function() {}, + "parsedMessage": function() {}, + "content": function() {}, "TextEncoder" : function () {}, "then" : function () {}, "times" : function () {}, diff --git a/src/status_im/transport/impl/receive.cljs b/src/status_im/transport/impl/receive.cljs index ab28337eba..9da1d31f7b 100644 --- a/src/status_im/transport/impl/receive.cljs +++ b/src/status_im/transport/impl/receive.cljs @@ -64,6 +64,6 @@ :identicon (get-in cofx [:metadata :author :identicon]) :from signature :metadata (:metadata cofx))] - (chat.message/receive-one cofx message)))) - ; disable verification until enabled in status-go -; (ens/verify-names-from-message this signature)))) + (fx/merge + (chat.message/receive-one cofx message) + (ens/verify-names-from-message this signature))))) diff --git a/src/status_im/transport/message/core.cljs b/src/status_im/transport/message/core.cljs index 7caf006cef..84c83acc8d 100644 --- a/src/status_im/transport/message/core.cljs +++ b/src/status_im/transport/message/core.cljs @@ -25,6 +25,7 @@ (protocol/Message. {:text (.-text content) :response-to (.-response-to content) + :name (.-name content) :chat-id (.-chat_id content)} (.-content_type parsed-message-js) (keyword (.-message_type parsed-message-js)) @@ -38,7 +39,7 @@ deserializing" [message-js] (if (and (.-parsedMessage message-js) - (= message-type-message) (.-messageType message-js)) + (= message-type-message (.-messageType message-js))) (build-message (.-parsedMessage message-js)) (transit/deserialize (.-payload message-js)))) diff --git a/status-go-version.json b/status-go-version.json index 10d7e64e01..18d4e71595 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 ' instead", "owner": "status-im", "repo": "status-go", - "version": "v0.34.0-beta.6", - "commit-sha1": "9d6601207f7bb2acf0ef0b952b2735995062fca7", - "src-sha256": "1w6c8vgawnd48ygarh18gjzzf3x90zidsi7kiwszmygfd7dh0dp8" + "version": "v0.34.0-beta.7", + "commit-sha1": "89659f85b49b48f4409ed9f522397b99728b214b", + "src-sha256": "0kyk3r2wl3qxz28ifgnk2r8lh5116q8s58pk9x044dsrl0zvn5qv" } diff --git a/test/appium/tests/atomic/account_management/test_profile.py b/test/appium/tests/atomic/account_management/test_profile.py index 63b84c5988..706d838a6f 100644 --- a/test/appium/tests/atomic/account_management/test_profile.py +++ b/test/appium/tests/atomic/account_management/test_profile.py @@ -840,8 +840,6 @@ class TestProfileMultipleDevice(MultipleDeviceTestCase): @marks.testrail_id(6226) @marks.critical - @marks.skip - # TODO: skipped in PR 9178 - should be re-enabled once geth 1.9 upgrade will be merged def test_ens_in_public_chat(self): self.create_drivers(2) device_1, device_2 = self.drivers[0], self.drivers[1]