Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#16703] The display name is not resolved in chats for user sender af… #16704

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/status_im/multiaccounts/core.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@
(contact.db/public-key->new-contact identity)))

(defn contact-two-names-by-identity
[contact current-multiaccount identity]
(let [me? (= (:public-key current-multiaccount) identity)]
[contact profile identity]
(let [me? (= (:public-key profile) identity)]
(if me?
[(or (:preferred-name current-multiaccount)
[(or (:preferred-name profile)
(:display-name profile)
(:primary-name contact)
(gfycat/generate-gfy identity))]
[(:primary-name contact) (:secondary-name contact)])))
Expand Down