aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/send_/send-content/send-gas-row
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2018-06-20 23:48:23 +0800
committerWhymarrh Whitby <whymarrh.whitby@gmail.com>2018-07-16 23:28:32 +0800
commitb3d78ed8a1fbea059344b04416fb21bdb1b73f86 (patch)
tree6a2d8f6dda690961331c9bcbf5e2c6bf7102bced /ui/app/components/send_/send-content/send-gas-row
parentf31e87dcd5cec09e81c741e311efc3793c9d9b98 (diff)
downloadtangerine-wallet-browser-b3d78ed8a1fbea059344b04416fb21bdb1b73f86.tar.gz
tangerine-wallet-browser-b3d78ed8a1fbea059344b04416fb21bdb1b73f86.tar.zst
tangerine-wallet-browser-b3d78ed8a1fbea059344b04416fb21bdb1b73f86.zip
Remove send_ directory, revert to just having send
Revert accidentally changed constants. Require defaults in ens-input, gas-fee-display and confirm screens.
Diffstat (limited to 'ui/app/components/send_/send-content/send-gas-row')
-rw-r--r--ui/app/components/send_/send-content/send-gas-row/README.md0
-rw-r--r--ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js61
-rw-r--r--ui/app/components/send_/send-content/send-gas-row/gas-fee-display/index.js1
-rw-r--r--ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js55
-rw-r--r--ui/app/components/send_/send-content/send-gas-row/index.js1
-rw-r--r--ui/app/components/send_/send-content/send-gas-row/send-gas-row.component.js48
-rw-r--r--ui/app/components/send_/send-content/send-gas-row/send-gas-row.container.js27
-rw-r--r--ui/app/components/send_/send-content/send-gas-row/send-gas-row.scss0
-rw-r--r--ui/app/components/send_/send-content/send-gas-row/send-gas-row.selectors.js14
-rw-r--r--ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-component.test.js70
-rw-r--r--ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-container.test.js70
-rw-r--r--ui/app/components/send_/send-content/send-gas-row/tests/send-gas-row-selectors.test.js49
12 files changed, 0 insertions, 396 deletions
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
--- a/ui/app/components/send_/send-content/send-gas-row/README.md
+++ /dev/null
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
--- a/ui/app/components/send_/send-content/send-gas-row/send-gas-row.scss
+++ /dev/null
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)
- })
- })
-
-})