Merge pull request #1430 from MetaMask/i1407-FixNonEditingTxForm

Add test around conf-tx view's gas editing.

1 files changed, 6 insertions, 2 deletions

diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index d592a5ad6..7cadb9d47 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -29,6 +29,7 @@ function mapStateToProps (state) {
     unapprovedMsgs: valuesFor(state.metamask.unapprovedMsgs),
     shapeShiftTxList: state.metamask.shapeShiftTxList,
     transactions: state.metamask.selectedAddressTxList || [],
+    conversionRate: state.metamask.conversionRate,
   }
 }
 
@@ -43,7 +44,7 @@ AccountDetailScreen.prototype.render = function () {
   var checksumAddress = selected && ethUtil.toChecksumAddress(selected)
   var identity = props.identities[selected]
   var account = props.accounts[selected]
-  const { network } = props
+  const { network, conversionRate } = props
 
   return (
 
@@ -182,6 +183,7 @@ AccountDetailScreen.prototype.render = function () {
 
           h(EthBalance, {
             value: account && account.balance,
+            conversionRate,
             style: {
               lineHeight: '7px',
               marginTop: '10px',
@@ -243,11 +245,13 @@ AccountDetailScreen.prototype.subview = function () {
 }
 
 AccountDetailScreen.prototype.transactionList = function () {
-  const {transactions, unapprovedMsgs, address, network, shapeShiftTxList } = this.props
+  const {transactions, unapprovedMsgs, address,
+    network, shapeShiftTxList, conversionRate } = this.props
   return h(TransactionList, {
     transactions: transactions.sort((a, b) => b.time - a.time),
     network,
     unapprovedMsgs,
+    conversionRate,
     address,
     shapeShiftTxList,
     viewPendingTx: (txId) => {