Commit d400ff62 authored by Noah Zinsmeister's avatar Noah Zinsmeister Committed by Ian Lapham

add null value checks (#568)

parent 38bb3250
...@@ -456,10 +456,16 @@ function CurrencySelectModal({ isOpen, onDismiss, onTokenSelect }) { ...@@ -456,10 +456,16 @@ function CurrencySelectModal({ isOpen, onDismiss, onTokenSelect }) {
let allBalances = useAllBalances() let allBalances = useAllBalances()
const _usdAmounts = Object.keys(allTokens).map(k => { const _usdAmounts = Object.keys(allTokens).map(k => {
if (ethPrice && allBalances[account] && allBalances[account][k]) { if (ethPrice && allBalances[account] && allBalances[account][k] && allBalances[account][k].value) {
let ethRate = 1 // default for ETH let ethRate = 1 // default for ETH
let exchangeDetails = allBalances[allTokens[k].exchangeAddress] let exchangeDetails = allBalances[allTokens[k].exchangeAddress]
if (exchangeDetails && exchangeDetails[k] && exchangeDetails['ETH']) { if (
exchangeDetails &&
exchangeDetails[k] &&
exchangeDetails[k].value &&
exchangeDetails['ETH'] &&
exchangeDetails['ETH'].value
) {
const tokenBalance = new BigNumber(exchangeDetails[k].value.toString()) const tokenBalance = new BigNumber(exchangeDetails[k].value.toString())
const ethBalance = new BigNumber(exchangeDetails['ETH'].value.toString()) const ethBalance = new BigNumber(exchangeDetails['ETH'].value.toString())
ethRate = ethBalance.div(tokenBalance) ethRate = ethBalance.div(tokenBalance)
...@@ -511,10 +517,10 @@ function CurrencySelectModal({ isOpen, onDismiss, onTokenSelect }) { ...@@ -511,10 +517,10 @@ function CurrencySelectModal({ isOpen, onDismiss, onTokenSelect }) {
let balance let balance
let usdBalance let usdBalance
// only update if we have data // only update if we have data
if (k === 'ETH' && allBalances[account] && allBalances[account][k]) { if (k === 'ETH' && allBalances[account] && allBalances[account][k] && allBalances[account][k].value) {
balance = formatEthBalance(allBalances[account][k].value) balance = formatEthBalance(allBalances[account][k].value)
usdBalance = usdAmounts[k] usdBalance = usdAmounts[k]
} else if (allBalances[account] && allBalances[account][k]) { } else if (allBalances[account] && allBalances[account][k] && allBalances[account][k].value) {
balance = formatTokenBalance(allBalances[account][k].value, allTokens[k].decimals) balance = formatTokenBalance(allBalances[account][k].value, allTokens[k].decimals)
usdBalance = usdAmounts[k] usdBalance = usdAmounts[k]
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment