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

[ISSUE #3224] Click on user picture open profile 

Signed-off-by: Julien Eluard <julien.eluard@gmail.com>
This commit is contained in:
Julien Eluard 2018-03-01 10:10:06 +01:00
parent ac9b5cd976
commit 2dee50e790
No known key found for this signature in database
GPG Key ID: 6FD7DB5437FCBEF6
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,6 @@
(ns status-im.chat.views.message.message (ns status-im.chat.views.message.message
(:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require-macros [status-im.utils.views :refer [defview letsubs]])
(:require [re-frame.core :as re-frame] (:require [re-frame.core :as re-frame]
[clojure.walk :as walk]
[reagent.core :as reagent] [reagent.core :as reagent]
[status-im.ui.components.react :as react] [status-im.ui.components.react :as react]
[status-im.ui.components.animation :as animation] [status-im.ui.components.animation :as animation]
@ -21,8 +20,7 @@
[status-im.i18n :as i18n] [status-im.i18n :as i18n]
[status-im.ui.components.colors :as colors] [status-im.ui.components.colors :as colors]
[clojure.string :as string] [clojure.string :as string]
[status-im.chat.events.console :as console] [status-im.chat.events.console :as console]))
[taoensso.timbre :as log]))
(def window-width (:width (react/get-dimensions "window"))) (def window-width (:width (react/get-dimensions "window")))
@ -69,7 +67,7 @@
[{:keys [content params] :as message}] [{:keys [content params] :as message}]
(letsubs [command [:get-command (:content-command-ref content)]] (letsubs [command [:get-command (:content-command-ref content)]]
(let [preview (:preview content) (let [preview (:preview content)
{:keys [type color] icon-path :icon} command] {:keys [color] icon-path :icon} command]
[react/view style/content-command-view [react/view style/content-command-view
(when color (when color
[react/view style/command-container [react/view style/command-container
@ -192,7 +190,7 @@
[wrapper message [text-message message]]) [wrapper message [text-message message]])
(defmethod message-content constants/content-type-status (defmethod message-content constants/content-type-status
[_ message] [_ _]
[message-content-status]) [message-content-status])
(defmethod message-content constants/content-type-command (defmethod message-content constants/content-type-command
@ -242,7 +240,7 @@
(str "+ " (- delivery-statuses-count 3))])]])))) (str "+ " (- delivery-statuses-count 3))])]]))))
(defn message-delivery-status (defn message-delivery-status
[{:keys [message-id chat-id current-public-key user-statuses content]}] [{:keys [chat-id current-public-key user-statuses content]}]
(let [outgoing-status (or (get user-statuses current-public-key) :sending) (let [outgoing-status (or (get user-statuses current-public-key) :sending)
delivery-status (get user-statuses chat-id) delivery-status (get user-statuses chat-id)
status (cond (and (= constants/console-chat-id chat-id) status (cond (and (= constants/console-chat-id chat-id)
@ -276,7 +274,9 @@
(when-not same-author? (when-not same-author?
(if outgoing (if outgoing
[my-photo from] [my-photo from]
[member-photo from]))] [react/touchable-highlight {:on-press #(re-frame/dispatch [:show-profile from])}
[react/view
[member-photo from]]]))]
[react/view (style/group-message-view message) [react/view (style/group-message-view message)
content content
(when last-outgoing? (when last-outgoing?
@ -292,9 +292,9 @@
(animation/start (animation/start
(animation/timing val {:toValue to-value (animation/timing val {:toValue to-value
:duration 250}) :duration 250})
(fn [arg] (fn [arg]
(when (.-finished arg) (when (.-finished arg)
(callback)))))))) (callback))))))))
(defn message-container [message & children] (defn message-container [message & children]
(if (:appearing? message) (if (:appearing? message)