From 898f8458a2b473e7ede52104a26de6c690158d11 Mon Sep 17 00:00:00 2001
From: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Date: Mon, 4 May 2020 08:22:34 -0700
Subject: [PATCH] Consolidate send, onboarding selectors (#8501)

* reorganize & dedupe send selectors
---
 test/unit/ui/app/selectors.spec.js            |   5 -
 .../gas-modal-page-container.container.js     |   4 +-
 .../currency-input.container.js               |   4 +-
 .../end-of-flow/end-of-flow.container.js      |   2 +-
 .../first-time-flow.container.js              |   2 +-
 .../metametrics-opt-in.container.js           |   2 +-
 .../reveal-seed-phrase.container.js           |   2 +-
 .../select-action/select-action.container.js  |   2 +-
 .../add-recipient/add-recipient.selectors.js  |  11 --
 .../tests/add-recipient-selectors.test.js     |  59 ------
 .../amount-max-button.container.js            |   4 +-
 .../amount-max-button.selectors.js            |   3 -
 .../tests/amount-max-button-container.test.js |   2 +-
 .../tests/amount-max-button-selectors.test.js |  22 ---
 .../send-amount-row.container.js              |   4 +-
 .../send-amount-row.selectors.js              |   3 -
 .../tests/send-amount-row-container.test.js   |   2 +-
 .../tests/send-amount-row-selectors.test.js   |  34 ----
 .../send-gas-row/send-gas-row.container.js    |  10 +-
 .../send-gas-row/send-gas-row.selectors.js    |  11 --
 .../tests/send-gas-row-container.test.js      |   4 +-
 .../tests/send-gas-row-selectors.test.js      |  62 ------
 .../send/send-footer/send-footer.container.js |   4 +-
 .../send/send-footer/send-footer.selectors.js |   5 -
 .../tests/send-footer-container.test.js       |   2 +-
 .../tests/send-footer-selectors.test.js       |  24 ---
 .../send/send-header/send-header.container.js |   2 +-
 .../send/send-header/send-header.selectors.js |  18 --
 .../tests/send-header-container.test.js       |   2 +-
 .../tests/send-header-selectors.test.js       |  34 ----
 ui/app/pages/send/send.container.js           |   2 +-
 ui/app/pages/send/send.selectors.js           |  41 ++++
 .../pages/send/tests/send-selectors.test.js   | 187 ++++++++++++++++++
 .../first-time-flow.js}                       |   2 +-
 ui/app/selectors/index.js                     |   1 +
 ui/app/selectors/selectors.js                 |   4 -
 36 files changed, 256 insertions(+), 326 deletions(-)
 delete mode 100644 ui/app/pages/send/send-content/add-recipient/add-recipient.selectors.js
 delete mode 100644 ui/app/pages/send/send-content/add-recipient/tests/add-recipient-selectors.test.js
 delete mode 100644 ui/app/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.selectors.js
 delete mode 100644 ui/app/pages/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-selectors.test.js
 delete mode 100644 ui/app/pages/send/send-content/send-amount-row/send-amount-row.selectors.js
 delete mode 100644 ui/app/pages/send/send-content/send-amount-row/tests/send-amount-row-selectors.test.js
 delete mode 100644 ui/app/pages/send/send-content/send-gas-row/send-gas-row.selectors.js
 delete mode 100644 ui/app/pages/send/send-content/send-gas-row/tests/send-gas-row-selectors.test.js
 delete mode 100644 ui/app/pages/send/send-footer/send-footer.selectors.js
 delete mode 100644 ui/app/pages/send/send-footer/tests/send-footer-selectors.test.js
 delete mode 100644 ui/app/pages/send/send-header/send-header.selectors.js
 delete mode 100644 ui/app/pages/send/send-header/tests/send-header-selectors.test.js
 rename ui/app/{pages/first-time-flow/first-time-flow.selectors.js => selectors/first-time-flow.js} (95%)

diff --git a/test/unit/ui/app/selectors.spec.js b/test/unit/ui/app/selectors.spec.js
index af5788a04..5ad0495db 100644
--- a/test/unit/ui/app/selectors.spec.js
+++ b/test/unit/ui/app/selectors.spec.js
@@ -110,11 +110,6 @@ describe('Selectors', function () {
     assert.equal(sendAmount, '1bc16d674ec80000')
   })
 
