aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/account-detail.js
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2017-01-28 08:11:59 +0800
committerFrankie <frankie.diamond@gmail.com>2017-01-29 12:28:20 +0800
commit8be68575bbef1dcc89b51355abaee90dbf018387 (patch)
treec8da5e217b838bff46bcc9ddfb8300133022ca91 /ui/app/account-detail.js
parenta8ed780d9b3659474c59c7856ab2ee1430c17b42 (diff)
downloadtangerine-wallet-browser-8be68575bbef1dcc89b51355abaee90dbf018387.tar
tangerine-wallet-browser-8be68575bbef1dcc89b51355abaee90dbf018387.tar.gz
tangerine-wallet-browser-8be68575bbef1dcc89b51355abaee90dbf018387.tar.bz2
tangerine-wallet-browser-8be68575bbef1dcc89b51355abaee90dbf018387.tar.lz
tangerine-wallet-browser-8be68575bbef1dcc89b51355abaee90dbf018387.tar.xz
tangerine-wallet-browser-8be68575bbef1dcc89b51355abaee90dbf018387.tar.zst
tangerine-wallet-browser-8be68575bbef1dcc89b51355abaee90dbf018387.zip
Clean up message manger includes:
Provider egine bump Remove presence of message manger in keyring controller Change the status wording fom conf to approved make Message manager a class fix messages not being apart of the badge re write message manger to better reflect controller pattern
Diffstat (limited to 'ui/app/account-detail.js')
-rw-r--r--ui/app/account-detail.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 387a1720a..7f6f155f3 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -27,7 +27,7 @@ function mapStateToProps (state) {
address: state.metamask.selectedAccount,
accountDetail: state.appState.accountDetail,
network: state.metamask.network,
- unconfMsgs: valuesFor(state.metamask.unconfMsgs),
+ unapprovedMsgs: valuesFor(state.metamask.unapprovedMsgs),
shapeShiftTxList: state.metamask.shapeShiftTxList,
transactions: state.metamask.selectedAccountTxList || [],
}
@@ -245,11 +245,11 @@ AccountDetailScreen.prototype.subview = function () {
}
AccountDetailScreen.prototype.transactionList = function () {
- const {transactions, unconfMsgs, address, network, shapeShiftTxList } = this.props
+ const {transactions, unapprovedMsgs, address, network, shapeShiftTxList } = this.props
return h(TransactionList, {
transactions: transactions.sort((a, b) => b.time - a.time),
network,
- unconfMsgs,
+ unapprovedMsgs,
address,
shapeShiftTxList,
viewPendingTx: (txId) => {