diff options
| author | kumavis <aaron@kumavis.me> | 2018-03-22 03:53:28 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2018-03-22 03:53:28 +0800 |
| commit | 3595d71c2d01d08fe1692ef4fe2f4d6d5c3241d9 (patch) | |
| tree | e9726a32e70a235df6c08a87858e051ef9fec556 /ui/app/selectors.js | |
| parent | 278e1ba61eab97860be295ad938cf47ce22f11ed (diff) | |
| parent | dc92b56f184100a24aaf53c3e93619514159f938 (diff) | |
| download | tangerine-wallet-browser-3595d71c2d01d08fe1692ef4fe2f4d6d5c3241d9.tar.gz tangerine-wallet-browser-3595d71c2d01d08fe1692ef4fe2f4d6d5c3241d9.tar.zst tangerine-wallet-browser-3595d71c2d01d08fe1692ef4fe2f4d6d5c3241d9.zip | |
Merge branch 'i3554-fix-editing-dapp-token-txs' of https://github.com/danjm/metamask-extension into danjm-i3554-fix-editing-dapp-token-txs
Diffstat (limited to 'ui/app/selectors.js')
| -rw-r--r-- | ui/app/selectors.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/app/selectors.js b/ui/app/selectors.js index d37c26f7e..2bdc39004 100644 --- a/ui/app/selectors.js +++ b/ui/app/selectors.js @@ -56,8 +56,9 @@ function getSelectedToken (state) { const tokens = state.metamask.tokens || [] const selectedTokenAddress = state.metamask.selectedTokenAddress const selectedToken = tokens.filter(({ address }) => address === selectedTokenAddress)[0] + const sendToken = state.metamask.send.token - return selectedToken || null + return selectedToken || sendToken || null } function getSelectedTokenExchangeRate (state) { |