aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2017-03-15 08:09:21 +0800
committerGitHub <noreply@github.com>2017-03-15 08:09:21 +0800
commit311b80adf35ba8b419bff15f83a6e8893b746b39 (patch)
tree0b82e66942ade02e78012414aeb9576327355387 /ui
parent37ffcfcf0e518ed8843022cd079ce09d0b2239ff (diff)
parent2a68c89ba7c5f168083beee77161adeb863d82c9 (diff)
downloadtangerine-wallet-browser-311b80adf35ba8b419bff15f83a6e8893b746b39.tar
tangerine-wallet-browser-311b80adf35ba8b419bff15f83a6e8893b746b39.tar.gz
tangerine-wallet-browser-311b80adf35ba8b419bff15f83a6e8893b746b39.tar.bz2
tangerine-wallet-browser-311b80adf35ba8b419bff15f83a6e8893b746b39.tar.lz
tangerine-wallet-browser-311b80adf35ba8b419bff15f83a6e8893b746b39.tar.xz
tangerine-wallet-browser-311b80adf35ba8b419bff15f83a6e8893b746b39.tar.zst
tangerine-wallet-browser-311b80adf35ba8b419bff15f83a6e8893b746b39.zip
Merge branch 'master' into i1211-currencyretention
Diffstat (limited to 'ui')
-rw-r--r--ui/app/app.js6
1 files changed, 5 insertions, 1 deletions
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'})