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

[Fixes: #1520] Enable ens 

Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>
This commit is contained in:
Andrea Maria Piana 2019-11-07 15:44:13 +01:00
parent 40de054393
commit 2bb7c70216
No known key found for this signature in database
GPG Key ID: AA6CCA6DE0E06424
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
externs.js
View File

@ -267,6 +267,11 @@ var TopLevel = {
"moveFile" : function () {}, "moveFile" : function () {},
"Multihash" : function () {}, "Multihash" : function () {},
"name" : function () {}, "name" : function () {},
"response-to": function() {},
"content_type": function() {},
"message_type": function() {},
"chat_id": function() {},
"clock": function() {},
"nativeEvent" : function () {}, "nativeEvent" : function () {},
"NativeEventEmitter" : function () {}, "NativeEventEmitter" : function () {},
"NativeModules" : function () {}, "NativeModules" : function () {},
@ -504,6 +509,9 @@ var TopLevel = {
"takePictureAsync" : function () {}, "takePictureAsync" : function () {},
"Text" : function () {}, "Text" : function () {},
"text" : function () {}, "text" : function () {},
"parsedText": function() {},
"parsedMessage": function() {},
"content": function() {},
"TextEncoder" : function () {}, "TextEncoder" : function () {},
"then" : function () {}, "then" : function () {},
"times" : function () {}, "times" : function () {},

6
src/status_im/transport/impl/receive.cljs
View File

@ -64,6 +64,6 @@
:identicon (get-in cofx [:metadata :author :identicon]) :identicon (get-in cofx [:metadata :author :identicon])
:from signature :from signature
:metadata (:metadata cofx))] :metadata (:metadata cofx))]
(chat.message/receive-one cofx message)))) (fx/merge
; disable verification until enabled in status-go (chat.message/receive-one cofx message)
; (ens/verify-names-from-message this signature)))) (ens/verify-names-from-message this signature)))))

3
src/status_im/transport/message/core.cljs
View File

@ -25,6 +25,7 @@
(protocol/Message. (protocol/Message.
{:text (.-text content) {:text (.-text content)
:response-to (.-response-to content) :response-to (.-response-to content)
:name (.-name content)
:chat-id (.-chat_id content)} :chat-id (.-chat_id content)}
(.-content_type parsed-message-js) (.-content_type parsed-message-js)
(keyword (.-message_type parsed-message-js)) (keyword (.-message_type parsed-message-js))
@ -38,7 +39,7 @@
deserializing" deserializing"
[message-js] [message-js]
(if (and (.-parsedMessage message-js) (if (and (.-parsedMessage message-js)
(= message-type-message) (.-messageType message-js)) (= message-type-message (.-messageType message-js)))
(build-message (.-parsedMessage message-js)) (build-message (.-parsedMessage message-js))
(transit/deserialize (.-payload message-js)))) (transit/deserialize (.-payload message-js))))

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": "v0.34.0-beta.6", "version": "v0.34.0-beta.7",
"commit-sha1": "9d6601207f7bb2acf0ef0b952b2735995062fca7", "commit-sha1": "89659f85b49b48f4409ed9f522397b99728b214b",
"src-sha256": "1w6c8vgawnd48ygarh18gjzzf3x90zidsi7kiwszmygfd7dh0dp8" "src-sha256": "0kyk3r2wl3qxz28ifgnk2r8lh5116q8s58pk9x044dsrl0zvn5qv"
} }

2
test/appium/tests/atomic/account_management/test_profile.py
View File

@ -840,8 +840,6 @@ class TestProfileMultipleDevice(MultipleDeviceTestCase):
@marks.testrail_id(6226) @marks.testrail_id(6226)
@marks.critical @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): def test_ens_in_public_chat(self):
self.create_drivers(2) self.create_drivers(2)
device_1, device_2 = self.drivers[0], self.drivers[1] device_1, device_2 = self.drivers[0], self.drivers[1]