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

[#6283] fix unknown chat after transaction

This commit is contained in:
Roman Volosovskyi 2018-10-15 10:57:55 +03:00
parent d09a2956c3
commit 9d1debbf28
No known key found for this signature in database
GPG Key ID: 0238A4B5ECEE70DE
3 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/status_im/ui/screens/wallet/send/events.cljs
View File

@ -261,17 +261,12 @@
cofx) cofx)
:dispatch [:wallet/update-gas-price true])))) :dispatch [:wallet/update-gas-price true]))))
(fx/defn navigate-after-transaction [{:keys [db] :as cofx} chat-id]
(if (= :wallet-send-transaction-modal (second (:navigation-stack db)))
(chat.models/navigate-to-chat cofx chat-id {})
(navigation/navigate-back cofx)))
(handlers/register-handler-fx (handlers/register-handler-fx
:close-transaction-sent-screen :close-transaction-sent-screen
(fn [cofx [_ chat-id]] (fn [cofx [_ chat-id]]
(fx/merge cofx (fx/merge cofx
{:dispatch-later [{:ms 400 :dispatch [:check-dapps-transactions-queue]}]} {:dispatch-later [{:ms 400 :dispatch [:check-dapps-transactions-queue]}]}
(navigate-after-transaction chat-id)))) (navigation/navigate-back))))
(handlers/register-handler-fx (handlers/register-handler-fx
:sync-wallet-transactions :sync-wallet-transactions

6
src/status_im/ui/screens/wallet/send/views.cljs
View File

@ -10,7 +10,7 @@
[status-im.ui.components.react :as react] [status-im.ui.components.react :as react]
[status-im.ui.components.status-bar.view :as status-bar] [status-im.ui.components.status-bar.view :as status-bar]
[status-im.ui.components.styles :as components.styles] [status-im.ui.components.styles :as components.styles]
[status-im.ui.components.toolbar.actions :as act] [status-im.ui.components.toolbar.actions :as actions]
[status-im.ui.components.toolbar.view :as toolbar] [status-im.ui.components.toolbar.view :as toolbar]
[status-im.ui.components.tooltip.views :as tooltip] [status-im.ui.components.tooltip.views :as tooltip]
[status-im.ui.screens.wallet.components.styles :as wallet.components.styles] [status-im.ui.screens.wallet.components.styles :as wallet.components.styles]
@ -31,11 +31,11 @@
[status-im.ui.components.colors :as colors])) [status-im.ui.components.colors :as colors]))
(defn- toolbar [modal? title] (defn- toolbar [modal? title]
(let [action (if modal? act/close-white act/back-white)] (let [action (if modal? actions/close-white actions/back-white)]
[toolbar/toolbar {:style wallet.styles/toolbar} [toolbar/toolbar {:style wallet.styles/toolbar}
[toolbar/nav-button (action (if modal? [toolbar/nav-button (action (if modal?
#(re-frame/dispatch [:wallet/discard-transaction-navigate-back]) #(re-frame/dispatch [:wallet/discard-transaction-navigate-back])
#(act/default-handler)))] #(actions/default-handler)))]
[toolbar/content-title {:color :white} title]])) [toolbar/content-title {:color :white} title]]))
(defn- advanced-cartouche [{:keys [max-fee gas gas-price]}] (defn- advanced-cartouche [{:keys [max-fee gas gas-price]}]

18
src/status_im/ui/screens/wallet/transaction_fee/views.cljs
View File

@ -16,16 +16,9 @@
[status-im.utils.ethereum.tokens :as tokens] [status-im.utils.ethereum.tokens :as tokens]
[status-im.utils.ethereum.core :as ethereum])) [status-im.utils.ethereum.core :as ethereum]))
(defn return-to-transaction [modal?] (defn- toolbar [title]
(if modal?
;;TODO(andrey) artificial navigation stack for modals (should be reworked)
;; ^ probably will be fixed with react-navigation
(re-frame/dispatch [:navigate-to-clean :wallet-send-transaction-modal])
(act/default-handler)))
(defn- toolbar [modal? title]
[toolbar/toolbar {:style wallet.styles/toolbar} [toolbar/toolbar {:style wallet.styles/toolbar}
[toolbar/nav-button (act/close-white #(return-to-transaction modal?))] [toolbar/nav-button (act/close-white act/default-handler)]
[toolbar/content-title {:color :white} title]]) [toolbar/content-title {:color :white} title]])
(defview transaction-fee [] (defview transaction-fee []
@ -34,13 +27,12 @@
{gas-edit :gas {gas-edit :gas
max-fee :max-fee max-fee :max-fee
gas-price-edit :gas-price} [:wallet/edit]] gas-price-edit :gas-price} [:wallet/edit]]
(let [modal? (:id send-transaction) (let [{:keys [amount symbol]} send-transaction
{:keys [amount symbol]} send-transaction
gas (:value gas-edit) gas (:value gas-edit)
gas-price (:value gas-price-edit) gas-price (:value gas-price-edit)
{:keys [decimals]} (tokens/asset-for (ethereum/network->chain-keyword network) symbol)] {:keys [decimals]} (tokens/asset-for (ethereum/network->chain-keyword network) symbol)]
[components/simple-screen {:status-bar-type :modal-wallet} [components/simple-screen {:status-bar-type :modal-wallet}
[toolbar modal? (i18n/label :t/wallet-transaction-fee)] [toolbar (i18n/label :t/wallet-transaction-fee)]
[react/view components.styles/flex [react/view components.styles/flex
[react/view {:flex-direction :row} [react/view {:flex-direction :row}
@ -99,7 +91,7 @@
[button/button {:on-press #(do (re-frame/dispatch [:wallet.send/set-gas-details [button/button {:on-press #(do (re-frame/dispatch [:wallet.send/set-gas-details
(:value-number gas-edit) (:value-number gas-edit)
(:value-number gas-price-edit)]) (:value-number gas-price-edit)])
(return-to-transaction modal?)) (act/default-handler))
:accessibility-label :done-button :accessibility-label :done-button
:disabled? (or (:invalid? gas-edit) :disabled? (or (:invalid? gas-edit)
(:invalid? gas-price-edit))} (:invalid? gas-price-edit))}