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/transaction-status | |
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/transaction-status')
4 files changed, 0 insertions, 142 deletions
diff --git a/ui/app/components/transaction-status/index.js b/ui/app/components/transaction-status/index.js deleted file mode 100644 index dece41e9c..000000000 --- a/ui/app/components/transaction-status/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './transaction-status.component' diff --git a/ui/app/components/transaction-status/index.scss b/ui/app/components/transaction-status/index.scss deleted file mode 100644 index e7daafeef..000000000 --- a/ui/app/components/transaction-status/index.scss +++ /dev/null @@ -1,45 +0,0 @@ -.transaction-status { - height: 26px; - width: 84px; - border-radius: 4px; - background-color: #f0f0f0; - color: #5e6064; - font-size: .625rem; - text-transform: uppercase; - display: flex; - justify-content: center; - align-items: center; - - @media screen and (max-width: $break-small) { - height: 16px; - width: 72px; - font-size: .5rem; - } - - &--confirmed { - background-color: #eafad7; - color: #609a1c; - - .transaction-status__transaction-count { - border: 1px solid #609a1c; - } - } - - &--approved, &--submitted { - background-color: #FFF2DB; - color: #CA810A; - - .transaction-status__transaction-count { - border: 1px solid #CA810A; - } - } - - &--failed { - background: lighten($monzo, 56%); - color: $monzo; - - .transaction-status__transaction-count { - border: 1px solid $monzo; - } - } -} diff --git a/ui/app/components/transaction-status/tests/transaction-status.component.test.js b/ui/app/components/transaction-status/tests/transaction-status.component.test.js deleted file mode 100644 index f4ddc9206..000000000 --- a/ui/app/components/transaction-status/tests/transaction-status.component.test.js +++ /dev/null @@ -1,33 +0,0 @@ -import React from 'react' -import assert from 'assert' -import { mount } from 'enzyme' -import TransactionStatus from '../transaction-status.component' -import Tooltip from '../../tooltip-v2' - -describe('TransactionStatus Component', () => { - it('should render APPROVED properly', () => { - const wrapper = mount( - <TransactionStatus - statusKey="approved" - title="test-title" - />, - { context: { t: str => str.toUpperCase() } } - ) - - assert.ok(wrapper) - assert.equal(wrapper.text(), 'APPROVED') - assert.equal(wrapper.find(Tooltip).props().title, 'test-title') - }) - - it('should render SUBMITTED properly', () => { - const wrapper = mount( - <TransactionStatus - statusKey="submitted" - />, - { context: { t: str => str.toUpperCase() } } - ) - - assert.ok(wrapper) - assert.equal(wrapper.text(), 'PENDING') - }) -}) diff --git a/ui/app/components/transaction-status/transaction-status.component.js b/ui/app/components/transaction-status/transaction-status.component.js deleted file mode 100644 index 28544d2cd..000000000 --- a/ui/app/components/transaction-status/transaction-status.component.js +++ /dev/null @@ -1,63 +0,0 @@ -import React, { PureComponent } from 'react' -import PropTypes from 'prop-types' -import classnames from 'classnames' -import Tooltip from '../tooltip-v2' -import { - UNAPPROVED_STATUS, - REJECTED_STATUS, - APPROVED_STATUS, - SIGNED_STATUS, - SUBMITTED_STATUS, - CONFIRMED_STATUS, - FAILED_STATUS, - DROPPED_STATUS, - CANCELLED_STATUS, -} from '../../constants/transactions' - -const statusToClassNameHash = { - [UNAPPROVED_STATUS]: 'transaction-status--unapproved', - [REJECTED_STATUS]: 'transaction-status--rejected', - [APPROVED_STATUS]: 'transaction-status--approved', - [SIGNED_STATUS]: 'transaction-status--signed', - [SUBMITTED_STATUS]: 'transaction-status--submitted', - [CONFIRMED_STATUS]: 'transaction-status--confirmed', - [FAILED_STATUS]: 'transaction-status--failed', - [DROPPED_STATUS]: 'transaction-status--dropped', - [CANCELLED_STATUS]: 'transaction-status--failed', -} - -const statusToTextHash = { - [SUBMITTED_STATUS]: 'pending', -} - -export default class TransactionStatus extends PureComponent { - static defaultProps = { - title: null, - } - - static contextTypes = { - t: PropTypes.func, - } - - static propTypes = { - statusKey: PropTypes.string, - className: PropTypes.string, - title: PropTypes.string, - } - - render () { - const { className, statusKey, title } = this.props - const statusText = this.context.t(statusToTextHash[statusKey] || statusKey) - - return ( - <div className={classnames('transaction-status', className, statusToClassNameHash[statusKey])}> - <Tooltip - position="top" - title={title} - > - { statusText } - </Tooltip> - </div> - ) - } -} |