From 31175625b446cb5d18b17db23018bca8b14d280c Mon Sep 17 00:00:00 2001 From: Chi Kei Chan Date: Thu, 21 Mar 2019 16:03:30 -0700 Subject: 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 --- ui/app/components/transaction-breakdown/index.js | 1 - ui/app/components/transaction-breakdown/index.scss | 24 ----- .../tests/transaction-breakdown.component.test.js | 33 ------- .../transaction-breakdown-row/index.js | 1 - .../transaction-breakdown-row/index.scss | 19 ---- .../transaction-breakdown-row.component.test.js | 39 -------- .../transaction-breakdown-row.component.js | 26 ----- .../transaction-breakdown.component.js | 106 --------------------- .../transaction-breakdown.container.js | 29 ------ 9 files changed, 278 deletions(-) delete mode 100644 ui/app/components/transaction-breakdown/index.js delete mode 100644 ui/app/components/transaction-breakdown/index.scss delete mode 100644 ui/app/components/transaction-breakdown/tests/transaction-breakdown.component.test.js delete mode 100644 ui/app/components/transaction-breakdown/transaction-breakdown-row/index.js delete mode 100644 ui/app/components/transaction-breakdown/transaction-breakdown-row/index.scss delete mode 100644 ui/app/components/transaction-breakdown/transaction-breakdown-row/tests/transaction-breakdown-row.component.test.js delete mode 100644 ui/app/components/transaction-breakdown/transaction-breakdown-row/transaction-breakdown-row.component.js delete mode 100644 ui/app/components/transaction-breakdown/transaction-breakdown.component.js delete mode 100644 ui/app/components/transaction-breakdown/transaction-breakdown.container.js (limited to 'ui/app/components/transaction-breakdown') diff --git a/ui/app/components/transaction-breakdown/index.js b/ui/app/components/transaction-breakdown/index.js deleted file mode 100644 index 4a5b52663..000000000 --- a/ui/app/components/transaction-breakdown/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './transaction-breakdown.container' diff --git a/ui/app/components/transaction-breakdown/index.scss b/ui/app/components/transaction-breakdown/index.scss deleted file mode 100644 index b56cbdd7f..000000000 --- a/ui/app/components/transaction-breakdown/index.scss +++ /dev/null @@ -1,24 +0,0 @@ -@import './transaction-breakdown-row/index'; - -.transaction-breakdown { - &__title { - border-bottom: 1px solid #d8d8d8; - padding-bottom: 4px; - text-transform: capitalize; - } - - &__row-title { - text-transform: capitalize; - } - - &__value { - text-align: end; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - - &--eth-total { - font-weight: 500; - } - } -} diff --git a/ui/app/components/transaction-breakdown/tests/transaction-breakdown.component.test.js b/ui/app/components/transaction-breakdown/tests/transaction-breakdown.component.test.js deleted file mode 100644 index 4512b84f0..000000000 --- a/ui/app/components/transaction-breakdown/tests/transaction-breakdown.component.test.js +++ /dev/null @@ -1,33 +0,0 @@ -import React from 'react' -import assert from 'assert' -import { shallow } from 'enzyme' -import TransactionBreakdown from '../transaction-breakdown.component' - -describe('TransactionBreakdown Component', () => { - it('should render properly', () => { - const transaction = { - history: [], - id: 1, - status: 'confirmed', - txParams: { - from: '0x1', - gas: '0x5208', - gasPrice: '0x3b9aca00', - nonce: '0xa4', - to: '0x2', - value: '0x2386f26fc10000', - }, - } - - const wrapper = shallow( - , - { context: { t: (str1, str2) => str2 ? str1 + str2 : str1 } } - ) - - assert.ok(wrapper.hasClass('transaction-breakdown')) - assert.ok(wrapper.hasClass('test-class')) - }) -}) diff --git a/ui/app/components/transaction-breakdown/transaction-breakdown-row/index.js b/ui/app/components/transaction-breakdown/transaction-breakdown-row/index.js deleted file mode 100644 index 557bf75fb..000000000 --- a/ui/app/components/transaction-breakdown/transaction-breakdown-row/index.js +++ /dev/null @@ -1 +0,0 @@ -export { default } from './transaction-breakdown-row.component' diff --git a/ui/app/components/transaction-breakdown/transaction-breakdown-row/index.scss b/ui/app/components/transaction-breakdown/transaction-breakdown-row/index.scss deleted file mode 100644 index 8c73be1a6..000000000 --- a/ui/app/components/transaction-breakdown/transaction-breakdown-row/index.scss +++ /dev/null @@ -1,19 +0,0 @@ -.transaction-breakdown-row { - font-size: .75rem; - color: $scorpion; - display: flex; - justify-content: space-between; - padding: 8px 0; - - &:not(:last-child) { - border-bottom: 1px solid #d8d8d8; - } - - &__title { - padding-right: 8px; - } - - &__value { - min-width: 0; - } -} diff --git a/ui/app/components/transaction-breakdown/transaction-breakdown-row/tests/transaction-breakdown-row.component.test.js b/ui/app/components/transaction-breakdown/transaction-breakdown-row/tests/transaction-breakdown-row.component.test.js deleted file mode 100644 index c19399dbb..000000000 --- a/ui/app/components/transaction-breakdown/transaction-breakdown-row/tests/transaction-breakdown-row.component.test.js +++ /dev/null @@ -1,39 +0,0 @@ -import React from 'react' -import assert from 'assert' -import { shallow } from 'enzyme' -import TransactionBreakdownRow from '../transaction-breakdown-row.component' -import Button from '../../../button' - -describe('TransactionBreakdownRow Component', () => { - it('should render text properly', () => { - const wrapper = shallow( - - Test - , - { context: { t: (str1, str2) => str2 ? str1 + str2 : str1 } } - ) - - assert.ok(wrapper.hasClass('transaction-breakdown-row')) - assert.equal(wrapper.find('.transaction-breakdown-row__title').text(), 'test') - assert.equal(wrapper.find('.transaction-breakdown-row__value').text(), 'Test') - }) - - it('should render components properly', () => { - const wrapper = shallow( - - - , - { context: { t: (str1, str2) => str2 ? str1 + str2 : str1 } } - ) - - assert.ok(wrapper.hasClass('transaction-breakdown-row')) - assert.equal(wrapper.find('.transaction-breakdown-row__title').text(), 'test') - assert.ok(wrapper.find('.transaction-breakdown-row__value').find(Button)) - }) -}) diff --git a/ui/app/components/transaction-breakdown/transaction-breakdown-row/transaction-breakdown-row.component.js b/ui/app/components/transaction-breakdown/transaction-breakdown-row/transaction-breakdown-row.component.js deleted file mode 100644 index c11ff8efa..000000000 --- a/ui/app/components/transaction-breakdown/transaction-breakdown-row/transaction-breakdown-row.component.js +++ /dev/null @@ -1,26 +0,0 @@ -import React, { PureComponent } from 'react' -import PropTypes from 'prop-types' -import classnames from 'classnames' - -export default class TransactionBreakdownRow extends PureComponent { - static propTypes = { - title: PropTypes.string, - children: PropTypes.node, - className: PropTypes.string, - } - - render () { - const { title, children, className } = this.props - - return ( -
-
- { title } -
-
- { children } -
-
- ) - } -} diff --git a/ui/app/components/transaction-breakdown/transaction-breakdown.component.js b/ui/app/components/transaction-breakdown/transaction-breakdown.component.js deleted file mode 100644 index 26dc4c153..000000000 --- a/ui/app/components/transaction-breakdown/transaction-breakdown.component.js +++ /dev/null @@ -1,106 +0,0 @@ -import React, { PureComponent } from 'react' -import PropTypes from 'prop-types' -import classnames from 'classnames' -import TransactionBreakdownRow from './transaction-breakdown-row' -import CurrencyDisplay from '../currency-display' -import UserPreferencedCurrencyDisplay from '../user-preferenced-currency-display' -import HexToDecimal from '../hex-to-decimal' -import { GWEI, PRIMARY, SECONDARY } from '../../constants/common' - -export default class TransactionBreakdown extends PureComponent { - static contextTypes = { - t: PropTypes.func, - } - - static propTypes = { - transaction: PropTypes.object, - className: PropTypes.string, - nativeCurrency: PropTypes.string.isRequired, - showFiat: PropTypes.bool, - gas: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), - gasPrice: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), - value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), - gasUsed: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), - totalInHex: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), - } - - static defaultProps = { - transaction: {}, - showFiat: true, - } - - render () { - const { t } = this.context - const { gas, gasPrice, value, className, nativeCurrency, showFiat, totalInHex, gasUsed } = this.props - - return ( -
-
- { t('transaction') } -
- - - - - {typeof gas !== 'undefined' - ? - : '?' - } - - { - typeof gasUsed === 'string' && ( - - - - ) - } - - {typeof gasPrice !== 'undefined' - ? - : '?' - } - - -
- - { - showFiat && ( - - ) - } -
- -
- ) - } -} diff --git a/ui/app/components/transaction-breakdown/transaction-breakdown.container.js b/ui/app/components/transaction-breakdown/transaction-breakdown.container.js deleted file mode 100644 index 3e85b9e23..000000000 --- a/ui/app/components/transaction-breakdown/transaction-breakdown.container.js +++ /dev/null @@ -1,29 +0,0 @@ -import { connect } from 'react-redux' -import TransactionBreakdown from './transaction-breakdown.component' -import {getIsMainnet, getNativeCurrency, preferencesSelector} from '../../selectors' -import { getHexGasTotal } from '../../helpers/confirm-transaction/util' -import { sumHexes } from '../../helpers/transactions.util' - -const mapStateToProps = (state, ownProps) => { - const { transaction } = ownProps - const { txParams: { gas, gasPrice, value } = {}, txReceipt: { gasUsed } = {} } = transaction - const { showFiatInTestnets } = preferencesSelector(state) - const isMainnet = getIsMainnet(state) - - const gasLimit = typeof gasUsed === 'string' ? gasUsed : gas - - const hexGasTotal = gasLimit && gasPrice && getHexGasTotal({ gasLimit, gasPrice }) || '0x0' - const totalInHex = sumHexes(hexGasTotal, value) - - return { - nativeCurrency: getNativeCurrency(state), - showFiat: (isMainnet || !!showFiatInTestnets), - totalInHex, - gas, - gasPrice, - value, - gasUsed, - } -} - -export default connect(mapStateToProps)(TransactionBreakdown) -- cgit v1.2.3