status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-01-11 11:34:45 +00:00
Code Issues Projects Releases Wiki Activity

bug #4737 - fixed duplicate payment message on android back button

Browse Source 
bug #4736 - amount from the previous transaction in message

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
This commit is contained in:
Goran Jovic 2018-06-13 10:35:16 +02:00 committed by Pedro Pombeiro
parent 8d278f3d7d
commit cdf356bb4f
No known key found for this signature in database
GPG Key ID: A65DEB11E4BBC647
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/status_im/chat/events.cljs
View File

@ -302,7 +302,7 @@
(fn [cofx [_ chat-id]]
(handlers-macro/merge-fx cofx
(events.commands/execute-stored-command)
(navigate-to-chat chat-id {}))))
(navigate-to-chat chat-id {:navigation-replace? true}))))
(defn start-chat
"Start a chat, making sure it exists"

1
src/status_im/chat/events/shortcuts.cljs
View File

@ -16,6 +16,7 @@
(merge {:db (-> db
(send.events/set-and-validate-amount-db (:amount params) :ETH 18)
(choose-recipient.events/fill-request-details (transaction-details contact))
(update-in [:wallet :send-transaction] dissoc :id :password :wrong-password?)
(navigation/navigate-to
(if (:wallet-set-up-passed? account)
:wallet-send-transaction-chat