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/reducers/metamask.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/reducers/metamask.js')
-rw-r--r-- | ui/app/reducers/metamask.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index dec247c82..4f13c1ab1 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -12,7 +12,7 @@ function reduceMetamask (state, action) { isUnlocked: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: {}, - unconfTxs: {}, + unapprovedTxs: {}, currentFiat: 'USD', conversionRate: 0, conversionDate: 'N/A', @@ -76,17 +76,17 @@ function reduceMetamask (state, action) { case actions.COMPLETED_TX: var stringId = String(action.id) newState = extend(metamaskState, { - unconfTxs: {}, - unconfMsgs: {}, + unapprovedTxs: {}, + unapprovedMsgs: {}, }) - for (const id in metamaskState.unconfTxs) { + for (const id in metamaskState.unapprovedTxs) { if (id !== stringId) { - newState.unconfTxs[id] = metamaskState.unconfTxs[id] + newState.unapprovedTxs[id] = metamaskState.unapprovedTxs[id] } } - for (const id in metamaskState.unconfMsgs) { + for (const id in metamaskState.unapprovedMsgs) { if (id !== stringId) { - newState.unconfMsgs[id] = metamaskState.unconfMsgs[id] + newState.unapprovedMsgs[id] = metamaskState.unapprovedMsgs[id] } } return newState |