-  it('#getSendMaxModeState', function () {
-    const sendMaxModeState = selectors.getSendMaxModeState(mockState)
-    assert.equal(sendMaxModeState, false)
-  })
-
   it('#getCurrentCurrency', function () {
     const currentCurrency = selectors.getCurrentCurrency(mockState)
     assert.equal(currentCurrency, 'usd')
diff --git a/ui/app/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js b/ui/app/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js
index 5c751d831..ba423d9d1 100644
--- a/ui/app/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js
+++ b/ui/app/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js
@@ -45,6 +45,7 @@ import {
 } from '../../../../selectors'
 import {
   getTokenBalance,
+  getSendMaxModeState,
 } from '../../../../pages/send/send.selectors'
 import {
   formatCurrency,
@@ -64,7 +65,6 @@ import {
   isBalanceSufficient,
 } from '../../../../pages/send/send.utils'
 import { addHexPrefix } from 'ethereumjs-util'
-import { getMaxModeOn } from '../../../../pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.selectors'
 import { calcMaxAmount } from '../../../../pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.utils'
 
 const mapStateToProps = (state, ownProps) => {
@@ -93,7 +93,7 @@ const mapStateToProps = (state, ownProps) => {
 
   const customGasPrice = calcCustomGasPrice(customModalGasPriceInHex)
 
-  const maxModeOn = getMaxModeOn(state)
+  const maxModeOn = getSendMaxModeState(state)
 
   const gasPrices = getEstimatedGasPrices(state)
   const estimatedTimes = getEstimatedGasTimes(state)
diff --git a/ui/app/components/ui/currency-input/currency-input.container.js b/ui/app/components/ui/currency-input/currency-input.container.js
index 76c903602..0808a07cd 100644
--- a/ui/app/components/ui/currency-input/currency-input.container.js
+++ b/ui/app/components/ui/currency-input/currency-input.container.js
@@ -1,14 +1,14 @@
 import { connect } from 'react-redux'
 import CurrencyInput from './currency-input.component'
 import { ETH } from '../../../helpers/constants/common'
-import { getMaxModeOn } from '../../../pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.selectors'
+import { getSendMaxModeState } from '../../../pages/send/send.selectors'
 import { getIsMainnet, preferencesSelector } from '../../../selectors'
 
 const mapStateToProps = (state) => {
   const { metamask: { nativeCurrency, currentCurrency, conversionRate } } = state
   const { showFiatInTestnets } = preferencesSelector(state)
   const isMainnet = getIsMainnet(state)
-  const maxModeOn = getMaxModeOn(state)
+  const maxModeOn = getSendMaxModeState(state)
 
   return {
     nativeCurrency,
diff --git a/ui/app/pages/first-time-flow/end-of-flow/end-of-flow.container.js b/ui/app/pages/first-time-flow/end-of-flow/end-of-flow.container.js
index c25204bdd..61af2fdaa 100644
--- a/ui/app/pages/first-time-flow/end-of-flow/end-of-flow.container.js
+++ b/ui/app/pages/first-time-flow/end-of-flow/end-of-flow.container.js
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux'
 import EndOfFlow from './end-of-flow.component'
 import { setCompletedOnboarding } from '../../../store/actions'
-import { getOnboardingInitiator } from '../first-time-flow.selectors'
+import { getOnboardingInitiator } from '../../../selectors'
 
 const firstTimeFlowTypeNameMap = {
   create: 'New Wallet Created',
diff --git a/ui/app/pages/first-time-flow/first-time-flow.container.js b/ui/app/pages/first-time-flow/first-time-flow.container.js
index 4f08010dd..e0070b853 100644
--- a/ui/app/pages/first-time-flow/first-time-flow.container.js
+++ b/ui/app/pages/first-time-flow/first-time-flow.container.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux'
 import FirstTimeFlow from './first-time-flow.component'
-import { getFirstTimeFlowTypeRoute } from './first-time-flow.selectors'
+import { getFirstTimeFlowTypeRoute } from '../../selectors'
 import {
   createNewVaultAndGetSeedPhrase,
   createNewVaultAndRestore,
diff --git a/ui/app/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.container.js b/ui/app/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.container.js
index 6f7360ef2..7c54fd980 100644
--- a/ui/app/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.container.js
+++ b/ui/app/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.container.js
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux'
 import MetaMetricsOptIn from './metametrics-opt-in.component'
 import { setParticipateInMetaMetrics } from '../../../store/actions'
-import { getFirstTimeFlowTypeRoute } from '../first-time-flow.selectors'
+import { getFirstTimeFlowTypeRoute } from '../../../selectors'
 
 const firstTimeFlowTypeNameMap = {
   create: 'Selected Create New Wallet',
diff --git a/ui/app/pages/first-time-flow/seed-phrase/reveal-seed-phrase/reveal-seed-phrase.container.js b/ui/app/pages/first-time-flow/seed-phrase/reveal-seed-phrase/reveal-seed-phrase.container.js
index da5a370a5..c1bf9109c 100644
--- a/ui/app/pages/first-time-flow/seed-phrase/reveal-seed-phrase/reveal-seed-phrase.container.js
+++ b/ui/app/pages/first-time-flow/seed-phrase/reveal-seed-phrase/reveal-seed-phrase.container.js
@@ -4,7 +4,7 @@ import {
   setCompletedOnboarding,
   setSeedPhraseBackedUp,
 } from '../../../../store/actions'
-import { getOnboardingInitiator } from '../../first-time-flow.selectors'
+import { getOnboardingInitiator } from '../../../../selectors'
 
 const mapStateToProps = (state) => {
   return {
diff --git a/ui/app/pages/first-time-flow/select-action/select-action.container.js b/ui/app/pages/first-time-flow/select-action/select-action.container.js
index 30813bb00..dd3c2c2b5 100644
--- a/ui/app/pages/first-time-flow/select-action/select-action.container.js
+++ b/ui/app/pages/first-time-flow/select-action/select-action.container.js
@@ -2,7 +2,7 @@ import { connect } from 'react-redux'
 import { withRouter } from 'react-router-dom'
 import { compose } from 'redux'
 import { setFirstTimeFlowType } from '../../../store/actions'
-import { getFirstTimeFlowTypeRoute } from '../first-time-flow.selectors'
+import { getFirstTimeFlowTypeRoute } from '../../../selectors'
 import Welcome from './select-action.component'
 
 const mapStateToProps = (state) => {
diff --git a/ui/app/pages/send/send-content/add-recipient/add-recipient.selectors.js b/ui/app/pages/send/send-content/add-recipient/add-recipient.selectors.js
deleted file mode 100644
index aac50823d..000000000
--- a/ui/app/pages/send/send-content/add-recipient/add-recipient.selectors.js
+++ /dev/null
@@ -1,11 +0,0 @@
-export function getToDropdownOpen (state) {
-  return state.send.toDropdownOpen
-}
-
-export function sendToIsInError (state) {
-  return Boolean(state.send.errors.to)
-}
-
-export function getTokens (state) {
-  return state.metamask.tokens
-}
diff --git a/ui/app/pages/send/send-content/add-recipient/tests/add-recipient-selectors.test.js b/ui/app/pages/send/send-content/add-recipient/tests/add-recipient-selectors.test.js
deleted file mode 100644
index 19ef6f860..000000000
--- a/ui/app/pages/send/send-content/add-recipient/tests/add-recipient-selectors.test.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import assert from 'assert'
-import {
-  getToDropdownOpen,
-  getTokens,
-  sendToIsInError,
-} from '../add-recipient.selectors.js'
-
-describe('add-recipient selectors', function () {
-
-  describe('getToDropdownOpen()', function () {
-    it('should return send.getToDropdownOpen', function () {
-      const state = {
-        send: {
-          toDropdownOpen: false,
-        },
-      }
-
-      assert.equal(getToDropdownOpen(state), false)
-    })
-  })
-
-  describe('sendToIsInError()', function () {
-    it('should return true if send.errors.to is truthy', function () {
-      const state = {
-        send: {
-          errors: {
-            to: 'abc',
-          },
-        },
-      }
-
-      assert.equal(sendToIsInError(state), true)
-    })
-
-    it('should return false if send.errors.to is falsy', function () {
-      const state = {
-        send: {
-          errors: {
-            to: null,
-          },
-        },
-      }
-
-      assert.equal(sendToIsInError(state), false)
-    })
-  })
-
-  describe('getTokens()', function () {
-    it('should return empty array if no tokens in state', function () {
-      const state = {
-        metamask: {
-          tokens: [],
-        },
-      }
-
-      assert.deepStrictEqual(getTokens(state), [])
-    })
-  })
-})
diff --git a/ui/app/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.container.js b/ui/app/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.container.js
index d1a7eef9f..2fb7493ae 100644
--- a/ui/app/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.container.js
+++ b/ui/app/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.container.js
@@ -4,9 +4,9 @@ import {
   getSelectedToken,
   getSendFromBalance,
   getTokenBalance,
+  getSendMaxModeState,
 } from '../../../send.selectors.js'
 import { getBasicGasEstimateLoadingStatus } from '../../../../../selectors'
-import { getMaxModeOn } from './amount-max-button.selectors.js'
 import { calcMaxAmount } from './amount-max-button.utils.js'
 import {
   updateSendAmount,
@@ -25,7 +25,7 @@ function mapStateToProps (state) {
     balance: getSendFromBalance(state),
     buttonDataLoading: getBasicGasEstimateLoadingStatus(state),
     gasTotal: getGasTotal(state),
-    maxModeOn: getMaxModeOn(state),
+    maxModeOn: getSendMaxModeState(state),
     selectedToken: getSelectedToken(state),
     tokenBalance: getTokenBalance(state),
   }
diff --git a/ui/app/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.selectors.js b/ui/app/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.selectors.js
deleted file mode 100644
index 2ae473663..000000000
--- a/ui/app/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.selectors.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export function getMaxModeOn (state) {
-  return state.metamask.send.maxModeOn
-}
diff --git a/ui/app/pages/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-container.test.js b/ui/app/pages/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-container.test.js
index a588dc657..0c85cf2db 100644
--- a/ui/app/pages/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-container.test.js
+++ b/ui/app/pages/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-container.test.js
@@ -26,8 +26,8 @@ proxyquire('../amount-max-button.container.js', {
     getSelectedToken: (s) => `mockSelectedToken:${s}`,
     getSendFromBalance: (s) => `mockBalance:${s}`,
     getTokenBalance: (s) => `mockTokenBalance:${s}`,
+    getSendMaxModeState: (s) => `mockMaxModeOn:${s}`,
   },
-  './amount-max-button.selectors.js': { getMaxModeOn: (s) => `mockMaxModeOn:${s}` },
   './amount-max-button.utils.js': { calcMaxAmount: (mockObj) => mockObj.val + 1 },
   '../../../../../selectors/': { getBasicGasEstimateLoadingStatus: (s) => `mockButtonDataLoading:${s}` },
   '../../../../../store/actions': actionSpies,
diff --git a/ui/app/pages/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-selectors.test.js b/ui/app/pages/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-selectors.test.js
deleted file mode 100644
index 45221ad3d..000000000
--- a/ui/app/pages/send/send-content/send-amount-row/amount-max-button/tests/amount-max-button-selectors.test.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import assert from 'assert'
-import {
-  getMaxModeOn,
-} from '../amount-max-button.selectors.js'
-
-describe('amount-max-button selectors', function () {
-
-  describe('getMaxModeOn()', function () {
-    it('should', function () {
-      const state = {
-        metamask: {
-          send: {
-            maxModeOn: null,
-          },
-        },
-      }
-
-      assert.equal(getMaxModeOn(state), null)
-    })
-  })
-
-})
diff --git a/ui/app/pages/send/send-content/send-amount-row/send-amount-row.container.js b/ui/app/pages/send/send-content/send-amount-row/send-amount-row.container.js
index 8ac06b7ba..3ecfd69bb 100644
--- a/ui/app/pages/send/send-content/send-amount-row/send-amount-row.container.js
+++ b/ui/app/pages/send/send-content/send-amount-row/send-amount-row.container.js
@@ -9,10 +9,8 @@ import {
   getSendFromBalance,
   getTokenBalance,
   getSendMaxModeState,
-} from '../../send.selectors'
-import {
   sendAmountIsInError,
-} from './send-amount-row.selectors'
+} from '../../send.selectors'
 import { getAmountErrorObject, getGasFeeErrorObject } from '../../send.utils'
 import {
   setMaxModeTo,
diff --git a/ui/app/pages/send/send-content/send-amount-row/send-amount-row.selectors.js b/ui/app/pages/send/send-content/send-amount-row/send-amount-row.selectors.js
deleted file mode 100644
index f4f6be775..000000000
--- a/ui/app/pages/send/send-content/send-amount-row/send-amount-row.selectors.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export function sendAmountIsInError (state) {
-  return Boolean(state.send.errors.amount)
-}
diff --git a/ui/app/pages/send/send-content/send-amount-row/tests/send-amount-row-container.test.js b/ui/app/pages/send/send-content/send-amount-row/tests/send-amount-row-container.test.js
index e8fb7d428..e5b8e9cea 100644
--- a/ui/app/pages/send/send-content/send-amount-row/tests/send-amount-row-container.test.js
+++ b/ui/app/pages/send/send-content/send-amount-row/tests/send-amount-row-container.test.js
@@ -19,7 +19,7 @@ proxyquire('../send-amount-row.container.js', {
       return () => ({})
     },
   },
-  './send-amount-row.selectors': { sendAmountIsInError: (s) => `mockInError:${s}` },
+  '../../send.selectors': { sendAmountIsInError: (s) => `mockInError:${s}` },
   '../../send.utils': {
     getAmountErrorObject: (mockDataObject) => ({ ...mockDataObject, mockChange: true }),
     getGasFeeErrorObject: (mockDataObject) => ({ ...mockDataObject, mockGasFeeErrorChange: true }),
diff --git a/ui/app/pages/send/send-content/send-amount-row/tests/send-amount-row-selectors.test.js b/ui/app/pages/send/send-content/send-amount-row/tests/send-amount-row-selectors.test.js
deleted file mode 100644
index b0130a794..000000000
--- a/ui/app/pages/send/send-content/send-amount-row/tests/send-amount-row-selectors.test.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import assert from 'assert'
-import {
-  sendAmountIsInError,
-} from '../send-amount-row.selectors.js'
-
-describe('send-amount-row selectors', function () {
-
-  describe('sendAmountIsInError()', function () {
-    it('should return true if send.errors.amount is truthy', function () {
-      const state = {
-        send: {
-          errors: {
-            amount: 'abc',
-          },
-        },
-      }
-
-      assert.equal(sendAmountIsInError(state), true)
-    })
-
-    it('should return false if send.errors.amount is falsy', function () {
-      const state = {
-        send: {
-          errors: {
-            amount: null,
-          },
-        },
-      }
-
-      assert.equal(sendAmountIsInError(state), false)
-    })
-  })
-
-})
diff --git a/ui/app/pages/send/send-content/send-gas-row/send-gas-row.container.js b/ui/app/pages/send/send-content/send-gas-row/send-gas-row.container.js
index 7d14f96db..0c75f1d44 100644
--- a/ui/app/pages/send/send-content/send-gas-row/send-gas-row.container.js
+++ b/ui/app/pages/send/send-content/send-gas-row/send-gas-row.container.js
@@ -7,10 +7,11 @@ import {
   getSendAmount,
   getSendFromBalance,
   getTokenBalance,
+  getSendMaxModeState,
+  getGasLoadingError,
+  gasFeeIsInError,
+  getGasButtonGroupShown,
 } from '../../send.selectors.js'
-import {
-  getMaxModeOn,
-} from '../send-amount-row/amount-max-button/amount-max-button.selectors'
 import {
   isBalanceSufficient,
   calcGasTotal,
@@ -25,7 +26,6 @@ import {
   setCustomGasPrice,
   setCustomGasLimit,
 } from '../../../../ducks/gas/gas.duck'
-import { getGasLoadingError, gasFeeIsInError, getGasButtonGroupShown } from './send-gas-row.selectors.js'
 import { showModal, setGasPrice, setGasLimit, setGasTotal, updateSendAmount } from '../../../../store/actions'
 import {
   getAdvancedInlineGasShown,
@@ -73,7 +73,7 @@ function mapStateToProps (state) {
     gasPrice,
     gasLimit,
     insufficientBalance,
-    maxModeOn: getMaxModeOn(state),
+    maxModeOn: getSendMaxModeState(state),
     selectedToken: getSelectedToken(state),
     tokenBalance: getTokenBalance(state),
   }
diff --git a/ui/app/pages/send/send-content/send-gas-row/send-gas-row.selectors.js b/ui/app/pages/send/send-content/send-gas-row/send-gas-row.selectors.js
deleted file mode 100644
index 424c3127c..000000000
--- a/ui/app/pages/send/send-content/send-gas-row/send-gas-row.selectors.js
+++ /dev/null
@@ -1,11 +0,0 @@
-export function getGasLoadingError (state) {
-  return state.send.errors.gasLoading
-}
-
-export function gasFeeIsInError (state) {
-  return Boolean(state.send.errors.gasFee)
-}
-
-export function getGasButtonGroupShown (state) {
-  return state.send.gasButtonGroupShown
-}
diff --git a/ui/app/pages/send/send-content/send-gas-row/tests/send-gas-row-container.test.js b/ui/app/pages/send/send-content/send-gas-row/tests/send-gas-row-container.test.js
index c870a4915..eef357497 100644
--- a/ui/app/pages/send/send-content/send-gas-row/tests/send-gas-row-container.test.js
+++ b/ui/app/pages/send/send-content/send-gas-row/tests/send-gas-row-container.test.js
@@ -30,8 +30,8 @@ proxyquire('../send-gas-row.container.js', {
       return () => ({})
     },
   },
-  '../send-amount-row/amount-max-button/amount-max-button.selectors': {
-    getMaxModeOn: (s) => `mockMaxModeOn:${s}`,
+  '../../send.selectors.js': {
+    getSendMaxModeState: (s) => `mockMaxModeOn:${s}`,
   },
   '../../send.utils.js': {
     isBalanceSufficient: ({
diff --git a/ui/app/pages/send/send-content/send-gas-row/tests/send-gas-row-selectors.test.js b/ui/app/pages/send/send-content/send-gas-row/tests/send-gas-row-selectors.test.js
deleted file mode 100644
index 19f88f4c4..000000000
--- a/ui/app/pages/send/send-content/send-gas-row/tests/send-gas-row-selectors.test.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import assert from 'assert'
-import {
-  gasFeeIsInError,
-  getGasLoadingError,
-  getGasButtonGroupShown,
-} from '../send-gas-row.selectors.js'
-
-describe('send-gas-row selectors', function () {
-
-  describe('getGasLoadingError()', function () {
-    it('should return send.errors.gasLoading', function () {
-      const state = {
-        send: {
-          errors: {
-            gasLoading: 'abc',
-          },
-        },
-      }
-
-      assert.equal(getGasLoadingError(state), 'abc')
-    })
-  })
-
-  describe('gasFeeIsInError()', function () {
-    it('should return true if send.errors.gasFee is truthy', function () {
-      const state = {
-        send: {
-          errors: {
-            gasFee: 'def',
-          },
-        },
-      }
-
-      assert.equal(gasFeeIsInError(state), true)
-    })
-
-    it('should return false send.errors.gasFee is falsely', function () {
-      const state = {
-        send: {
-          errors: {
-            gasFee: null,
-          },
-        },
-      }
-
-      assert.equal(gasFeeIsInError(state), false)
-    })
-  })
-
-  describe('getGasButtonGroupShown()', function () {
-    it('should return send.gasButtonGroupShown', function () {
-      const state = {
-        send: {
-          gasButtonGroupShown: 'foobar',
-        },
-      }
-
-      assert.equal(getGasButtonGroupShown(state), 'foobar')
-    })
-  })
-
-})
diff --git a/ui/app/pages/send/send-footer/send-footer.container.js b/ui/app/pages/send/send-footer/send-footer.container.js
index a3170911d..88ff063ef 100644
--- a/ui/app/pages/send/send-footer/send-footer.container.js
+++ b/ui/app/pages/send/send-footer/send-footer.container.js
@@ -22,10 +22,8 @@ import {
   getTokenBalance,
   getUnapprovedTxs,
   getSendErrors,
-} from '../send.selectors'
-import {
   isSendFormInError,
-} from './send-footer.selectors'
+} from '../send.selectors'
 import {
   addressIsNew,
   constructTxParams,
diff --git a/ui/app/pages/send/send-footer/send-footer.selectors.js b/ui/app/pages/send/send-footer/send-footer.selectors.js
deleted file mode 100644
index 2a6c3c954..000000000
--- a/ui/app/pages/send/send-footer/send-footer.selectors.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { getSendErrors } from '../send.selectors'
-
-export function isSendFormInError (state) {
-  return Object.values(getSendErrors(state)).some((n) => n)
-}
diff --git a/ui/app/pages/send/send-footer/tests/send-footer-container.test.js b/ui/app/pages/send/send-footer/tests/send-footer-container.test.js
index 9fde4283a..3c8a38b76 100644
--- a/ui/app/pages/send/send-footer/tests/send-footer-container.test.js
+++ b/ui/app/pages/send/send-footer/tests/send-footer-container.test.js
@@ -42,8 +42,8 @@ proxyquire('../send-footer.container.js', {
     getSendHexData: (s) => `mockHexData:${s}`,
     getUnapprovedTxs: (s) => `mockUnapprovedTxs:${s}`,
     getSendErrors: (s) => `mockSendErrors:${s}`,
+    isSendFormInError: (s) => `mockInError:${s}`,
   },
-  './send-footer.selectors': { isSendFormInError: (s) => `mockInError:${s}` },
   './send-footer.utils': utilsStubs,
   '../../../selectors/': {
     getRenderableEstimateDataForSmallButtonsFromGWEI: (s) => ([{ gasEstimateType: `mockGasEstimateType:${s}` }]),
diff --git a/ui/app/pages/send/send-footer/tests/send-footer-selectors.test.js b/ui/app/pages/send/send-footer/tests/send-footer-selectors.test.js
deleted file mode 100644
index 4671abf3f..000000000
--- a/ui/app/pages/send/send-footer/tests/send-footer-selectors.test.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-
-const {
-  isSendFormInError,
-} = proxyquire('../send-footer.selectors', {
-  '../send.selectors': {
-    getSendErrors: (mockState) => mockState.errors,
-  },
-})
-
-describe('send-footer selectors', function () {
-
-  describe('getTitleKey()', function () {
-    it('should return true if any of the values of the object returned by getSendErrors are truthy', function () {
-      assert.equal(isSendFormInError({ errors: { a: 'abc', b: false } }), true)
-    })
-
-    it('should return false if all of the values of the object returned by getSendErrors are falsy', function () {
-      assert.equal(isSendFormInError({ errors: { a: false, b: null } }), false)
-    })
-  })
-
-})
diff --git a/ui/app/pages/send/send-header/send-header.container.js b/ui/app/pages/send/send-header/send-header.container.js
index 7d57a71e9..26d79da22 100644
--- a/ui/app/pages/send/send-header/send-header.container.js
+++ b/ui/app/pages/send/send-header/send-header.container.js
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux'
 import { clearSend } from '../../../store/actions'
 import SendHeader from './send-header.component'
-import { getTitleKey } from './send-header.selectors'
+import { getTitleKey } from '../send.selectors'
 
 export default connect(mapStateToProps, mapDispatchToProps)(SendHeader)
 
diff --git a/ui/app/pages/send/send-header/send-header.selectors.js b/ui/app/pages/send/send-header/send-header.selectors.js
deleted file mode 100644
index 3bf53a32e..000000000
--- a/ui/app/pages/send/send-header/send-header.selectors.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { getSelectedToken, getSendEditingTransactionId, getSendTo } from '../send.selectors.js'
-
-export function getTitleKey (state) {
-  const isEditing = Boolean(getSendEditingTransactionId(state))
-  const isToken = Boolean(getSelectedToken(state))
-
-  if (!getSendTo(state)) {
-    return 'addRecipient'
-  }
-
-  if (isEditing) {
-    return 'edit'
-  } else if (isToken) {
-    return 'sendTokens'
-  } else {
-    return 'sendETH'
-  }
-}
diff --git a/ui/app/pages/send/send-header/tests/send-header-container.test.js b/ui/app/pages/send/send-header/tests/send-header-container.test.js
index 26f60bd7b..504bc9ea1 100644
--- a/ui/app/pages/send/send-header/tests/send-header-container.test.js
+++ b/ui/app/pages/send/send-header/tests/send-header-container.test.js
@@ -18,7 +18,7 @@ proxyquire('../send-header.container.js', {
     },
   },
   '../../../store/actions': actionSpies,
-  './send-header.selectors': {
+  '../send.selectors': {
     getTitleKey: (s) => `mockTitleKey:${s}`,
   },
 })
diff --git a/ui/app/pages/send/send-header/tests/send-header-selectors.test.js b/ui/app/pages/send/send-header/tests/send-header-selectors.test.js
deleted file mode 100644
index 21cd2ad48..000000000
--- a/ui/app/pages/send/send-header/tests/send-header-selectors.test.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-
-const {
-  getTitleKey,
-} = proxyquire('../send-header.selectors', {
-  '../send.selectors': {
-    getSelectedToken: (mockState) => mockState.t,
-    getSendEditingTransactionId: (mockState) => mockState.e,
-    getSendTo: (mockState) => mockState.to,
-  },
-})
-
-describe('send-header selectors', function () {
-
-  describe('getTitleKey()', function () {
-    it('should return the correct key when "to" is empty', function () {
-      assert.equal(getTitleKey({ e: 1, t: true, to: '' }), 'addRecipient')
-    })
-
-    it('should return the correct key when getSendEditingTransactionId is truthy', function () {
-      assert.equal(getTitleKey({ e: 1, t: true, to: '0x123' }), 'edit')
-    })
-
-    it('should return the correct key when getSendEditingTransactionId is falsy and getSelectedToken is truthy', function () {
-      assert.equal(getTitleKey({ e: null, t: 'abc', to: '0x123' }), 'sendTokens')
-    })
-
-    it('should return the correct key when getSendEditingTransactionId is falsy and getSelectedToken is falsy', function () {
-      assert.equal(getTitleKey({ e: null, to: '0x123' }), 'sendETH')
-    })
-  })
-
-})
diff --git a/ui/app/pages/send/send.container.js b/ui/app/pages/send/send.container.js
index ed5934bf4..478961732 100644
--- a/ui/app/pages/send/send.container.js
+++ b/ui/app/pages/send/send.container.js
@@ -23,12 +23,12 @@ import {
   getSendToNickname,
   getTokenBalance,
   getQrCodeData,
+  getTokens,
 } from './send.selectors'
 import {
   getSelectedAddress,
   getAddressBook,
 } from '../../selectors'
-import { getTokens } from './send-content/add-recipient/add-recipient.selectors'
 import {
   updateSendTo,
   updateSendTokenBalance,
diff --git a/ui/app/pages/send/send.selectors.js b/ui/app/pages/send/send.selectors.js
index 9f6d9cc82..0347ddd74 100644
--- a/ui/app/pages/send/send.selectors.js
+++ b/ui/app/pages/send/send.selectors.js
@@ -132,6 +132,10 @@ export function getSendErrors (state) {
   return state.send.errors
 }
 
+export function sendAmountIsInError (state) {
+  return Boolean(state.send.errors.amount)
+}
+
 export function getSendFrom (state) {
   return state.metamask.send.from
 }
@@ -192,3 +196,40 @@ export function getUnapprovedTxs (state) {
 export function getQrCodeData (state) {
   return state.appState.qrCodeData
 }
+
+export function getGasLoadingError (state) {
+  return state.send.errors.gasLoading
+}
+
+export function gasFeeIsInError (state) {
+  return Boolean(state.send.errors.gasFee)
+}
+
+export function getGasButtonGroupShown (state) {
+  return state.send.gasButtonGroupShown
+}
+
+export function getTokens (state) {
+  return state.metamask.tokens
+}
+
+export function getTitleKey (state) {
+  const isEditing = Boolean(getSendEditingTransactionId(state))
+  const isToken = Boolean(getSelectedToken(state))
+
+  if (!getSendTo(state)) {
+    return 'addRecipient'
+  }
+
+  if (isEditing) {
+    return 'edit'
+  } else if (isToken) {
+    return 'sendTokens'
+  } else {
+    return 'sendETH'
+  }
+}
+
+export function isSendFormInError (state) {
+  return Object.values(getSendErrors(state)).some((n) => n)
+}
diff --git a/ui/app/pages/send/tests/send-selectors.test.js b/ui/app/pages/send/tests/send-selectors.test.js
index 3df4754bf..38a297747 100644
--- a/ui/app/pages/send/tests/send-selectors.test.js
+++ b/ui/app/pages/send/tests/send-selectors.test.js
@@ -23,6 +23,7 @@ import {
   getSelectedTokenExchangeRate,
   getSelectedTokenToFiatRate,
   getSendAmount,
+  sendAmountIsInError,
   getSendEditingTransactionId,
   getSendErrors,
   getSendFrom,
@@ -35,6 +36,12 @@ import {
   getTokenBalance,
   getTokenExchangeRate,
   getUnapprovedTxs,
+  gasFeeIsInError,
+  getGasLoadingError,
+  getGasButtonGroupShown,
+  getTokens,
+  getTitleKey,
+  isSendFormInError,
 } from '../send.selectors.js'
 import mockState from './send-selectors-test-data'
 
@@ -520,4 +527,184 @@ describe('send selectors', function () {
       )
     })
   })
+
+  describe('send-amount-row selectors', function () {
+
+    describe('sendAmountIsInError()', function () {
+      it('should return true if send.errors.amount is truthy', function () {
+        const state = {
+          send: {
+            errors: {
+              amount: 'abc',
+            },
+          },
+        }
+
+        assert.equal(sendAmountIsInError(state), true)
+      })
+
+      it('should return false if send.errors.amount is falsy', function () {
+        const state = {
+          send: {
+            errors: {
+              amount: null,
+            },
+          },
+        }
+
+        assert.equal(sendAmountIsInError(state), false)
+      })
+    })
+  })
+
+  describe('send-gas-row selectors', function () {
+
+    describe('getGasLoadingError()', function () {
+      it('should return send.errors.gasLoading', function () {
+        const state = {
+          send: {
+            errors: {
+              gasLoading: 'abc',
+            },
+          },
+        }
+
+        assert.equal(getGasLoadingError(state), 'abc')
+      })
+    })
+
+    describe('gasFeeIsInError()', function () {
+      it('should return true if send.errors.gasFee is truthy', function () {
+        const state = {
+          send: {
+            errors: {
+              gasFee: 'def',
+            },
+          },
+        }
+
+        assert.equal(gasFeeIsInError(state), true)
+      })
+
+      it('should return false send.errors.gasFee is falsely', function () {
+        const state = {
+          send: {
+            errors: {
+              gasFee: null,
+            },
+          },
+        }
+
+        assert.equal(gasFeeIsInError(state), false)
+      })
+    })
+
+    describe('getGasButtonGroupShown()', function () {
+      it('should return send.gasButtonGroupShown', function () {
+        const state = {
+          send: {
+            gasButtonGroupShown: 'foobar',
+          },
+        }
+
+        assert.equal(getGasButtonGroupShown(state), 'foobar')
+      })
+    })
+  })
+
+  describe('add-recipient selectors', function () {
+    describe('getTokens()', function () {
+      it('should return empty array if no tokens in state', function () {
+        const state = {
+          metamask: {
+            tokens: [],
+          },
+        }
+
+        assert.deepStrictEqual(getTokens(state), [])
+      })
+    })
+  })
+
+  describe('send-header selectors', function () {
+
+    const getMetamaskSendMockState = (send) => {
+      return {
+        metamask: {
+          send: { ...send },
+        },
+      }
+    }
+
+    describe('getTitleKey()', function () {
+      it('should return the correct key when "to" is empty', function () {
+        assert.equal(getTitleKey(getMetamaskSendMockState({})), 'addRecipient')
+      })
+
+      it('should return the correct key when getSendEditingTransactionId is truthy', function () {
+        assert.equal(
+          getTitleKey(
+            getMetamaskSendMockState({
+              to: true,
+              editingTransactionId: true,
+              token: true, // this can be whatever
+            })
+          ), 'edit')
+      })
+
+      it('should return the correct key when getSendEditingTransactionId is falsy and getSelectedToken is truthy', function () {
+        assert.equal(
+          getTitleKey(
+            getMetamaskSendMockState({
+              to: true,
+              editingTransactionId: false,
+              token: true,
+            })
+          ), 'sendTokens')
+      })
+
+      it('should return the correct key when getSendEditingTransactionId is falsy and getSelectedToken is falsy', function () {
+        assert.equal(
+          getTitleKey(
+            getMetamaskSendMockState({
+              to: true,
+              editingTransactionId: false,
+              token: false,
+            })
+          ), 'sendETH')
+      })
+    })
+  })
+
+  describe('send-footer selectors', function () {
+
+    const getSendMockState = (send) => {
+      return {
+        send: { ...send },
+      }
+    }
+
+    describe('isSendFormInError()', function () {
+      it('should return true if any of the values of the object returned by getSendErrors are truthy', function () {
+        assert.equal(isSendFormInError(
+          getSendMockState({
+            errors: [ true ],
+          })
+        ), true)
+      })
+
+      it('should return false if all of the values of the object returned by getSendErrors are falsy', function () {
+        assert.equal(isSendFormInError(
+          getSendMockState({
+            errors: [],
+          })
+        ), false)
+        assert.equal(isSendFormInError(
+          getSendMockState({
+            errors: [ false ],
+          })
+        ), false)
+      })
+    })
+  })
 })
diff --git a/ui/app/pages/first-time-flow/first-time-flow.selectors.js b/ui/app/selectors/first-time-flow.js
similarity index 95%
rename from ui/app/pages/first-time-flow/first-time-flow.selectors.js
rename to ui/app/selectors/first-time-flow.js
index aa6cb2ffe..5b3c8436d 100644
--- a/ui/app/pages/first-time-flow/first-time-flow.selectors.js
+++ b/ui/app/selectors/first-time-flow.js
@@ -2,7 +2,7 @@ import {
   INITIALIZE_CREATE_PASSWORD_ROUTE,
   INITIALIZE_IMPORT_WITH_SEED_PHRASE_ROUTE,
   DEFAULT_ROUTE,
-} from '../../helpers/constants/routes'
+} from '../helpers/constants/routes'
 
 export function getFirstTimeFlowTypeRoute (state) {
   const { firstTimeFlowType } = state.metamask
diff --git a/ui/app/selectors/index.js b/ui/app/selectors/index.js
index ee758f156..33648b731 100644
--- a/ui/app/selectors/index.js
+++ b/ui/app/selectors/index.js
@@ -1,5 +1,6 @@
 export * from './confirm-transaction'
 export * from './custom-gas'
+export * from './first-time-flow'
 export * from './permissions'
 export * from './selectors'
 export * from './tokens'
diff --git a/ui/app/selectors/selectors.js b/ui/app/selectors/selectors.js
index b144a7f88..2cfb2ff03 100644
--- a/ui/app/selectors/selectors.js
+++ b/ui/app/selectors/selectors.js
@@ -256,10 +256,6 @@ export function getSendAmount (state) {
   return state.metamask.send.amount
 }
 
-export function getSendMaxModeState (state) {
-  return state.metamask.send.maxModeOn
-}
-
 export function getCurrentCurrency (state) {
   return state.metamask.currentCurrency
 }