diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-10 23:38:27 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-10 23:38:27 +0800 |
| commit | 1816eca9144b13b3e869e2c3c95476b27c3e3aba (patch) | |
| tree | 356cc6269f6920bc20585e455811a43253fff777 /ui/app/reducers | |
| parent | 24a55cf7770a6154fe723cf13cdc9998e1759f3b (diff) | |
| parent | f18615a82abafee1a648e8de6f60ecc54e1aabb4 (diff) | |
| download | tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.tar tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.tar.gz tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.tar.bz2 tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.tar.lz tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.tar.xz tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.tar.zst tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.zip | |
Merge branch 'master' into version-debugging
Diffstat (limited to 'ui/app/reducers')
| -rw-r--r-- | ui/app/reducers/app.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 3a98d53a9..349c25b96 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -574,9 +574,9 @@ function checkUnconfActions (state) { function getUnconfActionList (state) { const { unapprovedTxs, unapprovedMsgs, - unapprovedPersonalMsgs, network } = state.metamask + unapprovedPersonalMsgs, unapprovedTypedMessages, network } = state.metamask - const unconfActionList = txHelper(unapprovedTxs, unapprovedMsgs, unapprovedPersonalMsgs, network) + const unconfActionList = txHelper(unapprovedTxs, unapprovedMsgs, unapprovedPersonalMsgs, unapprovedTypedMessages, network) return unconfActionList } |