From 25c46a16364612cd4bcebe375af910c08862b17a Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Sun, 30 Oct 2016 15:59:55 -0700 Subject: Make case condition more consistent. Remove extra action. Fix incorrect display of network. --- ui/app/actions.js | 2 +- ui/app/components/network.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'ui') diff --git a/ui/app/actions.js b/ui/app/actions.js index 3ae3a623d..a2f59cb3c 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -174,7 +174,7 @@ function tryUnlockMetamask (password) { function createNewVault (password, entropy) { return (dispatch) => { - dispatch(actions.createNewVaultInProgress()) + // dispatch(actions.createNewVaultInProgress()) background.createNewVault(password, entropy, (err, newState) => { if (err) { return dispatch(actions.showWarning(err.message)) diff --git a/ui/app/components/network.js b/ui/app/components/network.js index 845861396..ff5aefd41 100644 --- a/ui/app/components/network.js +++ b/ui/app/components/network.js @@ -36,13 +36,14 @@ Network.prototype.render = function () { } else if (providerName === 'mainnet') { hoverText = 'Main Ethereum Network' iconName = 'ethereum-network' - } else if (parseInt(networkNumber) === 2) { + } else if (providerName === 'testnet') { hoverText = 'Morden Test Network' iconName = 'morden-test-network' } else { hoverText = 'Unknown Private Network' iconName = 'unknown-private-network' } + return ( h('#network_component.flex-center.pointer', { style: { -- cgit v1.2.3