fixup! WIP

Author: cammellos

src/status_im/chat/db.cljs

@@ -11,59 +11,6 @@
   [{:keys [public? name]}]
   (str (when public? "#") name))
 
-(defn enrich-active-chat
-  [contacts {:keys [chat-id
-                    identicon
-                    alias
-                    group-chat] :as chat} current-public-key]
-  (if group-chat
-    (let [pending-invite-inviter-name
-          (group-chats.db/get-pending-invite-inviter-name contacts
-                                                          chat
-                                                          current-public-key)
-          inviter-name
-          (group-chats.db/get-inviter-name contacts
-                                           chat
-                                           current-public-key)]
-      (cond-> chat
-        pending-invite-inviter-name
-        (assoc :pending-invite-inviter-name pending-invite-inviter-name)
-        inviter-name
-        (assoc :inviter-name inviter-name)
-        :always
-        (assoc :chat-name (group-chat-name chat))))
-    (let [photo (if (seq identicon)
-                  identicon
-                  (identicon/identicon chat-id))
-          alias (if (seq alias)
-                  alias
-                  (gfycat/generate-gfy chat-id))
-          {contact-name :name :as contact}
-          (get contacts chat-id
-               {:public-key chat-id
-                :identicon photo
-                :alias alias
-                :name alias
-                :system-tags #{}})]
-      (-> chat
-          (assoc :contact contact
-                 :chat-name (multiaccounts/displayed-name contact)
-                 :name contact-name
-                 :identicon photo
-                 :alias alias)
-          (update :tags clojure.set/union (:tags contact))))))
-
-(defn active-chats
-  [contacts chats {:keys [public-key]}]
-  (reduce-kv (fn [acc chat-id {:keys [is-active] :as chat}]
-               (if is-active
-                 (assoc acc
-                        chat-id
-                        (enrich-active-chat contacts chat public-key))
-                 acc))
-             {}
-             chats))
-
 (defn datemark? [{:keys [type]}]
   (= type :datemark))
 

src/status_im/group_chats/db.cljs

@@ -23,21 +23,3 @@
 
 (defn group-chat? [chat]
   (and (:group-chat chat) (not (:public? chat))))
-
-(defn get-pending-invite-inviter-name
-  "when the chat is a private group chat in which the user has been
-  invited and didn't accept the invitation yet, return inviter-name"
-  [contacts chat my-public-key]
-  (when (and (group-chat? chat)
-             (invited? my-public-key chat)
-             (not (joined? my-public-key chat)))
-    (let [inviter-pk (get-inviter-pk my-public-key chat)]
-      (multiaccounts/displayed-name (or (get contacts inviter-pk) {:public-key inviter-pk})))))
-
-(defn get-inviter-name
-  "when the chat is a private group chat in which the user has been
-  invited and didn't accept the invitation yet, return inviter-name"
-  [contacts chat my-public-key]
-  (when (group-chat? chat)
-    (let [inviter-pk (get-inviter-pk my-public-key chat)]
-      (multiaccounts/displayed-name (or (get contacts inviter-pk) {:public-key inviter-pk})))))

src/status_im/subs.cljs

@@ -610,13 +610,21 @@
 
 (re-frame/reg-sub
  :chats/active-chats
- :<- [:contacts/contacts]
  :<- [::chats]
- :<- [:multiaccount]
- (fn [[contacts chats multiaccount]]
-   (chat.db/active-chats contacts chats multiaccount)))
+ (fn [chats]
+   (reduce-kv (fn [acc id {:keys [is-active] :as chat}]
+                (if is-active
+                  (assoc acc id chat)
+                  acc))
+              {}
+              chats)))
+
+(re-frame/reg-sub
+ ::chat
+ :<- [::chats]
+ (fn [chats [_ chat-id]]
+   (get chats chat-id)))
 
-;; TODO: Fix me
 (re-frame/reg-sub
  :chats/current-raw-chat
  :<- [::chats]
@@ -748,9 +756,15 @@
  :chats/unread-messages-number
  :<- [:chats/active-chats]
  (fn [chats _]
-   (let [grouped-chats (group-by :public? (vals chats))]
-     {:public (apply + (map :unviewed-messages-count (get grouped-chats true)))
-      :other (apply + (map :unviewed-messages-count (get grouped-chats false)))})))
+   (reduce-kv (fn [{:keys [public other]} _ {:keys [unviewed-messages-count public?]}]
+                (if public?
+                  {:public (+ public unviewed-messages-count)
+                   :other other}
+                  {:other (+ other unviewed-messages-count)
+                   :public public}))
+              {:public 0
+               :other 0}
+              chats)))
 
 (re-frame/reg-sub
  :chats/cooldown-enabled?
@@ -803,18 +817,12 @@
 
 (re-frame/reg-sub
  :group-chat/inviter-info
- (fn []
-   {:pending-invite-inviter-name "test 1"
-    :inviter-name "test 2"}))
-
-(re-frame/reg-sub
- :group-chat/chat-joined?
- :<- [:multiaccount/public-key]
- :<- [::chats]
- (fn [[my-public-key chats] [_ chat-id]]
-   (let [current-chat (get chats chat-id)]
-     (and (chat.models/group-chat? current-chat)
-          (group-chats.db/joined? my-public-key current-chat)))))
+ (fn [[_ chat-id] _]
+   [(re-frame/subscribe [::chat chat-id])
+    (re-frame/subscribe [:multiaccount/public-key])])
+ (fn [[chat my-public-key]]
+   {:joined? (group-chats.db/joined? my-public-key chat)
+    :inviter-pk (group-chats.db/get-inviter-pk my-public-key chat)}))
 
 (re-frame/reg-sub
  :chats/transaction-status
@@ -1559,6 +1567,13 @@
  (fn [contacts [_ identity]]
    (get contacts identity)))
 
