m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i765-gaslimits

Browse Source
This commit is contained in:
Dan Finlay 2017-02-28 14:45:44 -08:00
commit 513a9d72ef
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ui/app/components/pending-tx-details.js
View File

@ -40,7 +40,6 @@ PTXP.render = function () {
var maxCost = state.maxCost || txData.maxCost || '' var maxCost = state.maxCost || txData.maxCost || ''
var dataLength = txParams.data ? (txParams.data.length - 2) / 2 : 0 var dataLength = txParams.data ? (txParams.data.length - 2) / 2 : 0
var imageify = props.imageifyIdenticons === undefined ? true : props.imageifyIdenticons var imageify = props.imageifyIdenticons === undefined ? true : props.imageifyIdenticons
var advanced = state.advanced || false
log.debug(`rendering gas: ${gas}, gasPrice: ${gasPrice}, txFee: ${txFee}, maxCost: ${maxCost}`) log.debug(`rendering gas: ${gas}, gasPrice: ${gasPrice}, txFee: ${txFee}, maxCost: ${maxCost}`)
@ -109,17 +108,6 @@ PTXP.render = function () {
h('.table-box', [ h('.table-box', [
h('.row', [
h('.cell.label', 'Advanced Options'),
h('input', {
type: 'checkbox',
selected: advanced,
onChange: () => {
this.setState({advanced: !advanced})
},
}),
]),
// Ether Value // Ether Value
// Currently not customizable, but easily modified // Currently not customizable, but easily modified
// in the way that gas and gasLimit currently are. // in the way that gas and gasLimit currently are.
@ -129,7 +117,7 @@ PTXP.render = function () {
]), ]),
// Gas Limit (customizable) // Gas Limit (customizable)
advanced ? h('.cell.row', [ h('.cell.row', [
h('.cell.label', 'Gas Limit'), h('.cell.label', 'Gas Limit'),
h('.cell.value', { h('.cell.value', {
}, [ }, [
@ -146,10 +134,10 @@ PTXP.render = function () {
}, },
}), }),
]), ]),
]) : null, ]),
// Gas Price (customizable) // Gas Price (customizable)
advanced ? h('.cell.row', [ h('.cell.row', [
h('.cell.label', 'Gas Price'), h('.cell.label', 'Gas Price'),
h('.cell.value', { h('.cell.value', {
}, [ }, [
@ -166,9 +154,7 @@ PTXP.render = function () {
}, },
}), }),
]), ]),
]) : null, ]),
// Max Transaction Fee (calculated) // Max Transaction Fee (calculated)
h('.cell.row', [ h('.cell.row', [