mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 01:39:44 +01:00
Merge branch 'master' into UpdateWeb3
This commit is contained in:
commit
1d1c64cf89
@ -4,6 +4,10 @@
|
||||
|
||||
- Add a check for improper Transaction data.
|
||||
- Inject up to date version of web3.js
|
||||
- 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
|
||||
|
||||
|
@ -247,9 +247,9 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
|
||||
// perform static analyis on the target contract code
|
||||
function analyzeForDelegateCall(cb){
|
||||
if (txParams.to) {
|
||||
query.getCode(txParams.to, function (err, result) {
|
||||
query.getCode(txParams.to, (err, result) => {
|
||||
if (err) return cb(err)
|
||||
var containsDelegateCall = this.checkForDelegateCall(result)
|
||||
var containsDelegateCall = self.checkForDelegateCall(result)
|
||||
txData.containsDelegateCall = containsDelegateCall
|
||||
cb()
|
||||
})
|
||||
@ -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,
|
||||
|
@ -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, {
|
||||
|
@ -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', '✓')
|
||||
|
Loading…
Reference in New Issue
Block a user