m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-26 20:39:08 +01:00
Code

Merge pull request #4721 from MetaMask/i4666-gasLimit

Browse Source 
fixes #4666 getGasLimit and getGasPrice removed and replaced
This commit is contained in:
Dan J Miller 2018-07-04 17:22:14 -02:30 committed by GitHub
commit fd218142ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/app/components/customize-gas-modal/index.js
View File

@ -31,8 +31,6 @@ const {
} = require('../../conversion-util') } = require('../../conversion-util')
const { const {
getGasPrice,
getGasLimit,
getGasIsLoading, getGasIsLoading,
getForceGasMin, getForceGasMin,
conversionRateSelector, conversionRateSelector,
@ -44,6 +42,11 @@ const {
getSendMaxModeState, getSendMaxModeState,
} = require('../../selectors') } = require('../../selectors')
const {
getGasPrice,
getGasLimit,
} = require('../send_/send.selectors')
function mapStateToProps (state) { function mapStateToProps (state) {
const selectedToken = getSelectedToken(state) const selectedToken = getSelectedToken(state)
const currentAccount = getSendFrom(state) || getCurrentAccountWithSendEtherInfo(state) const currentAccount = getSendFrom(state) || getCurrentAccountWithSendEtherInfo(state)

10
ui/app/selectors.js
View File

@ -17,8 +17,6 @@ const selectors = {
accountsWithSendEtherInfoSelector, accountsWithSendEtherInfoSelector,
getCurrentAccountWithSendEtherInfo, getCurrentAccountWithSendEtherInfo,
getGasIsLoading, getGasIsLoading,
getGasPrice,
getGasLimit,
getForceGasMin, getForceGasMin,
getAddressBook, getAddressBook,
getSendFrom, getSendFrom,
@ -122,14 +120,6 @@ function getGasIsLoading (state) {
return state.appState.gasIsLoading return state.appState.gasIsLoading
} }
function getGasPrice (state) {
return state.metamask.send.gasPrice
}
function getGasLimit (state) {
return state.metamask.send.gasLimit
}
function getForceGasMin (state) { function getForceGasMin (state) {
return state.metamask.send.forceGasMin return state.metamask.send.forceGasMin
} }