From 19db11856bef65c38d96eb1d6084d88ab6e7eebc Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Fri, 12 May 2017 12:41:31 -0700
Subject: Remove redux dependency from eth-balance and its dependent tree

For better unit testability of the conf-tx view.
---
 ui/app/send.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'ui/app/send.js')

diff --git a/ui/app/send.js b/ui/app/send.js
index eb32d5e06..d73744f70 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -21,6 +21,7 @@ function mapStateToProps (state) {
     warning: state.appState.warning,
     network: state.metamask.network,
     addressBook: state.metamask.addressBook,
+    conversionRate: state.metamask.conversionRate,
   }
 
   result.error = result.warning && result.warning.split('.')[0]
@@ -40,13 +41,14 @@ function SendTransactionScreen () {
 SendTransactionScreen.prototype.render = function () {
   this.persistentFormParentId = 'send-tx-form'
 
-  var state = this.props
-  var address = state.address
-  var account = state.account
-  var identity = state.identity
-  var network = state.network
-  var identities = state.identities
-  var addressBook = state.addressBook
+  var props = this.props
+  var address = props.address
+  var account = props.account
+  var identity = props.identity
+  var network = props.network
+  var identities = props.identities
+  var addressBook = props.addressBook
+  var conversionRate = props.conversionRate
 
   return (
 
@@ -125,6 +127,7 @@ SendTransactionScreen.prototype.render = function () {
 
             h(EthBalance, {
               value: account && account.balance,
+              conversionRate,
             }),
 
           ]),
@@ -147,7 +150,7 @@ SendTransactionScreen.prototype.render = function () {
       ]),
 
       // error message
-      state.error && h('span.error.flex-center', state.error),
+      props.error && h('span.error.flex-center', props.error),
 
       // 'to' field
       h('section.flex-row.flex-center', [
-- 
cgit 


From d5636080cf48fef8381a01006d4a3156a6b62aba Mon Sep 17 00:00:00 2001
From: kumavis <kumavis@users.noreply.github.com>
Date: Mon, 15 May 2017 23:12:47 -0700
Subject: ui - send - clean props assignment

---
 ui/app/send.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'ui/app/send.js')

diff --git a/ui/app/send.js b/ui/app/send.js
index d73744f70..6cfe909e6 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -41,14 +41,16 @@ function SendTransactionScreen () {
 SendTransactionScreen.prototype.render = function () {
   this.persistentFormParentId = 'send-tx-form'
 
-  var props = this.props
-  var address = props.address
-  var account = props.account
-  var identity = props.identity
-  var network = props.network
-  var identities = props.identities
-  var addressBook = props.addressBook
-  var conversionRate = props.conversionRate
+  const props = this.props
+  const {
+    address,
+    account,
+    identity,
+    network,
+    identities,
+    addressBook,
+    conversionRate
+  } = props
 
   return (
 
-- 
cgit 


From e28e0acaa8fb690a7fe5ac45597837f20d2079e1 Mon Sep 17 00:00:00 2001
From: kumavis <kumavis@users.noreply.github.com>
Date: Mon, 15 May 2017 23:21:46 -0700
Subject: lint - mandatory dangle

:stuck_out_tongue:
---
 ui/app/send.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/send.js')

diff --git a/ui/app/send.js b/ui/app/send.js
index 6cfe909e6..a313c6bee 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -49,7 +49,7 @@ SendTransactionScreen.prototype.render = function () {
     network,
     identities,
     addressBook,
-    conversionRate
+    conversionRate,
   } = props
 
   return (
-- 
cgit 


From b4e6ea9db787cbf7839d9caad6e1ea0385cc588e Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 16 May 2017 11:34:53 -0700
Subject: Fix fiat rendering

Fixes #1439.

When reorganizing fiat-value component to not use global state, had missed its necessary `currentCurrency` parameter.

This now passes it in wherever it's used.
---
 ui/app/send.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'ui/app/send.js')

diff --git a/ui/app/send.js b/ui/app/send.js
index a313c6bee..fd6994145 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -22,6 +22,7 @@ function mapStateToProps (state) {
     network: state.metamask.network,
     addressBook: state.metamask.addressBook,
     conversionRate: state.metamask.conversionRate,
+    currentCurrency: state.metamask.currentCurrency,
   }
 
   result.error = result.warning && result.warning.split('.')[0]
@@ -50,6 +51,7 @@ SendTransactionScreen.prototype.render = function () {
     identities,
     addressBook,
     conversionRate,
+    currentCurrency,
   } = props
 
   return (
@@ -130,6 +132,7 @@ SendTransactionScreen.prototype.render = function () {
             h(EthBalance, {
               value: account && account.balance,
               conversionRate,
+              currentCurrency,
             }),
 
           ]),
-- 
cgit