diff options
author | Thomas Huang <tmashuang@users.noreply.github.com> | 2017-10-31 21:08:29 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-31 21:08:29 +0800 |
commit | 7bfb08cf3b5ed93d28147e5ddaad18e3aaf49c8b (patch) | |
tree | 63b905ecfe40c7fcc3094df5593f6cc8e2a95ad1 | |
parent | e0030a8bf84c01184eaf251f6ef6a4b61bac2a01 (diff) | |
parent | 657449916556d3e8db24dbfbf0355e84a9ea0b09 (diff) | |
download | tangerine-wallet-browser-7bfb08cf3b5ed93d28147e5ddaad18e3aaf49c8b.tar tangerine-wallet-browser-7bfb08cf3b5ed93d28147e5ddaad18e3aaf49c8b.tar.gz tangerine-wallet-browser-7bfb08cf3b5ed93d28147e5ddaad18e3aaf49c8b.tar.bz2 tangerine-wallet-browser-7bfb08cf3b5ed93d28147e5ddaad18e3aaf49c8b.tar.lz tangerine-wallet-browser-7bfb08cf3b5ed93d28147e5ddaad18e3aaf49c8b.tar.xz tangerine-wallet-browser-7bfb08cf3b5ed93d28147e5ddaad18e3aaf49c8b.tar.zst tangerine-wallet-browser-7bfb08cf3b5ed93d28147e5ddaad18e3aaf49c8b.zip |
Merge pull request #2508 from watilde/fixes-1192
Remove warning message when show import page
-rw-r--r-- | ui/app/accounts/import/index.js | 1 | ||||
-rw-r--r-- | ui/app/reducers.js | 4 | ||||
-rw-r--r-- | ui/app/reducers/app.js | 1 |
3 files changed, 4 insertions, 2 deletions
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.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) }) } 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: |