From 36dd828a556425da88bf2d83c42064a124156880 Mon Sep 17 00:00:00 2001 From: Mohsen Date: Tue, 10 Oct 2023 14:36:40 +0300 Subject: [PATCH] [#17446] fix: Display name is not shown in chats after sync (#17591) --- src/status_im/multiaccounts/core.cljs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/status_im/multiaccounts/core.cljs b/src/status_im/multiaccounts/core.cljs index 9f2312571c..7b6bda0a43 100644 --- a/src/status_im/multiaccounts/core.cljs +++ b/src/status_im/multiaccounts/core.cljs @@ -41,13 +41,16 @@ (defn contact-two-names-by-identity [contact profile contact-identity] - (let [me? (= (:public-key profile) contact-identity)] + (let [{:keys [public-key preferred-name display-name]} profile + {:keys [primary-name secondary-name]} contact + me? (= public-key contact-identity)] (if me? - [(or (:preferred-name profile) - (:display-name profile) - (:primary-name contact) - (gfycat/generate-gfy contact-identity))] - [(:primary-name contact) (:secondary-name contact)]))) + [(cond + (not (string/blank? preferred-name)) preferred-name + (not (string/blank? display-name)) display-name + (not (string/blank? primary-name)) primary-name + :else (gfycat/generate-gfy contact-identity))] + [primary-name secondary-name]))) (defn displayed-photo [{:keys [images]}]