aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/reducers
diff options
context:
space:
mode:
authorChi Kei Chan <chikeichan@gmail.com>2017-10-19 14:04:54 +0800
committerGitHub <noreply@github.com>2017-10-19 14:04:54 +0800
commit776e8241f0464939cc3049f7155c150e3375c623 (patch)
tree017600778515e74eaf15bf4f889e5b26638c56d7 /ui/app/reducers
parentde1da7d1b215ade650fc644adf63384a401dc240 (diff)
parenta8bba2f4b7ca714d46b2e1ca405aec3135aa23b2 (diff)
downloadtangerine-wallet-browser-776e8241f0464939cc3049f7155c150e3375c623.tar.gz
tangerine-wallet-browser-776e8241f0464939cc3049f7155c150e3375c623.tar.zst
tangerine-wallet-browser-776e8241f0464939cc3049f7155c150e3375c623.zip
Merge pull request #2402 from chikeichan/merge
[NewUI] Merge master into NewUI-flat
Diffstat (limited to 'ui/app/reducers')
-rw-r--r--ui/app/reducers/app.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 4f10d9857..f10bf9fb7 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -637,9 +637,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
}