From ca69fa5d910351e1c813a431df9603b34cb7a901 Mon Sep 17 00:00:00 2001
From: Chi Kei Chan <chikeichan@gmail.com>
Date: Thu, 7 Sep 2017 11:38:21 -0700
Subject: Re-enable Contract tx list item

---
 ui/app/components/tx-list.js | 25 +++++++------------------
 ui/app/components/tx-view.js |  2 +-
 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),
 
   ])
 }
-- 
cgit