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

patch gas price issue - add fallback gas price (#11239)

Browse Source
This commit is contained in:
Alex Donesky 2021-06-15 09:17:42 -05:00 committed by GitHub
parent df6c6a46d7
commit a8643af481
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/ducks/confirm-transaction/confirm-transaction.duck.js
View File

@ -18,6 +18,7 @@ import {
import { getTokenData, sumHexes } from '../../helpers/utils/transactions.util';
import { conversionUtil } from '../../helpers/utils/conversion-util';
import { getAveragePriceEstimateInHexWEI } from '../../selectors/custom-gas';
// Actions
const createActionType = (action) => `metamask/confirm-transaction/${action}`;
@ -198,9 +199,16 @@ export function updateTxDataAndCalculate(txData) {
dispatch(updateTxData(txData));
const {
txParams: { value = '0x0', gas: gasLimit = '0x0', gasPrice = '0x0' } = {},
const { txParams: { value = '0x0', gas: gasLimit = '0x0' } = {} } = txData;
// if the gas price from our infura endpoint is null or undefined
// use the metaswap average price estimation as a fallback
let {
txParams: { gasPrice },
} = txData;
if (!gasPrice) {
gasPrice = getAveragePriceEstimateInHexWEI(state) || '0x0';
}
const fiatTransactionAmount = getValueFromWeiHex({
value,

12
ui/selectors/confirm-transaction.js
View File

@ -12,6 +12,7 @@ import {
import { sumHexes } from '../helpers/utils/transactions.util';
import { transactionMatchesNetwork } from '../../shared/modules/transaction.utils';
import { getNativeCurrency } from '../ducks/metamask/metamask';
import { getAveragePriceEstimateInHexWEI } from './custom-gas';
import { getCurrentChainId, deprecatedGetCurrentNetworkId } from './selectors';
const unapprovedTxsSelector = (state) => state.metamask.unapprovedTxs;
@ -218,9 +219,16 @@ export const transactionFeeSelector = function (state, txData) {
const conversionRate = conversionRateSelector(state);
const nativeCurrency = getNativeCurrency(state);
const {
txParams: { value = '0x0', gas: gasLimit = '0x0', gasPrice = '0x0' } = {},
const { txParams: { value = '0x0', gas: gasLimit = '0x0' } = {} } = txData;
// if the gas price from our infura endpoint is null or undefined
// use the metaswap average price estimation as a fallback
let {
txParams: { gasPrice },
} = txData;
if (!gasPrice) {
gasPrice = getAveragePriceEstimateInHexWEI(state) || '0x0';
}
const fiatTransactionAmount = getValueFromWeiHex({
value,