aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2017-03-15 05:05:28 +0800
committerKevin Serrano <kevgagser@gmail.com>2017-03-15 05:05:28 +0800
commitfcee7723e99c13b3fddcb97853dfdd771b42de14 (patch)
tree6837476a4a3797cf26dd2a1e1661f9b79bbb5797
parent1ec7930c75f10390e3e4ab553e1032056d1d2c2f (diff)
parentc759300d4cff90f6dc23d5550d8f0f3f9107eca2 (diff)
downloadtangerine-wallet-browser-fcee7723e99c13b3fddcb97853dfdd771b42de14.tar
tangerine-wallet-browser-fcee7723e99c13b3fddcb97853dfdd771b42de14.tar.gz
tangerine-wallet-browser-fcee7723e99c13b3fddcb97853dfdd771b42de14.tar.bz2
tangerine-wallet-browser-fcee7723e99c13b3fddcb97853dfdd771b42de14.tar.lz
tangerine-wallet-browser-fcee7723e99c13b3fddcb97853dfdd771b42de14.tar.xz
tangerine-wallet-browser-fcee7723e99c13b3fddcb97853dfdd771b42de14.tar.zst
tangerine-wallet-browser-fcee7723e99c13b3fddcb97853dfdd771b42de14.zip
Merge branch 'i1165-predictive' of github.com:MetaMask/metamask-plugin into i1165-predictive
-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 45030cc15..77dcc53c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
- Allow sending to ENS names in send form on Ropsten.
- Added an address book functionality that remembers the last 15 unique addresses sent to.
+- 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'})