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 #354

This commit is contained in:
Roman Volosovskyi 2016-10-14 16:42:30 +03:00
parent 5db0f9678d
commit f51d932283
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/status_im/chat/views/request_message.cljs
View File

@ -5,6 +5,7 @@
animated-view
text
image
icon
touchable-highlight]]
[status-im.chat.styles.message :as st]
[status-im.models.commands :refer [parse-command-request]]
@ -64,9 +65,8 @@
:style st/command-request-image-touchable
:accessibility-label (label command)}
[animated-view {:style (st/command-request-image-view command scale-anim-val)}
(if command-icon
[image {:source {:uri command-icon}
:style st/command-request-image}])]]))})))
(when command-icon
[icon command-icon st/command-request-image])]]))})))
(defn message-content-command-request
[{:keys [message-id content from incoming-group]}]

13
src/status_im/data_store/messages.cljs
View File

@ -14,7 +14,12 @@
(defn- str-to-map
[s]
(keywordize-keys (apply hash-map (split s #"[;=]"))))
(->> (keywordize-keys (apply hash-map (split s #"[;=]")))
(map (fn [[k v]]
[k (if (= k :params)
(read-string v)
v)]))
(into {})))
(defn- user-statuses-to-map
[user-statuses]
@ -76,9 +81,9 @@
(map-to-str content))
message' (merge default-values
message
{:chat-id chat-id
:content content'
:timestamp (timestamp)})]
{:chat-id chat-id
:content content'
:timestamp (timestamp)})]
(data-store/save message'))))
(defn update