aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md1
-rw-r--r--ui/app/app.js6
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f070d9a9..c8e73c286 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
## Current Master
- 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
diff --git a/ui/app/app.js b/ui/app/app.js
index 2bc92b54c..9c1ba8a3a 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -266,7 +266,7 @@ App.prototype.renderNetworkDropdown = function () {
this.renderCustomOption(props.provider),
this.renderCommonRpc(rpcList, props.provider),
- props.isUnlocked && h(DropMenuItem, {
+ h(DropMenuItem, {
label: 'Custom RPC',
closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
action: () => this.props.dispatch(actions.showConfigPage()),
@@ -400,6 +400,10 @@ App.prototype.renderPrimary = function () {
log.debug('rendering restore vault screen')
return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'})
+ case 'config':
+ log.debug('rendering config screen from unlock screen.')
+ return h(ConfigScreen, {key: 'config'})
+
default:
log.debug('rendering locked screen')
return h(UnlockScreen, {key: 'locked'})