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

Pre-filling /send response with amount (#996)

This commit is contained in:
alwx 2017-04-19 12:26:10 +03:00 committed by Roman Volosovskyi
parent d9bef7e77f
commit 4e488d91b9
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
externs/externs.js
View File

@ -1,5 +1,4 @@
var TopLevel = { var TopLevel = {
"abs" : function () {},
"ActionSheetIOS" : function () {}, "ActionSheetIOS" : function () {},
"addEntropy" : function () {}, "addEntropy" : function () {},
"addEventListener" : function () {}, "addEventListener" : function () {},

11
src/status_im/chat/handlers/input.cljs
View File

@ -37,19 +37,22 @@
(handlers/register-handler (handlers/register-handler
:select-chat-input-command :select-chat-input-command
(handlers/side-effect! (handlers/side-effect!
(fn [{:keys [current-chat-id chat-ui-props] :as db} [_ {:keys [name prefill] :as command} metadata]] (fn [{:keys [current-chat-id chat-ui-props] :as db}
[_ {:keys [name prefill sequential-params] :as command} metadata]]
(dispatch [:set-chat-input-text (str const/command-char (dispatch [:set-chat-input-text (str const/command-char
name name
const/spacing-char const/spacing-char
(input-model/join-command-args prefill))]) (when-not sequential-params
(input-model/join-command-args prefill)))])
(dispatch [:set-chat-input-metadata metadata]) (dispatch [:set-chat-input-metadata metadata])
(dispatch [:set-chat-ui-props :show-suggestions? false]) (dispatch [:set-chat-ui-props :show-suggestions? false])
(dispatch [:set-chat-ui-props :result-box nil]) (dispatch [:set-chat-ui-props :result-box nil])
(dispatch [:set-chat-ui-props :validation-messages nil]) (dispatch [:set-chat-ui-props :validation-messages nil])
(dispatch [:load-chat-parameter-box command 0]) (dispatch [:load-chat-parameter-box command 0])
(if (:sequential-params command) (if sequential-params
(js/setTimeout (js/setTimeout
#(dispatch [:chat-input-focus :seq-input-ref]) #(do (dispatch [:chat-input-focus :seq-input-ref])
(dispatch [:set-chat-seq-arg-input-text (str/join const/spacing-char prefill)]))
100) 100)
(dispatch [:chat-input-focus :input-ref]))))) (dispatch [:chat-input-focus :input-ref])))))

5
src/status_im/chat/views/message/request_message.cljs
View File

@ -17,8 +17,7 @@
(defn set-chat-command [message-id command] (defn set-chat-command [message-id command]
(let [command-key (keyword (:name command)) (let [command-key (keyword (:name command))
metadata (-> (:set-params command) metadata {:to-message-id message-id}]
(assoc :to-message-id message-id))]
(dispatch [:select-chat-input-command command metadata]))) (dispatch [:select-chat-input-command command metadata])))
(def min-scale 1) (def min-scale 1)
@ -79,7 +78,7 @@
params (:params content) params (:params content)
{:keys [command content]} (parse-command-request commands content) {:keys [command content]} (parse-command-request commands content)
command (if (and params command) command (if (and params command)
(merge command {:set-params params}) (merge command {:prefill (vals params)})
command)] command)]
[view st/comand-request-view [view st/comand-request-view
[touchable-highlight [touchable-highlight