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

Clear amount when switching assets 

Signed-off-by: Igor Mandrigin <i@mandrigin.ru>
This commit is contained in:
janherich 2018-06-20 17:28:11 +02:00 committed by Igor Mandrigin
parent 424d7cc6ae
commit 32a2c0ad08
No known key found for this signature in database
GPG Key ID: 4A0EDDE26E66BC8B
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/status_im/ui/screens/wallet/choose_recipient/events.cljs
View File

@ -35,16 +35,20 @@
(when (ethereum/address? s) (when (ethereum/address? s)
{:address s :chain-id chain-id}))) {:address s :chain-id chain-id})))
(defn changed-asset-warning [cofx old-symbol new-symbol] ;; NOTE(janherich) - whenever changing assets, we want to clear the previusly set amount/amount-text
(assoc-in cofx [:db :wallet :send-transaction :asset-error] (defn changed-asset [fx old-symbol new-symbol]
(i18n/label :t/changed-asset-warning {:old old-symbol :new new-symbol}))) (-> fx
(assoc-in [:db :wallet :send-transaction :amount] nil)
(assoc-in [:db :wallet :send-transaction :amount-text] nil)
(assoc-in [:db :wallet :send-transaction :asset-error]
(i18n/label :t/changed-asset-warning {:old old-symbol :new new-symbol}))))
(defn changed-amount-warning [cofx old-amount new-amount] (defn changed-amount-warning [fx old-amount new-amount]
(assoc-in cofx [:db :wallet :send-transaction :amount-error] (assoc-in fx [:db :wallet :send-transaction :amount-error]
(i18n/label :t/changed-amount-warning {:old old-amount :new new-amount}))) (i18n/label :t/changed-amount-warning {:old old-amount :new new-amount})))
(defn use-default-eth-gas [cofx] (defn use-default-eth-gas [fx]
(assoc-in cofx [:db :wallet :send-transaction :gas] (assoc-in fx [:db :wallet :send-transaction :gas]
ethereum/default-transaction-gas)) ethereum/default-transaction-gas))
(handlers/register-handler-fx (handlers/register-handler-fx
@ -64,7 +68,7 @@
:dispatch [:navigate-back]} :dispatch [:navigate-back]}
(and address (= :choose-recipient view-id)) (assoc :dispatch [:navigate-back]) (and address (= :choose-recipient view-id)) (assoc :dispatch [:navigate-back])
(and address valid-network?) (update :db #(fill-request-details % details)) (and address valid-network?) (update :db #(fill-request-details % details))
(and old-symbol new-symbol (not= old-symbol new-symbol)) (changed-asset-warning old-symbol new-symbol) (and old-symbol new-symbol (not= old-symbol new-symbol)) (changed-asset old-symbol new-symbol)
(and old-amount new-amount (not= old-amount new-amount)) (changed-amount-warning old-amount new-amount) (and old-amount new-amount (not= old-amount new-amount)) (changed-amount-warning old-amount new-amount)
;; NOTE(goranjovic) - the next line is there is because QR code scanning switches the amount to ETH ;; NOTE(goranjovic) - the next line is there is because QR code scanning switches the amount to ETH
;; automatically, so we need to update the gas limit accordingly. The check for origin screen is there ;; automatically, so we need to update the gas limit accordingly. The check for origin screen is there