diff options
author | kumavis <kumavis@users.noreply.github.com> | 2017-02-02 07:08:04 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-02 07:08:04 +0800 |
commit | 3afa3592feef33070a997e53cf3a8b358c5ff703 (patch) | |
tree | 204af19a6accbfa3bdf7be243284ee9286863d0a /ui/app/conf-tx.js | |
parent | 25c5a4462369f5209924a99cbe0395da13a6a0a7 (diff) | |
parent | c7b9adbfcbaa51082f193581b80bec4f86996f81 (diff) | |
download | tangerine-wallet-browser-3afa3592feef33070a997e53cf3a8b358c5ff703.tar tangerine-wallet-browser-3afa3592feef33070a997e53cf3a8b358c5ff703.tar.gz tangerine-wallet-browser-3afa3592feef33070a997e53cf3a8b358c5ff703.tar.bz2 tangerine-wallet-browser-3afa3592feef33070a997e53cf3a8b358c5ff703.tar.lz tangerine-wallet-browser-3afa3592feef33070a997e53cf3a8b358c5ff703.tar.xz tangerine-wallet-browser-3afa3592feef33070a997e53cf3a8b358c5ff703.tar.zst tangerine-wallet-browser-3afa3592feef33070a997e53cf3a8b358c5ff703.zip |
Merge pull request #1076 from MetaMask/messageManagerCleanUp
Message manager clean up
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r-- | ui/app/conf-tx.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index ca6c28ac9..a27219576 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -20,8 +20,8 @@ function mapStateToProps (state) { identities: state.metamask.identities, accounts: state.metamask.accounts, selectedAddress: state.metamask.selectedAddress, - unconfTxs: state.metamask.unconfTxs, - unconfMsgs: state.metamask.unconfMsgs, + unapprovedTxs: state.metamask.unapprovedTxs, + unapprovedMsgs: state.metamask.unapprovedMsgs, index: state.appState.currentView.context, warning: state.appState.warning, network: state.metamask.network, @@ -39,10 +39,10 @@ ConfirmTxScreen.prototype.render = function () { var network = state.network var provider = state.provider - var unconfTxs = state.unconfTxs - var unconfMsgs = state.unconfMsgs + var unapprovedTxs = state.unapprovedTxs + var unapprovedMsgs = state.unapprovedMsgs - var unconfTxList = txHelper(unconfTxs, unconfMsgs, network) + var unconfTxList = txHelper(unapprovedTxs, unapprovedMsgs, network) var index = state.index !== undefined && unconfTxList[index] ? state.index : 0 var txData = unconfTxList[index] || {} var txParams = txData.params || {} |