Merge branch 'master' into i1237-xmlfix2

feature/default_network_editable
Dan Finlay 8 years ago committed by GitHub
commit 76e7d6fbb1
  1. 3
      ui/app/accounts/import/json.js
  2. 3
      ui/app/accounts/import/private-key.js

@ -60,7 +60,7 @@ JsonImportSubview.prototype.render = function () {
},
}, 'Import'),
error ? h('span.warning', error) : null,
error ? h('span.error', error) : null,
])
)
}
@ -95,4 +95,3 @@ JsonImportSubview.prototype.createNewKeychain = function () {
this.props.dispatch(actions.importNewAccount('JSON File', [ fileContents, password ]))
}

@ -48,7 +48,7 @@ PrivateKeyImportView.prototype.render = function () {
},
}, 'Import'),
error ? h('span.warning', error) : null,
error ? h('span.error', error) : null,
])
)
}
@ -65,4 +65,3 @@ PrivateKeyImportView.prototype.createNewKeychain = function () {
const privateKey = input.value
this.props.dispatch(actions.importNewAccount('Private Key', [ privateKey ]))
}

Loading…
Cancel
Save