+(re-frame/reg-sub
+ :contacts/contact-added?
+ (fn [[_ identity] _]
+   [(re-frame/subscribe [:contacts/contact-by-identity identity])])
+ (fn [[contact] _]
+   (contact.db/added? contact)))
+
 (re-frame/reg-sub
  :contacts/contact-name-by-identity
  (fn [[_ identity] _]
@@ -1567,14 +1582,12 @@
  (fn [[db-contact current-multiaccount] [_ identity]]
    (let [me? (= (:public-key current-multiaccount) identity)]
      (if me?
-       {:ens-name (:preferred-name current-multiaccount)
-        :alias (gfycat/generate-gfy identity)}
-       (let [contact (or db-contact
-                         (contact.db/public-key->new-contact identity))]
-         {:ens-name  (when (:ens-verified contact)
-                       (:name contact))
-          :alias (or (:alias contact)
-                     (gfycat/generate-gfy identity))})))))
+       (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)))))))
 
 (re-frame/reg-sub
  :messages/quote-info
@@ -1623,17 +1636,6 @@
  (fn [[chat all-contacts] [_ query-fn]]
    (contact.db/query-chat-contacts chat all-contacts query-fn)))
 
-(re-frame/reg-sub
- :contacts/chat-photo
- (fn [[_ chat-id] _]
-   [(re-frame/subscribe [:chats/chat chat-id])
-    (re-frame/subscribe [:contacts/contacts-by-chat filter chat-id])])
- (fn [[chat contacts] [_ _]]
-   (when (and chat (not (:group-chat chat)))
-     (if (pos? (count contacts))
-       (multiaccounts/displayed-photo (first contacts))
-       (multiaccounts/displayed-photo chat)))))
-
 (re-frame/reg-sub
  :contacts/contact-by-address
  :<- [:contacts/contacts]

src/status_im/ui/components/chat_icon/screen.cljs

@@ -8,8 +8,6 @@
             [status-im.ui.screens.chat.photos :as photos]
             [status-im.utils.platform :as platform]))
 
