mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-11-24 11:01:41 +01:00
ba25d52670
* Use `AdvancedGasInputs` in `AdvancedTabContent` The `AdvancedGasInputs` component was originally extracted from the `AdvancedTabContent` component, duplicating much of the rendering logic. They have since evolved separately, with bugs being fixed in one place but not the other. The inputs and outputs expected weren't exactly the same, as the `AdvancedGasInputs` component converts the input custom gas price and limit, and it converts them both in the setter methods as well. The `GasModalPageContainer` had to be adjusted to avoid converting these values multiple times. Both components dealt with input debouncing separately, both in less than ideal ways. `AdvancedTabContent` didn't debounce either field, but it did debounce the check for whether the gas limit field was below the minimum value. So if a less-than-minimum value was set, it would be propogated upwards and could be saved if the user clicked 'Save' quickly enough. After a second delay it would snap back to the minimum value. The `AdvancedGasInputs` component debounced both fields, but it would replace any gas limit below the minimum with the minimum value. This led to a problem where a brief pause during typing would reset the field to 21000. The `AdvancedGasInputs` approach was chosen, except that it was updated to no longer change the gas limit if it was below the minimum. Instead it displays an error. Parent components were checked to ensure they would detect the error case of the gas limit being set too low, and prevent the form submission in those cases. Of the three parents, one had already dealt with it correctly, one needed to convert the gas limit from hex first, and another needed the gas limit check added. Closes #6872 * Cleanup send components Empty README files have been removed, and a mistake in the index file for the send page has been corrected. The Gas Slider component class name was updated as well; it looks like it was originally created from `AdvancedTabContent`, so it still had that class name.
332 lines
9.1 KiB
JavaScript
332 lines
9.1 KiB
JavaScript
import { pipe, partialRight } from 'ramda'
|
|
import {
|
|
conversionUtil,
|
|
multiplyCurrencies,
|
|
conversionGreaterThan,
|
|
} from '../helpers/utils/conversion-util'
|
|
import {
|
|
getCurrentCurrency, getIsMainnet, preferencesSelector,
|
|
} from './selectors'
|
|
import {
|
|
formatCurrency,
|
|
} from '../helpers/utils/confirm-tx.util'
|
|
import {
|
|
decEthToConvertedCurrency as ethTotalToConvertedCurrency,
|
|
} from '../helpers/utils/conversions.util'
|
|
import {
|
|
formatETHFee,
|
|
} from '../helpers/utils/formatters'
|
|
import {
|
|
calcGasTotal,
|
|
} from '../pages/send/send.utils'
|
|
import { addHexPrefix } from 'ethereumjs-util'
|
|
|
|
import { GAS_ESTIMATE_TYPES } from '../helpers/constants/common'
|
|
|
|
const selectors = {
|
|
formatTimeEstimate,
|
|
getAveragePriceEstimateInHexWEI,
|
|
getFastPriceEstimateInHexWEI,
|
|
getBasicGasEstimateLoadingStatus,
|
|
getBasicGasEstimateBlockTime,
|
|
getCustomGasErrors,
|
|
getCustomGasLimit,
|
|
getCustomGasPrice,
|
|
getCustomGasTotal,
|
|
getDefaultActiveButtonIndex,
|
|
getEstimatedGasPrices,
|
|
getEstimatedGasTimes,
|
|
getGasEstimatesLoadingStatus,
|
|
getPriceAndTimeEstimates,
|
|
getRenderableBasicEstimateData,
|
|
getRenderableEstimateDataForSmallButtonsFromGWEI,
|
|
priceEstimateToWei,
|
|
getSafeLowEstimate,
|
|
isCustomPriceSafe,
|
|
}
|
|
|
|
module.exports = selectors
|
|
|
|
const NUMBER_OF_DECIMALS_SM_BTNS = 5
|
|
|
|
function getCustomGasErrors (state) {
|
|
return state.gas.errors
|
|
}
|
|
|
|
function getCustomGasLimit (state) {
|
|
return state.gas.customData.limit
|
|
}
|
|
|
|
function getCustomGasPrice (state) {
|
|
return state.gas.customData.price
|
|
}
|
|
|
|
function getCustomGasTotal (state) {
|
|
return state.gas.customData.total
|
|
}
|
|
|
|
function getBasicGasEstimateLoadingStatus (state) {
|
|
return state.gas.basicEstimateIsLoading
|
|
}
|
|
|
|
function getGasEstimatesLoadingStatus (state) {
|
|
return state.gas.gasEstimatesLoading
|
|
}
|
|
|
|
function getPriceAndTimeEstimates (state) {
|
|
return state.gas.priceAndTimeEstimates
|
|
}
|
|
|
|
function getEstimatedGasPrices (state) {
|
|
return getPriceAndTimeEstimates(state).map(({ gasprice }) => gasprice)
|
|
}
|
|
|
|
function getEstimatedGasTimes (state) {
|
|
return getPriceAndTimeEstimates(state).map(({ expectedTime }) => expectedTime)
|
|
}
|
|
|
|
function getAveragePriceEstimateInHexWEI (state) {
|
|
const averagePriceEstimate = state.gas.basicEstimates.average
|
|
return getGasPriceInHexWei(averagePriceEstimate || '0x0')
|
|
}
|
|
|
|
function getFastPriceEstimateInHexWEI (state) {
|
|
const fastPriceEstimate = state.gas.basicEstimates.fast
|
|
return getGasPriceInHexWei(fastPriceEstimate || '0x0')
|
|
}
|
|
|
|
function getDefaultActiveButtonIndex (gasButtonInfo, customGasPriceInHex, gasPrice) {
|
|
return gasButtonInfo.findIndex(({ priceInHexWei }) => {
|
|
return priceInHexWei === addHexPrefix(customGasPriceInHex || gasPrice)
|
|
})
|
|
}
|
|
|
|
function getSafeLowEstimate (state) {
|
|
const {
|
|
gas: {
|
|
basicEstimates: {
|
|
safeLow,
|
|
},
|
|
},
|
|
} = state
|
|
|
|
return safeLow
|
|
}
|
|
|
|
function isCustomPriceSafe (state) {
|
|
const safeLow = getSafeLowEstimate(state)
|
|
const customGasPrice = getCustomGasPrice(state)
|
|
|
|
if (!customGasPrice) {
|
|
return true
|
|
}
|
|
|
|
if (safeLow === null) {
|
|
return null
|
|
}
|
|
|
|
const customPriceSafe = conversionGreaterThan(
|
|
{
|
|
value: customGasPrice,
|
|
fromNumericBase: 'hex',
|
|
fromDenomination: 'WEI',
|
|
toDenomination: 'GWEI',
|
|
},
|
|
{ value: safeLow, fromNumericBase: 'dec' }
|
|
)
|
|
|
|
return customPriceSafe
|
|
}
|
|
|
|
function getBasicGasEstimateBlockTime (state) {
|
|
return state.gas.basicEstimates.blockTime
|
|
}
|
|
|
|
function basicPriceEstimateToETHTotal (estimate, gasLimit, numberOfDecimals = 9) {
|
|
return conversionUtil(calcGasTotal(gasLimit, estimate), {
|
|
fromNumericBase: 'hex',
|
|
toNumericBase: 'dec',
|
|
fromDenomination: 'GWEI',
|
|
numberOfDecimals,
|
|
})
|
|
}
|
|
|
|
function getRenderableEthFee (estimate, gasLimit, numberOfDecimals = 9) {
|
|
return pipe(
|
|
x => conversionUtil(x, { fromNumericBase: 'dec', toNumericBase: 'hex' }),
|
|
partialRight(basicPriceEstimateToETHTotal, [gasLimit, numberOfDecimals]),
|
|
formatETHFee
|
|
)(estimate, gasLimit)
|
|
}
|
|
|
|
|
|
function getRenderableConvertedCurrencyFee (estimate, gasLimit, convertedCurrency, conversionRate) {
|
|
return pipe(
|
|
x => conversionUtil(x, { fromNumericBase: 'dec', toNumericBase: 'hex' }),
|
|
partialRight(basicPriceEstimateToETHTotal, [gasLimit]),
|
|
partialRight(ethTotalToConvertedCurrency, [convertedCurrency, conversionRate]),
|
|
partialRight(formatCurrency, [convertedCurrency])
|
|
)(estimate, gasLimit, convertedCurrency, conversionRate)
|
|
}
|
|
|
|
function getTimeEstimateInSeconds (blockWaitEstimate) {
|
|
return multiplyCurrencies(blockWaitEstimate, 60, {
|
|
toNumericBase: 'dec',
|
|
multiplicandBase: 10,
|
|
multiplierBase: 10,
|
|
numberOfDecimals: 1,
|
|
})
|
|
}
|
|
|
|
function formatTimeEstimate (totalSeconds, greaterThanMax, lessThanMin) {
|
|
const minutes = Math.floor(totalSeconds / 60)
|
|
const seconds = Math.floor(totalSeconds % 60)
|
|
|
|
if (!minutes && !seconds) {
|
|
return '...'
|
|
}
|
|
|
|
let symbol = '~'
|
|
if (greaterThanMax) {
|
|
symbol = '< '
|
|
} else if (lessThanMin) {
|
|
symbol = '> '
|
|
}
|
|
|
|
const formattedMin = `${minutes ? minutes + ' min' : ''}`
|
|
const formattedSec = `${seconds ? seconds + ' sec' : ''}`
|
|
const formattedCombined = formattedMin && formattedSec
|
|
? `${symbol}${formattedMin} ${formattedSec}`
|
|
: symbol + [formattedMin, formattedSec].find(t => t)
|
|
|
|
return formattedCombined
|
|
}
|
|
|
|
function getRenderableTimeEstimate (blockWaitEstimate) {
|
|
return pipe(
|
|
getTimeEstimateInSeconds,
|
|
formatTimeEstimate
|
|
)(blockWaitEstimate)
|
|
}
|
|
|
|
function priceEstimateToWei (priceEstimate) {
|
|
return conversionUtil(priceEstimate, {
|
|
fromNumericBase: 'hex',
|
|
toNumericBase: 'hex',
|
|
fromDenomination: 'GWEI',
|
|
toDenomination: 'WEI',
|
|
numberOfDecimals: 9,
|
|
})
|
|
}
|
|
|
|
function getGasPriceInHexWei (price) {
|
|
return pipe(
|
|
x => conversionUtil(x, { fromNumericBase: 'dec', toNumericBase: 'hex' }),
|
|
priceEstimateToWei,
|
|
addHexPrefix
|
|
)(price)
|
|
}
|
|
|
|
function getRenderableBasicEstimateData (state, gasLimit) {
|
|
if (getBasicGasEstimateLoadingStatus(state)) {
|
|
return []
|
|
}
|
|
|
|
const { showFiatInTestnets } = preferencesSelector(state)
|
|
const isMainnet = getIsMainnet(state)
|
|
const showFiat = (isMainnet || !!showFiatInTestnets)
|
|
const conversionRate = state.metamask.conversionRate
|
|
const currentCurrency = getCurrentCurrency(state)
|
|
const {
|
|
gas: {
|
|
basicEstimates: {
|
|
safeLow,
|
|
average,
|
|
fast,
|
|
safeLowWait,
|
|
avgWait,
|
|
fastWait,
|
|
},
|
|
},
|
|
} = state
|
|
|
|
return [
|
|
{
|
|
gasEstimateType: GAS_ESTIMATE_TYPES.SLOW,
|
|
feeInPrimaryCurrency: getRenderableEthFee(safeLow, gasLimit),
|
|
feeInSecondaryCurrency: showFiat
|
|
? getRenderableConvertedCurrencyFee(safeLow, gasLimit, currentCurrency, conversionRate)
|
|
: '',
|
|
timeEstimate: safeLowWait && getRenderableTimeEstimate(safeLowWait),
|
|
priceInHexWei: getGasPriceInHexWei(safeLow),
|
|
},
|
|
{
|
|
gasEstimateType: GAS_ESTIMATE_TYPES.AVERAGE,
|
|
feeInPrimaryCurrency: getRenderableEthFee(average, gasLimit),
|
|
feeInSecondaryCurrency: showFiat
|
|
? getRenderableConvertedCurrencyFee(average, gasLimit, currentCurrency, conversionRate)
|
|
: '',
|
|
timeEstimate: avgWait && getRenderableTimeEstimate(avgWait),
|
|
priceInHexWei: getGasPriceInHexWei(average),
|
|
},
|
|
{
|
|
gasEstimateType: GAS_ESTIMATE_TYPES.FAST,
|
|
feeInPrimaryCurrency: getRenderableEthFee(fast, gasLimit),
|
|
feeInSecondaryCurrency: showFiat
|
|
? getRenderableConvertedCurrencyFee(fast, gasLimit, currentCurrency, conversionRate)
|
|
: '',
|
|
timeEstimate: fastWait && getRenderableTimeEstimate(fastWait),
|
|
priceInHexWei: getGasPriceInHexWei(fast),
|
|
},
|
|
]
|
|
}
|
|
|
|
function getRenderableEstimateDataForSmallButtonsFromGWEI (state) {
|
|
if (getBasicGasEstimateLoadingStatus(state)) {
|
|
return []
|
|
}
|
|
|
|
const { showFiatInTestnets } = preferencesSelector(state)
|
|
const isMainnet = getIsMainnet(state)
|
|
const showFiat = (isMainnet || !!showFiatInTestnets)
|
|
const gasLimit = state.metamask.send.gasLimit || getCustomGasLimit(state) || '0x5208'
|
|
const conversionRate = state.metamask.conversionRate
|
|
const currentCurrency = getCurrentCurrency(state)
|
|
const {
|
|
gas: {
|
|
basicEstimates: {
|
|
safeLow,
|
|
average,
|
|
fast,
|
|
},
|
|
},
|
|
} = state
|
|
|
|
return [
|
|
{
|
|
gasEstimateType: GAS_ESTIMATE_TYPES.SLOW,
|
|
feeInSecondaryCurrency: showFiat
|
|
? getRenderableConvertedCurrencyFee(safeLow, gasLimit, currentCurrency, conversionRate)
|
|
: '',
|
|
feeInPrimaryCurrency: getRenderableEthFee(safeLow, gasLimit, NUMBER_OF_DECIMALS_SM_BTNS, true),
|
|
priceInHexWei: getGasPriceInHexWei(safeLow, true),
|
|
},
|
|
{
|
|
gasEstimateType: GAS_ESTIMATE_TYPES.AVERAGE,
|
|
feeInSecondaryCurrency: showFiat
|
|
? getRenderableConvertedCurrencyFee(average, gasLimit, currentCurrency, conversionRate)
|
|
: '',
|
|
feeInPrimaryCurrency: getRenderableEthFee(average, gasLimit, NUMBER_OF_DECIMALS_SM_BTNS, true),
|
|
priceInHexWei: getGasPriceInHexWei(average, true),
|
|
},
|
|
{
|
|
gasEstimateType: GAS_ESTIMATE_TYPES.FAST,
|
|
feeInSecondaryCurrency: showFiat
|
|
? getRenderableConvertedCurrencyFee(fast, gasLimit, currentCurrency, conversionRate)
|
|
: '',
|
|
feeInPrimaryCurrency: getRenderableEthFee(fast, gasLimit, NUMBER_OF_DECIMALS_SM_BTNS, true),
|
|
priceInHexWei: getGasPriceInHexWei(fast, true),
|
|
},
|
|
]
|
|
}
|