Merge branch 'develop' into update-mobile-provider

MetaMask · May 4, 2020 · 5e76905 · 5e76905
2 parents 7846209 + a5c3bf0
commit 5e76905
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/app/components/Nav/Main/index.js b/app/components/Nav/Main/index.js
@@ -538,16 +538,17 @@ class Main extends PureComponent {
 		let hasSAI = false;
 		Object.keys(this.props.allTokens).forEach(account => {
 			const tokens = this.props.allTokens[account].mainnet;
-			tokens.forEach(token => {
-				if (token.address.toLowerCase() === AppConstants.SAI_ADDRESS.toLowerCase()) {
-					if (this.props.contractBalances[AppConstants.SAI_ADDRESS]) {
-						const balance = this.props.contractBalances[AppConstants.SAI_ADDRESS];
-						if (!balance.isZero()) {
-							hasSAI = true;
+			tokens &&
+				tokens.forEach(token => {
+					if (token.address.toLowerCase() === AppConstants.SAI_ADDRESS.toLowerCase()) {
+						if (this.props.contractBalances[AppConstants.SAI_ADDRESS]) {
+							const balance = this.props.contractBalances[AppConstants.SAI_ADDRESS];
+							if (!balance.isZero()) {
+								hasSAI = true;
+							}
 						}
 					}
-				}
-			});
+				});
 		});
 
 		if (hasSAI) {