-;;TODO REWORK THIS NAMESPACE
-
 (defn default-chat-icon [name styles]
   (when-not (string/blank? name)
     [react/view (:default-chat-icon styles)
@@ -32,15 +30,16 @@
      [react/view online-dot-right]]]])
 
 (defn chat-icon-view
-  [contact group-chat name styles]
+  [chat-id group-chat name styles]
   [react/view (:container styles)
-   (if-not group-chat
-     [photos/photo (multiaccounts/displayed-photo contact) styles]
-     [default-chat-icon name styles])])
+   (if group-chat
+     [default-chat-icon name styles]
+     (let [photo-path @(re-frame.core/subscribe [:chats/photo-path chat-id])]
+       [photos/photo photo-path styles]))])
 
 (defn chat-icon-view-toolbar
-  [contact group-chat name color]
-  [chat-icon-view contact group-chat name
+  [chat-id group-chat name color]
+  [chat-icon-view chat-id group-chat name
    {:container              styles/container-chat-toolbar
     :online-view-wrapper    styles/online-view-wrapper
     :online-view            styles/online-view
@@ -52,8 +51,8 @@
     :default-chat-icon-text (styles/default-chat-icon-text 36)}])
 
 (defn chat-icon-view-chat-list
-  [contact group-chat name color]
-  [chat-icon-view contact group-chat name
+  [chat-id group-chat name color]
+  [chat-icon-view chat-id group-chat name
    {:container              styles/container-chat-list
     :online-view-wrapper    styles/online-view-wrapper
     :online-view            styles/online-view
@@ -65,8 +64,8 @@
     :default-chat-icon-text (styles/default-chat-icon-text 40)}])
 
 (defn chat-icon-view-chat-sheet
-  [contact group-chat name color]
-  [chat-icon-view contact group-chat name
+  [chat-id group-chat name color]
+  [chat-icon-view chat-id group-chat name
    {:container              styles/container-chat-list
     :online-view-wrapper    styles/online-view-wrapper
     :online-view            styles/online-view
@@ -116,11 +115,12 @@
     :default-chat-icon      (styles/default-chat-icon-profile colors/default-chat-color size)
     :default-chat-icon-text (styles/default-chat-icon-text size)}])
 
-(defn chat-intro-icon-view [icon-text chat-id styles]
-  (let [photo-path (re-frame.core/subscribe [:contacts/chat-photo chat-id])]
-    (if-not (string/blank? @photo-path)
-      [photos/photo @photo-path styles]
-      [default-chat-icon icon-text styles])))
+(defn chat-intro-icon-view [icon-text chat-id group-chat styles]
+  (if group-chat
+    [default-chat-icon icon-text styles]
+    (let [photo-path @(re-frame.core/subscribe [:chats/photo-path chat-id])]
+      (if-not (string/blank? photo-path)
+        [photos/photo photo-path styles]))))
 
 (defn profile-icon-view [photo-path name color edit? size override-styles]
   (let [styles (merge {:container              {:width size :height size}

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

@@ -22,12 +22,14 @@
    [react/text {:style style/decline-chat}
     (i18n/label :t/group-chat-decline-invitation)]])
 
-(defn group-chat-footer
+(defview group-chat-footer
   [chat-id]
-  [react/view {:style style/group-chat-join-footer}
-   [react/view {:style style/group-chat-join-container}
-    [join-chat-button chat-id]
-    [decline-chat chat-id]]])
+  (letsubs [{:keys [joined?]} [:group-chat/inviter-info chat-id]]
+    (when-not joined?
+      [react/view {:style style/group-chat-join-footer}
+       [react/view {:style style/group-chat-join-container}
+        [join-chat-button chat-id]
+        [decline-chat chat-id]]])))
 
 (def group-chat-description-loading
   [react/view {:style (merge style/intro-header-description-container
@@ -60,29 +62,44 @@
                      :t/share-public-chat-text {:link (links/generate-link :public-chat :external chat-id)})})}
       (i18n/label :t/empty-chat-description-public-share-this)]]))
 
+(defview pending-invitation-description
+  [inviter-pk chat-name]
+  (letsubs [inviter-name [:contacts/contact-name-by-identity inviter-pk]]
+    [react/nested-text {:style style/intro-header-description}
+     [{:style {:color colors/black}} inviter-name]
+     (i18n/label :t/join-group-chat-description
+                 {:username   ""
+                  :group-name chat-name})]))
+
+(defview joined-group-chat-description
+  [inviter-pk chat-name]
+  (letsubs [inviter-name [:contacts/contact-name-by-identity inviter-pk]]
+    [react/nested-text {:style style/intro-header-description}
+     (i18n/label :t/joined-group-chat-description
+                 {:username   ""
+                  :group-name chat-name})
+     [{:style {:color colors/black}} inviter-name]]))
+
+(defn created-group-chat-description [chat-name]
+  [react/text {:style style/intro-header-description}
+   (i18n/label :t/created-group-chat-description
+               {:group-name chat-name})])
+
 (defview group-chat-inviter-description-container [chat-id chat-name]
-  (letsubs [{:keys [pending-invite-inviter-name
-                    inviter-name]}
+  (letsubs [{:keys [joined? inviter-pk]}
             [:group-chat/inviter-info chat-id]]
-    (if pending-invite-inviter-name
-      [react/nested-text {:style style/intro-header-description}
-       [{:style {:color colors/black}} pending-invite-inviter-name]
-       (i18n/label :t/join-group-chat-description
-                   {:username   ""
-                    :group-name chat-name})]
-      (if (not= inviter-name "Unknown")
-        [react/nested-text {:style style/intro-header-description}
-         (i18n/label :t/joined-group-chat-description
-                     {:username   ""
-                      :group-name chat-name})
-         [{:style {:color colors/black}} inviter-name]]
-        [react/text {:style style/intro-header-description}
-         (i18n/label :t/created-group-chat-description
-                     {:group-name chat-name})]))))
+    (cond
+      (not joined?)
+      [pending-invitation-description inviter-pk chat-name]
+      inviter-pk
+      [joined-group-chat-description inviter-pk chat-name]
+      :else
+      [created-group-chat-description chat-name])))
 
 (defn group-chat-description-container
   [{:keys [public?
            chat-id
+           chat-name
            loading-messages?
            no-messages?]}]
   (cond loading-messages?
@@ -92,4 +109,4 @@
         [no-messages-group-chat-description-container chat-id]
 
         (not public?)
-        [group-chat-inviter-description-container chat-id]))
+        [group-chat-inviter-description-container chat-id chat-name]))

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

