fixup! WIP

Author: cammellos

src/status_im/subs.cljs

@@ -452,6 +452,21 @@
  (fn [{:keys [public-key]}]
    public-key))
 
+(re-frame/reg-sub
+ :multiaccount/preferred-name
+ :<- [:multiaccount]
+ (fn [{:keys [preferred-name]}]
+   preferred-name))
+
+(re-frame/reg-sub
+ :multiaccount/my-name
+ :<- [:multiaccount/public-key]
+ :<- [:multiaccount/preferred-name]
+ (fn [[identity preferred-name]]
+   (if preferred-name
+     (stateofus/username (str "@" preferred-name))
+     (gfycat/generate-gfy identity))))
+
 (re-frame/reg-sub
  :multiaccount/default-account
  :<- [:multiaccount/accounts]

src/status_im/ui/screens/chat/sheets.cljs

@@ -103,7 +103,7 @@
 
 (defn group-chat-actions []
   (fn [{:keys [chat-id group-chat chat-name color]}]
-    (let [joined @(re-frame/subscribe [:group-chat/chat-joined? chat-id])]
+    (let [{:keys [joined?]} @(re-frame/subscribe [:group-chat/inviter-info chat-id])]
       [react/view
        [list-item/list-item
         {:theme       :action
@@ -131,7 +131,7 @@
          :accessibility-label :fetch-history-button
          :icon                :main-icons/arrow-down
          :on-press            #(hide-sheet-and-dispatch [:chat.ui/fetch-history-pressed chat-id])}]
-       (when joined
+       (when joined?
          [list-item/list-item
           {:theme               :action
            :title               :t/leave-chat

src/status_im/ui/screens/ens/views.cljs

@@ -18,7 +18,9 @@
             [status-im.ui.components.radio :as radio]
             [status-im.ui.components.react :as react]
             [status-im.ui.components.topbar :as topbar]
+            [status-im.ui.screens.chat.utils :as chat.utils]
             [status-im.ui.screens.chat.message.message :as message]
+            [status-im.ui.screens.chat.styles.message.message :as message.style]
             [status-im.ui.screens.chat.photos :as photos]
             [status-im.ui.screens.profile.components.views :as profile.components]
             [status-im.utils.debounce :as debounce])
@@ -624,6 +626,10 @@
              [name-item {:name name :hide-chevron? true :action action}]]
             [radio/radio (= name preferred-name)]]]))]]]])
 
+(views/defview my-name []
+  (views/letsubs [contact-name [:multiaccount/my-name]]
+    (chat.utils/format-author contact-name message.style/message-author-name-container)))
+
 (defn- registered [names {:keys [preferred-name public-key] :as account} _]
   [react/view {:style {:flex 1}}
    [react/scroll-view
@@ -663,7 +669,7 @@
                    :timestamp-str "9:41 AM"}]
       [react/view
        [react/view {:padding-left 72}
-        [message/message-author-name public-key]]
+        [my-name]]
        [react/view {:flex-direction :row}
         [react/view {:padding-left 16 :padding-right 8 :padding-top 4}
          [photos/photo (multiaccounts/displayed-photo account) {:size 36}]]

src/status_im/ui/screens/home/views/inner_item.cljs

@@ -101,12 +101,6 @@
                    :accessibility-label :unviewed-messages-public}]
       [badge/message-counter unviewed-messages-count])))
 
-(defview one-to-one-title [from]
-  (letsubs [contact-name [:contacts/contact-name-by-identity from]]
-    [react/text-class
-     {:accessibility-label :chat-name-text}
-     (utils/truncate-str contact-name 30)]))
-
 (defn home-list-item [[_ home-item]]
   (let [{:keys [chat-id chat-name color online group-chat
                 public? timestamp last-message]}
@@ -122,7 +116,7 @@
                                    :else nil)
       :title                     (if group-chat
                                    (utils/truncate-str chat-name 30)
-                                   [one-to-one-title chat-id])
+                                   @(re-frame/subscribe [:contacts/contact-name-by-identity chat-id]))
       :title-accessibility-label :chat-name-text
       :title-row-accessory       [message-timestamp (if (pos? (:whisper-timestamp last-message))
                                                       (:whisper-timestamp last-message)