From e4feb50f6f909082b6a65351bbb9bfaeebaf9028 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Mon, 13 Mar 2017 16:41:25 -0700 Subject: [PATCH 1/3] Display Custom RPC on lock screen. --- ui/app/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/app.js b/ui/app/app.js index 2bc92b54c..b3e86220a 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()), From b10f370c7463c177df16650a80a57f9875db7685 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Mon, 13 Mar 2017 16:43:34 -0700 Subject: [PATCH 2/3] Render config screen from unlock. --- ui/app/app.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/app/app.js b/ui/app/app.js index b3e86220a..9c1ba8a3a 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -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'}) From 7d0bfdf076fbc05d276b7a26df4cb745ca117691 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Mon, 13 Mar 2017 16:46:33 -0700 Subject: [PATCH 3/3] Changelog addition. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) 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