aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/app.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/app.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/app.js')
-rw-r--r--ui/app/app.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index d8dedd397..3bc4897c8 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -52,8 +52,8 @@ function mapStateToProps (state) {
activeAddress: state.appState.activeAddress,
transForward: state.appState.transForward,
seedWords: state.metamask.seedWords,
- unconfTxs: state.metamask.unconfTxs,
- unconfMsgs: state.metamask.unconfMsgs,
+ unapprovedTxs: state.metamask.unapprovedTxs,
+ unapprovedMsgs: state.metamask.unapprovedMsgs,
menuOpen: state.appState.menuOpen,
network: state.metamask.network,
provider: state.metamask.provider,