fix(lockbox): default erc20 token request to wallet address, never lo…

…ckbox
blockchain · Sep 16, 2019 · 2867b96 · 2867b96
1 parent d84903a
commit 2867b96
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/Eth/RequestEth/selectors.js b/packages/blockchain-wallet-v4-frontend/src/modals/Eth/RequestEth/selectors.js
@@ -8,7 +8,7 @@ export const getData = (state, coin) => {
   const accountsR = selectors.core.kvStore.eth.getAccounts(state)
   const availability = selectors.core.walletOptions.getCoinAvailability(
     state,
-    propOr('ETH', coin, coin)
+    coin
   )
   const excludeLockbox = !availability
     .map(propOr(true, 'lockbox'))
@@ -28,7 +28,8 @@ export const getInitialValues = (state, ownProps) => {
     .getErc20CoinList(state)
     .getOrElse([])
   const to = to => ({ to, coin })
-  if (ownProps.lockboxIndex != null) {
+  // this will need to change if we support ERC20 tokens on Lockbox in the future
+  if (ownProps.lockboxIndex != null && !includes(coin, erc20List)) {
     return selectors.core.common.eth
       .getLockboxEthBalances(state)
       .map(nth(ownProps.lockboxIndex))