diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js index 14b2e1e15..b2f484866 100644 --- a/ui/pages/routes/routes.component.js +++ b/ui/pages/routes/routes.component.js @@ -109,6 +109,7 @@ export default class Routes extends Component { isNetworkUsed: PropTypes.bool, allAccountsOnNetworkAreEmpty: PropTypes.bool, isTestNet: PropTypes.bool, + currentChainId: PropTypes.string, }; static contextTypes = { @@ -366,6 +367,7 @@ export default class Routes extends Component { isNetworkUsed, allAccountsOnNetworkAreEmpty, isTestNet, + currentChainId, } = this.props; const loadMessage = loadingMessage || isNetworkLoading @@ -374,6 +376,7 @@ export default class Routes extends Component { const shouldShowNetworkInfo = isUnlocked && + currentChainId && !isTestNet && !isNetworkUsed && allAccountsOnNetworkAreEmpty; diff --git a/ui/pages/routes/routes.container.js b/ui/pages/routes/routes.container.js index 8d02b1399..b70872e64 100644 --- a/ui/pages/routes/routes.container.js +++ b/ui/pages/routes/routes.container.js @@ -9,6 +9,7 @@ import { isNetworkLoading, getTheme, getIsTestnet, + getCurrentChainId, } from '../../selectors'; import { lockMetamask, @@ -45,7 +46,8 @@ function mapStateToProps(state) { sendStage: getSendStage(state), isNetworkUsed: getIsNetworkUsed(state), allAccountsOnNetworkAreEmpty: getAllAccountsOnNetworkAreEmpty(state), - isTestnet: getIsTestnet(state), + isTestNet: getIsTestnet(state), + currentChainId: getCurrentChainId(state), }; }