From 260de6532c50dceebee93acab70a3319afdb16fb Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Fri, 5 Aug 2016 12:18:44 -0700
Subject: Get fiat numbers rendering on tooltip. Need to find way to create
 line breaks.

---
 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 b1b0495eb..3cc1fb8ba 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -20,6 +20,7 @@ module.exports = connect(mapStateToProps)(AccountDetailScreen)
 
 function mapStateToProps (state) {
   return {
+    metamask: state.metamask,
     identities: state.metamask.identities,
     accounts: state.metamask.accounts,
     address: state.metamask.selectedAccount,
@@ -250,4 +251,3 @@ AccountDetailScreen.prototype.transactionList = function () {
 AccountDetailScreen.prototype.requestAccountExport = function () {
   this.props.dispatch(actions.requestExportAccount())
 }
-
-- 
cgit 


From 009784c79b5c0ebfd9dbe9536870c55e906e914d Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Tue, 16 Aug 2016 10:34:29 -0700
Subject: Divided eth components for tx and account detail.

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

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

diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 7af8aece7..7236a2471 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -9,6 +9,7 @@ const ReactCSSTransitionGroup = require('react-addons-css-transition-group')
 const valuesFor = require('./util').valuesFor
 
 const Identicon = require('./components/identicon')
+const AccountEtherBalance = require('./components/account-eth-balance')
 const EtherBalance = require('./components/eth-balance')
 const TransactionList = require('./components/transaction-list')
 const ExportAccountView = require('./components/account-export')
@@ -163,7 +164,7 @@ AccountDetailScreen.prototype.render = function () {
           },
         }, [
 
-          h(EtherBalance, {
+          h(AccountEtherBalance, {
             value: account && account.balance,
             mainBalance: true,
             style: {
-- 
cgit 


From 7d1b2db87e9d66735d0de04dc5e8c53e72e8431b Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Tue, 16 Aug 2016 10:48:31 -0700
Subject: linting and ignoring.

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

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

diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 7236a2471..190045c02 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -10,7 +10,6 @@ const valuesFor = require('./util').valuesFor
 
 const Identicon = require('./components/identicon')
 const AccountEtherBalance = require('./components/account-eth-balance')
-const EtherBalance = require('./components/eth-balance')
 const TransactionList = require('./components/transaction-list')
 const ExportAccountView = require('./components/account-export')
 const ethUtil = require('ethereumjs-util')
-- 
cgit 


From 3814bf8f5d75cd58243d2e9edd425a4ad085b876 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Tue, 16 Aug 2016 14:13:03 -0700
Subject: Change account list balance rendering.

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

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

diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 190045c02..2c98af0dd 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -165,7 +165,6 @@ AccountDetailScreen.prototype.render = function () {
 
           h(AccountEtherBalance, {
             value: account && account.balance,
-            mainBalance: true,
             style: {
               lineHeight: '7px',
               marginTop: '10px',
-- 
cgit