status-im/status-mobile
2
0
Fork 0
mirror of https://github.com/status-im/status-mobile.git synced 2025-02-04 21:05:18 +00:00
Code Issues Projects Releases Wiki Activity

fix :navigation-back after sending transactions

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/status_im/android/core.cljs
View File

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

2
src/status_im/chat/handlers/send_message.cljs
View File

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

2
src/status_im/components/chat_icon/screen.cljs
View File

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

1
src/status_im/ios/core.cljs
View File

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

4
src/status_im/transactions/handlers.cljs
View File

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