fixup! WIP

status-im · May 26, 2020 · 7112a6e · 7112a6e
1 parent a17acde
commit 7112a6e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/src/status_im/subs.cljs b/src/status_im/subs.cljs
@@ -1574,20 +1574,27 @@
  (fn [[contact] _]
    (contact.db/added? contact)))
 
+(re-frame/reg-sub
+ :contacts/raw-contact-name-by-identity
+ (fn [[_ identity] _]
+   [(re-frame/subscribe [:contacts/contact-by-identity identity])])
+ (fn [[db-contact] [_ identity]]
+   (if (and (:ens-verified db-contact) (seq (:name db-contact)))
+     (str "@" (:name db-contact))
+     (:alias db-contact))))
+
 (re-frame/reg-sub
  :contacts/contact-name-by-identity
  (fn [[_ identity] _]
-   [(re-frame/subscribe [:contacts/contact-by-identity identity])
+   [(re-frame/subscribe [:contacts/raw-contact-name-by-identity identity])
     (re-frame/subscribe [:multiaccount])])
- (fn [[db-contact current-multiaccount] [_ identity]]
+ (fn [[contact-name current-multiaccount] [_ identity]]
    (let [me? (= (:public-key current-multiaccount) identity)]
      (if me?
        (or (:preferred-name current-multiaccount)
            (gfycat/generate-gfy identity))
-       (if (and (:ens-verified db-contact) (seq (:name db-contact)))
-         (str "@" (:name db-contact))
-         (or (:alias db-contact)
-             (gfycat/generate-gfy identity)))))))
+       (or contact-name
+           (gfycat/generate-gfy identity))))))
 
 (re-frame/reg-sub
  :messages/quote-info

diff --git a/src/status_im/ui/screens/chat/message/message.cljs b/src/status_im/ui/screens/chat/message/message.cljs
@@ -219,9 +219,9 @@
                    (i18n/label :t/status-sent)])
       nil)))
 
-(defview message-author-name [from]
-  (letsubs [contact-name [:contacts/contact-name-by-identity from]]
-    (chat.utils/format-author contact-name style/message-author-name-container)))
+(defview message-author-name [from alias]
+  (letsubs [contact-name [:contacts/raw-contact-name-by-identity from]]
+    (chat.utils/format-author (or contact-name alias) style/message-author-name-container)))
 
 (defn message-press-handlers [{:keys [outgoing from content-type content] :as message}]
   (let [pack (get-in content [:sticker :pack])]
@@ -260,7 +260,7 @@
      (when display-username?
        [react/touchable-opacity {:style    style/message-author-touchable
                                  :on-press #(re-frame/dispatch [:chat.ui/show-profile from])}
-        [message-author-name from]])
+        [message-author-name from alias]])
      ;;MESSAGE CONTENT
      content]]
    ; delivery status