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

Merge remote-tracking branch 'origin/develop' into fix-input 

Former-commit-id: ea09dcb1a6
This commit is contained in:
virvar 2016-05-25 10:44:14 +03:00
parent 950251a281 88aa653d79
commit a035991b3f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/status_im/chats_list/views/inner_item.cljs
View File

@ -14,7 +14,7 @@
[view st/chat-icon-container [view st/chat-icon-container
[chat-icon-view-chat-list chat-id group-chat name color online]] [chat-icon-view-chat-list chat-id group-chat name color online]]
[view st/item-container [view st/item-container
[view st/name-view #_[view st/name-view
[text {:style st/name-text} (truncate-str name 20)] [text {:style st/name-text} (truncate-str name 20)]
(when group-chat (when group-chat
[icon :group st/group-icon]) [icon :group st/group-icon])
@ -26,7 +26,10 @@
[text {:style st/last-message-text [text {:style st/last-message-text
:numberOfLines 2} :numberOfLines 2}
(when last-message (when last-message
(:content last-message))]] (let [content (:content last-message)]
(if (string? content)
content
(:content content))))]]
[view [view
(when last-message (when last-message
[view st/status-container [view st/status-container