diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-10-31 06:59:55 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-10-31 07:01:12 +0800 |
| commit | 25c46a16364612cd4bcebe375af910c08862b17a (patch) | |
| tree | a5e0a0848e7fe778eed4c06c270cda0040ed48bf /ui | |
| parent | 625c54b7eca1c12f5d95b3ae9d2374315abc0c2b (diff) | |
| download | tangerine-wallet-browser-25c46a16364612cd4bcebe375af910c08862b17a.tar tangerine-wallet-browser-25c46a16364612cd4bcebe375af910c08862b17a.tar.gz tangerine-wallet-browser-25c46a16364612cd4bcebe375af910c08862b17a.tar.bz2 tangerine-wallet-browser-25c46a16364612cd4bcebe375af910c08862b17a.tar.lz tangerine-wallet-browser-25c46a16364612cd4bcebe375af910c08862b17a.tar.xz tangerine-wallet-browser-25c46a16364612cd4bcebe375af910c08862b17a.tar.zst tangerine-wallet-browser-25c46a16364612cd4bcebe375af910c08862b17a.zip | |
Make case condition more consistent. Remove extra action. Fix incorrect display of network.
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app/actions.js | 2 | ||||
| -rw-r--r-- | ui/app/components/network.js | 3 |
2 files changed, 3 insertions, 2 deletions
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: { |