m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #2508 from watilde/fixes-1192

Browse Source 
Remove warning message when show import page
This commit is contained in:
Thomas Huang 2017-10-31 06:08:29 -07:00 committed by GitHub
commit 7bfb08cf3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/app/accounts/import/index.js
View File

@ -72,6 +72,7 @@ AccountImportSubview.prototype.render = function () {
} }
}), }),
onChange: (opt) => { onChange: (opt) => {
props.dispatch(actions.showImportPage())
this.setState({ type: opt.value }) this.setState({ type: opt.value })
}, },
}), }),

4
ui/app/reducers.js
View File

@ -43,7 +43,7 @@ function rootReducer (state, action) {
} }
window.logStateString = function (cb) { window.logStateString = function (cb) {
let state = window.METAMASK_CACHED_LOG_STATE const state = window.METAMASK_CACHED_LOG_STATE
const version = global.platform.getVersion() const version = global.platform.getVersion()
const browser = window.navigator.userAgent const browser = window.navigator.userAgent
return global.platform.getPlatformInfo((err, platform) => { return global.platform.getPlatformInfo((err, platform) => {
@ -53,7 +53,7 @@ window.logStateString = function (cb) {
state.version = version state.version = version
state.platform = platform state.platform = platform
state.browser = browser state.browser = browser
let stateString = JSON.stringify(state, removeSeedWords, 2) const stateString = JSON.stringify(state, removeSeedWords, 2)
return cb(null, stateString) return cb(null, stateString)
}) })
} }

1
ui/app/reducers/app.js
View File

@ -122,6 +122,7 @@ function reduceApp (state, action) {
name: 'import-menu', name: 'import-menu',
}, },
transForward: true, transForward: true,
warning: null,
}) })
case actions.SHOW_INFO_PAGE: case actions.SHOW_INFO_PAGE: