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

Pull username from message or generate when not in contacts 

Signed-off-by: Andrea Maria Piana <andrea.maria.piana@gmail.com>
This commit is contained in:
Andrea Maria Piana 2018-03-16 09:53:40 +00:00
parent 9cae0a5d90
commit 8bcd635451
No known key found for this signature in database
GPG Key ID: AA6CCA6DE0E06424
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,12 +257,14 @@
(letsubs [{:keys [photo-path]} [:get-current-account]] (letsubs [{:keys [photo-path]} [:get-current-account]]
(photo from photo-path))) (photo from photo-path)))
(defview message-author-name [from] (defview message-author-name [from message-username]
(letsubs [username [:contact-name-by-identity from]] (letsubs [username [:contact-name-by-identity from]]
[react/text {:style style/message-author-name} username])) [react/text {:style style/message-author-name} (or username
message-username
(gfycat/generate-gfy from))])) ; TODO: We defensively generate the name for now, to be revisited when new protocol is defined
(defn message-body (defn message-body
[{:keys [last-outgoing? last-by-same-author? message-type same-author? from outgoing group-chat] :as message} content] [{:keys [last-outgoing? last-by-same-author? message-type same-author? from outgoing group-chat username] :as message} content]
[react/view (style/group-message-wrapper message) [react/view (style/group-message-wrapper message)
[react/view (style/message-body message) [react/view (style/message-body message)
[react/view style/message-author [react/view style/message-author
@ -274,7 +276,7 @@
[member-photo from]]]))] [member-photo from]]]))]
[react/view (style/group-message-view outgoing) [react/view (style/group-message-view outgoing)
(when-not same-author? (when-not same-author?
[message-author-name from]) [message-author-name from username])
content]] content]]
(when last-outgoing? (when last-outgoing?
[react/view style/delivery-status [react/view style/delivery-status