bug #5269 - fix sending from wallet

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
This commit is contained in:
janherich 2018-07-23 15:09:18 +02:00 committed by Andrey Shovkoplyas
parent 9b990a8038
commit 7acefed224
No known key found for this signature in database
GPG Key ID: EAAB7C8622D860A4
1 changed files with 5 additions and 1 deletions

View File

@ -306,9 +306,13 @@
(concat models.message/send-interceptors (concat models.message/send-interceptors
navigation/navigation-interceptors) navigation/navigation-interceptors)
(fn [{:keys [db] :as cofx} [chat-id params]] (fn [{:keys [db] :as cofx} [chat-id params]]
(when-let [send-command (get-in db [:id->command ["send" #{:personal-chats}]])] ;;NOTE(goranjovic): we want to send the payment message only when we have a whisper id
;; for the recipient, we always redirect to `:wallet-transaction-sent` even when we don't
(if-let [send-command (and chat-id (get-in db [:id->command ["send" #{:personal-chats}]]))]
(handlers-macro/merge-fx cofx (handlers-macro/merge-fx cofx
(commands-sending/send chat-id send-command params) (commands-sending/send chat-id send-command params)
(navigation/replace-view :wallet-transaction-sent))
(handlers-macro/merge-fx cofx
(navigation/replace-view :wallet-transaction-sent))))) (navigation/replace-view :wallet-transaction-sent)))))
(handlers/register-handler-fx (handlers/register-handler-fx