status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #380 from status-im/bug/#378 

User icons in group chat (#378)
This commit is contained in:
Roman Volosovskyi 2016-10-21 15:20:06 +03:00 committed by GitHub
parent a7bbc77e19 5c56ed94bf
commit 2584b40dae
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/status_im/chat/screen.cljs
View File

@ -81,6 +81,7 @@
(add-message-color contact-by-identity) (add-message-color contact-by-identity)
(assoc :group-chat group-chat) (assoc :group-chat group-chat)
(assoc :messages-count messages-count) (assoc :messages-count messages-count)
(assoc :index index)
(assoc :last-message (= (js/parseInt index) (dec messages-count))))] (assoc :last-message (= (js/parseInt index) (dec messages-count))))]
(list-item [chat-message message]))) (list-item [chat-message message])))

5
src/status_im/chat/views/message.cljs
View File

@ -225,7 +225,7 @@
:style st/photo}]]) :style st/photo}]])
(defn incoming-group-message-body (defn incoming-group-message-body
[{:keys [selected same-author from] :as message} content] [{:keys [selected same-author from index] :as message} content]
(let [delivery-status :seen-by-everyone] (let [delivery-status :seen-by-everyone]
[view st/group-message-wrapper [view st/group-message-wrapper
(when selected (when selected
@ -234,7 +234,8 @@
"Mar 7th, 15:22"]) "Mar 7th, 15:22"])
[view (st/incoming-group-message-body-st message) [view (st/incoming-group-message-body-st message)
[view st/message-author [view st/message-author
(when (not same-author) [member-photo from])] (when (or (= index 1)
(not same-author)) [member-photo from])]
[view st/group-message-view [view st/group-message-view
content content
;; TODO show for last or selected ;; TODO show for last or selected