diff options
author | Chi Kei Chan <chikeichan@gmail.com> | 2019-03-22 07:03:30 +0800 |
---|---|---|
committer | Dan J Miller <danjm.com@gmail.com> | 2019-03-22 07:03:30 +0800 |
commit | 31175625b446cb5d18b17db23018bca8b14d280c (patch) | |
tree | f54e159883deef003fb281267025edf796eb8004 /ui/app/components/error-message | |
parent | 7287133e15fab22299e07704206e85bc855d1064 (diff) | |
download | tangerine-wallet-browser-31175625b446cb5d18b17db23018bca8b14d280c.tar.gz tangerine-wallet-browser-31175625b446cb5d18b17db23018bca8b14d280c.tar.zst tangerine-wallet-browser-31175625b446cb5d18b17db23018bca8b14d280c.zip |
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/error-message')
4 files changed, 0 insertions, 88 deletions
diff --git a/ui/app/components/error-message/error-message.component.js b/ui/app/components/error-message/error-message.component.js deleted file mode 100644 index b4464c33b..000000000 --- a/ui/app/components/error-message/error-message.component.js +++ /dev/null @@ -1,30 +0,0 @@ -import React from 'react' -import PropTypes from 'prop-types' - -const ErrorMessage = (props, context) => { - const { errorMessage, errorKey } = props - const error = errorKey ? context.t(errorKey) : errorMessage - - return ( - <div className="error-message"> - <img - src="/images/alert-red.svg" - className="error-message__icon" - /> - <div className="error-message__text"> - { `ALERT: ${error}` } - </div> - </div> - ) -} - -ErrorMessage.propTypes = { - errorMessage: PropTypes.string, - errorKey: PropTypes.string, -} - -ErrorMessage.contextTypes = { - t: PropTypes.func, -} - -export default ErrorMessage diff --git a/ui/app/components/error-message/index.js b/ui/app/components/error-message/index.js deleted file mode 100644 index 1c97a9955..000000000 --- a/ui/app/components/error-message/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './error-message.component' diff --git a/ui/app/components/error-message/index.scss b/ui/app/components/error-message/index.scss deleted file mode 100644 index 5915e21cf..000000000 --- a/ui/app/components/error-message/index.scss +++ /dev/null @@ -1,21 +0,0 @@ -.error-message { - min-height: 32px; - border: 1px solid $monzo; - color: $monzo; - background: lighten($monzo, 56%); - border-radius: 4px; - font-size: .75rem; - display: flex; - justify-content: flex-start; - align-items: center; - padding: 8px 16px; - - &__icon { - margin-right: 8px; - flex: 0 0 auto; - } - - &__text { - overflow: auto; - } -} diff --git a/ui/app/components/error-message/tests/error-message.component.test.js b/ui/app/components/error-message/tests/error-message.component.test.js deleted file mode 100644 index 8c5347173..000000000 --- a/ui/app/components/error-message/tests/error-message.component.test.js +++ /dev/null @@ -1,36 +0,0 @@ -import React from 'react' -import assert from 'assert' -import { shallow } from 'enzyme' -import ErrorMessage from '../error-message.component' - -describe('ErrorMessage Component', () => { - const t = key => `translate ${key}` - - it('should render a message from props.errorMessage', () => { - const wrapper = shallow( - <ErrorMessage - errorMessage="This is an error." - />, - { context: { t }} - ) - - assert.ok(wrapper) - assert.equal(wrapper.find('.error-message').length, 1) - assert.equal(wrapper.find('.error-message__icon').length, 1) - assert.equal(wrapper.find('.error-message__text').text(), 'ALERT: This is an error.') - }) - - it('should render a message translated from props.errorKey', () => { - const wrapper = shallow( - <ErrorMessage - errorKey="testKey" - />, - { context: { t }} - ) - - assert.ok(wrapper) - assert.equal(wrapper.find('.error-message').length, 1) - assert.equal(wrapper.find('.error-message__icon').length, 1) - assert.equal(wrapper.find('.error-message__text').text(), 'ALERT: translate testKey') - }) -}) |