Merge pull request #2508 from watilde/fixes-1192

Remove warning message when show import page
feature/default_network_editable
Thomas Huang 7 years ago committed by GitHub
commit 7bfb08cf3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      ui/app/accounts/import/index.js
  2. 4
      ui/app/reducers.js
  3. 1
      ui/app/reducers/app.js

@ -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 })
}, },
}), }),

@ -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)
}) })
} }

@ -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:

Loading…
Cancel
Save