aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/reducers
diff options
context:
space:
mode:
authorChi Kei Chan <chikeichan@gmail.com>2017-11-16 04:39:34 +0800
committerGitHub <noreply@github.com>2017-11-16 04:39:34 +0800
commitfbd04a6af6e9eda22eebaae27d712ae08272c131 (patch)
treebbb643e10e42d8113fe2d67d78efccd56b92322c /ui/app/reducers
parentf8d38f44c2612f0f291063814ec0e98bb4aaf4bb (diff)
parent03968ffafe27e64dcdf58764057cee1d67aa4168 (diff)
downloadtangerine-wallet-browser-fbd04a6af6e9eda22eebaae27d712ae08272c131.tar.gz
tangerine-wallet-browser-fbd04a6af6e9eda22eebaae27d712ae08272c131.tar.zst
tangerine-wallet-browser-fbd04a6af6e9eda22eebaae27d712ae08272c131.zip
Merge pull request #2590 from MetaMask/merge-master
Merge master
Diffstat (limited to 'ui/app/reducers')
-rw-r--r--ui/app/reducers/app.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index d84f264c9..3a4fb536d 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -175,6 +175,7 @@ function reduceApp (state, action) {
name: 'import-menu',
},
transForward: true,
+ warning: null,
})
case actions.SHOW_INFO_PAGE: