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

[Fixes: #10978] Endless loading public chat name 

Signed-off-by: andrey <motor4ik@gmail.com>
This commit is contained in:
Frank Tang 2020-12-23 11:28:53 +08:00 committed by andrey
parent 767bd46bff
commit b5b16f1278
No known key found for this signature in database
GPG Key ID: 89B67245FD2F0272
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/status_im/mailserver/core.cljs
View File

@ -11,7 +11,6 @@
[status-im.multiaccounts.update.core :as multiaccounts.update] [status-im.multiaccounts.update.core :as multiaccounts.update]
[status-im.native-module.core :as status] [status-im.native-module.core :as status]
[status-im.node.core :as node] [status-im.node.core :as node]
[status-im.transport.utils :as transport.utils]
[status-im.ui.screens.mobile-network-settings.utils [status-im.ui.screens.mobile-network-settings.utils
:as :as
mobile-network-utils] mobile-network-utils]
@ -21,6 +20,7 @@
[status-im.utils.handlers :as handlers] [status-im.utils.handlers :as handlers]
[status-im.utils.random :as rand] [status-im.utils.random :as rand]
[status-im.utils.utils :as utils] [status-im.utils.utils :as utils]
[status-im.mailserver.topics :as topics]
[taoensso.timbre :as log])) [taoensso.timbre :as log]))
;; How do mailserver work ? ;; How do mailserver work ?
@ -362,12 +362,20 @@
(defn chats->never-synced-public-chats [chats] (defn chats->never-synced-public-chats [chats]
(into {} (filter (fn [[_ v]] (:might-have-join-time-messages? v)) chats))) (into {} (filter (fn [[_ v]] (:might-have-join-time-messages? v)) chats)))
(defn- assoc-topic-chat [chat chats topic]
(assoc chats topic chat))
(defn- reduce-assoc-topic-chat [db chats-map chat-id chat]
(let [assoc-topic-chat (partial assoc-topic-chat chat)
topics (topics/topics-for-chat db chat-id)]
(reduce assoc-topic-chat chats-map topics)))
(fx/defn handle-request-success [{{:keys [chats] :as db} :db} (fx/defn handle-request-success [{{:keys [chats] :as db} :db}
{:keys [request-id topics]}] {:keys [request-id topics]}]
(when (:mailserver/current-request db) (when (:mailserver/current-request db)
(let [by-topic-never-synced-chats (let [by-topic-never-synced-chats
(reduce-kv (reduce-kv
#(assoc %1 (transport.utils/get-topic %2) %3) (partial reduce-assoc-topic-chat db)
{} {}
(chats->never-synced-public-chats chats)) (chats->never-synced-public-chats chats))
never-synced-chats-in-this-request never-synced-chats-in-this-request

8
src/status_im/transport/utils.cljs
View File

@ -1,12 +1,6 @@
(ns ^{:doc "Utils for transport layer"} (ns ^{:doc "Utils for transport layer"}
status-im.transport.utils status-im.transport.utils
(:require [clojure.string :as string] (:require [clojure.string :as string]))
[status-im.ethereum.core :as ethereum]))
(defn get-topic
"Get the topic of a group chat or public chat from the chat-id"
[chat-id]
(subs (ethereum/sha3 chat-id) 0 10))
(defn extract-enode-id [enode] (defn extract-enode-id [enode]
(-> enode (-> enode