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

[fix 6508] user own picture should be unclickable in chats 

Signed-off-by: yenda <eric@status.im>
This commit is contained in:
yenda 2018-10-24 13:20:17 +02:00
parent e9bf1d7864
commit 5594fb6c60
No known key found for this signature in database
GPG Key ID: 0095623C0069DCE6
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/status_im/ui/screens/desktop/main/chat/views.cljs
View File

@ -75,25 +75,18 @@
[react/text {:style styles/author :font :medium} name]]))) [react/text {:style styles/author :font :medium} name]])))
(views/defview member-photo [from] (views/defview member-photo [from]
(views/letsubs [photo-path [:get-photo-path from]] (views/letsubs [current-public-key [:get-current-public-key]
photo-path [:get-photo-path from]]
[react/view {:style {:width 40 :margin-horizontal 16}} [react/view {:style {:width 40 :margin-horizontal 16}}
[react/view {:style {:position :absolute}} [react/view {:style {:position :absolute}}
[react/touchable-highlight {:on-press #(re-frame/dispatch [:show-profile-desktop from])} [react/touchable-highlight {:on-press #(when-not (= current-public-key from)
(re-frame/dispatch [:show-profile-desktop from]))}
[react/view {:style styles/member-photo-container} [react/view {:style styles/member-photo-container}
[react/image {:source {:uri (if (string/blank? photo-path) [react/image {:source {:uri (if (string/blank? photo-path)
(identicon/identicon from) (identicon/identicon from)
photo-path)} photo-path)}
:style styles/photo-style}]]]]])) :style styles/photo-style}]]]]]))
(views/defview my-photo [from]
(views/letsubs [account [:get-current-account]]
(let [{:keys [photo-path]} account]
[react/view
[react/image {:source {:uri (if (string/blank? photo-path)
(identicon/identicon from)
photo-path)}
:style styles/photo-style}]])))
(views/defview quoted-message [{:keys [from text]} outgoing current-public-key] (views/defview quoted-message [{:keys [from text]} outgoing current-public-key]
(views/letsubs [username [:get-contact-name-by-identity from]] (views/letsubs [username [:get-contact-name-by-identity from]]
[react/view {:style styles/quoted-message-container} [react/view {:style styles/quoted-message-container}