@@ -33,11 +33,11 @@
     :auto-capitalize        :sentences}])
 
 (defview reply-message [from alias message-text]
-  (letsubs [{:keys [ens-name]} [:contacts/contact-name-by-identity from]
+  (letsubs [contact-name [:contacts/contact-name-by-identity from]
             current-public-key [:multiaccount/public-key]]
     [react/scroll-view {:style style/reply-message-content}
      [react/view {:style style/reply-message-to-container}
-      (chat-utils/format-reply-author from alias ens-name current-public-key style/reply-message-author)]
+      (chat-utils/format-reply-author from contact-name current-public-key style/reply-message-author)]
      [react/text {:style (assoc (message-style/style-message-text false) :font-size 14) :number-of-lines 3} message-text]]))
 
 (defview reply-message-view []

src/status_im/ui/screens/chat/message/gap.cljs

@@ -21,15 +21,15 @@
 
 (views/defview gap
   [{:keys [gaps first-gap?]} idx list-ref]
-  (views/letsubs [{:keys [range intro-status]} [:chats/current-chat]
+  (views/letsubs [range [:chats/range]
+                  {:keys [might-have-join-time-messages?]} [:chats/current-raw-chat]
                   in-progress? [:chats/fetching-gap-in-progress?
                                 (if first-gap?
                                   [:first-gap]
                                   (:ids gaps))]
                   connected?   [:mailserver/connected?]]
-    (let [ids            (:ids gaps)
-          intro-loading? (= intro-status :loading)]
-      (when-not (and first-gap? intro-loading?)
+    (let [ids            (:ids gaps)]
+      (when-not (and first-gap? might-have-join-time-messages?)
         [react/view {:style style/gap-container}
          [react/touchable-highlight
           {:on-press (when (and connected? (not in-progress?))