fix :navigation-back after sending transactions

This commit is contained in:
Roman Volosovskyi 2016-12-09 12:54:24 +02:00
parent 1f3411f8fc
commit 72f9b8dfa2
5 changed files with 5 additions and 5 deletions

View File

@ -104,7 +104,6 @@
:accounts accounts
:login login
:recover recover
:confirm confirm
:my-profile my-profile)]
[view
{:flex 1}

View File

@ -75,7 +75,7 @@
(if (:sent-to-jail? message)
;; todo there could be other reasons for "long-running"
;; hanling of the command besides sendTransaction
(dispatch [:navigate-to :confirm])
(dispatch [:navigate-to-modal :confirm])
(cond
(console-command? chat-id command-name)
(dispatch [:invoke-console-command-handler! params'])

View File

@ -90,6 +90,7 @@
:default-chat-icon-text st/default-chat-icon-text}])
(defn chat-icon-view-menu-item [chat-id group-chat name color online]
^{:key chat-id}
[chat-icon-view chat-id group-chat name online
{:container st/container-menu-item
:online-view-wrapper st/online-view-menu-wrapper
@ -105,6 +106,7 @@
:default-chat-icon-text st/default-chat-icon-text}])
(defn chat-icon-message-status [chat-id group-chat name color online]
^{:key chat-id}
[chat-icon-view chat-id group-chat name online
{:container st/container-message-status
:online-view-wrapper st/online-view-wrapper

View File

@ -91,7 +91,6 @@
:accounts accounts
:login login
:recover recover
:confirm confirm
:my-profile my-profile)]
[view
{:flex 1}

View File

@ -79,8 +79,8 @@
(update :transactions-queue #(apply dissoc % hashes)))))
(register-handler ::remove-transaction
(after (fn [{:keys [transactions modal]}]
(when-not (and (:confirm modal) (seq transactions))
(after (fn [{:keys [modal]}]
(when (= :confirm modal)
(dispatch [:navigate-back]))))
(fn [db [_ hash]]
(-> db