2 files changed, 87 insertions, 48 deletions

diff --git a/ui/app/components/tx-list.js b/ui/app/components/tx-list.js
index 8fa712b4a..368854786 100644
--- a/ui/app/components/tx-list.js
+++ b/ui/app/components/tx-list.js
@@ -2,24 +2,17 @@ const Component = require('react').Component
 const connect = require('react-redux').connect
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
+const selectors = require('../selectors')
+const Identicon = require('./identicon')
 
 const valuesFor = require('../util').valuesFor
 
 module.exports = connect(mapStateToProps)(TxList)
 
 function mapStateToProps (state) {
-  const network = state.metamask.network
-  const unapprovedMsgs = valuesFor(state.metamask.unapprovedMsgs)
-
-  const shapeShiftTxList = (network === '1') ? state.metamask.shapeShiftTxList : undefined
-  const transactions = state.metamask.selectedAddressTxList || []
-
-  const txsToRender = !shapeShiftTxList ? transactions.concat(unapprovedMsgs) : transactions.concat(unapprovedMsgs, shapeShiftTxList)
-  .sort((a, b) => b.time - a.time)
-
   return {
-    txsToRender,
-    conversionRate: state.metamask.conversionRate,
+    txsToRender: selectors.transactionsSelector(state),
+    conversionRate: selectors.conversionRateSelector(state),
   }
 }
 
@@ -56,18 +49,9 @@ TxList.prototype.render = function () {
       }, [
 
         h('div', {
-          style: {
-            borderBottom: '0.07em solid black',
-            paddingBottom: '0.015em',
-          }
+          style: {}
         }, 'TRANSACTIONS'),
 
-        h('div', {
-          style: {
-            marginLeft: '1.25em',
-          }
-        }, 'TOKENS'),
-
       ]),
     ]),
 
@@ -77,31 +61,77 @@ TxList.prototype.render = function () {
 
     contentDivider,
 
-    this.renderTransactionListItem(),
+    // this.renderTransactionListItem(),
 
-    contentDivider,
+    // contentDivider,
+
+    // this.renderTransactionListItem(),
+
+    // contentDivider,
+
+    // this.renderTransactionListItem(),
+
+    // contentDivider,
+
+    // this.renderTransactionListItem(),
+
+    // contentDivider,
+
+    // this.renderTransactionListItem(),
+
+    // contentDivider,
+
+    // this.renderTransactionListItem(),
+
+    // contentDivider,
+
+    // this.renderTransactionListItem(),
+
+    // contentDivider,
+
+    // this.renderTransactionListItem(),
+
+    // contentDivider,
+
+    // this.renderTransactionListItem(),
+
+    // contentDivider,
 
-    // column
-    // tab row
-    // divider
-    // item
   ])
 }
 
 TxList.prototype.renderTransactionListItem = function () {
+  // fake data
+  const props = {
+    dateString: 'Jul 01, 2017',
+    address: '0x82df11beb942beeed58d466fcb0f0791365c7684',
+    transactionStatus: 'Confirmed',
+    transactionAmount: '3'
+  }
+
+  const { address, transactionStatus, transactionAmount, dateString } = props
+
   return h('div.flex-column', {
     style: {
       alignItems: 'stretch',
+      justifyContent: 'flex-start',
       margin: '0.6em 1.3em 0.6em 1.3em',
+      overflow: 'none'
     }
   }, [
 
     h('div', {
       style: {
         flexGrow: 1,
+        flexShrink: 1,
+        flexBasis: 'auto',
         marginTop: '0.3em',
       }
-    }, 'Jul 01, 2017'),
+    }, [
+      h('span', {}, [
+        dateString,
+      ])
+    ]),
 
     h('div.flex-row', {
       style: {
@@ -113,28 +143,49 @@ TxList.prototype.renderTransactionListItem = function () {
         style: {
           flexGrow: 1,
         }
-      }, 'icon'),
+      }, [
+        h(Identicon, {
+          address,
+          diameter: 24,
+        })
+      ]),
 
       h('div', {
         style: {
           flexGrow: 3,
         }
-      }, 'Hash'),
+      }, [
+        h('span', {}, [
+          '0x82df11be...7684', //address
+        ]),
+      ]),
 
       h('div', {
         style: {
           flexGrow: 5,
         }
-      }, 'Status'),
+      }, [
+        h('span', {}, [
+          transactionStatus,
+        ]),
+      ]),
 
-      h('div', {
+      h('div.flex-column', {
         style: {
           flexGrow: 2,
         }
-      }, 'Details'),
+      }, [
 
-    ])
+        h('span', {}, [
+          transactionAmount,
+        ]),
+
+        h('span', {}, [
+          '300 USD',
+        ]),
 
+      ]),
+    ])
   ])
 }
 
diff --git a/ui/app/components/tx-view.js b/ui/app/components/tx-view.js
index ba93aae8b..0d1f3fc31 100644
--- a/ui/app/components/tx-view.js
+++ b/ui/app/components/tx-view.js
@@ -4,18 +4,11 @@ const h = require('react-hyperscript')
 const ethUtil = require('ethereumjs-util')
 const inherits = require('util').inherits
 const actions = require('../actions')
-// slideout menu
-const WalletView = require('./wallet-view')
 
-// balance component
+const WalletView = require('./wallet-view')
 const BalanceComponent = require('./balance-component')
-
-// tx list
 const TxList = require('./tx-list')
-
 const Identicon = require('./identicon')
-// const AccountDropdowns = require('./account-dropdowns').AccountDropdowns
-// const Content = require('./wallet-content-display')
 
 module.exports = connect(mapStateToProps, mapDispatchToProps)(TxView)
 
@@ -68,14 +61,13 @@ TxView.prototype.render = function () {
         this.props.sidebarOpen ? this.props.hideSidebar() : this.props.showSidebar()
       },
     }, [
-      // burger
+
       h('div.fa.fa-bars', {
         style: {
           fontSize: '1.3em',
         },
       }, []),
 
-      // account display
       h('.identicon-wrapper.select-none', {
         style: {
           marginLeft: '0.9em',
@@ -95,8 +87,6 @@ TxView.prototype.render = function () {
 
     ]),
 
-    // laptop: flex-row, flex-center
-    // mobile: flex-column
     h('div.hero-balance', {
       style: {},
     }, [
@@ -106,8 +96,6 @@ TxView.prototype.render = function () {
         style: {},
       }),
 
-      // laptop: 10vw?
-      // phone: 75vw?
       h('div.flex-row.flex-center.hero-balance-buttons', {
         style: {},
       }, [