@ -28,6 +28,7 @@ import {
getIsMainnet ,
getIsMainnet ,
getSendToken ,
getSendToken ,
getPreferences ,
getPreferences ,
getIsTestnet ,
getBasicGasEstimateLoadingStatus ,
getBasicGasEstimateLoadingStatus ,
getCustomGasLimit ,
getCustomGasLimit ,
getCustomGasPrice ,
getCustomGasPrice ,
@ -36,6 +37,7 @@ import {
isCustomPriceSafe ,
isCustomPriceSafe ,
getTokenBalance ,
getTokenBalance ,
getSendMaxModeState ,
getSendMaxModeState ,
isCustomPriceSafeForCustomNetwork ,
getAveragePriceEstimateInHexWEI ,
getAveragePriceEstimateInHexWEI ,
isCustomPriceExcessive ,
isCustomPriceExcessive ,
getIsGasEstimatesFetched ,
getIsGasEstimatesFetched ,
@ -118,6 +120,7 @@ const mapStateToProps = (state, ownProps) => {
const showFiat = Boolean ( isMainnet || showFiatInTestnets ) ;
const showFiat = Boolean ( isMainnet || showFiatInTestnets ) ;
const isSendTokenSet = Boolean ( sendToken ) ;
const isSendTokenSet = Boolean ( sendToken ) ;
const isTestnet = getIsTestnet ( state ) ;
const newTotalEth =
const newTotalEth =
maxModeOn && ! isSendTokenSet
maxModeOn && ! isSendTokenSet
@ -138,6 +141,16 @@ const mapStateToProps = (state, ownProps) => {
conversionRate ,
conversionRate ,
} ) ;
} ) ;
const isGasEstimate = getIsGasEstimatesFetched ( state ) ;
const isGasEstimate = getIsGasEstimatesFetched ( state ) ;
let customPriceIsSafe ;
if ( ( isMainnet || process . env . IN _TEST ) && isGasEstimate ) {
customPriceIsSafe = isCustomPriceSafe ( state ) ;
} else if ( isTestnet ) {
customPriceIsSafe = true ;
} else {
customPriceIsSafe = isCustomPriceSafeForCustomNetwork ( state ) ;
}
return {
return {
hideBasic ,
hideBasic ,
isConfirm : isConfirm ( state ) ,
isConfirm : isConfirm ( state ) ,
@ -147,10 +160,7 @@ const mapStateToProps = (state, ownProps) => {
customGasLimit : calcCustomGasLimit ( customModalGasLimitInHex ) ,
customGasLimit : calcCustomGasLimit ( customModalGasLimitInHex ) ,
customGasTotal ,
customGasTotal ,
newTotalFiat ,
newTotalFiat ,
customPriceIsSafe :
customPriceIsSafe ,
( isMainnet || process . env . IN _TEST ) && isGasEstimate
? isCustomPriceSafe ( state )
: true ,
customPriceIsExcessive : isCustomPriceExcessive ( state ) ,
customPriceIsExcessive : isCustomPriceExcessive ( state ) ,
maxModeOn ,
maxModeOn ,
gasPriceButtonGroupProps : {
gasPriceButtonGroupProps : {