diff options
author | Dan <danjm.com@gmail.com> | 2018-02-08 08:49:14 +0800 |
---|---|---|
committer | Dan <danjm.com@gmail.com> | 2018-02-08 08:49:14 +0800 |
commit | b0db68a281168a94316823387b1670839990dd63 (patch) | |
tree | 153ca25095e5293951df032c8aa4860b2fe9965d /old-ui | |
parent | 7f151b861cc3a565d3feefc50b3be25ab4490ac8 (diff) | |
parent | c50a197ab95b462b4416cbf85139f80db9b70f0c (diff) | |
download | tangerine-wallet-browser-b0db68a281168a94316823387b1670839990dd63.tar.gz tangerine-wallet-browser-b0db68a281168a94316823387b1670839990dd63.tar.zst tangerine-wallet-browser-b0db68a281168a94316823387b1670839990dd63.zip |
Merge branch 'uat' into uat-next
Diffstat (limited to 'old-ui')
-rw-r--r-- | old-ui/app/add-token.js | 4 | ||||
-rw-r--r-- | old-ui/app/config.js | 46 |
2 files changed, 47 insertions, 3 deletions
diff --git a/old-ui/app/add-token.js b/old-ui/app/add-token.js index 8778f312e..8a3e66978 100644 --- a/old-ui/app/add-token.js +++ b/old-ui/app/add-token.js @@ -25,7 +25,7 @@ inherits(AddTokenScreen, Component) function AddTokenScreen () { this.state = { warning: null, - address: null, + address: '', symbol: 'TOKEN', decimals: 18, } @@ -190,7 +190,7 @@ AddTokenScreen.prototype.validateInputs = function () { const validAddress = ethUtil.isValidAddress(address) if (!validAddress) { - msg += 'Address is invalid. ' + msg += 'Address is invalid.' } const validDecimals = decimals >= 0 && decimals < 36 diff --git a/old-ui/app/config.js b/old-ui/app/config.js index 75198fba5..689385a02 100644 --- a/old-ui/app/config.js +++ b/old-ui/app/config.js @@ -30,7 +30,12 @@ ConfigScreen.prototype.render = function () { var warning = state.warning return ( - h('.flex-column.flex-grow', [ + h('.flex-column.flex-grow', { + style:{ + maxHeight: '465px', + overflowY: 'auto', + }, + }, [ h(Modal, {}, []), @@ -57,6 +62,7 @@ ConfigScreen.prototype.render = function () { h('.flex-space-around', { style: { padding: '20px', + overflow: 'auto', }, }, [ @@ -144,6 +150,40 @@ ConfigScreen.prototype.render = function () { }, 'Reveal Seed Words'), ]), + h('hr.horizontal-line'), + + h('div', { + style: { + marginTop: '20px', + }, + }, [ + + h('p', { + style: { + fontFamily: 'Montserrat Light', + fontSize: '13px', + }, + }, [ + 'Resetting is for developer use only. ', + h('a', { + href: 'http://metamask.helpscoutdocs.com/article/36-resetting-an-account', + target: '_blank', + onClick (event) { this.navigateTo(event.target.href) }, + }, 'Read more.'), + ]), + h('br'), + + h('button', { + style: { + alignSelf: 'center', + }, + onClick (event) { + event.preventDefault() + state.dispatch(actions.resetAccount()) + }, + }, 'Reset Account'), + ]), + ]), ]), ]) @@ -220,3 +260,7 @@ function currentProviderDisplay (metamaskState) { h('span', value), ]) } + +ConfigScreen.prototype.navigateTo = function (url) { + global.platform.openWindow({ url }) +} |