feature/default_network_editable
Dan Finlay 8 years ago
parent f57cbe59fc
commit 17f3f90d80
  1. 2
      ui/app/account-detail.js
  2. 4
      ui/app/components/shift-list-item.js
  3. 2
      ui/app/components/transaction-list-item.js
  4. 4
      ui/app/components/transaction-list.js

@ -143,7 +143,7 @@ AccountDetailScreen.prototype.render = function () {
style: {
display: 'flex',
alignItems: 'center',
}
},
}, [
h('img.cursor-pointer.color-orange', {
src: 'images/key-32.png',

@ -27,8 +27,7 @@ function ShiftListItem () {
ShiftListItem.prototype.render = function () {
var props = this.props
const { depositAddress, time, i, response } = props
const { transaction } = response
const { response } = props
return (
h('.transaction-list-item.flex-row', {
@ -117,7 +116,6 @@ ShiftListItem.prototype.renderUtilComponents = function () {
default:
return ''
}
}
ShiftListItem.prototype.renderInfo = function () {

@ -19,7 +19,7 @@ function TransactionListItem () {
}
TransactionListItem.prototype.render = function () {
const { transaction, i, network } = this.props
const { transaction, network } = this.props
if (transaction.key === 'shapeshift') {
if (network === '1') return h(ShiftListItem, transaction)
}

@ -2,7 +2,6 @@ const Component = require('react').Component
const h = require('react-hyperscript')
const inherits = require('util').inherits
const genAccountLink = require('../../lib/account-link')
const extension = require('../../../app/scripts/lib/extension')
const TransactionListItem = require('./transaction-list-item')
@ -17,12 +16,11 @@ function TransactionList () {
TransactionList.prototype.render = function () {
const { txsToRender, network, unconfMsgs, address } = this.props
var shapeShiftTxList
if (network === '1'){
if (network === '1') {
shapeShiftTxList = this.props.shapeShiftTxList
}
const transactions = !shapeShiftTxList ? txsToRender.concat(unconfMsgs) : txsToRender.concat(unconfMsgs, shapeShiftTxList)
.sort((a, b) => b.time - a.time)
const accountLink = genAccountLink(address, network)
return (

Loading…
Cancel
Save