1 files changed, 32 insertions, 13 deletions
diff --git a/ui/app/accounts.js b/ui/app/accounts.js
index 16f37dc67..18ba1e67d 100644
--- a/ui/app/accounts.js
+++ b/ui/app/accounts.js
@@ -3,9 +3,12 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const connect = require('react-redux').connect
 const extend = require('xtend')
+const Identicon = require('./components/identicon')
 const actions = require('./actions')
 const AccountPanel = require('./components/account-panel')
 const valuesFor = require('./util').valuesFor
+const addressSummary = require('./util').addressSummary
+const formatBalance = require('./util').formatBalance
 
 module.exports = connect(mapStateToProps)(AccountsScreen)
 
@@ -40,24 +43,14 @@ AccountsScreen.prototype.render = function() {
 
       // subtitle and nav
       h('.section-title.flex-column.flex-center', [
-        h('h2.page-subtitle', 'Accounts'),
+        h('h2.page-subtitle', 'Select Account'),
       ]),
 
-      // current domain
-      /* AUDIT
-       * Temporarily removed
-       * since accounts are currently injected
-       * regardless of the current domain.
-       */
-      h('.current-domain-panel.flex-center.font-small', [
-        h('span', 'Selected address is visible to all sites you visit.'),
-        // h('span', state.currentDomain),
-      ]),
+      h('hr.horizontal-line'),
 
       // identity selection
       h('section.identity-section.flex-column', {
         style: {
-          maxHeight: '290px',
           overflowY: 'auto',
           overflowX: 'hidden',
         }
@@ -94,7 +87,33 @@ AccountsScreen.prototype.render = function() {
       isSelected: false,
       isFauceting: isFauceting,
     })
-    return h(AccountPanel, componentState)
+
+    return (
+      h('.accounts-list-option.flex-row.flex-space-between.cursor-pointer', {
+        style: {
+          flex: '1 0 auto',
+          background: isSelected ? 'white' : 'none',
+        },
+        onClick: (event) => actions.onShowDetail(identity.address, event),
+      }, [
+
+        h('.identicon-wrapper.flex-column.flex-center.select-none', [
+          h(Identicon, {
+            address: identity.address
+          }),
+        ]),
+
+        // account address, balance
+        h('.identity-data.flex-column.flex-justify-center.flex-grow.select-none', [
+
+          h('span', identity.name),
+          h('span.font-small', addressSummary(identity.address)),
+          h('span.font-small', formatBalance(account.balance)),
+
+        ]),
+
+      ])
+    )
   }
 }