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

Fix gas-modal-page-container.container check for custom gas price safety (#11426)

Browse Source 
* Fix gas-modal-page-container.container check for custom gas price safety

* Ensure gas price has been fetch before checking for price safety on testnets
This commit is contained in:
Dan J Miller 2021-06-30 15:56:34 -02:30 committed by GitHub
parent ad6715511e
commit 18464793f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,6 +41,7 @@ import {
isCustomPriceExcessive, isCustomPriceExcessive,
getIsGasEstimatesFetched, getIsGasEstimatesFetched,
getShouldShowFiat, getShouldShowFiat,
getIsCustomNetworkGasPriceFetched,
} from '../../../../selectors'; } from '../../../../selectors';
import { import {
@ -137,13 +138,17 @@ const mapStateToProps = (state, ownProps) => {
conversionRate, conversionRate,
}); });
const isGasEstimate = getIsGasEstimatesFetched(state); const isGasEstimate = getIsGasEstimatesFetched(state);
const customNetworkEstimateWasFetched = getIsCustomNetworkGasPriceFetched(
state,
);
let customPriceIsSafe; let customPriceIsSafe = true;
if ((isMainnet || process.env.IN_TEST) && isGasEstimate) { if ((isMainnet || process.env.IN_TEST) && isGasEstimate) {
customPriceIsSafe = isCustomPriceSafe(state); customPriceIsSafe = isCustomPriceSafe(state);
} else if (isTestnet) { } else if (
customPriceIsSafe = true; !(isMainnet || process.env.IN_TEST || isTestnet) &&
} else { customNetworkEstimateWasFetched
) {
customPriceIsSafe = isCustomPriceSafeForCustomNetwork(state); customPriceIsSafe = isCustomPriceSafeForCustomNetwork(state);
} }

13
ui/selectors/custom-gas.js
View File

@ -105,6 +105,10 @@ export function isCustomPriceSafeForCustomNetwork(state) {
return true; return true;
} }
if (!estimatedPrice) {
return false;
}
const customPriceSafe = conversionGreaterThan( const customPriceSafe = conversionGreaterThan(
{ {
value: customGasPrice, value: customGasPrice,
@ -382,6 +386,15 @@ export function getIsEthGasPriceFetched(state) {
); );
} }
export function getIsCustomNetworkGasPriceFetched(state) {
const gasState = state.gas;
return Boolean(
gasState.estimateSource === GAS_SOURCE.ETHGASPRICE &&
gasState.basicEstimateStatus === BASIC_ESTIMATE_STATES.READY &&
!getIsMainnet(state),
);
}
export function getNoGasPriceFetched(state) { export function getNoGasPriceFetched(state) {
const gasState = state.gas; const gasState = state.gas;
return Boolean(gasState.basicEstimateStatus === BASIC_ESTIMATE_STATES.FAILED); return Boolean(gasState.basicEstimateStatus === BASIC_ESTIMATE_STATES.FAILED);