From c27dfb01bbf0d84c6f4ac37c17a6d7d563d21c76 Mon Sep 17 00:00:00 2001
From: trejgun <trejgun@gmail.com>
Date: Thu, 21 Jun 2018 14:43:48 +0800
Subject: refactor gas-fee-display component #4622

---
 .../gas-fee-display/gas-fee-display.component.js   | 51 ++++++++++++++++++++
 .../send-gas-row/gas-fee-display/index.js          |  1 +
 .../test/gas-fee-display.component.test.js         | 55 ++++++++++++++++++++++
 .../send-gas-row/send-gas-row.component.js         |  2 +-
 .../tests/send-gas-row-component.test.js           |  2 +-
 5 files changed, 109 insertions(+), 2 deletions(-)
 create mode 100644 ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
 create mode 100644 ui/app/components/send_/send-content/send-gas-row/gas-fee-display/index.js
 create mode 100644 ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js

(limited to 'ui/app/components/send_/send-content/send-gas-row')

diff --git a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
new file mode 100644
index 000000000..99286a139
--- /dev/null
+++ b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
@@ -0,0 +1,51 @@
+import React, {Component} from 'react'
+import PropTypes from 'prop-types'
+import CurrencyDisplay from '../../../../send/currency-display'
+
+
+export default class GasFeeDisplay extends Component {
+  render() {
+    const {
+      conversionRate,
+      gasTotal,
+      onClick,
+      primaryCurrency = 'ETH',
+      convertedCurrency,
+      gasLoadingError,
+    } = this.props
+
+    return (
+      <div className="send-v2__gas-fee-display">
+        {gasTotal
+          ? <CurrencyDisplay
+              primaryCurrency={primaryCurrency}
+              convertedCurrency={convertedCurrency}
+              value={gasTotal}
+              conversionRate={conversionRate}
+              gasLoadingError={gasLoadingError}
+              convertedPrefix={'$'}
+              readOnly
+            />
+          : gasLoadingError
+            ? <div className="currency-display.currency-display--message">
+                {this.context.t('setGasPrice')}
+              </div>
+            : <div className="currency-display">
+                {this.context.t('loading')}
+              </div>
+        }
+        <button
+          className="sliders-icon-container"
+          onClick={onClick}
+          disabled={!gasTotal && !gasLoadingError}
+        >
+          <i className="fa fa-sliders sliders-icon" />
+        </button>
+      </div>
+    )
+  }
+}
+
+GasFeeDisplay.contextTypes = {
+  t: PropTypes.func,
+}
diff --git a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/index.js b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/index.js
new file mode 100644
index 000000000..dba0edb7b
--- /dev/null
+++ b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/index.js
@@ -0,0 +1 @@
+export { default } from './gas-fee-display.component'
diff --git a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js
new file mode 100644
index 000000000..630781515
--- /dev/null
+++ b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js
@@ -0,0 +1,55 @@
+import React from 'react'
+import assert from 'assert'
+import {shallow} from 'enzyme'
+import GasFeeDisplay from '../gas-fee-display.component'
+import CurrencyDisplay from '../../../../../send/currency-display'
+import sinon from "sinon";
+
+
+const propsMethodSpies = {
+  showCustomizeGasModal: sinon.spy(),
+}
+
+describe.only('SendGasRow Component', function() {
+  let wrapper
+
+  beforeEach(() => {
+    wrapper = shallow(<GasFeeDisplay
+      conversionRate={20}
+      gasTotal={'mockGasTotal'}
+      onClick={propsMethodSpies.showCustomizeGasModal}
+      primaryCurrency={'mockPrimaryCurrency'}
+      convertedCurrency={'mockConvertedCurrency'}
+    />, {context: {t: str => str + '_t'}})
+  })
+
+  afterEach(() => {
+    propsMethodSpies.showCustomizeGasModal.resetHistory()
+  })
+
+  describe('render', () => {
+    it('should render a CurrencyDisplay component', () => {
+      assert.equal(wrapper.find(CurrencyDisplay).length, 1)
+    })
+
+    it('should render the CurrencyDisplay with the correct props', () => {
+      const {
+        conversionRate,
+        convertedCurrency,
+        value
+      } = wrapper.find(CurrencyDisplay).props()
+      assert.equal(conversionRate, 20)
+      assert.equal(convertedCurrency, 'mockConvertedCurrency')
+      assert.equal(value, 'mockGasTotal')
+    })
+
+    it('should render the Button with the correct props', () => {
+      const {
+        onClick,
+      } = wrapper.find("button").props()
+      assert.equal(propsMethodSpies.showCustomizeGasModal.callCount, 0)
+      onClick()
+      assert.equal(propsMethodSpies.showCustomizeGasModal.callCount, 1)
+    })
+  })
+})
diff --git a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js b/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js
index c80d8c0bb..17cea3d4e 100644
--- a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js
+++ b/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import SendRowWrapper from '../send-row-wrapper/'
-import GasFeeDisplay from '../../../send/gas-fee-display-v2'
+import GasFeeDisplay from './gas-fee-display/gas-fee-display.component'
 
 export default class SendGasRow extends Component {
 
diff --git a/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-component.test.js b/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-component.test.js
index e4f05d708..db37f18be 100644
--- a/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-component.test.js
+++ b/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-component.test.js
@@ -5,7 +5,7 @@ import sinon from 'sinon'
 import SendGasRow from '../send-gas-row.component.js'
 
 import SendRowWrapper from '../../send-row-wrapper/send-row-wrapper.component'
-import GasFeeDisplay from '../../../../send/gas-fee-display-v2'
+import GasFeeDisplay from '../gas-fee-display/gas-fee-display.component'
 
 const propsMethodSpies = {
   showCustomizeGasModal: sinon.spy(),
-- 
cgit 


From 778aec8c754a2bbd2b9f35aabfb57a99a9608e54 Mon Sep 17 00:00:00 2001
From: trejgun <trejgun@gmail.com>
Date: Thu, 21 Jun 2018 15:03:19 +0800
Subject: lint

---
 .../send-gas-row/gas-fee-display/gas-fee-display.component.js  | 10 ++++++++++
 .../gas-fee-display/test/gas-fee-display.component.test.js     |  6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'ui/app/components/send_/send-content/send-gas-row')

diff --git a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
index 99286a139..b1fd67412 100644
--- a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
+++ b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
@@ -4,6 +4,16 @@ import CurrencyDisplay from '../../../../send/currency-display'
 
 
 export default class GasFeeDisplay extends Component {
+
+  static propTypes = {
+    conversionRate: PropTypes.number,
+    primaryCurrency: PropTypes.string,
+    convertedCurrency: PropTypes.string,
+    gasLoadingError: PropTypes.bool,
+    gasTotal: PropTypes.string,
+    onClick: PropTypes.func,
+  };
+
   render() {
     const {
       conversionRate,
diff --git a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js
index 630781515..9f2f1a0cf 100644
--- a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js
+++ b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js
@@ -3,7 +3,7 @@ import assert from 'assert'
 import {shallow} from 'enzyme'
 import GasFeeDisplay from '../gas-fee-display.component'
 import CurrencyDisplay from '../../../../../send/currency-display'
-import sinon from "sinon";
+import sinon from 'sinon'
 
 
 const propsMethodSpies = {
@@ -36,7 +36,7 @@ describe.only('SendGasRow Component', function() {
       const {
         conversionRate,
         convertedCurrency,
-        value
+        value,
       } = wrapper.find(CurrencyDisplay).props()
       assert.equal(conversionRate, 20)
       assert.equal(convertedCurrency, 'mockConvertedCurrency')
@@ -46,7 +46,7 @@ describe.only('SendGasRow Component', function() {
     it('should render the Button with the correct props', () => {
       const {
         onClick,
-      } = wrapper.find("button").props()
+      } = wrapper.find('button').props()
       assert.equal(propsMethodSpies.showCustomizeGasModal.callCount, 0)
       onClick()
       assert.equal(propsMethodSpies.showCustomizeGasModal.callCount, 1)
-- 
cgit 


From fb02e71e2245d746661e5db42f2cf8000c82c001 Mon Sep 17 00:00:00 2001
From: tmashuang <thomas.b.huang@gmail.com>
Date: Tue, 26 Jun 2018 18:14:21 -0700
Subject: Remove .only on test

---
 .../send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/components/send_/send-content/send-gas-row')

diff --git a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js
index 9f2f1a0cf..66f3a94df 100644
--- a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js
+++ b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js
@@ -10,7 +10,7 @@ const propsMethodSpies = {
   showCustomizeGasModal: sinon.spy(),
 }
 
-describe.only('SendGasRow Component', function() {
+describe('SendGasRow Component', function() {
   let wrapper
 
   beforeEach(() => {
-- 
cgit 


From ad6c454fd5d59c7f47edf515f0eb8aec549a8683 Mon Sep 17 00:00:00 2001
From: Sara Reynolds <sarareynolds@Saras-MacBook-Pro-2.local>
Date: Fri, 22 Jun 2018 15:05:50 -0700
Subject: fixes #4623

---
 .../send_/send-content/send-gas-row/send-gas-row.container.js         | 4 ++--
 .../send-content/send-gas-row/tests/send-gas-row-container.test.js    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'ui/app/components/send_/send-content/send-gas-row')

diff --git a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.container.js b/ui/app/components/send_/send-content/send-gas-row/send-gas-row.container.js
index 20d3daa59..6e6fbc8a8 100644
--- a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.container.js
+++ b/ui/app/components/send_/send-content/send-gas-row/send-gas-row.container.js
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux'
 import {
     getConversionRate,
-    getConvertedCurrency,
+    getCurrentCurrency,
     getGasTotal,
 } from '../../send.selectors.js'
 import { sendGasIsInError } from './send-gas-row.selectors.js'
@@ -13,7 +13,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(SendGasRow)
 function mapStateToProps (state) {
   return {
     conversionRate: getConversionRate(state),
-    convertedCurrency: getConvertedCurrency(state),
+    convertedCurrency: getCurrentCurrency(state),
     gasTotal: getGasTotal(state),
     gasLoadingError: sendGasIsInError(state),
   }
diff --git a/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-container.test.js b/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-container.test.js
index 9135524d1..e928c8aba 100644
--- a/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-container.test.js
+++ b/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-container.test.js
@@ -19,7 +19,7 @@ proxyquire('../send-gas-row.container.js', {
   },
   '../../send.selectors.js': {
     getConversionRate: (s) => `mockConversionRate:${s}`,
-    getConvertedCurrency: (s) => `mockConvertedCurrency:${s}`,
+    getCurrentCurrency: (s) => `mockConvertedCurrency:${s}`,
     getGasTotal: (s) => `mockGasTotal:${s}`,
   },
   './send-gas-row.selectors.js': { sendGasIsInError: (s) => `mockGasLoadingError:${s}` },
-- 
cgit 


From a8f745f9fe74751b87f500af3857b66d4c80f45e Mon Sep 17 00:00:00 2001
From: brunobar79 <brunobar79@gmail.com>
Date: Mon, 2 Jul 2018 18:49:33 -0400
Subject: eslint --fix .

---
 .../send-gas-row/gas-fee-display/gas-fee-display.component.js           | 2 +-
 .../send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js | 2 +-
 ui/app/components/send_/send-content/send-gas-row/index.js              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'ui/app/components/send_/send-content/send-gas-row')

diff --git a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
index b1fd67412..c8d619be5 100644
--- a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
+++ b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
@@ -14,7 +14,7 @@ export default class GasFeeDisplay extends Component {
     onClick: PropTypes.func,
   };
 
-  render() {
+  render () {
     const {
       conversionRate,
       gasTotal,
diff --git a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js
index 66f3a94df..7cbe8d0df 100644
--- a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js
+++ b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js
@@ -10,7 +10,7 @@ const propsMethodSpies = {
   showCustomizeGasModal: sinon.spy(),
 }
 
-describe('SendGasRow Component', function() {
+describe('SendGasRow Component', function () {
   let wrapper
 
   beforeEach(() => {
diff --git a/ui/app/components/send_/send-content/send-gas-row/index.js b/ui/app/components/send_/send-content/send-gas-row/index.js
index 060ed7fd3..3c7ff1d5f 100644
--- a/ui/app/components/send_/send-content/send-gas-row/index.js
+++ b/ui/app/components/send_/send-content/send-gas-row/index.js
@@ -1 +1 @@
-export { default } from './send-gas-row.container'
\ No newline at end of file
+export { default } from './send-gas-row.container'
-- 
cgit 


From 0796fc58e4638df9e448654b199b661cb2a492aa Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Fri, 29 Jun 2018 14:49:40 -0230
Subject: Improve send token error ux.

---
 .../send-gas-row/send-gas-row.component.js         |  8 +++++-
 .../send-gas-row/send-gas-row.container.js         |  5 ++--
 .../send-gas-row/send-gas-row.selectors.js         |  9 ++++--
 .../tests/send-gas-row-component.test.js           |  5 ++++
 .../tests/send-gas-row-container.test.js           |  6 +++-
 .../tests/send-gas-row-selectors.test.js           | 33 ++++++++++++++++++++--
 6 files changed, 57 insertions(+), 9 deletions(-)

(limited to 'ui/app/components/send_/send-content/send-gas-row')

diff --git a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js b/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js
index 17cea3d4e..ba5c22a47 100644
--- a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js
+++ b/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js
@@ -8,6 +8,7 @@ export default class SendGasRow extends Component {
   static propTypes = {
     conversionRate: PropTypes.number,
     convertedCurrency: PropTypes.string,
+    gasFeeError: PropTypes.bool,
     gasLoadingError: PropTypes.bool,
     gasTotal: PropTypes.string,
     showCustomizeGasModal: PropTypes.func,
@@ -19,11 +20,16 @@ export default class SendGasRow extends Component {
       convertedCurrency,
       gasLoadingError,
       gasTotal,
+      gasFeeError,
       showCustomizeGasModal,
     } = this.props
 
     return (
-      <SendRowWrapper label={`${this.context.t('gasFee')}:`}>
+      <SendRowWrapper
+        label={`${this.context.t('gasFee')}:`}
+        showError={gasFeeError}
+        errorType={'gasFee'}
+      >
         <GasFeeDisplay
           conversionRate={conversionRate}
           convertedCurrency={convertedCurrency}
diff --git a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.container.js b/ui/app/components/send_/send-content/send-gas-row/send-gas-row.container.js
index 6e6fbc8a8..8f8e3e4dd 100644
--- a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.container.js
+++ b/ui/app/components/send_/send-content/send-gas-row/send-gas-row.container.js
@@ -4,7 +4,7 @@ import {
     getCurrentCurrency,
     getGasTotal,
 } from '../../send.selectors.js'
-import { sendGasIsInError } from './send-gas-row.selectors.js'
+import { getGasLoadingError, gasFeeIsInError } from './send-gas-row.selectors.js'
 import { showModal } from '../../../../actions'
 import SendGasRow from './send-gas-row.component'
 
@@ -15,7 +15,8 @@ function mapStateToProps (state) {
     conversionRate: getConversionRate(state),
     convertedCurrency: getCurrentCurrency(state),
     gasTotal: getGasTotal(state),
-    gasLoadingError: sendGasIsInError(state),
+    gasFeeError: gasFeeIsInError(state),
+    gasLoadingError: getGasLoadingError(state),
   }
 }
 
diff --git a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.selectors.js b/ui/app/components/send_/send-content/send-gas-row/send-gas-row.selectors.js
index d069ae8c6..96f6293c2 100644
--- a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.selectors.js
+++ b/ui/app/components/send_/send-content/send-gas-row/send-gas-row.selectors.js
@@ -1,9 +1,14 @@
 const selectors = {
-  sendGasIsInError,
+  gasFeeIsInError,
+  getGasLoadingError,
 }
 
 module.exports = selectors
 
-function sendGasIsInError (state) {
+function getGasLoadingError (state) {
   return state.send.errors.gasLoading
 }
+
+function gasFeeIsInError (state) {
+  return Boolean(state.send.errors.gasFee)
+}
diff --git a/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-component.test.js b/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-component.test.js
index db37f18be..54a92bd2d 100644
--- a/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-component.test.js
+++ b/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-component.test.js
@@ -18,6 +18,7 @@ describe('SendGasRow Component', function () {
     wrapper = shallow(<SendGasRow
       conversionRate={20}
       convertedCurrency={'mockConvertedCurrency'}
+      gasFeeError={'mockGasFeeError'}
       gasLoadingError={false}
       gasTotal={'mockGasTotal'}
       showCustomizeGasModal={propsMethodSpies.showCustomizeGasModal}
@@ -36,9 +37,13 @@ describe('SendGasRow Component', function () {
     it('should pass the correct props to SendRowWrapper', () => {
       const {
         label,
+        showError,
+        errorType,
       } = wrapper.find(SendRowWrapper).props()
 
       assert.equal(label, 'gasFee_t:')
+      assert.equal(showError, 'mockGasFeeError')
+      assert.equal(errorType, 'gasFee')
     })
 
     it('should render a GasFeeDisplay as a child of the SendRowWrapper', () => {
diff --git a/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-container.test.js b/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-container.test.js
index e928c8aba..2ce062505 100644
--- a/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-container.test.js
+++ b/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-container.test.js
@@ -22,7 +22,10 @@ proxyquire('../send-gas-row.container.js', {
     getCurrentCurrency: (s) => `mockConvertedCurrency:${s}`,
     getGasTotal: (s) => `mockGasTotal:${s}`,
   },
-  './send-gas-row.selectors.js': { sendGasIsInError: (s) => `mockGasLoadingError:${s}` },
+  './send-gas-row.selectors.js': {
+    getGasLoadingError: (s) => `mockGasLoadingError:${s}`,
+    gasFeeIsInError: (s) => `mockGasFeeError:${s}`,
+  },
   '../../../../actions': actionSpies,
 })
 
@@ -35,6 +38,7 @@ describe('send-gas-row container', () => {
         conversionRate: 'mockConversionRate:mockState',
         convertedCurrency: 'mockConvertedCurrency:mockState',
         gasTotal: 'mockGasTotal:mockState',
+        gasFeeError: 'mockGasFeeError:mockState',
         gasLoadingError: 'mockGasLoadingError:mockState',
       })
     })
diff --git a/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-selectors.test.js b/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-selectors.test.js
index a5196334e..d46dd9d8b 100644
--- a/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-selectors.test.js
+++ b/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-selectors.test.js
@@ -1,11 +1,12 @@
 import assert from 'assert'
 import {
-  sendGasIsInError,
+  gasFeeIsInError,
+  getGasLoadingError,
 } from '../send-gas-row.selectors.js'
 
 describe('send-gas-row selectors', () => {
 
-  describe('sendGasIsInError()', () => {
+  describe('getGasLoadingError()', () => {
     it('should return send.errors.gasLoading', () => {
       const state = {
         send: {
@@ -15,7 +16,33 @@ describe('send-gas-row selectors', () => {
         },
       }
 
-      assert.equal(sendGasIsInError(state), 'abc')
+      assert.equal(getGasLoadingError(state), 'abc')
+    })
+  })
+
+  describe('gasFeeIsInError()', () => {
+    it('should return true if send.errors.gasFee is truthy', () => {
+      const state = {
+        send: {
+          errors: {
+            gasFee: 'def',
+          },
+        },
+      }
+
+      assert.equal(gasFeeIsInError(state), true)
+    })
+
+    it('should return false send.errors.gasFee is falsely', () => {
+      const state = {
+        send: {
+          errors: {
+            gasFee: null,
+          },
+        },
+      }
+
+      assert.equal(gasFeeIsInError(state), false)
     })
   })
 
-- 
cgit 


From c94f639de55a867ebe8d3599d337a1f7341b1979 Mon Sep 17 00:00:00 2001
From: trejgun <trejgun@gmail.com>
Date: Mon, 2 Jul 2018 10:09:28 +0800
Subject: convert contextType to static prop for refactored components

---
 .../send-gas-row/gas-fee-display/gas-fee-display.component.js     | 8 ++++----
 .../send_/send-content/send-gas-row/send-gas-row.component.js     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'ui/app/components/send_/send-content/send-gas-row')

diff --git a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
index b1fd67412..67cd99741 100644
--- a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
+++ b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
@@ -14,6 +14,10 @@ export default class GasFeeDisplay extends Component {
     onClick: PropTypes.func,
   };
 
+  static contextTypes = {
+    t: PropTypes.func,
+  };
+
   render() {
     const {
       conversionRate,
@@ -55,7 +59,3 @@ export default class GasFeeDisplay extends Component {
     )
   }
 }
-
-GasFeeDisplay.contextTypes = {
-  t: PropTypes.func,
-}
diff --git a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js b/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js
index 17cea3d4e..e9f5fda29 100644
--- a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js
+++ b/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js
@@ -13,6 +13,10 @@ export default class SendGasRow extends Component {
     showCustomizeGasModal: PropTypes.func,
   };
 
+  static contextTypes = {
+    t: PropTypes.func,
+  };
+
   render () {
     const {
       conversionRate,
@@ -36,7 +40,3 @@ export default class SendGasRow extends Component {
   }
 
 }
-
-SendGasRow.contextTypes = {
-  t: PropTypes.func,
-}
-- 
cgit 


From b3d78ed8a1fbea059344b04416fb21bdb1b73f86 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Wed, 20 Jun 2018 13:18:23 -0230
Subject: Remove send_ directory, revert to just having send

Revert accidentally changed constants.

Require defaults in ens-input, gas-fee-display and confirm screens.
---
 .../send_/send-content/send-gas-row/README.md      |  0
 .../gas-fee-display/gas-fee-display.component.js   | 61 -------------------
 .../send-gas-row/gas-fee-display/index.js          |  1 -
 .../test/gas-fee-display.component.test.js         | 55 -----------------
 .../send_/send-content/send-gas-row/index.js       |  1 -
 .../send-gas-row/send-gas-row.component.js         | 48 ---------------
 .../send-gas-row/send-gas-row.container.js         | 27 ---------
 .../send-content/send-gas-row/send-gas-row.scss    |  0
 .../send-gas-row/send-gas-row.selectors.js         | 14 -----
 .../tests/send-gas-row-component.test.js           | 70 ----------------------
 .../tests/send-gas-row-container.test.js           | 70 ----------------------
 .../tests/send-gas-row-selectors.test.js           | 49 ---------------
 12 files changed, 396 deletions(-)
 delete mode 100644 ui/app/components/send_/send-content/send-gas-row/README.md
 delete mode 100644 ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
 delete mode 100644 ui/app/components/send_/send-content/send-gas-row/gas-fee-display/index.js
 delete mode 100644 ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js
 delete mode 100644 ui/app/components/send_/send-content/send-gas-row/index.js
 delete mode 100644 ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js
 delete mode 100644 ui/app/components/send_/send-content/send-gas-row/send-gas-row.container.js
 delete mode 100644 ui/app/components/send_/send-content/send-gas-row/send-gas-row.scss
 delete mode 100644 ui/app/components/send_/send-content/send-gas-row/send-gas-row.selectors.js
 delete mode 100644 ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-component.test.js
 delete mode 100644 ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-container.test.js
 delete mode 100644 ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-selectors.test.js

(limited to 'ui/app/components/send_/send-content/send-gas-row')

diff --git a/ui/app/components/send_/send-content/send-gas-row/README.md b/ui/app/components/send_/send-content/send-gas-row/README.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
deleted file mode 100644
index bb9a94428..000000000
--- a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import React, {Component} from 'react'
-import PropTypes from 'prop-types'
-import CurrencyDisplay from '../../../../send/currency-display'
-
-
-export default class GasFeeDisplay extends Component {
-
-  static propTypes = {
-    conversionRate: PropTypes.number,
-    primaryCurrency: PropTypes.string,
-    convertedCurrency: PropTypes.string,
-    gasLoadingError: PropTypes.bool,
-    gasTotal: PropTypes.string,
-    onClick: PropTypes.func,
-  };
-
-  static contextTypes = {
-    t: PropTypes.func,
-  };
-
-  render () {
-    const {
-      conversionRate,
-      gasTotal,
-      onClick,
-      primaryCurrency = 'ETH',
-      convertedCurrency,
-      gasLoadingError,
-    } = this.props
-
-    return (
-      <div className="send-v2__gas-fee-display">
-        {gasTotal
-          ? <CurrencyDisplay
-              primaryCurrency={primaryCurrency}
-              convertedCurrency={convertedCurrency}
-              value={gasTotal}
-              conversionRate={conversionRate}
-              gasLoadingError={gasLoadingError}
-              convertedPrefix={'$'}
-              readOnly
-            />
-          : gasLoadingError
-            ? <div className="currency-display.currency-display--message">
-                {this.context.t('setGasPrice')}
-              </div>
-            : <div className="currency-display">
-                {this.context.t('loading')}
-              </div>
-        }
-        <button
-          className="sliders-icon-container"
-          onClick={onClick}
-          disabled={!gasTotal && !gasLoadingError}
-        >
-          <i className="fa fa-sliders sliders-icon" />
-        </button>
-      </div>
-    )
-  }
-}
diff --git a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/index.js b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/index.js
deleted file mode 100644
index dba0edb7b..000000000
--- a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './gas-fee-display.component'
diff --git a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js
deleted file mode 100644
index 7cbe8d0df..000000000
--- a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import {shallow} from 'enzyme'
-import GasFeeDisplay from '../gas-fee-display.component'
-import CurrencyDisplay from '../../../../../send/currency-display'
-import sinon from 'sinon'
-
-
-const propsMethodSpies = {
-  showCustomizeGasModal: sinon.spy(),
-}
-
-describe('SendGasRow Component', function () {
-  let wrapper
-
-  beforeEach(() => {
-    wrapper = shallow(<GasFeeDisplay
-      conversionRate={20}
-      gasTotal={'mockGasTotal'}
-      onClick={propsMethodSpies.showCustomizeGasModal}
-      primaryCurrency={'mockPrimaryCurrency'}
-      convertedCurrency={'mockConvertedCurrency'}
-    />, {context: {t: str => str + '_t'}})
-  })
-
-  afterEach(() => {
-    propsMethodSpies.showCustomizeGasModal.resetHistory()
-  })
-
-  describe('render', () => {
-    it('should render a CurrencyDisplay component', () => {
-      assert.equal(wrapper.find(CurrencyDisplay).length, 1)
-    })
-
-    it('should render the CurrencyDisplay with the correct props', () => {
-      const {
-        conversionRate,
-        convertedCurrency,
-        value,
-      } = wrapper.find(CurrencyDisplay).props()
-      assert.equal(conversionRate, 20)
-      assert.equal(convertedCurrency, 'mockConvertedCurrency')
-      assert.equal(value, 'mockGasTotal')
-    })
-
-    it('should render the Button with the correct props', () => {
-      const {
-        onClick,
-      } = wrapper.find('button').props()
-      assert.equal(propsMethodSpies.showCustomizeGasModal.callCount, 0)
-      onClick()
-      assert.equal(propsMethodSpies.showCustomizeGasModal.callCount, 1)
-    })
-  })
-})
diff --git a/ui/app/components/send_/send-content/send-gas-row/index.js b/ui/app/components/send_/send-content/send-gas-row/index.js
deleted file mode 100644
index 3c7ff1d5f..000000000
--- a/ui/app/components/send_/send-content/send-gas-row/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './send-gas-row.container'
diff --git a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js b/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js
deleted file mode 100644
index 91b58cfd0..000000000
--- a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import React, { Component } from 'react'
-import PropTypes from 'prop-types'
-import SendRowWrapper from '../send-row-wrapper/'
-import GasFeeDisplay from './gas-fee-display/gas-fee-display.component'
-
-export default class SendGasRow extends Component {
-
-  static propTypes = {
-    conversionRate: PropTypes.number,
-    convertedCurrency: PropTypes.string,
-    gasFeeError: PropTypes.bool,
-    gasLoadingError: PropTypes.bool,
-    gasTotal: PropTypes.string,
-    showCustomizeGasModal: PropTypes.func,
-  };
-
-  static contextTypes = {
-    t: PropTypes.func,
-  };
-
-  render () {
-    const {
-      conversionRate,
-      convertedCurrency,
-      gasLoadingError,
-      gasTotal,
-      gasFeeError,
-      showCustomizeGasModal,
-    } = this.props
-
-    return (
-      <SendRowWrapper
-        label={`${this.context.t('gasFee')}:`}
-        showError={gasFeeError}
-        errorType={'gasFee'}
-      >
-        <GasFeeDisplay
-          conversionRate={conversionRate}
-          convertedCurrency={convertedCurrency}
-          gasLoadingError={gasLoadingError}
-          gasTotal={gasTotal}
-          onClick={() => showCustomizeGasModal()}
-        />
-      </SendRowWrapper>
-    )
-  }
-
-}
diff --git a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.container.js b/ui/app/components/send_/send-content/send-gas-row/send-gas-row.container.js
deleted file mode 100644
index 8f8e3e4dd..000000000
--- a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.container.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { connect } from 'react-redux'
-import {
-    getConversionRate,
-    getCurrentCurrency,
-    getGasTotal,
-} from '../../send.selectors.js'
-import { getGasLoadingError, gasFeeIsInError } from './send-gas-row.selectors.js'
-import { showModal } from '../../../../actions'
-import SendGasRow from './send-gas-row.component'
-
-export default connect(mapStateToProps, mapDispatchToProps)(SendGasRow)
-
-function mapStateToProps (state) {
-  return {
-    conversionRate: getConversionRate(state),
-    convertedCurrency: getCurrentCurrency(state),
-    gasTotal: getGasTotal(state),
-    gasFeeError: gasFeeIsInError(state),
-    gasLoadingError: getGasLoadingError(state),
-  }
-}
-
-function mapDispatchToProps (dispatch) {
-  return {
-    showCustomizeGasModal: () => dispatch(showModal({ name: 'CUSTOMIZE_GAS' })),
-  }
-}
diff --git a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.scss b/ui/app/components/send_/send-content/send-gas-row/send-gas-row.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.selectors.js b/ui/app/components/send_/send-content/send-gas-row/send-gas-row.selectors.js
deleted file mode 100644
index 96f6293c2..000000000
--- a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.selectors.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const selectors = {
-  gasFeeIsInError,
-  getGasLoadingError,
-}
-
-module.exports = selectors
-
-function getGasLoadingError (state) {
-  return state.send.errors.gasLoading
-}
-
-function gasFeeIsInError (state) {
-  return Boolean(state.send.errors.gasFee)
-}
diff --git a/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-component.test.js b/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-component.test.js
deleted file mode 100644
index 54a92bd2d..000000000
--- a/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-component.test.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import React from 'react'
-import assert from 'assert'
-import { shallow } from 'enzyme'
-import sinon from 'sinon'
-import SendGasRow from '../send-gas-row.component.js'
-
-import SendRowWrapper from '../../send-row-wrapper/send-row-wrapper.component'
-import GasFeeDisplay from '../gas-fee-display/gas-fee-display.component'
-
-const propsMethodSpies = {
-  showCustomizeGasModal: sinon.spy(),
-}
-
-describe('SendGasRow Component', function () {
-  let wrapper
-
-  beforeEach(() => {
-    wrapper = shallow(<SendGasRow
-      conversionRate={20}
-      convertedCurrency={'mockConvertedCurrency'}
-      gasFeeError={'mockGasFeeError'}
-      gasLoadingError={false}
-      gasTotal={'mockGasTotal'}
-      showCustomizeGasModal={propsMethodSpies.showCustomizeGasModal}
-    />, { context: { t: str => str + '_t' } })
-  })
-
-  afterEach(() => {
-    propsMethodSpies.showCustomizeGasModal.resetHistory()
-  })
-
-  describe('render', () => {
-    it('should render a SendRowWrapper component', () => {
-      assert.equal(wrapper.find(SendRowWrapper).length, 1)
-    })
-
-    it('should pass the correct props to SendRowWrapper', () => {
-      const {
-        label,
-        showError,
-        errorType,
-      } = wrapper.find(SendRowWrapper).props()
-
-      assert.equal(label, 'gasFee_t:')
-      assert.equal(showError, 'mockGasFeeError')
-      assert.equal(errorType, 'gasFee')
-    })
-
-    it('should render a GasFeeDisplay as a child of the SendRowWrapper', () => {
-      assert(wrapper.find(SendRowWrapper).childAt(0).is(GasFeeDisplay))
-    })
-
-    it('should render the GasFeeDisplay with the correct props', () => {
-      const {
-        conversionRate,
-        convertedCurrency,
-        gasLoadingError,
-        gasTotal,
-        onClick,
-      } = wrapper.find(SendRowWrapper).childAt(0).props()
-      assert.equal(conversionRate, 20)
-      assert.equal(convertedCurrency, 'mockConvertedCurrency')
-      assert.equal(gasLoadingError, false)
-      assert.equal(gasTotal, 'mockGasTotal')
-      assert.equal(propsMethodSpies.showCustomizeGasModal.callCount, 0)
-      onClick()
-      assert.equal(propsMethodSpies.showCustomizeGasModal.callCount, 1)
-    })
-  })
-})
diff --git a/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-container.test.js b/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-container.test.js
deleted file mode 100644
index 2ce062505..000000000
--- a/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-container.test.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import assert from 'assert'
-import proxyquire from 'proxyquire'
-import sinon from 'sinon'
-
-let mapStateToProps
-let mapDispatchToProps
-
-const actionSpies = {
-  showModal: sinon.spy(),
-}
-
-proxyquire('../send-gas-row.container.js', {
-  'react-redux': {
-    connect: (ms, md) => {
-      mapStateToProps = ms
-      mapDispatchToProps = md
-      return () => ({})
-    },
-  },
-  '../../send.selectors.js': {
-    getConversionRate: (s) => `mockConversionRate:${s}`,
-    getCurrentCurrency: (s) => `mockConvertedCurrency:${s}`,
-    getGasTotal: (s) => `mockGasTotal:${s}`,
-  },
-  './send-gas-row.selectors.js': {
-    getGasLoadingError: (s) => `mockGasLoadingError:${s}`,
-    gasFeeIsInError: (s) => `mockGasFeeError:${s}`,
-  },
-  '../../../../actions': actionSpies,
-})
-
-describe('send-gas-row container', () => {
-
-  describe('mapStateToProps()', () => {
-
-    it('should map the correct properties to props', () => {
-      assert.deepEqual(mapStateToProps('mockState'), {
-        conversionRate: 'mockConversionRate:mockState',
-        convertedCurrency: 'mockConvertedCurrency:mockState',
-        gasTotal: 'mockGasTotal:mockState',
-        gasFeeError: 'mockGasFeeError:mockState',
-        gasLoadingError: 'mockGasLoadingError:mockState',
-      })
-    })
-
-  })
-
-  describe('mapDispatchToProps()', () => {
-    let dispatchSpy
-    let mapDispatchToPropsObject
-
-    beforeEach(() => {
-      dispatchSpy = sinon.spy()
-      mapDispatchToPropsObject = mapDispatchToProps(dispatchSpy)
-    })
-
-    describe('showCustomizeGasModal()', () => {
-      it('should dispatch an action', () => {
-        mapDispatchToPropsObject.showCustomizeGasModal()
-        assert(dispatchSpy.calledOnce)
-        assert.deepEqual(
-          actionSpies.showModal.getCall(0).args[0],
-          { name: 'CUSTOMIZE_GAS' }
-        )
-      })
-    })
-
-  })
-
-})
diff --git a/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-selectors.test.js b/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-selectors.test.js
deleted file mode 100644
index d46dd9d8b..000000000
--- a/ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-selectors.test.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import assert from 'assert'
-import {
-  gasFeeIsInError,
-  getGasLoadingError,
-} from '../send-gas-row.selectors.js'
-
-describe('send-gas-row selectors', () => {
-
-  describe('getGasLoadingError()', () => {
-    it('should return send.errors.gasLoading', () => {
-      const state = {
-        send: {
-          errors: {
-            gasLoading: 'abc',
-          },
-        },
-      }
-
-      assert.equal(getGasLoadingError(state), 'abc')
-    })
-  })
-
-  describe('gasFeeIsInError()', () => {
-    it('should return true if send.errors.gasFee is truthy', () => {
-      const state = {
-        send: {
-          errors: {
-            gasFee: 'def',
-          },
-        },
-      }
-
-      assert.equal(gasFeeIsInError(state), true)
-    })
-
-    it('should return false send.errors.gasFee is falsely', () => {
-      const state = {
-        send: {
-          errors: {
-            gasFee: null,
-          },
-        },
-      }
-
-      assert.equal(gasFeeIsInError(state), false)
-    })
-  })
-
-})
-- 
cgit