diff options
author | Dan Finlay <dan@danfinlay.com> | 2017-03-01 06:45:44 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2017-03-01 06:45:44 +0800 |
commit | 513a9d72ef2f19f02f5cac3b1c66b01371c281c9 (patch) | |
tree | f2ff12cebb1a334cda0870633f3cc8c7672406de /ui | |
parent | f908aaafbc0c3ed94ef8892b9bd16a9c1b49269f (diff) | |
parent | 9fb4b4a77fb97e5bf1081127071c232d9729e8eb (diff) | |
download | tangerine-wallet-browser-513a9d72ef2f19f02f5cac3b1c66b01371c281c9.tar tangerine-wallet-browser-513a9d72ef2f19f02f5cac3b1c66b01371c281c9.tar.gz tangerine-wallet-browser-513a9d72ef2f19f02f5cac3b1c66b01371c281c9.tar.bz2 tangerine-wallet-browser-513a9d72ef2f19f02f5cac3b1c66b01371c281c9.tar.lz tangerine-wallet-browser-513a9d72ef2f19f02f5cac3b1c66b01371c281c9.tar.xz tangerine-wallet-browser-513a9d72ef2f19f02f5cac3b1c66b01371c281c9.tar.zst tangerine-wallet-browser-513a9d72ef2f19f02f5cac3b1c66b01371c281c9.zip |
Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits
Diffstat (limited to 'ui')
-rw-r--r-- | ui/app/components/pending-tx-details.js | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/ui/app/components/pending-tx-details.js b/ui/app/components/pending-tx-details.js index a9172d4ad..f5651bb1d 100644 --- a/ui/app/components/pending-tx-details.js +++ b/ui/app/components/pending-tx-details.js @@ -40,7 +40,6 @@ PTXP.render = function () { var maxCost = state.maxCost || txData.maxCost || '' var dataLength = txParams.data ? (txParams.data.length - 2) / 2 : 0 var imageify = props.imageifyIdenticons === undefined ? true : props.imageifyIdenticons - var advanced = state.advanced || false log.debug(`rendering gas: ${gas}, gasPrice: ${gasPrice}, txFee: ${txFee}, maxCost: ${maxCost}`) @@ -109,17 +108,6 @@ PTXP.render = function () { h('.table-box', [ - h('.row', [ - h('.cell.label', 'Advanced Options'), - h('input', { - type: 'checkbox', - selected: advanced, - onChange: () => { - this.setState({advanced: !advanced}) - }, - }), - ]), - // Ether Value // Currently not customizable, but easily modified // in the way that gas and gasLimit currently are. @@ -129,7 +117,7 @@ PTXP.render = function () { ]), // Gas Limit (customizable) - advanced ? h('.cell.row', [ + h('.cell.row', [ h('.cell.label', 'Gas Limit'), h('.cell.value', { }, [ @@ -146,10 +134,10 @@ PTXP.render = function () { }, }), ]), - ]) : null, + ]), // Gas Price (customizable) - advanced ? h('.cell.row', [ + h('.cell.row', [ h('.cell.label', 'Gas Price'), h('.cell.value', { }, [ @@ -166,9 +154,7 @@ PTXP.render = function () { }, }), ]), - ]) : null, - - + ]), // Max Transaction Fee (calculated) h('.cell.row', [ |