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

Min and default gas price, limit, total; comments out code for gas slider.

Browse Source
This commit is contained in:
Dan 2017-10-18 16:53:35 -02:30 committed by Chi Kei Chan
parent 7362fb8dfc
commit c2880c4b8f
4 changed files with 47 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/app/components/customize-gas-modal/gas-modal-card.js
View File

@ -19,7 +19,7 @@ GasModalCard.prototype.render = function () {
unitLabel,
value,
min,
max,
// max,
step,
title,
copy
@ -34,20 +34,20 @@ GasModalCard.prototype.render = function () {
h(InputNumber, {
unitLabel,
step,
max,
// max,
min,
placeholder: '0',
value,
onChange,
}),
h(GasSlider, {
value,
step,
max,
min,
onChange,
}),
// h(GasSlider, {
// value,
// step,
// max,
// min,
// onChange,
// }),
])

17
ui/app/components/customize-gas-modal/index.js
View File

@ -5,6 +5,11 @@ const connect = require('react-redux').connect
const actions = require('../../actions')
const GasModalCard = require('./gas-modal-card')
const {
MIN_GAS_PRICE,
MIN_GAS_LIMIT,
} = require('../send/send-constants')
const { conversionUtil, multiplyCurrencies } = require('../../conversion-util')
const {
@ -35,8 +40,8 @@ function CustomizeGasModal (props) {
Component.call(this)
this.state = {
gasPrice: props.gasPrice,
gasLimit: props.gasLimit,
gasPrice: props.gasPrice || MIN_GAS_PRICE,
gasLimit: props.gasLimit || MIN_GAS_LIMIT,
}
}
@ -115,8 +120,8 @@ CustomizeGasModal.prototype.render = function () {
h(GasModalCard, {
value: convertedGasPrice,
min: 0,
max: 1000,
min: MIN_GAS_PRICE,
// max: 1000,
step: 1,
onChange: value => this.convertAndSetGasPrice(value),
title: 'Gas Price',
@ -125,8 +130,8 @@ CustomizeGasModal.prototype.render = function () {
h(GasModalCard, {
value: convertedGasLimit,
min: 20000,
max: 100000,
min: MIN_GAS_LIMIT,
// max: 100000,
step: 1,
onChange: value => this.convertAndSetGasLimit(value),
title: 'Gas Limit',

23
ui/app/components/send/send-constants.js Normal file
View File

@ -0,0 +1,23 @@
const Identicon = require('../identicon')
const { multiplyCurrencies } = require('../../conversion-util')
const MIN_GAS_PRICE_GWEI = '1'
const GWEI_FACTOR = '1e9'
const MIN_GAS_PRICE = multiplyCurrencies(GWEI_FACTOR, MIN_GAS_PRICE_GWEI, {
multiplicandBase: 16,
multiplierBase: 16,
})
const MIN_GAS_LIMIT = (21000).toString(16)
const MIN_GAS_TOTAL = multiplyCurrencies(MIN_GAS_LIMIT, MIN_GAS_PRICE, {
toNumericBase: 'hex',
multiplicandBase: 16,
multiplierBase: 16,
})
module.exports = {
MIN_GAS_PRICE_GWEI,
GWEI_FACTOR,
MIN_GAS_PRICE,
MIN_GAS_LIMIT,
MIN_GAS_TOTAL,
}

7
ui/app/send-v2.js
View File

@ -10,6 +10,8 @@ const CurrencyDisplay = require('./components/send/currency-display')
const MemoTextArea = require('./components/send/memo-textarea')
const GasFeeDisplay = require('./components/send/gas-fee-display-v2')
const { MIN_GAS_TOTAL } = require('./components/send/send-constants')
const { showModal } = require('./actions')
const {
@ -135,9 +137,8 @@ SendTransactionScreen.prototype.renderHeader = function () {
SendTransactionScreen.prototype.renderErrorMessage = function(errorType) {
const { errors } = this.props
console.log(`! errors`, errors);
const errorMessage = errors[errorType];
console.log(`errorMessage`, errorMessage);
return errorMessage
? h('div.send-v2__error', [ errorMessage ] )
: null
@ -309,7 +310,7 @@ SendTransactionScreen.prototype.renderGasRow = function () {
const {
conversionRate,
showCustomizeGasModal,
gasTotal,
gasTotal = MIN_GAS_TOTAL,
} = this.props
return h('div.send-v2__form-row', [