Merge branch 'master' into i390-TransactionLimit

1 files changed, 4 insertions, 7 deletions

diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index cafc03503..e00a34c4a 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -30,6 +30,7 @@ function mapStateToProps (state) {
     unconfTxs: valuesFor(state.metamask.unconfTxs),
     unconfMsgs: valuesFor(state.metamask.unconfMsgs),
     isEthWarningConfirmed: state.metamask.isEthConfirmed,
+    shapeShiftTxList: state.metamask.shapeShiftTxList,
   }
 }
 
@@ -179,12 +180,7 @@ AccountDetailScreen.prototype.render = function () {
               position: 'absolute',
               left: '219px',
             },
-          }, props.accountDetail.subview === 'buyForm' ? [h('i.fa.fa-arrow-left', {
-            style: {
-              width: '22.641px',
-              height: '14px',
-            },
-          })] : 'BUY'),
+          }, 'BUY'),
 
           h('button', {
             onClick: () => props.dispatch(actions.showSendPage()),
@@ -233,7 +229,7 @@ AccountDetailScreen.prototype.subview = function () {
 }
 
 AccountDetailScreen.prototype.transactionList = function () {
-  const { transactions, unconfTxs, unconfMsgs, address, network } = this.props
+  const { transactions, unconfTxs, unconfMsgs, address, network, shapeShiftTxList } = this.props
 
   var txsToRender = transactions
   // only transactions that are from the current address
@@ -249,6 +245,7 @@ AccountDetailScreen.prototype.transactionList = function () {
     unconfTxs,
     unconfMsgs,
     address,
+    shapeShiftTxList,
     viewPendingTx: (txId) => {
       this.props.dispatch(actions.viewPendingTx(txId))
     },