aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorChi Kei Chan <chikeichan@gmail.com>2017-09-08 02:38:21 +0800
committerChi Kei Chan <chikeichan@gmail.com>2017-09-08 02:38:21 +0800
commitca69fa5d910351e1c813a431df9603b34cb7a901 (patch)
tree8fc133a1b80efc6c1e89f1ce37ee2dc89f14b7c6 /ui
parent687d2f755d4fe9129d785603e5332c8af71a3481 (diff)
downloadtangerine-wallet-browser-ca69fa5d910351e1c813a431df9603b34cb7a901.tar
tangerine-wallet-browser-ca69fa5d910351e1c813a431df9603b34cb7a901.tar.gz
tangerine-wallet-browser-ca69fa5d910351e1c813a431df9603b34cb7a901.tar.bz2
tangerine-wallet-browser-ca69fa5d910351e1c813a431df9603b34cb7a901.tar.lz
tangerine-wallet-browser-ca69fa5d910351e1c813a431df9603b34cb7a901.tar.xz
tangerine-wallet-browser-ca69fa5d910351e1c813a431df9603b34cb7a901.tar.zst
tangerine-wallet-browser-ca69fa5d910351e1c813a431df9603b34cb7a901.zip
Re-enable Contract tx list item
Diffstat (limited to 'ui')
-rw-r--r--ui/app/components/tx-list.js25
-rw-r--r--ui/app/components/tx-view.js2
2 files changed, 8 insertions, 19 deletions
diff --git a/ui/app/components/tx-list.js b/ui/app/components/tx-list.js
index 5066ab387..26782900c 100644
--- a/ui/app/components/tx-list.js
+++ b/ui/app/components/tx-list.js
@@ -34,19 +34,10 @@ TxList.prototype.render = function () {
return h('div.flex-column.tx-list-container', {}, [
- h('div.flex-row.tx-list-header-wrapper', {
- style: {},
- }, [
-
- h('div.flex-row.tx-list-header', {
- }, [
-
- h('div', {
- style: {},
- }, 'transactions'),
-
+ h('div.flex-row.tx-list-header-wrapper', [
+ h('div.flex-row.tx-list-header', [
+ h('div', 'transactions'),
]),
-
]),
this.renderTranstions(),
@@ -61,7 +52,7 @@ TxList.prototype.renderTranstions = function () {
? txsToRender.map((transaction) => {
return this.renderTransactionListItem(transaction)
})
- : h('div.tx-list-item.tx-list-item--empty', [ 'No Transactions' ])
+ : [h('div.tx-list-item.tx-list-item--empty', [ 'No Transactions' ])]
}
// TODO: Consider moving TxListItem into a separate component
@@ -87,9 +78,8 @@ TxList.prototype.renderTransactionListItem = function (transaction) {
} = props
const { showConfTxPage } = this.props
- if (!address) return null
-
const opts = {
+ key: transactionHash,
transactionStatus,
transActionId,
dateString,
@@ -102,9 +92,8 @@ TxList.prototype.renderTransactionListItem = function (transaction) {
if (transactionStatus === 'unapproved') {
opts.onClick = () => showConfTxPage({id: transActionId})
opts.className += '.tx-list-pending-item-container'
- opt.transactionStatus = 'Not Started'
- }
- else if (transactionHash) {
+ opts.transactionStatus = 'Not Started'
+ } else if (transactionHash) {
opts.onClick = () => this.view(transactionHash, transactionNetworkId)
}
diff --git a/ui/app/components/tx-view.js b/ui/app/components/tx-view.js
index f5ac6e2dc..59f55d485 100644
--- a/ui/app/components/tx-view.js
+++ b/ui/app/components/tx-view.js
@@ -142,7 +142,7 @@ TxView.prototype.render = function () {
this.renderHeroBalance(),
- h(TxList, {}),
+ h(TxList),
])
}