From 2a17ebecf0651b39be42eb5ec8f91006c9826ce8 Mon Sep 17 00:00:00 2001 From: Ricky Miller Date: Wed, 5 May 2021 19:06:56 -0400 Subject: [PATCH 1/3] Fix isZero is undefined --- app/components/UI/Tokens/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/UI/Tokens/index.js b/app/components/UI/Tokens/index.js index 7af958a99bf..be9fac14202 100644 --- a/app/components/UI/Tokens/index.js +++ b/app/components/UI/Tokens/index.js @@ -266,7 +266,7 @@ class Tokens extends PureComponent { const tokensToDisplay = hideZeroBalanceTokens ? tokens.filter(token => { const { address, symbol } = token; - return (tokenBalances[address] && !tokenBalances[address].isZero()) || symbol === 'ETH'; + return (tokenBalances[address] && !tokenBalances[address]?.isZero()) || symbol === 'ETH'; // eslint-disable-next-line no-mixed-spaces-and-tabs }) : tokens; From c2121d8506ba9d818bb663339f234330700439d1 Mon Sep 17 00:00:00 2001 From: ricky Date: Wed, 5 May 2021 19:27:18 -0400 Subject: [PATCH 2/3] Update app/components/UI/Tokens/index.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Esteban Miño --- app/components/UI/Tokens/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/UI/Tokens/index.js b/app/components/UI/Tokens/index.js index be9fac14202..11b70f55af0 100644 --- a/app/components/UI/Tokens/index.js +++ b/app/components/UI/Tokens/index.js @@ -266,7 +266,7 @@ class Tokens extends PureComponent { const tokensToDisplay = hideZeroBalanceTokens ? tokens.filter(token => { const { address, symbol } = token; - return (tokenBalances[address] && !tokenBalances[address]?.isZero()) || symbol === 'ETH'; + return (tokenBalances[address] && !tokenBalances[address]?.isZero?.()) || symbol === 'ETH'; // eslint-disable-next-line no-mixed-spaces-and-tabs }) : tokens; From afa2c97c04c38881dc4725b9a4fecd4eb710c952 Mon Sep 17 00:00:00 2001 From: Ricky Miller Date: Wed, 5 May 2021 19:29:26 -0400 Subject: [PATCH 3/3] add optional chaining --- app/components/UI/Tokens/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/UI/Tokens/index.js b/app/components/UI/Tokens/index.js index be9fac14202..71a53a598d6 100644 --- a/app/components/UI/Tokens/index.js +++ b/app/components/UI/Tokens/index.js @@ -246,7 +246,7 @@ class Tokens extends PureComponent { const hasTokensBalance = hasTokens && tokens.some( - token => !token.isETH && tokenBalances[token.address] && !tokenBalances[token.address].isZero() + token => !token.isETH && tokenBalances[token.address] && !tokenBalances[token.address]?.isZero?.() ); return (