From 7aca279a5fdf90a566d8231e837e930b709ad240 Mon Sep 17 00:00:00 2001 From: Frankie Date: Wed, 1 Feb 2017 12:19:22 -0800 Subject: [PATCH 1/3] fix transactions not showing up in history --- ui/app/account-detail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index aa418a1ba..86dc7c3d9 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -29,7 +29,7 @@ function mapStateToProps (state) { network: state.metamask.network, unconfMsgs: valuesFor(state.metamask.unconfMsgs), shapeShiftTxList: state.metamask.shapeShiftTxList, - transactions: state.metamask.selectedAccountTxList || [], + transactions: state.metamask.selectedAddressTxList } } From 23622632c6313c8657b3db9b7bdf1bbf51543ae1 Mon Sep 17 00:00:00 2001 From: Frankie Date: Wed, 1 Feb 2017 12:25:52 -0800 Subject: [PATCH 2/3] linting --- ui/app/account-detail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 86dc7c3d9..d43f73983 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -29,7 +29,7 @@ function mapStateToProps (state) { network: state.metamask.network, unconfMsgs: valuesFor(state.metamask.unconfMsgs), shapeShiftTxList: state.metamask.shapeShiftTxList, - transactions: state.metamask.selectedAddressTxList + transactions: state.metamask.selectedAddressTxList, } } From 6eb6057118f03c4a84f2f3e2fd1bf1672823059b Mon Sep 17 00:00:00 2001 From: Frankie Date: Wed, 1 Feb 2017 12:57:00 -0800 Subject: [PATCH 3/3] default a return of an empty array --- ui/app/account-detail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index d43f73983..ac7fe4098 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -29,7 +29,7 @@ function mapStateToProps (state) { network: state.metamask.network, unconfMsgs: valuesFor(state.metamask.unconfMsgs), shapeShiftTxList: state.metamask.shapeShiftTxList, - transactions: state.metamask.selectedAddressTxList, + transactions: state.metamask.selectedAddressTxList || [], } }