diff options
author | Chi Kei Chan <chikeichan@gmail.com> | 2019-04-18 03:15:13 +0800 |
---|---|---|
committer | Dan J Miller <danjm.com@gmail.com> | 2019-04-18 03:15:13 +0800 |
commit | 931aaeb7003f175374a06eb949cd47a12ebc8bbf (patch) | |
tree | fe67bd73faf453f5f06ebae1987da5a2338f2e41 /ui/app/ducks/metamask/metamask.js | |
parent | a844eb20da700b832003f63b83fc42ba74392d6c (diff) | |
download | tangerine-wallet-browser-931aaeb7003f175374a06eb949cd47a12ebc8bbf.tar tangerine-wallet-browser-931aaeb7003f175374a06eb949cd47a12ebc8bbf.tar.gz tangerine-wallet-browser-931aaeb7003f175374a06eb949cd47a12ebc8bbf.tar.bz2 tangerine-wallet-browser-931aaeb7003f175374a06eb949cd47a12ebc8bbf.tar.lz tangerine-wallet-browser-931aaeb7003f175374a06eb949cd47a12ebc8bbf.tar.xz tangerine-wallet-browser-931aaeb7003f175374a06eb949cd47a12ebc8bbf.tar.zst tangerine-wallet-browser-931aaeb7003f175374a06eb949cd47a12ebc8bbf.zip |
Add token selection to the send screen (#6445)
* Move send to pages/
* Fix unit tests
* Finish UI
* Integrate asset dropdown to send actions
* Remove console.log
* Hide asset change during edit
* Enable switch from send token to seand eth
* Enable switching from token to eth when editing
* Fix linter
* Fixing test
* Fix unit tests
* Fix linter
* Fix react warning; remove console.log
* fix flat test
* Add metrics
* Address code review comments
* Consistent spacing between send screen form rows.
* Reduce height of gas buttons on send screen.
* Make send screen gas button height dependent on size of contents.
Diffstat (limited to 'ui/app/ducks/metamask/metamask.js')
-rw-r--r-- | ui/app/ducks/metamask/metamask.js | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/ui/app/ducks/metamask/metamask.js b/ui/app/ducks/metamask/metamask.js index 47c767d68..3ca487c1f 100644 --- a/ui/app/ducks/metamask/metamask.js +++ b/ui/app/ducks/metamask/metamask.js @@ -154,9 +154,26 @@ function reduceMetamask (state, action) { return newState case actions.SET_SELECTED_TOKEN: - return extend(metamaskState, { + newState = extend(metamaskState, { selectedTokenAddress: action.value, }) + const newSend = extend(metamaskState.send) + + if (metamaskState.send.editingTransactionId && !action.value) { + delete newSend.token + const unapprovedTx = newState.unapprovedTxs[newSend.editingTransactionId] || {} + const txParams = unapprovedTx.txParams || {} + newState.unapprovedTxs = extend(newState.unapprovedTxs, { + [newSend.editingTransactionId]: extend(unapprovedTx, { + txParams: extend(txParams, { data: '' }), + }), + }) + newSend.tokenBalance = null + newSend.balance = '0' + } + + newState.send = newSend + return newState case actions.SET_ACCOUNT_LABEL: const account = action.value.account |