m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge branch 'master' into i1211-currencyretention

Browse Source
This commit is contained in:
Kevin Serrano 2017-03-14 17:09:21 -07:00 committed by GitHub
commit 311b80adf3
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@
## Current Master ## Current Master
- Allow sending to ENS names in send form on Ropsten. - Allow sending to ENS names in send form on Ropsten.
- Can now change network to custom RPC URL from lock screen.
## 3.4.0 2017-3-8 ## 3.4.0 2017-3-8

6
ui/app/app.js
View File

@ -266,7 +266,7 @@ App.prototype.renderNetworkDropdown = function () {
this.renderCustomOption(props.provider), this.renderCustomOption(props.provider),
this.renderCommonRpc(rpcList, props.provider), this.renderCommonRpc(rpcList, props.provider),
props.isUnlocked && h(DropMenuItem, { h(DropMenuItem, {
label: 'Custom RPC', label: 'Custom RPC',
closeMenu: () => this.setState({ isNetworkMenuOpen: false }), closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
action: () => this.props.dispatch(actions.showConfigPage()), action: () => this.props.dispatch(actions.showConfigPage()),
@ -400,6 +400,10 @@ App.prototype.renderPrimary = function () {
log.debug('rendering restore vault screen') log.debug('rendering restore vault screen')
return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'}) return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'})
case 'config':
log.debug('rendering config screen from unlock screen.')
return h(ConfigScreen, {key: 'config'})
default: default:
log.debug('rendering locked screen') log.debug('rendering locked screen')
return h(UnlockScreen, {key: 'locked'}) return h(UnlockScreen, {key: 'locked'})