Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254

ui/app/components/shift-list-item.js

@@ -29,10 +29,7 @@ function ShiftListItem () {
 }
 
 ShiftListItem.prototype.render = function () {
-  const { selectedAddress, receivingAddress } = this.props
+  return h('div.tx-list-item.tx-list-clickable', {
-  return (
-    selectedAddress === receivingAddress
-      ? h('div.tx-list-item.tx-list-clickable', {
     style: {
       paddingTop: '20px',
       paddingBottom: '20px',
@@ -61,8 +58,6 @@ ShiftListItem.prototype.render = function () {
     this.renderInfo(),
     this.renderUtilComponents(),
   ])
-      : null
-  )
 }
 
 function formatDate (date) {

ui/app/components/tx-list.js

@@ -56,6 +56,7 @@ TxList.prototype.render = function () {
 
 TxList.prototype.renderTransaction = function () {
   const { txsToRender, conversionRate } = this.props
+
   return txsToRender.length
     ? txsToRender.map((transaction, i) => this.renderTransactionListItem(transaction, conversionRate, i))
     : [h(
@@ -71,11 +72,7 @@ TxList.prototype.renderTransactionListItem = function (transaction, conversionRa
   // refer to transaction-list.js:line 58
 
   if (transaction.key === 'shapeshift') {
-    return h('div', {
+    return h(ShiftListItem, { ...transaction, key: `shapeshift${index}` })
-      key: `shapeshift${index}`,
-    }, [
-      h(ShiftListItem, transaction),
-    ])
   }
 
   const props = {