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

Add useFastestButtons options to gas-customization modal and utilize it in swaps. (#9548)

Browse Source
This commit is contained in:
Dan J Miller 2020-10-12 14:21:17 -02:30 committed by GitHub
parent a9d156e611
commit 0e37904692
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 111 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/_locales/en/messages.json
View File

@ -669,6 +669,9 @@
"faster": {
"message": "Faster"
},
"fastest": {
"message": "Fastest"
},
"feeAssociatedRequest": {
"message": "A fee is associated with this request."
},

3
ui/app/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js
View File

@ -74,6 +74,7 @@ const mapStateToProps = (state, ownProps) => {
customGasLimitMessage = '',
customTotalSupplement = '',
extraInfoRow = null,
useFastestButtons = false,
} = modalProps || {}
const { transaction = {} } = ownProps
const selectedTransaction = isSwap
@ -97,7 +98,7 @@ const mapStateToProps = (state, ownProps) => {
const customModalGasLimitInHex = getCustomGasLimit(state) || currentGasLimit || '0x5208'
const customGasTotal = calcGasTotal(customModalGasLimitInHex, customModalGasPriceInHex)
const gasButtonInfo = getRenderableBasicEstimateData(state, customModalGasLimitInHex)
const gasButtonInfo = getRenderableBasicEstimateData(state, customModalGasLimitInHex, useFastestButtons)
const currentCurrency = getCurrentCurrency(state)
const conversionRate = getConversionRate(state)

2
ui/app/components/app/gas-customization/gas-price-button-group/gas-price-button-group.component.js
View File

@ -35,6 +35,8 @@ export default class GasPriceButtonGroup extends Component {
return this.context.t('average')
} else if (gasEstimateType === GAS_ESTIMATE_TYPES.FAST) {
return this.context.t('fast')
} else if (gasEstimateType === GAS_ESTIMATE_TYPES.FASTEST) {
return this.context.t('fastest')
}
throw new Error(`Unrecognized gas estimate type: ${gasEstimateType}`)
}

2
ui/app/ducks/swaps/swaps.js
View File

@ -245,7 +245,7 @@ export const prepareToLeaveSwaps = () => {
export const fetchAndSetSwapsGasPriceInfo = () => {
return async (dispatch) => {
const basicEstimates = await dispatch(fetchBasicGasAndTimeEstimates())
dispatch(setSwapsTxGasPrice(decGWEIToHexWEI(basicEstimates.fast)))
dispatch(setSwapsTxGasPrice(decGWEIToHexWEI(basicEstimates.fastest)))
await dispatch(fetchGasEstimates(basicEstimates.blockTime))
}

1
ui/app/helpers/constants/common.js
View File

@ -17,4 +17,5 @@ export const GAS_ESTIMATE_TYPES = {
SLOW: 'SLOW',
AVERAGE: 'AVERAGE',
FAST: 'FAST',
FASTEST: 'FASTEST',
}

1
ui/app/pages/swaps/view-quote/view-quote.js
View File

@ -393,6 +393,7 @@ export default function ViewQuote () {
}
: null
),
useFastestButtons: true,
}))
const thirdRowTextComponent = (

79
ui/app/selectors/custom-gas.js
View File

@ -71,9 +71,9 @@ export function getFastPriceEstimateInHexWEI (state) {
}
export function getDefaultActiveButtonIndex (gasButtonInfo, customGasPriceInHex, gasPrice) {
return gasButtonInfo.findIndex(({ priceInHexWei }) => {
return priceInHexWei === addHexPrefix(customGasPriceInHex || gasPrice)
})
return gasButtonInfo
.map(({ priceInHexWei }) => priceInHexWei)
.lastIndexOf(addHexPrefix(customGasPriceInHex || gasPrice))
}
export function getSafeLowEstimate (state) {
@ -191,7 +191,7 @@ export function getGasPriceInHexWei (price) {
return addHexPrefix(priceEstimateToWei(value))
}
export function getRenderableBasicEstimateData (state, gasLimit) {
export function getRenderableBasicEstimateData (state, gasLimit, useFastestButtons) {
if (getBasicGasEstimateLoadingStatus(state)) {
return []
}
@ -210,39 +210,52 @@ export function getRenderableBasicEstimateData (state, gasLimit) {
safeLowWait,
avgWait,
fastWait,
fastest,
fastestWait,
},
},
} = 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),
},
]
const slowEstimatData = {
gasEstimateType: GAS_ESTIMATE_TYPES.SLOW,
feeInPrimaryCurrency: getRenderableEthFee(safeLow, gasLimit),
feeInSecondaryCurrency: showFiat
? getRenderableConvertedCurrencyFee(safeLow, gasLimit, currentCurrency, conversionRate)
: '',
timeEstimate: safeLowWait && getRenderableTimeEstimate(safeLowWait),
priceInHexWei: getGasPriceInHexWei(safeLow),
}
const averageEstimateData = {
gasEstimateType: GAS_ESTIMATE_TYPES.AVERAGE,
feeInPrimaryCurrency: getRenderableEthFee(average, gasLimit),
feeInSecondaryCurrency: showFiat
? getRenderableConvertedCurrencyFee(average, gasLimit, currentCurrency, conversionRate)
: '',
timeEstimate: avgWait && getRenderableTimeEstimate(avgWait),
priceInHexWei: getGasPriceInHexWei(average),
}
const fastEstimatData = {
gasEstimateType: GAS_ESTIMATE_TYPES.FAST,
feeInPrimaryCurrency: getRenderableEthFee(fast, gasLimit),
feeInSecondaryCurrency: showFiat
? getRenderableConvertedCurrencyFee(fast, gasLimit, currentCurrency, conversionRate)
: '',
timeEstimate: fastWait && getRenderableTimeEstimate(fastWait),
priceInHexWei: getGasPriceInHexWei(fast),
}
const fastestEstimateData = {
gasEstimateType: GAS_ESTIMATE_TYPES.FASTEST,
feeInPrimaryCurrency: getRenderableEthFee(fastest, gasLimit),
feeInSecondaryCurrency: showFiat
? getRenderableConvertedCurrencyFee(fastest, gasLimit, currentCurrency, conversionRate)
: '',
timeEstimate: fastestWait && getRenderableTimeEstimate(fastestWait),
priceInHexWei: getGasPriceInHexWei(fastest),
}
return useFastestButtons
? [averageEstimateData, fastEstimatData, fastestEstimateData]
: [slowEstimatData, averageEstimateData, fastEstimatData]
}
export function getRenderableEstimateDataForSmallButtonsFromGWEI (state) {

57
ui/app/selectors/tests/custom-gas.test.js
View File

@ -344,16 +344,69 @@ describe('custom-gas selectors', function () {
},
},
},
{
expectedResult: [
{
gasEstimateType: 'AVERAGE',
feeInPrimaryCurrency: '0.000147 ETH',
feeInSecondaryCurrency: '$0.38',
priceInHexWei: '0x1a13b8600',
timeEstimate: '~10 min 6 sec',
},
{
gasEstimateType: 'FAST',
feeInSecondaryCurrency: '$0.54',
feeInPrimaryCurrency: '0.00021 ETH',
timeEstimate: '~6 min 36 sec',
priceInHexWei: '0x2540be400',
},
{
feeInPrimaryCurrency: '0.00042 ETH',
feeInSecondaryCurrency: '$1.07',
gasEstimateType: 'FASTEST',
priceInHexWei: '0x4a817c800',
timeEstimate: '~1 min',
},
],
mockState: {
metamask: {
conversionRate: 2557.1,
currentCurrency: 'usd',
send: {
gasLimit: '0x5208',
},
preferences: {
showFiatInTestnets: true,
},
provider: {
type: 'mainnet',
},
},
gas: {
basicEstimates: {
blockTime: 14.16326530612245,
safeLow: 5,
safeLowWait: 13.2,
average: 7,
avgWait: 10.1,
fast: 10,
fastWait: 6.6,
fastest: 20,
fastestWait: 1.0,
},
},
},
useFastestButtons: true,
},
]
it('should return renderable data about basic estimates', function () {
tests.forEach((test) => {
assert.deepEqual(
getRenderableBasicEstimateData(test.mockState, '0x5208'),
getRenderableBasicEstimateData(test.mockState, '0x5208', test.useFastestButtons),
test.expectedResult,
)
})
})
})
describe('getRenderableEstimateDataForSmallButtonsFromGWEI()', function () {