diff options
Folder restructure (#6304)
* Remove ui/app/keychains/
* Remove ui/app/img/ (unused images)
* Move conversion-util to helpers/utils/
* Move token-util to helpers/utils/
* Move /helpers/*.js inside /helpers/utils/
* Move util tests inside /helpers/utils/
* Renameand move confirm-transaction/util.js to helpers/utils/
* Move higher-order-components to helpers/higher-order-components/
* Move infura-conversion.json to helpers/constants/
* Move all utility functions to helpers/utils/
* Move pages directory to top-level
* Move all constants to helpers/constants/
* Move metametrics inside helpers/
* Move app and root inside pages/
* Move routes inside helpers/
* Re-organize ducks/
* Move reducers to ducks/
* Move selectors inside selectors/
* Move test out of test folder
* Move action, reducer, store inside store/
* Move ui components inside ui/
* Move UI components inside ui/
* Move connected components inside components/app/
* Move i18n-helper inside helpers/
* Fix unit tests
* Fix unit test
* Move pages components
* Rename routes component
* Move reducers to ducks/index
* Fix bad path in unit test
Diffstat (limited to 'ui/app/components/send/send-content/send-row-wrapper')
18 files changed, 0 insertions, 320 deletions
diff --git a/ui/app/components/send/send-content/send-row-wrapper/index.js b/ui/app/components/send/send-content/send-row-wrapper/index.js deleted file mode 100644 index d17545dcc..000000000 --- a/ui/app/components/send/send-content/send-row-wrapper/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './send-row-wrapper.component' diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/index.js b/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/index.js deleted file mode 100644 index c00617f83..000000000 --- a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './send-row-error-message.container' diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message-README.md b/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message-README.md deleted file mode 100644 index e69de29bb..000000000 --- a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message-README.md +++ /dev/null diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.component.js b/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.component.js deleted file mode 100644 index 61bc7bab7..000000000 --- a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.component.js +++ /dev/null @@ -1,27 +0,0 @@ -import React, { Component } from 'react' -import PropTypes from 'prop-types' - -export default class SendRowErrorMessage extends Component { - - static propTypes = { - errors: PropTypes.object, - errorType: PropTypes.string, - }; - - static contextTypes = { - t: PropTypes.func, - }; - - render () { - const { errors, errorType } = this.props - - const errorMessage = errors[errorType] - - return ( - errorMessage - ? <div className="send-v2__error">{this.context.t(errorMessage)}</div> - : null - ) - } - -} diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.container.js b/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.container.js deleted file mode 100644 index 59622047f..000000000 --- a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.container.js +++ /dev/null @@ -1,12 +0,0 @@ -import { connect } from 'react-redux' -import { getSendErrors } from '../../../send.selectors' -import SendRowErrorMessage from './send-row-error-message.component' - -export default connect(mapStateToProps)(SendRowErrorMessage) - -function mapStateToProps (state, ownProps) { - return { - errors: getSendErrors(state), - errorType: ownProps.errorType, - } -} diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.scss b/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.scss deleted file mode 100644 index e69de29bb..000000000 --- a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/send-row-error-message.scss +++ /dev/null diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/tests/send-row-error-message-component.test.js b/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/tests/send-row-error-message-component.test.js deleted file mode 100644 index 2304a43d2..000000000 --- a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/tests/send-row-error-message-component.test.js +++ /dev/null @@ -1,28 +0,0 @@ -import React from 'react' -import assert from 'assert' -import { shallow } from 'enzyme' -import SendRowErrorMessage from '../send-row-error-message.component.js' - -describe('SendRowErrorMessage Component', function () { - let wrapper - - beforeEach(() => { - wrapper = shallow(<SendRowErrorMessage - errors={{ error1: 'abc', error2: 'def' }} - errorType={'error3'} - />, { context: { t: str => str + '_t' } }) - }) - - describe('render', () => { - it('should render null if the passed errors do not contain an error of errorType', () => { - assert.equal(wrapper.find('.send-v2__error').length, 0) - assert.equal(wrapper.html(), null) - }) - - it('should render an error message if the passed errors contain an error of errorType', () => { - wrapper.setProps({ errors: { error1: 'abc', error2: 'def', error3: 'xyz' } }) - assert.equal(wrapper.find('.send-v2__error').length, 1) - assert.equal(wrapper.find('.send-v2__error').text(), 'xyz_t') - }) - }) -}) diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/tests/send-row-error-message-container.test.js b/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/tests/send-row-error-message-container.test.js deleted file mode 100644 index eecff165d..000000000 --- a/ui/app/components/send/send-content/send-row-wrapper/send-row-error-message/tests/send-row-error-message-container.test.js +++ /dev/null @@ -1,28 +0,0 @@ -import assert from 'assert' -import proxyquire from 'proxyquire' - -let mapStateToProps - -proxyquire('../send-row-error-message.container.js', { - 'react-redux': { - connect: (ms, md) => { - mapStateToProps = ms - return () => ({}) - }, - }, - '../../../send.selectors': { getSendErrors: (s) => `mockErrors:${s}` }, -}) - -describe('send-row-error-message container', () => { - - describe('mapStateToProps()', () => { - - it('should map the correct properties to props', () => { - assert.deepEqual(mapStateToProps('mockState', { errorType: 'someType' }), { - errors: 'mockErrors:mockState', - errorType: 'someType' }) - }) - - }) - -}) diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-warning-message/index.js b/ui/app/components/send/send-content/send-row-wrapper/send-row-warning-message/index.js deleted file mode 100644 index fd4d19ef7..000000000 --- a/ui/app/components/send/send-content/send-row-wrapper/send-row-warning-message/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './send-row-warning-message.container' diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-warning-message/send-row-warning-message.component.js b/ui/app/components/send/send-content/send-row-wrapper/send-row-warning-message/send-row-warning-message.component.js deleted file mode 100644 index f1caa8f99..000000000 --- a/ui/app/components/send/send-content/send-row-wrapper/send-row-warning-message/send-row-warning-message.component.js +++ /dev/null @@ -1,27 +0,0 @@ -import React, { Component } from 'react' -import PropTypes from 'prop-types' - -export default class SendRowWarningMessage extends Component { - - static propTypes = { - warnings: PropTypes.object, - warningType: PropTypes.string, - }; - - static contextTypes = { - t: PropTypes.func, - }; - - render () { - const { warnings, warningType } = this.props - - const warningMessage = warningType in warnings && warnings[warningType] - - return ( - warningMessage - ? <div className="send-v2__warning">{this.context.t(warningMessage)}</div> - : null - ) - } - -} diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-warning-message/send-row-warning-message.container.js b/ui/app/components/send/send-content/send-row-wrapper/send-row-warning-message/send-row-warning-message.container.js deleted file mode 100644 index 7df14fd96..000000000 --- a/ui/app/components/send/send-content/send-row-wrapper/send-row-warning-message/send-row-warning-message.container.js +++ /dev/null @@ -1,12 +0,0 @@ -import { connect } from 'react-redux' -import { getSendWarnings } from '../../../send.selectors' -import SendRowWarningMessage from './send-row-warning-message.component' - -export default connect(mapStateToProps)(SendRowWarningMessage) - -function mapStateToProps (state, ownProps) { - return { - warnings: getSendWarnings(state), - warningType: ownProps.warningType, - } -} diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-warning-message/send-row-warning-message.scss b/ui/app/components/send/send-content/send-row-wrapper/send-row-warning-message/send-row-warning-message.scss deleted file mode 100644 index e69de29bb..000000000 --- a/ui/app/components/send/send-content/send-row-wrapper/send-row-warning-message/send-row-warning-message.scss +++ /dev/null diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-warning-message/tests/send-row-warning-message-component.test.js b/ui/app/components/send/send-content/send-row-wrapper/send-row-warning-message/tests/send-row-warning-message-component.test.js deleted file mode 100644 index bd803d833..000000000 --- a/ui/app/components/send/send-content/send-row-wrapper/send-row-warning-message/tests/send-row-warning-message-component.test.js +++ /dev/null @@ -1,28 +0,0 @@ -import React from 'react' -import assert from 'assert' -import { shallow } from 'enzyme' -import SendRowWarningMessage from '../send-row-warning-message.component.js' - -describe('SendRowWarningMessage Component', function () { - let wrapper - - beforeEach(() => { - wrapper = shallow(<SendRowWarningMessage - warnings={{ warning1: 'abc', warning2: 'def' }} - warningType={'warning3'} - />, { context: { t: str => str + '_t' } }) - }) - - describe('render', () => { - it('should render null if the passed warnings do not contain a warning of warningType', () => { - assert.equal(wrapper.find('.send-v2__warning').length, 0) - assert.equal(wrapper.html(), null) - }) - - it('should render a warning message if the passed warnings contain a warning of warningType', () => { - wrapper.setProps({ warnings: { warning1: 'abc', warning2: 'def', warning3: 'xyz' } }) - assert.equal(wrapper.find('.send-v2__warning').length, 1) - assert.equal(wrapper.find('.send-v2__warning').text(), 'xyz_t') - }) - }) -}) diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-warning-message/tests/send-row-warning-message-container.test.js b/ui/app/components/send/send-content/send-row-wrapper/send-row-warning-message/tests/send-row-warning-message-container.test.js deleted file mode 100644 index 225bf056c..000000000 --- a/ui/app/components/send/send-content/send-row-wrapper/send-row-warning-message/tests/send-row-warning-message-container.test.js +++ /dev/null @@ -1,28 +0,0 @@ -import assert from 'assert' -import proxyquire from 'proxyquire' - -let mapStateToProps - -proxyquire('../send-row-warning-message.container.js', { - 'react-redux': { - connect: (ms, md) => { - mapStateToProps = ms - return () => ({}) - }, - }, - '../../../send.selectors': { getSendWarnings: (s) => `mockWarnings:${s}` }, -}) - -describe('send-row-warning-message container', () => { - - describe('mapStateToProps()', () => { - - it('should map the correct properties to props', () => { - assert.deepEqual(mapStateToProps('mockState', { warningType: 'someType' }), { - warnings: 'mockWarnings:mockState', - warningType: 'someType' }) - }) - - }) - -}) diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-wrapper-README.md b/ui/app/components/send/send-content/send-row-wrapper/send-row-wrapper-README.md deleted file mode 100644 index e69de29bb..000000000 --- a/ui/app/components/send/send-content/send-row-wrapper/send-row-wrapper-README.md +++ /dev/null diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-wrapper.component.js b/ui/app/components/send/send-content/send-row-wrapper/send-row-wrapper.component.js deleted file mode 100644 index 0146ce645..000000000 --- a/ui/app/components/send/send-content/send-row-wrapper/send-row-wrapper.component.js +++ /dev/null @@ -1,48 +0,0 @@ -import React, { Component } from 'react' -import PropTypes from 'prop-types' -import SendRowErrorMessage from './send-row-error-message/' -import SendRowWarningMessage from './send-row-warning-message/' - -export default class SendRowWrapper extends Component { - - static propTypes = { - children: PropTypes.node, - errorType: PropTypes.string, - label: PropTypes.string, - showError: PropTypes.bool, - showWarning: PropTypes.bool, - warningType: PropTypes.string, - }; - - static contextTypes = { - t: PropTypes.func, - }; - - render () { - const { - children, - errorType = '', - label, - showError = false, - showWarning = false, - warningType = '', - } = this.props - const formField = Array.isArray(children) ? children[1] || children[0] : children - const customLabelContent = children.length > 1 ? children[0] : null - - return ( - <div className="send-v2__form-row"> - <div className="send-v2__form-label"> - {label} - {showError && <SendRowErrorMessage errorType={errorType}/>} - {!showError && showWarning && <SendRowWarningMessage warningType={warningType} />} - {customLabelContent} - </div> - <div className="send-v2__form-field"> - {formField} - </div> - </div> - ) - } - -} diff --git a/ui/app/components/send/send-content/send-row-wrapper/send-row-wrapper.scss b/ui/app/components/send/send-content/send-row-wrapper/send-row-wrapper.scss deleted file mode 100644 index e69de29bb..000000000 --- a/ui/app/components/send/send-content/send-row-wrapper/send-row-wrapper.scss +++ /dev/null diff --git a/ui/app/components/send/send-content/send-row-wrapper/tests/send-row-wrapper-component.test.js b/ui/app/components/send/send-content/send-row-wrapper/tests/send-row-wrapper-component.test.js deleted file mode 100644 index 30280e1d0..000000000 --- a/ui/app/components/send/send-content/send-row-wrapper/tests/send-row-wrapper-component.test.js +++ /dev/null @@ -1,79 +0,0 @@ -import React from 'react' -import assert from 'assert' -import { shallow } from 'enzyme' -import SendRowWrapper from '../send-row-wrapper.component.js' - -import SendRowErrorMessage from '../send-row-error-message/send-row-error-message.container' - -describe('SendContent Component', function () { - let wrapper - - beforeEach(() => { - wrapper = shallow(<SendRowWrapper - errorType={'mockErrorType'} - label={'mockLabel'} - showError={false} - > - <span>Mock Form Field</span> - </SendRowWrapper>) - }) - - describe('render', () => { - it('should render a div with a send-v2__form-row class', () => { - assert.equal(wrapper.find('div.send-v2__form-row').length, 1) - }) - - it('should render two children of the root div, with send-v2_form label and field classes', () => { - assert.equal(wrapper.find('.send-v2__form-row > .send-v2__form-label').length, 1) - assert.equal(wrapper.find('.send-v2__form-row > .send-v2__form-field').length, 1) - }) - - it('should render the label as a child of the send-v2__form-label', () => { - assert.equal(wrapper.find('.send-v2__form-row > .send-v2__form-label').childAt(0).text(), 'mockLabel') - }) - - it('should render its first child as a child of the send-v2__form-field', () => { - assert.equal(wrapper.find('.send-v2__form-row > .send-v2__form-field').childAt(0).text(), 'Mock Form Field') - }) - - it('should not render a SendRowErrorMessage if showError is false', () => { - assert.equal(wrapper.find(SendRowErrorMessage).length, 0) - }) - - it('should render a SendRowErrorMessage with and errorType props if showError is true', () => { - wrapper.setProps({showError: true}) - assert.equal(wrapper.find(SendRowErrorMessage).length, 1) - - const expectedSendRowErrorMessage = wrapper.find('.send-v2__form-row > .send-v2__form-label').childAt(1) - assert(expectedSendRowErrorMessage.is(SendRowErrorMessage)) - assert.deepEqual( - expectedSendRowErrorMessage.props(), - { errorType: 'mockErrorType' } - ) - }) - - it('should render its second child as a child of the send-v2__form-field, if it has two children', () => { - wrapper = shallow(<SendRowWrapper - errorType={'mockErrorType'} - label={'mockLabel'} - showError={false} - > - <span>Mock Custom Label Content</span> - <span>Mock Form Field</span> - </SendRowWrapper>) - assert.equal(wrapper.find('.send-v2__form-row > .send-v2__form-field').childAt(0).text(), 'Mock Form Field') - }) - - it('should render its first child as the last child of the send-v2__form-label, if it has two children', () => { - wrapper = shallow(<SendRowWrapper - errorType={'mockErrorType'} - label={'mockLabel'} - showError={false} - > - <span>Mock Custom Label Content</span> - <span>Mock Form Field</span> - </SendRowWrapper>) - assert.equal(wrapper.find('.send-v2__form-row > .send-v2__form-label').childAt(1).text(), 'Mock Custom Label Content') - }) - }) -}) |