aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-06-23 12:08:59 +0800
committerGitHub <noreply@github.com>2016-06-23 12:08:59 +0800
commit9fb3ee9846730cfd49b1e3afc04a33e54ad96be6 (patch)
treea9cdf13e680fa1656d63330d8f60c22071d0f195
parentfd01e45cd52c594982577230f1dc13e6485c24ef (diff)
parent973aa4fd15315ae34350899ca48dc7b23761003b (diff)
downloadtangerine-wallet-browser-9fb3ee9846730cfd49b1e3afc04a33e54ad96be6.tar
tangerine-wallet-browser-9fb3ee9846730cfd49b1e3afc04a33e54ad96be6.tar.gz
tangerine-wallet-browser-9fb3ee9846730cfd49b1e3afc04a33e54ad96be6.tar.bz2
tangerine-wallet-browser-9fb3ee9846730cfd49b1e3afc04a33e54ad96be6.tar.lz
tangerine-wallet-browser-9fb3ee9846730cfd49b1e3afc04a33e54ad96be6.tar.xz
tangerine-wallet-browser-9fb3ee9846730cfd49b1e3afc04a33e54ad96be6.tar.zst
tangerine-wallet-browser-9fb3ee9846730cfd49b1e3afc04a33e54ad96be6.zip
Merge pull request #311 from MetaMask/settings
Remove network option buttons
-rw-r--r--CHANGELOG.md1
-rw-r--r--ui/app/config.js37
2 files changed, 1 insertions, 37 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 032b91d1a..7ac576325 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
## Current Master
+- Remove redundant network option buttons from settings page
- Switch out font family Transat for Montserrat
## 2.4.2 2016-06-22
diff --git a/ui/app/config.js b/ui/app/config.js
index 4094180dd..c88e7ac6e 100644
--- a/ui/app/config.js
+++ b/ui/app/config.js
@@ -73,43 +73,6 @@ ConfigScreen.prototype.render = function () {
},
}, 'Save'),
]),
-
- h('div', [
- h('button.spaced', {
- style: {
- alignSelf: 'center',
- },
- onClick (event) {
- event.preventDefault()
- state.dispatch(actions.setProviderType('mainnet'))
- },
- }, 'Use Main Network'),
- ]),
-
- h('div', [
- h('button.spaced', {
- style: {
- alignSelf: 'center',
- },
- onClick (event) {
- event.preventDefault()
- state.dispatch(actions.setProviderType('testnet'))
- },
- }, 'Use Morden Test Network'),
- ]),
-
- h('div', [
- h('button.spaced', {
- style: {
- alignSelf: 'center',
- },
- onClick (event) {
- event.preventDefault()
- state.dispatch(actions.setRpcTarget('http://localhost:8545/'))
- },
- }, 'Use http://localhost:8545'),
- ]),
-
h('hr.horizontal-line'),
h('div', {