m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

moved the props initialization steps into mapStateToProps

Browse Source
This commit is contained in:
Simon Liang 2017-08-10 11:06:37 +08:00
parent 9d36b25c5f
commit 87cb930130
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ui/app/components/tx-list.js
View File

@ -8,11 +8,17 @@ const valuesFor = require('../util').valuesFor
module.exports = connect(mapStateToProps)(TxList) module.exports = connect(mapStateToProps)(TxList)
function mapStateToProps (state) { function mapStateToProps (state) {
const network = state.metamask.network
const unapprovedMsgs = valuesFor(state.metamask.unapprovedMsgs)
const shapeShiftTxList = (network === '1') ? state.metamask.shapeShiftTxList : undefined
const transactions = state.metamask.selectedAddressTxList || []
const txsToRender = !shapeShiftTxList ? transactions.concat(unapprovedMsgs) : transactions.concat(unapprovedMsgs, shapeShiftTxList)
.sort((a, b) => b.time - a.time)
return { return {
network: state.metamask.network, txsToRender,
unapprovedMsgs: valuesFor(state.metamask.unapprovedMsgs),
shapeShiftTxList: state.metamask.shapeShiftTxList,
transactions: state.metamask.selectedAddressTxList || [],
conversionRate: state.metamask.conversionRate, conversionRate: state.metamask.conversionRate,
} }
} }
@ -33,16 +39,9 @@ const contentDivider = h('div', {
TxList.prototype.render = function () { TxList.prototype.render = function () {
const { transactions, network, unapprovedMsgs, conversionRate } = this.props const { txsToRender, conversionRate } = this.props
var shapeShiftTxList console.log('transactions to render', txsToRender)
if (network === '1') {
shapeShiftTxList = this.props.shapeShiftTxList
}
const txsToRender = !shapeShiftTxList ? transactions.concat(unapprovedMsgs) : transactions.concat(unapprovedMsgs, shapeShiftTxList)
.sort((a, b) => b.time - a.time)
console.log("transactions to render", txsToRender)
return h('div.flex-column.tx-list-container', {}, [ return h('div.flex-column.tx-list-container', {}, [