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

added transaction sent modal

This commit is contained in:
Andrey Shovkoplyas 2017-10-19 12:34:59 +03:00 committed by Roman Volosovskyi
parent aeee3a6583
commit 780efc3ac1
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/status_im/ui/screens/views.cljs
View File

@ -40,7 +40,7 @@
[status-im.ui.screens.wallet.request.views :refer [request-transaction]] [status-im.ui.screens.wallet.request.views :refer [request-transaction]]
[status-im.ui.screens.wallet.wallet-list.views :refer [wallet-list-screen]] [status-im.ui.screens.wallet.wallet-list.views :refer [wallet-list-screen]]
[status-im.ui.screens.wallet.transactions.views :as wallet-transactions] [status-im.ui.screens.wallet.transactions.views :as wallet-transactions]
[status-im.ui.screens.wallet.send.transaction-sent.views :refer [transaction-sent]] [status-im.ui.screens.wallet.send.transaction-sent.views :refer [transaction-sent transaction-sent-modal]]
[status-im.components.status-bar :as status-bar] [status-im.components.status-bar :as status-bar]
@ -123,5 +123,6 @@
:contact-list-modal contact-list-modal :contact-list-modal contact-list-modal
:wallet-transactions-filter wallet-transactions/filter-history :wallet-transactions-filter wallet-transactions/filter-history
:wallet-send-transaction-modal send-transaction-modal :wallet-send-transaction-modal send-transaction-modal
:wallet-transaction-sent-modal transaction-sent-modal
(throw (str "Unknown modal view: " modal-view)))] (throw (str "Unknown modal view: " modal-view)))]
[component])]])]]))))) [component])]])]])))))

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

@ -148,7 +148,7 @@
(update-in [:wallet :send-transaction] merge clear-send-properties))} (update-in [:wallet :send-transaction] merge clear-send-properties))}
(if modal? (if modal?
{:dispatch-n [[:navigate-back] {:dispatch-n [[:navigate-back]
[:navigate-to :wallet-transaction-sent]]} [:navigate-to-modal :wallet-transaction-sent-modal]]}
{:dispatch [:navigate-to :wallet-transaction-sent]})))))) {:dispatch [:navigate-to :wallet-transaction-sent]}))))))
(defn on-transactions-modal-completed [raw-results] (defn on-transactions-modal-completed [raw-results]

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

@ -11,10 +11,10 @@
[status-im.i18n :as i18n] [status-im.i18n :as i18n]
[status-im.utils.platform :as platform])) [status-im.utils.platform :as platform]))
(defview transaction-sent [] (defview transaction-sent [& [modal?]]
(letsubs [close-transaction-screen-event [:wallet.sent/close-transaction-screen-event]] (letsubs [close-transaction-screen-event [:wallet.sent/close-transaction-screen-event]]
[react/view wallet.styles/wallet-modal-container [react/view wallet.styles/wallet-modal-container
[status-bar/status-bar {:type :transparent}] [status-bar/status-bar {:type (if modal? :modal-wallet :transparent)}]
[react/view styles/transaction-sent-container [react/view styles/transaction-sent-container
[react/view styles/ok-icon-container [react/view styles/ok-icon-container
[vi/icon :icons/ok {:color components.styles/color-blue4}]] [vi/icon :icons/ok {:color components.styles/color-blue4}]]
@ -38,3 +38,6 @@
:font (if platform/android? :medium :default) :font (if platform/android? :medium :default)
:uppercase? (get-in platform/platform-specific [:uppercase?])} :uppercase? (get-in platform/platform-specific [:uppercase?])}
(i18n/label :t/got-it)]]]])) (i18n/label :t/got-it)]]]]))
(defview transaction-sent-modal []
[transaction-sent true])