Clean up for send refactor PR.

6 files changed, 8 insertions, 17 deletions

diff --git a/test/integration/index.js b/test/integration/index.js
index 7789eb283..b266ddf37 100644
--- a/test/integration/index.js
+++ b/test/integration/index.js
@@ -2,8 +2,7 @@ const fs = require('fs')
 const path = require('path')
 const pump = require('pump')
 const browserify = require('browserify')
-let tests = fs.readdirSync(path.join(__dirname, 'lib'))
-tests = tests.filter(fln => fln.match(/send/))
+const tests = fs.readdirSync(path.join(__dirname, 'lib'))
 const bundlePath = path.join(__dirname, 'bundle.js')
 
 const b = browserify()
diff --git a/ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js b/ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js
index bf95c50fb..418766cd9 100644
--- a/ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js
+++ b/ui/app/components/send_/send-content/send-from-row/from-dropdown/from-dropdown.component.js
@@ -35,7 +35,7 @@ export default class FromDropdown extends Component {
         closeDropdown={closeDropdown}
         onSelect={onSelect}
         activeAddress={selectedAccount.address}
-      />},
+      />}
     </div>
   }
 
diff --git a/ui/app/components/send_/send-content/send-to-row/send-to-row.component.js b/ui/app/components/send_/send-content/send-to-row/send-to-row.component.js
index a54608259..901ae97e9 100644
--- a/ui/app/components/send_/send-content/send-to-row/send-to-row.component.js
+++ b/ui/app/components/send_/send-content/send-to-row/send-to-row.component.js
@@ -37,7 +37,7 @@ export default class SendToRow extends Component {
     return (
       <SendRowWrapper
         errorType={'to'}
-        label={`${this.context.t('to')}:`}
+        label={`${this.context.t('to')}`}
         showError={inError}
       >
         <EnsInput
diff --git a/ui/app/components/send_/send-content/send-to-row/tests/send-to-row-component.test.js b/ui/app/components/send_/send-content/send-to-row/tests/send-to-row-component.test.js
index df6ad6fe8..e58695210 100644
--- a/ui/app/components/send_/send-content/send-to-row/tests/send-to-row-component.test.js
+++ b/ui/app/components/send_/send-content/send-to-row/tests/send-to-row-component.test.js
@@ -81,7 +81,7 @@ describe('SendToRow Component', function () {
 
       assert.equal(errorType, 'to')
 
-      assert.equal(label, 'to_t:')
+      assert.equal(label, 'to_t')
 
       assert.equal(showError, false)
     })
diff --git a/ui/app/components/send_/send-footer/tests/send-footer-container.test.js b/ui/app/components/send_/send-footer/tests/send-footer-container.test.js
index e9d4eb04d..9a616777e 100644
--- a/ui/app/components/send_/send-footer/tests/send-footer-container.test.js
+++ b/ui/app/components/send_/send-footer/tests/send-footer-container.test.js
@@ -16,7 +16,6 @@ const utilsStubs = {
   addressIsNew: sinon.stub().returns(true),
   constructTxParams: sinon.stub().returns('mockConstructedTxParams'),
   constructUpdatedTx: sinon.stub().returns('mockConstructedUpdatedTxParams'),
-  formShouldBeDisabled: sinon.stub().returns('mockFormShouldBeDisabled'),
 }
 
 proxyquire('../send-footer.container.js', {
@@ -53,27 +52,18 @@ describe('send-footer container', () => {
     it('should map the correct properties to props', () => {
       assert.deepEqual(mapStateToProps('mockState'), {
         amount: 'mockAmount:mockState',
-        disabled: 'mockFormShouldBeDisabled',
         selectedToken: 'mockSelectedToken:mockState',
         editingTransactionId: 'mockEditingTransactionId:mockState',
         from: 'mockFromObject:mockState',
         gasLimit: 'mockGasLimit:mockState',
         gasPrice: 'mockGasPrice:mockState',
+        gasTotal: 'mockGasTotal:mockState',
         inError: 'mockInError:mockState',
-        isToken: true,
         to: 'mockTo:mockState',
         toAccounts: 'mockToAccounts:mockState',
+        tokenBalance: 'mockTokenBalance:mockState',
         unapprovedTxs: 'mockUnapprovedTxs:mockState',
       })
-      assert.deepEqual(
-        utilsStubs.formShouldBeDisabled.getCall(0).args[0],
-        {
-          inError: 'mockInError:mockState',
-          selectedToken: 'mockSelectedToken:mockState',
-          tokenBalance: 'mockTokenBalance:mockState',
-          gasTotal: 'mockGasTotal:mockState',
-        }
-      )
     })
 
   })
diff --git a/ui/app/components/send_/tests/send-component.test.js b/ui/app/components/send_/tests/send-component.test.js
index 60b160333..8aeab36b4 100644
--- a/ui/app/components/send_/tests/send-component.test.js
+++ b/ui/app/components/send_/tests/send-component.test.js
@@ -142,6 +142,7 @@ describe('Send Component', function () {
 
     it('should not call updateSendTokenBalance or this.updateGas if network === prevNetwork', () => {
       SendTransactionScreen.prototype.updateGas.resetHistory()
+      propsMethodSpies.updateSendTokenBalance.resetHistory()
       wrapper.instance().componentDidUpdate({
         from: {
           balance: 'balanceChanged',
@@ -168,6 +169,7 @@ describe('Send Component', function () {
 
     it('should call updateSendTokenBalance and this.updateGas with the correct params', () => {
       SendTransactionScreen.prototype.updateGas.resetHistory()
+      propsMethodSpies.updateSendTokenBalance.resetHistory()
       wrapper.instance().componentDidUpdate({
         from: {
           balance: 'balanceChanged',