Merge pull request #4721 from MetaMask/i4666-gasLimit

fixes #4666 getGasLimit and getGasPrice removed and replaced

2 files changed, 5 insertions, 12 deletions

diff --git a/ui/app/components/customize-gas-modal/index.js b/ui/app/components/customize-gas-modal/index.js
index cd8f76ed5..cefa428b9 100644
--- a/ui/app/components/customize-gas-modal/index.js
+++ b/ui/app/components/customize-gas-modal/index.js
@@ -31,8 +31,6 @@ const {
 } = require('../../conversion-util')
 
 const {
-  getGasPrice,
-  getGasLimit,
   getGasIsLoading,
   getForceGasMin,
   conversionRateSelector,
@@ -44,6 +42,11 @@ const {
   getSendMaxModeState,
 } = require('../../selectors')
 
+const {
+  getGasPrice,
+  getGasLimit,
+} = require('../send_/send.selectors')
+
 function mapStateToProps (state) {
   const selectedToken = getSelectedToken(state)
   const currentAccount = getSendFrom(state) || getCurrentAccountWithSendEtherInfo(state)
diff --git a/ui/app/selectors.js b/ui/app/selectors.js
index cf0affe9c..3e2253550 100644
--- a/ui/app/selectors.js
+++ b/ui/app/selectors.js
@@ -17,8 +17,6 @@ const selectors = {
   accountsWithSendEtherInfoSelector,
   getCurrentAccountWithSendEtherInfo,
   getGasIsLoading,
-  getGasPrice,
-  getGasLimit,
   getForceGasMin,
   getAddressBook,
   getSendFrom,
@@ -122,14 +120,6 @@ function getGasIsLoading (state) {
   return state.appState.gasIsLoading
 }
 
-function getGasPrice (state) {
-  return state.metamask.send.gasPrice
-}
-
-function getGasLimit (state) {
-  return state.metamask.send.gasLimit
-}
-
 function getForceGasMin (state) {
   return state.metamask.send.forceGasMin
 }