From e4feb50f6f909082b6a65351bbb9bfaeebaf9028 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Mon, 13 Mar 2017 16:41:25 -0700 Subject: Display Custom RPC on lock screen. --- ui/app/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui/app/app.js') 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()), -- cgit From b10f370c7463c177df16650a80a57f9875db7685 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Mon, 13 Mar 2017 16:43:34 -0700 Subject: Render config screen from unlock. --- ui/app/app.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ui/app/app.js') 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'}) -- cgit From b26c53452e2817f4f00a4770eae8828731e97808 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Wed, 22 Mar 2017 16:05:04 -0400 Subject: Add Kovan test network to our application. --- ui/app/app.js | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'ui/app/app.js') diff --git a/ui/app/app.js b/ui/app/app.js index 9c1ba8a3a..5a7596aca 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -255,6 +255,15 @@ App.prototype.renderNetworkDropdown = function () { provider: props.provider, }), + h(DropMenuItem, { + label: 'Kovan Test Network', + closeMenu: () => this.setState({ isNetworkMenuOpen: false}), + action: () => props.dispatch(actions.setProviderType('kovan')), + icon: h('.menu-icon.hollow-diamond'), + activeNetworkRender: props.network, + provider: props.provider, + }), + h(DropMenuItem, { label: 'Localhost 8545', closeMenu: () => this.setState({ isNetworkMenuOpen: false }), -- cgit