From bd9d89826c2bbd6e91a088040b7708de89658d1a Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 18 Aug 2016 16:23:12 -0700
Subject: Added `view more` button to transaction list

Visible at the end of the transaction list, or if no transactions are listed, displayed right after the `No Transactions` message.
---
 ui/app/account-detail.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ui/app/account-detail.js')

diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 2c98af0dd..cafc03503 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -248,6 +248,7 @@ AccountDetailScreen.prototype.transactionList = function () {
     network,
     unconfTxs,
     unconfMsgs,
+    address,
     viewPendingTx: (txId) => {
       this.props.dispatch(actions.viewPendingTx(txId))
     },
-- 
cgit v1.2.3


From f57cbe59fc9e0d3cfb3ee54da749470248fe2b8b Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 22 Aug 2016 14:36:21 -0700
Subject: Removed view more button, added account info button.

Also:
- Also fixed bug that caused React warning when rendering the tx history.
- Renamed 'Transactions' to 'History', since it now has more than that.
---
 ui/app/account-detail.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'ui/app/account-detail.js')

diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index e00a34c4a..4316ff54e 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -4,6 +4,7 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const connect = require('react-redux').connect
 const CopyButton = require('./components/copyButton')
+const AccountInfoLink = require('./components/account-info-link')
 const actions = require('./actions')
 const ReactCSSTransitionGroup = require('react-addons-css-transition-group')
 const valuesFor = require('./util').valuesFor
@@ -44,6 +45,7 @@ AccountDetailScreen.prototype.render = function () {
   var selected = props.address || Object.keys(props.accounts)[0]
   var identity = props.identities[selected]
   var account = props.accounts[selected]
+  const { network } = props
 
   return (
 
@@ -127,6 +129,9 @@ AccountDetailScreen.prototype.render = function () {
                   bottom: '15px',
                 },
               }, [
+
+                h(AccountInfoLink, { selected, network }),
+
                 h(CopyButton, {
                   value: ethUtil.toChecksumAddress(selected),
                 }),
@@ -136,16 +141,15 @@ AccountDetailScreen.prototype.render = function () {
                 }, [
                   h('div', {
                     style: {
-                      margin: '5px',
-                    },
+                      display: 'flex',
+                      alignItems: 'center',
+                    }
                   }, [
                     h('img.cursor-pointer.color-orange', {
                       src: 'images/key-32.png',
                       onClick: () => this.requestAccountExport(selected),
                       style: {
-                        margin: '0px 5px',
-                        width: '20px',
-                        height: '20px',
+                        height: '19px',
                       },
                     }),
                   ]),
-- 
cgit v1.2.3


From 17f3f90d805d91aedac517c8d6607a1f337c6525 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 22 Aug 2016 17:21:54 -0700
Subject: Linted

---
 ui/app/account-detail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/account-detail.js')

diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 4316ff54e..486a1a633 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -143,7 +143,7 @@ AccountDetailScreen.prototype.render = function () {
                     style: {
                       display: 'flex',
                       alignItems: 'center',
-                    }
+                    },
                   }, [
                     h('img.cursor-pointer.color-orange', {
                       src: 'images/key-32.png',
-- 
cgit v1.2.3