fix display name issues
This commit is contained in:
parent
d458bca193
commit
21d409ce36
|
@ -44,6 +44,7 @@
|
||||||
(let [me? (= (:public-key current-multiaccount) identity)]
|
(let [me? (= (:public-key current-multiaccount) identity)]
|
||||||
(if me?
|
(if me?
|
||||||
[(or (:preferred-name current-multiaccount)
|
[(or (:preferred-name current-multiaccount)
|
||||||
|
(:primary-name contact)
|
||||||
(gfycat/generate-gfy identity))]
|
(gfycat/generate-gfy identity))]
|
||||||
[(:primary-name contact) (:secondary-name contact)])))
|
[(:primary-name contact) (:secondary-name contact)])))
|
||||||
|
|
||||||
|
|
|
@ -552,7 +552,7 @@
|
||||||
{:icon :placeholder
|
{:icon :placeholder
|
||||||
:icon-color colors/primary-50-opa-40
|
:icon-color colors/primary-50-opa-40
|
||||||
:title (i18n/label :t/contact-request-accepted-toast
|
:title (i18n/label :t/contact-request-accepted-toast
|
||||||
{:name (:alias message)})})
|
{:name (or name (:alias message))})})
|
||||||
|
|
||||||
:else
|
:else
|
||||||
cofx))
|
cofx))
|
||||||
|
|
|
@ -181,7 +181,7 @@
|
||||||
:accessibility-label :forget-password-button
|
:accessibility-label :forget-password-button
|
||||||
:override-theme :dark
|
:override-theme :dark
|
||||||
:style style/forget-password-button}
|
:style style/forget-password-button}
|
||||||
(i18n/label :t/forget-password)]
|
(i18n/label :t/forgot-password)]
|
||||||
[quo/button
|
[quo/button
|
||||||
{:size 40
|
{:size 40
|
||||||
:type :primary
|
:type :primary
|
||||||
|
|
Loading…
Reference in New Issue