poanetwork
/
nifty-wallet
mirror of https://github.com/poanetwork/nifty-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix empty keyring on wrong password

This commit is contained in:
Victor Baranov 2018-09-12 17:03:03 +03:00
parent b5cae6a9eb
commit 1daf415499
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
old-ui/app/components/confirm-change-password.js
View File

@ -146,7 +146,7 @@ ConfirmChangePassword.prototype.ChangePassword = function () {
props.dispatch(actions.showConfigPage())
})
.catch((err) => {
this.warning = err
this.warning = err.message
props.dispatch(actions.displayWarning(this.warning))
})
}

1
old-ui/app/keychains/hd/restore-vault.js
View File

@ -156,7 +156,6 @@ RestoreVaultScreen.prototype.createNewVaultAndRestore = function () {
var passwordConfirm = passwordConfirmBox.value
if (password.length < 8) {
this.warning = 'Password not long enough'
this.props.dispatch(actions.displayWarning(this.warning))
return
}

8
package-lock.json generated
View File

@ -8579,9 +8579,9 @@
}
},
"eth-keychain-controller": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/eth-keychain-controller/-/eth-keychain-controller-4.0.2.tgz",
"integrity": "sha512-1NbyfdrmniEwcXdYhVeKRbw9JkqZRRexBM2QRydf613htE0jxzmQZaTMvMKV4rNL/S3fxYPd1AbLhQ3lZRiffw==",
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/eth-keychain-controller/-/eth-keychain-controller-5.0.0.tgz",
"integrity": "sha512-OOgX55AYn18br7Lt5ndD1WeyyBlZO7CvhevOsZ1CqGrcm7TWXeVjUFWO6cuYdY0mXueEGZWC/K3Ad9k8EiOKkA==",
"dev": true,
"requires": {
"bip39": "^2.4.0",
@ -8598,7 +8598,7 @@
"dependencies": {
"babelify": {
"version": "7.3.0",
"resolved": "https://registry.npmjs.org/babelify/-/babelify-7.3.0.tgz",
"resolved": "http://registry.npmjs.org/babelify/-/babelify-7.3.0.tgz",
"integrity": "sha1-qlau3nBn/XvVSWZu4W3ChQh+iOU=",
"dev": true,
"requires": {

2
package.json
View File

@ -245,7 +245,7 @@
"eslint-plugin-mocha": "^5.0.0",
"eslint-plugin-react": "^7.4.0",
"eth-json-rpc-middleware": "^1.6.0",
"eth-keychain-controller": "^4.0.2",
"eth-keychain-controller": "^5.0.0",
"file-loader": "^1.1.11",
"fs-promise": "^2.0.3",
"ganache-cli": "^6.1.0",

6
ui/app/actions.js
View File

@ -519,6 +519,10 @@ function requestRevealSeed (password) {
})
})
})
.catch((err) => {
dispatch(actions.displayWarning(err.message))
return Promise.reject(err)
})
}
}
@ -1671,7 +1675,7 @@ function markNoticeRead (notice) {
background.markNoticeRead(notice, (err, notice) => {
dispatch(actions.hideLoadingIndication())
if (err) {
dispatch(actions.displayWarning(err))
dispatch(actions.displayWarning(err.message))
return reject(err)
}