diff options
| author | Thomas Huang <tmashuang@users.noreply.github.com> | 2018-03-28 04:28:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-28 04:28:58 +0800 |
| commit | 8648aee907bb67e4a0e80ee6f67562046f302ef5 (patch) | |
| tree | fa24bed0df96260e0271f93d3f99977613e6a566 /ui/app/selectors.js | |
| parent | 775275e1387c140fabb3ddbef5544af0dcbc4df0 (diff) | |
| parent | 0fe0d8b7a5ec3a143ece38df4d0811b6de02b63f (diff) | |
| download | tangerine-wallet-browser-8648aee907bb67e4a0e80ee6f67562046f302ef5.tar tangerine-wallet-browser-8648aee907bb67e4a0e80ee6f67562046f302ef5.tar.gz tangerine-wallet-browser-8648aee907bb67e4a0e80ee6f67562046f302ef5.tar.bz2 tangerine-wallet-browser-8648aee907bb67e4a0e80ee6f67562046f302ef5.tar.lz tangerine-wallet-browser-8648aee907bb67e4a0e80ee6f67562046f302ef5.tar.xz tangerine-wallet-browser-8648aee907bb67e4a0e80ee6f67562046f302ef5.tar.zst tangerine-wallet-browser-8648aee907bb67e4a0e80ee6f67562046f302ef5.zip | |
Merge branch 'master' into selenium-e2e
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) { |