aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2017-10-03 08:28:15 +0800
committerChi Kei Chan <chikeichan@gmail.com>2017-10-03 09:09:45 +0800
commit45dbd017e65e5698db4580c77d723bface0e9b63 (patch)
tree5f644ac9994036ddb439b8456a8fba526fccb80f /ui
parentd206f183f5a07787535acd196c506145f00a199e (diff)
downloadtangerine-wallet-browser-45dbd017e65e5698db4580c77d723bface0e9b63.tar.gz
tangerine-wallet-browser-45dbd017e65e5698db4580c77d723bface0e9b63.tar.zst
tangerine-wallet-browser-45dbd017e65e5698db4580c77d723bface0e9b63.zip
Add needed iterator in tx-list and path to account in selectors.
Diffstat (limited to 'ui')
-rw-r--r--ui/app/components/tx-list.js7
-rw-r--r--ui/app/selectors.js2
2 files changed, 7 insertions, 2 deletions
diff --git a/ui/app/components/tx-list.js b/ui/app/components/tx-list.js
index 97d937aca..137cccf37 100644
--- a/ui/app/components/tx-list.js
+++ b/ui/app/components/tx-list.js
@@ -50,7 +50,11 @@ TxList.prototype.renderTransaction = function () {
const { txsToRender, conversionRate } = this.props
return txsToRender.length
? txsToRender.map((transaction, i) => this.renderTransactionListItem(transaction, conversionRate))
- : [h('div.tx-list-item.tx-list-item--empty', [ 'No Transactions' ])]
+ : [h(
+ 'div.tx-list-item.tx-list-item--empty',
+ { key: 'tx-list-none' },
+ [ 'No Transactions' ],
+ )]
}
// TODO: Consider moving TxListItem into a separate component
@@ -88,6 +92,7 @@ TxList.prototype.renderTransactionListItem = function (transaction, conversionRa
txParams: transaction.txParams,
transactionStatus,
transActionId,
+ key: transActionId,
dateString,
address,
transactionAmount,
diff --git a/ui/app/selectors.js b/ui/app/selectors.js
index 9a8bf5c7e..fdbc5fcde 100644
--- a/ui/app/selectors.js
+++ b/ui/app/selectors.js
@@ -13,7 +13,7 @@ module.exports = selectors
function getSelectedAddress (state) {
// TODO: accounts is not defined. Is it needed?
- const selectedAddress = state.metamask.selectedAddress || Object.keys(accounts)[0]
+ const selectedAddress = state.metamask.selectedAddress || Object.keys(state.metamask.accounts)[0]
return selectedAddress
}