diff options
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | app/scripts/lib/idStore.js | 2 | ||||
| -rw-r--r-- | ui/app/app.js | 15 | ||||
| -rw-r--r-- | ui/app/components/drop-menu-item.js | 2 |
5 files changed, 15 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0586b8ef1..893c0d9cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,12 @@ ## Current Master +## 2.13.6 2016-10-26 + - Add a check for improper Transaction data. +- Now nicknaming new accounts "Account #" instead of "Wallet #" for clarity. +- Fix bug where custom provider selection could show duplicate items. +- Fix bug where connecting to a local morden node would make two providers appear selected. - Fix bug that was sometimes preventing transactions from being sent. ## 2.13.5 2016-10-18 diff --git a/app/manifest.json b/app/manifest.json index 8f5a34ea6..e35f2918d 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "2.13.5", + "version": "2.13.6", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js index 27372b3e9..46d53c4e1 100644 --- a/app/scripts/lib/idStore.js +++ b/app/scripts/lib/idStore.js @@ -426,7 +426,7 @@ IdentityStore.prototype._loadIdentities = function () { // // add to ethStore this._ethStore.addAccount(ethUtil.addHexPrefix(address)) // add to identities - const defaultLabel = 'Wallet ' + (i + 1) + const defaultLabel = 'Account ' + (i + 1) const nickname = configManager.nicknameForWallet(address) var identity = { name: nickname || defaultLabel, diff --git a/ui/app/app.js b/ui/app/app.js index 71e0637d0..ae6fe7071 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -240,6 +240,7 @@ App.prototype.renderNetworkDropdown = function () { action: () => props.dispatch(actions.setProviderType('testnet')), icon: h('.menu-icon.red-dot'), activeNetworkRender: props.network, + provider: props.provider, }), h(DropMenuItem, { @@ -250,13 +251,6 @@ App.prototype.renderNetworkDropdown = function () { activeNetworkRender: props.provider.rpcTarget, }), - h(DropMenuItem, { - label: 'Custom RPC', - closeMenu: () => this.setState({ isNetworkMenuOpen: false }), - action: () => this.props.dispatch(actions.showConfigPage()), - icon: h('i.fa.fa-question-circle.fa-lg'), - }), - this.renderCustomOption(props.provider.rpcTarget), ]) } @@ -508,7 +502,12 @@ App.prototype.toggleMetamaskActive = function () { App.prototype.renderCustomOption = function (rpcTarget) { switch (rpcTarget) { case undefined: - return null + return h(DropMenuItem, { + label: 'Custom RPC', + closeMenu: () => this.setState({ isNetworkMenuOpen: false }), + action: () => this.props.dispatch(actions.showConfigPage()), + icon: h('i.fa.fa-question-circle.fa-lg'), + }) case 'http://localhost:8545': return h(DropMenuItem, { diff --git a/ui/app/components/drop-menu-item.js b/ui/app/components/drop-menu-item.js index 0ca1988c6..8088680c0 100644 --- a/ui/app/components/drop-menu-item.js +++ b/ui/app/components/drop-menu-item.js @@ -42,7 +42,7 @@ DropMenuItem.prototype.activeNetworkRender = function () { if (providerType === 'mainnet') return h('.check', '✓') break case 'Morden Test Network': - if (activeNetwork === '2') return h('.check', '✓') + if (provider.type === 'testnet') return h('.check', '✓') break case 'Localhost 8545': if (activeNetwork === 'http://localhost:8545') return h('.check', '✓') |