diff options
author | Alexander Tseung <alextsg@gmail.com> | 2018-03-31 07:18:48 +0800 |
---|---|---|
committer | Alexander Tseung <alextsg@gmail.com> | 2018-03-31 07:18:48 +0800 |
commit | ba23843f91ca5046400cea14cea4c0d256578fec (patch) | |
tree | e29ef2a930930d4256bd7f59aa3d0274563bc4cf /ui/app/components/tx-list.js | |
parent | bdc4a6964ae83faa8229c50870e3bcc9b9074989 (diff) | |
parent | 8e0f39353dd47c4a201aaf2ee160912846f2e68b (diff) | |
download | tangerine-wallet-browser-ba23843f91ca5046400cea14cea4c0d256578fec.tar.gz tangerine-wallet-browser-ba23843f91ca5046400cea14cea4c0d256578fec.tar.zst tangerine-wallet-browser-ba23843f91ca5046400cea14cea4c0d256578fec.zip |
Fix merge conflicts
Diffstat (limited to 'ui/app/components/tx-list.js')
-rw-r--r-- | ui/app/components/tx-list.js | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ui/app/components/tx-list.js b/ui/app/components/tx-list.js index ca683f764..0cef64ca6 100644 --- a/ui/app/components/tx-list.js +++ b/ui/app/components/tx-list.js @@ -1,5 +1,6 @@ const Component = require('react').Component -const connect = require('../metamask-connect') +const PropTypes = require('prop-types') +const connect = require('react-redux').connect const h = require('react-hyperscript') const inherits = require('util').inherits const prefixForNetwork = require('../../lib/etherscan-prefix-for-network') @@ -19,6 +20,10 @@ module.exports = compose( connect(mapStateToProps, mapDispatchToProps) )(TxList) +TxList.contextTypes = { + t: PropTypes.func, +} + function mapStateToProps (state) { return { txsToRender: selectors.transactionsSelector(state), @@ -45,7 +50,7 @@ TxList.prototype.render = function () { return h('div.flex-column', [ h('div.flex-row.tx-list-header-wrapper', [ h('div.flex-row.tx-list-header', [ - h('div', this.props.t('transactions')), + h('div', this.context.t('transactions')), ]), ]), h('div.flex-column.tx-list-container', {}, [ @@ -62,7 +67,7 @@ TxList.prototype.renderTransaction = function () { : [h( 'div.tx-list-item.tx-list-item--empty', { key: 'tx-list-none' }, - [ this.props.t('noTransactions') ], + [ this.context.t('noTransactions') ], )] } @@ -116,7 +121,7 @@ TxList.prototype.renderTransactionListItem = function (transaction, conversionRa if (isUnapproved) { opts.onClick = () => history.push(CONFIRM_TRANSACTION_ROUTE) - opts.transactionStatus = this.props.t('notStarted') + opts.transactionStatus = this.context.t('notStarted') } else if (transactionHash) { opts.onClick = () => this.view(transactionHash, transactionNetworkId) } |