From 53d0cb519c723cec1d6adc3f905346ea5009aee9 Mon Sep 17 00:00:00 2001 From: Andrea Maria Piana Date: Thu, 16 Jan 2020 11:31:36 +0100 Subject: [PATCH] Fix ens names & group chat add-members Signed-off-by: Andrea Maria Piana --- src/status_im/contact/core.cljs | 17 ++++++++++------- src/status_im/contact/db.cljs | 1 - src/status_im/node/core.cljs | 1 + src/status_im/subs.cljs | 4 +++- status-go-version.json | 6 +++--- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/status_im/contact/core.cljs b/src/status_im/contact/core.cljs index b5d0ff665a..e5d18e6e61 100644 --- a/src/status_im/contact/core.cljs +++ b/src/status_im/contact/core.cljs @@ -81,7 +81,7 @@ {:db (-> db (update-in [:contacts/contacts public-key] merge contact))} (transport.filters/load-contact contact) - (contacts-store/save-contact contact))) + #(contacts-store/save-contact % (get-in % [:db :contacts/contacts public-key])))) (fx/defn send-contact-request [{:keys [db] :as cofx} {:keys [public-key] :as contact}] @@ -205,9 +205,12 @@ (fx/defn name-verified {:events [:contacts/ens-name-verified]} - [{:keys [db]} public-key ens-name] - {:db (update-in db [:contacts/contacts public-key] - merge - {:name ens-name - :ens-verified-at (quot (time/timestamp) 1000) - :ens-verified true})}) + [{:keys [db] :as cofx} public-key ens-name] + (fx/merge cofx + {:db (update-in db [:contacts/contacts public-key] + merge + {:name ens-name + :ens-verified-at (quot (time/timestamp) 1000) + :ens-verified true})} + + (upsert-contact {:public-key public-key}))) diff --git a/src/status_im/contact/db.cljs b/src/status_im/contact/db.cljs index 174d9718aa..eaeef9cd44 100644 --- a/src/status_im/contact/db.cljs +++ b/src/status_im/contact/db.cljs @@ -10,7 +10,6 @@ ;;Contact -(spec/def :contact/address (spec/nilable :global/address)) (spec/def :contact/last-online (spec/nilable int?)) (spec/def :contact/last-updated (spec/nilable int?)) (spec/def :contact/name (spec/nilable string?)) diff --git a/src/status_im/node/core.cljs b/src/status_im/node/core.cljs index 65eeb2c7c0..f7e10a2a2e 100644 --- a/src/status_im/node/core.cljs +++ b/src/status_im/node/core.cljs @@ -129,6 +129,7 @@ :MaxMessageDeliveryAttempts config/max-message-delivery-attempts :MailServerConfirmations config/mailserver-confirmations-enabled? :VerifyTransactionURL "https://mainnet.infura.io/v3/f315575765b14720b32382a61a89341a" + :VerifyENSURL "https://mainnet.infura.io/v3/f315575765b14720b32382a61a89341a" :VerifyTransactionChainID 1 :DataSyncEnabled true :PFSEnabled true} diff --git a/src/status_im/subs.cljs b/src/status_im/subs.cljs index 492d9ec61c..515ad29ca0 100644 --- a/src/status_im/subs.cljs +++ b/src/status_im/subs.cljs @@ -1631,7 +1631,9 @@ :contacts/all-contacts-not-in-current-chat :<- [::query-current-chat-contacts remove] (fn [contacts] - (sort-by (comp clojure.string/lower-case :name) contacts))) + (->> contacts + (filter contact.db/added?) + (sort-by (comp clojure.string/lower-case multiaccounts/displayed-name))))) (re-frame/reg-sub :contacts/current-chat-contacts diff --git a/status-go-version.json b/status-go-version.json index fe7e914ac1..6af963ad89 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.39.5", - "commit-sha1": "0316f949077f1481ccff5b71c0aeeec69fecaafb", - "src-sha256": "123wsfhrn53yv18xgmx3fhfh0bgm0wpqpx7pszx8fq5kgr8nssc3" + "version": "v0.39.6", + "commit-sha1": "25d46c6d82fbf3e4b6659cb96cf1789bac87f12a", + "src-sha256": "1m6d07hlxfp8yr94ld73m6dflrgdyjhmpr2ajnjkhjlv9ffvicgb" }