diff options
| -rw-r--r-- | app/scripts/keyring-controller.js | 7 | ||||
| -rw-r--r-- | test/unit/account-link-test.js | 10 | ||||
| -rw-r--r-- | ui/app/actions.js | 6 | ||||
| -rw-r--r-- | ui/lib/account-link.js | 6 |
4 files changed, 21 insertions, 8 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index bf6280016..34d81ace3 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -171,10 +171,15 @@ module.exports = class KeyringController extends EventEmitter { }) } - placeSeedWords () { + placeSeedWords (cb) { const firstKeyring = this.keyrings[0] const seedWords = firstKeyring.serialize().mnemonic this.configManager.setSeedWords(seedWords) + + if (cb) { + cb() + } + this.emit('update') } submitPassword (password, cb) { diff --git a/test/unit/account-link-test.js b/test/unit/account-link-test.js index 39889b6be..4ea12e002 100644 --- a/test/unit/account-link-test.js +++ b/test/unit/account-link-test.js @@ -3,9 +3,15 @@ var linkGen = require('../../ui/lib/account-link') describe('account-link', function() { - it('adds testnet prefix to morden test network', function() { + it('adds morden prefix to morden test network', function() { var result = linkGen('account', '2') - assert.notEqual(result.indexOf('testnet'), -1, 'testnet injected') + assert.notEqual(result.indexOf('morden'), -1, 'testnet included') + assert.notEqual(result.indexOf('account'), -1, 'account included') + }) + + it('adds testnet prefix to ropsten test network', function() { + var result = linkGen('account', '3') + assert.notEqual(result.indexOf('testnet'), -1, 'testnet included') assert.notEqual(result.indexOf('account'), -1, 'account included') }) diff --git a/ui/app/actions.js b/ui/app/actions.js index 8fc7e3a29..e78cf8a51 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -221,9 +221,11 @@ function requestRevealSeed (password) { return (dispatch) => { dispatch(actions.showLoadingIndication()) background.submitPassword(password, (err) => { - dispatch(actions.hideLoadingIndication()) if (err) return dispatch(actions.displayWarning(err.message)) - background.placeSeedWords() + background.placeSeedWords((err) => { + if (err) return dispatch(actions.displayWarning(err.message)) + dispatch(actions.hideLoadingIndication()) + }) }) } } diff --git a/ui/lib/account-link.js b/ui/lib/account-link.js index a29ba5e69..ff52d9c54 100644 --- a/ui/lib/account-link.js +++ b/ui/lib/account-link.js @@ -1,4 +1,4 @@ -module.exports = function (address, network) { +module.exports = function(address, network) { const net = parseInt(network) let link @@ -7,10 +7,10 @@ module.exports = function (address, network) { link = `http://etherscan.io/address/${address}` break case 2: // morden test net - link = `http://testnet.etherscan.io/address/${address}` + link = `http://morden.etherscan.io/address/${address}` break case 3: // ropsten test net - link = '' + link = `http://testnet.etherscan.io/address/${address}` break default: link = '' |