From 0bfa10e501f47197996002447a216f278d7e6eb5 Mon Sep 17 00:00:00 2001
From: Daijiro Wachi <daijiro.wachi@gmail.com>
Date: Mon, 30 Oct 2017 20:04:44 +0100
Subject: Remove warning message when show import page

Fixes: https://github.com/MetaMask/metamask-extension/issues/1192
---
 ui/app/accounts/import/index.js | 1 +
 ui/app/reducers/app.js          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ui/app/accounts/import/index.js b/ui/app/accounts/import/index.js
index 97b387229..46260c3e7 100644
--- a/ui/app/accounts/import/index.js
+++ b/ui/app/accounts/import/index.js
@@ -72,6 +72,7 @@ AccountImportSubview.prototype.render = function () {
             }
           }),
           onChange: (opt) => {
+            props.dispatch(actions.showImportPage())
             this.setState({ type: opt.value })
           },
         }),
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 6f08c6dc4..8558d6dca 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -122,6 +122,7 @@ function reduceApp (state, action) {
           name: 'import-menu',
         },
         transForward: true,
+        warning: null,
       })
 
     case actions.SHOW_INFO_PAGE:
-- 
cgit v1.2.3


From 657449916556d3e8db24dbfbf0355e84a9ea0b09 Mon Sep 17 00:00:00 2001
From: Daijiro Wachi <daijiro.wachi@gmail.com>
Date: Mon, 30 Oct 2017 20:08:10 +0100
Subject: Use const and fix lint warnings

---
 ui/app/reducers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/app/reducers.js b/ui/app/reducers.js
index 05136f70f..70b7e71dc 100644
--- a/ui/app/reducers.js
+++ b/ui/app/reducers.js
@@ -43,7 +43,7 @@ function rootReducer (state, action) {
 }
 
 window.logStateString = function (cb) {
-  let state = window.METAMASK_CACHED_LOG_STATE
+  const state = window.METAMASK_CACHED_LOG_STATE
   const version = global.platform.getVersion()
   const browser = window.navigator.userAgent
   return global.platform.getPlatformInfo((err, platform) => {
@@ -53,7 +53,7 @@ window.logStateString = function (cb) {
     state.version = version
     state.platform = platform
     state.browser = browser
-    let stateString = JSON.stringify(state, removeSeedWords, 2)
+    const stateString = JSON.stringify(state, removeSeedWords, 2)
     return cb(null, stateString)
   })
 }
-- 
cgit v1.2.3