diff --git a/src/status_im/accounts/core.cljs b/src/status_im/accounts/core.cljs index b2f39844d8..4874e28550 100644 --- a/src/status_im/accounts/core.cljs +++ b/src/status_im/accounts/core.cljs @@ -1,6 +1,7 @@ (ns status-im.accounts.core (:require [re-frame.core :as re-frame] [status-im.accounts.update.core :as accounts.update] + [status-im.ethereum.ens :as ens] [status-im.ethereum.stateofus :as stateofus] [status-im.i18n :as i18n] [status-im.native-module.core :as native-module] @@ -12,12 +13,12 @@ [status-im.utils.platform :as platform] [status-im.utils.utils :as utils])) -(defn displayed-name [{:keys [ens-name nickname public-key]}] - (or nickname - (when ens-name - (let [username (stateofus/username ens-name)] - (str "@" (or username ens-name)))) - (gfycat/generate-gfy public-key))) +(defn displayed-name [account] + (let [name (or (:preferred-name account) (:name account))] + (if (ens/is-valid-eth-name? name) + (let [username (stateofus/username name)] + (str "@" (or username name))) + (or name (gfycat/generate-gfy (:public-key account)))))) (re-frame/reg-fx ::chaos-mode-changed diff --git a/src/status_im/accounts/update/core.cljs b/src/status_im/accounts/update/core.cljs index 5bee8f140b..0cef2d97b5 100644 --- a/src/status_im/accounts/update/core.cljs +++ b/src/status_im/accounts/update/core.cljs @@ -11,8 +11,8 @@ (fx/defn account-update-message [{:keys [db] :as cofx}] (let [account (:account/account db) fcm-token (get-in db [:notifications :fcm-token]) - {:keys [name photo-path address]} account] - (message.contact/ContactUpdate. name photo-path address fcm-token (device-info/all cofx)))) + {:keys [name preferred-name photo-path address]} account] + (message.contact/ContactUpdate. (or preferred-name name) photo-path address fcm-token (device-info/all cofx)))) (fx/defn send-account-update [cofx] (protocol/send diff --git a/src/status_im/chat/models/input.cljs b/src/status_im/chat/models/input.cljs index 6deae1bece..4c4fb6611e 100644 --- a/src/status_im/chat/models/input.cljs +++ b/src/status_im/chat/models/input.cljs @@ -124,7 +124,9 @@ [input-text current-chat-id {:keys [db] :as cofx}] (when-not (string/blank? input-text) (let [{:keys [message-id old-message-id]} - (get-in db [:chats current-chat-id :metadata :responding-to-message])] + (get-in db [:chats current-chat-id :metadata :responding-to-message]) + show-name? (get-in db [:account/account :show-name?]) + preferred-name (when show-name? (get-in db [:account/account :preferred-name]))] (fx/merge cofx {:db (assoc-in db [:chats current-chat-id :metadata :responding-to-message] nil)} (chat.message/send-message {:chat-id current-chat-id @@ -133,7 +135,9 @@ :text input-text} message-id (assoc :response-to old-message-id - :response-to-v2 message-id))}) + :response-to-v2 message-id) + preferred-name + (assoc :name preferred-name))}) (commands.input/set-command-reference nil) (set-chat-input-text nil) (process-cooldown))))) diff --git a/src/status_im/contact/core.cljs b/src/status_im/contact/core.cljs index 3fc8a8901a..c312e1ddfe 100644 --- a/src/status_im/contact/core.cljs +++ b/src/status_im/contact/core.cljs @@ -34,9 +34,9 @@ (defn- own-info [db] - (let [{:keys [name photo-path address]} (:account/account db) + (let [{:keys [name preferred-name photo-path address]} (:account/account db) fcm-token (get-in db [:notifications :fcm-token])] - {:name name + {:name (or preferred-name name) :profile-image photo-path :address address :device-info (device-info/all {:db db}) diff --git a/src/status_im/ens/core.cljs b/src/status_im/ens/core.cljs index 15af4d52c5..b4c85e14d4 100644 --- a/src/status_im/ens/core.cljs +++ b/src/status_im/ens/core.cljs @@ -121,7 +121,14 @@ [{:keys [db] :as cofx} name] (fx/merge (assoc-in cofx [:db :account/account :preferred-name] name) (accounts.update/account-update cofx - {:preferred-name name}))) + {:preferred-name name}) + (accounts.update/send-account-update))) + +(fx/defn save-preferred-name-when-first + [cofx names name] + (when (= 1 (count names)) + ;; First name, save it as default + (save-preferred-name cofx name))) (fx/defn save-username {:events [:ens/save-username]} @@ -133,9 +140,7 @@ (accounts.update/account-update cofx {:usernames names} {:success-event [:ens/set-state username :saved]}) - (when (= 1 (count names)) - ;; First name, save it as default - (save-preferred-name cofx name))))) + (save-preferred-name-when-first names name)))) (fx/defn switch-show-username {:events [:ens/switch-show-username]} diff --git a/src/status_im/ethereum/ens.cljs b/src/status_im/ethereum/ens.cljs index eceea4f67e..b300e51f1f 100644 --- a/src/status_im/ethereum/ens.cljs +++ b/src/status_im/ethereum/ens.cljs @@ -143,8 +143,7 @@ :on-success (fn [[x y]] (let [public-key (uncompressed-public-key x y)] - (when-not (= public-key default-key) - (cb public-key))))})) + (cb public-key)))})) (defn get-addr [registry ens-name cb] diff --git a/src/status_im/notifications/core.cljs b/src/status_im/notifications/core.cljs index 11f712b64d..ae7864a6f5 100644 --- a/src/status_im/notifications/core.cljs +++ b/src/status_im/notifications/core.cljs @@ -151,7 +151,7 @@ (defn- get-contact-name [{:keys [db] :as cofx} from] (if (accounts.model/logged-in? cofx) - (accounts/displayed-name (hash->contact from (-> db :contacts/contacts vals))) + (:name (hash->contact from (-> db :contacts/contacts vals))) (anonymize-pubkey from))) (defn- build-notification [{:keys [title body decoded-payload]}] diff --git a/src/status_im/transport/message/contact.cljs b/src/status_im/transport/message/contact.cljs index e32ce4d4ce..54430b2ec7 100644 --- a/src/status_im/transport/message/contact.cljs +++ b/src/status_im/transport/message/contact.cljs @@ -1,8 +1,7 @@ (ns ^{:doc "Contact request and update API"} status-im.transport.message.contact (:require [cljs.spec.alpha :as spec] - [status-im.transport.message.protocol :as protocol] - [status-im.utils.fx :as fx])) + [status-im.transport.message.protocol :as protocol])) (defrecord ContactRequest [name profile-image address fcm-token device-info] protocol/StatusMessage diff --git a/src/status_im/ui/screens/chat/message/message.cljs b/src/status_im/ui/screens/chat/message/message.cljs index 97c44d0c0f..ba6c2be958 100644 --- a/src/status_im/ui/screens/chat/message/message.cljs +++ b/src/status_im/ui/screens/chat/message/message.cljs @@ -215,9 +215,9 @@ (if outgoing-status [text-status outgoing-status])))))) -(defview message-author-name [from message-username name] +(defview message-author-name [from name] (letsubs [username [:contacts/contact-name-by-identity from]] - (chat.utils/format-author from (or username message-username) style/message-author-name name))) + (chat.utils/format-author from style/message-author-name name))) (defn message-body [{:keys [last-in-group? @@ -226,8 +226,7 @@ from outgoing modal? - username - name] :as message} content] + content] :as message} child] [react/view (style/group-message-wrapper message) [react/view (style/message-body message) (when display-photo? @@ -239,9 +238,9 @@ [react/view (style/group-message-view outgoing display-photo?) (when display-username? [react/touchable-opacity {:on-press #(re-frame/dispatch [:chat.ui/show-profile from])} - [message-author-name from username name]]) + [message-author-name from (:name content)]]) [react/view {:style (style/timestamp-content-wrapper outgoing)} - content]]] + child]]] [react/view (style/delivery-status outgoing) [message-delivery-status message]]]) diff --git a/src/status_im/ui/screens/chat/utils.cljs b/src/status_im/ui/screens/chat/utils.cljs index ac99454570..6576265ba0 100644 --- a/src/status_im/ui/screens/chat/utils.cljs +++ b/src/status_im/ui/screens/chat/utils.cljs @@ -1,5 +1,6 @@ (ns status-im.ui.screens.chat.utils (:require [re-frame.core :as re-frame] + [status-im.ethereum.ens :as ens] [status-im.ethereum.stateofus :as stateofus] [status-im.utils.gfycat.core :as gfycat] [status-im.utils.platform :as platform] @@ -9,11 +10,14 @@ [status-im.ui.components.colors :as colors] [status-im.utils.http :as http])) -(defn format-author [from username style ens-name] +(defn format-author [from style name] (cond - ens-name + (ens/is-valid-eth-name? name) [react/text {:style {:color colors/blue :font-size 13 :font-weight "500"}} - (str "@" (or (stateofus/username ens-name) ens-name))] + (str "@" (or (stateofus/username name) name))] + name + [react/text {:style {:color colors/blue :font-size 13 :font-weight "500"}} + name] :else [react/text {:style {:color colors/gray :font-size 12 :font-weight "400"}} (gfycat/generate-gfy from)])) @@ -22,7 +26,7 @@ (or (and (= from current-public-key) [react/text {:style (style true)} (i18n/label :t/You)]) - (format-author from username style nil))) + (format-author from style nil))) (def ^:private styling->prop {:bold {:style {:font-weight "700"}} diff --git a/src/status_im/ui/screens/chat/views.cljs b/src/status_im/ui/screens/chat/views.cljs index 468655b350..347d979c1f 100644 --- a/src/status_im/ui/screens/chat/views.cljs +++ b/src/status_im/ui/screens/chat/views.cljs @@ -1,6 +1,7 @@ (ns status-im.ui.screens.chat.views (:require [re-frame.core :as re-frame] [reagent.core :as reagent] + [status-im.accounts.core :as accounts] [status-im.contact.db :as contact.db] [status-im.i18n :as i18n] [status-im.tribute-to-talk.core :as tribute-to-talk] @@ -123,10 +124,10 @@ (str " " (i18n/label :learn-more))]]) (defn intro-header - [name] + [contact] [react/text {:style (assoc style/intro-header-description :margin-bottom 32)} - (str (i18n/label :t/empty-chat-description-one-to-one) name)]) + (str (i18n/label :t/empty-chat-description-one-to-one) (accounts/displayed-name contact))]) (defn join-chat-button [chat-id] [buttons/secondary-button @@ -278,7 +279,7 @@ (:paid :none) [react/view - [intro-header name] + [intro-header contact] (when (= tribute-status :paid) [pay-to-chat-messages snt-amount chat-id tribute-status tribute-label fiat-amount fiat-currency token]) @@ -297,7 +298,7 @@ (i18n/label (if received? :tribute-to-talk-tribute-received2 :tribute-to-talk-contact-received-your-tribute))]]])] - [intro-header name])) + [intro-header contact])) (defn chat-intro-header-container [{:keys [group-chat name pending-invite-inviter-name @@ -305,7 +306,7 @@ contact universal-link intro-status height input-height] :as chat} no-messages] (let [icon-text (if public? chat-id name) - intro-name (if public? chat-name name)] + intro-name (if public? chat-name (accounts/displayed-name contact))] ;; TODO This when check ought to be unnecessary but for now it prevents ;; jerky motion when fresh chat is created, when input-height can be null ;; affecting the calculation of content-layout-height to be briefly adjusted diff --git a/src/status_im/ui/screens/profile/components/views.cljs b/src/status_im/ui/screens/profile/components/views.cljs index d6dd445366..11d6c78373 100644 --- a/src/status_im/ui/screens/profile/components/views.cljs +++ b/src/status_im/ui/screens/profile/components/views.cljs @@ -32,19 +32,23 @@ (list-selection/show {:title (i18n/label :t/image-source-title) :options options}))) +(defn- names [{:keys [name public-key] :as contact}] + (let [generated-name (when public-key (gfy/generate-gfy public-key))] + [react/view styles/profile-header-name-container + [react/text {:style styles/profile-name-text + :number-of-lines 1} + (accounts/displayed-name contact)] + (when generated-name + [react/text {:style styles/profile-three-words + :number-of-lines 1} + generated-name])])) + (defn- profile-header-display [{:keys [name public-key] :as contact}] (let [generated-name (when public-key (gfy/generate-gfy public-key))] [react/view styles/profile-header-display [chat-icon.screen/my-profile-icon {:account contact :edit? false}] - [react/view styles/profile-header-name-container - [react/text {:style styles/profile-name-text - :number-of-lines 1} - (accounts/displayed-name contact)] - (when (and public-key (not= generated-name name)) - [react/text {:style styles/profile-three-words - :number-of-lines 1} - generated-name])]])) + [names contact]])) (defn- profile-header-edit [{:keys [name group-chat] :as contact} icon-options on-change-text-event allow-icon-change?] @@ -54,14 +58,12 @@ [react/view styles/modal-menu [chat-icon.screen/my-profile-icon {:account contact :edit? allow-icon-change?}]]] - [react/view styles/profile-header-name-container - [profile-name-input name on-change-text-event - (when group-chat {:accessibility-label :chat-name-input})]]]) + [names contact]]) (defn profile-header [{:keys [contact edited-contact editing? allow-icon-change? options on-change-text-event]}] (if editing? - [profile-header-edit (or edited-contact contact) options on-change-text-event allow-icon-change?] + [profile-header-edit (merge edited-contact contact) options on-change-text-event allow-icon-change?] [profile-header-display contact])) ;; settings items elements diff --git a/src/status_im/ui/screens/profile/user/views.cljs b/src/status_im/ui/screens/profile/user/views.cljs index b02bd512e0..c8c2943e56 100644 --- a/src/status_im/ui/screens/profile/user/views.cljs +++ b/src/status_im/ui/screens/profile/user/views.cljs @@ -2,6 +2,7 @@ (:require [clojure.string :as string] [re-frame.core :as re-frame] [reagent.core :as reagent] + [status-im.accounts.core :as accounts] [status-im.i18n :as i18n] [status-im.ui.components.button.view :as button] [status-im.ui.components.colors :as colors] @@ -87,7 +88,7 @@ ttt-enabled? [:tribute-to-talk/enabled?]] [react/view styles/qr-code-viewer [status-bar/status-bar {:type :modal-white}] - [qr-viewer-toolbar (:name contact) value] + [qr-viewer-toolbar (accounts/displayed-name contact) value] [qr-code-viewer/qr-code-viewer (merge {:style styles/qr-code diff --git a/src/status_im/ui/screens/signing/views.cljs b/src/status_im/ui/screens/signing/views.cljs index 99c2ad9617..94bf2c8555 100644 --- a/src/status_im/ui/screens/signing/views.cljs +++ b/src/status_im/ui/screens/signing/views.cljs @@ -2,6 +2,7 @@ (:require-macros [status-im.utils.views :as views]) (:require [status-im.ui.components.react :as react] [re-frame.core :as re-frame] + [status-im.accounts.core :as accounts] [status-im.ui.components.colors :as colors] [status-im.ui.components.animation :as anim] [reagent.core :as reagent] @@ -51,7 +52,7 @@ [list-item/list-item {:type :small :title (i18n/label :t/to) :accessories [[react/text {:ellipsize-mode :middle :number-of-lines 1 :style {:flex-wrap :wrap}} - (or (:name contact) (:address contact))]]}]) + (accounts/displayed-name contact)]]}]) (defn token-item [{:keys [icon color] :as token} display-symbol] (when token @@ -82,7 +83,7 @@ [react/nested-text {:style {:color colors/gray} :ellipsize-mode :middle :number-of-lines 1} (i18n/label :t/to) " " - [{:style {:color colors/black}} (or (:name contact) (:address contact))]] + [{:style {:color colors/black}} (accounts/displayed-name contact)]] [react/text {:style {:margin-top 6 :color colors/gray}} (str fee " " fee-display-symbol " " (string/lower-case (i18n/label :t/network-fee)))])] [react/touchable-highlight (when-not in-progress? {:on-press #(re-frame/dispatch [:signing.ui/cancel-is-pressed])}) diff --git a/src/status_im/ui/screens/wallet/components/views.cljs b/src/status_im/ui/screens/wallet/components/views.cljs index af52821ccd..ab4b242bf1 100644 --- a/src/status_im/ui/screens/wallet/components/views.cljs +++ b/src/status_im/ui/screens/wallet/components/views.cljs @@ -2,6 +2,7 @@ (:require [clojure.string :as string] [re-frame.core :as re-frame] [reagent.core :as reagent] + [status-im.accounts.core :as accounts] [status-im.ethereum.core :as ethereum] [status-im.ethereum.eip55 :as eip55] [status-im.ethereum.tokens :as tokens] @@ -196,7 +197,7 @@ [photos/photo (:photo-path contact) {:size list.styles/image-size}] [list/item-content [list/item-primary {:accessibility-label :contact-name-text} - (:name contact)] + (accounts/displayed-name contact)] [react/text {:style list.styles/secondary-text :accessibility-label :contact-address-text} (eip55/address->checksum (ethereum/normalized-address (:address contact)))]]]])