diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2016-11-23 05:18:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-23 05:18:43 +0800 |
| commit | e14efa8f175e17bd671e0c38b3e743716ea4aa19 (patch) | |
| tree | 21db5d12547010031c30c77b498551f390109dd0 /ui | |
| parent | 4669f262e2bad5052aac804c3cff8a8c5ee825e3 (diff) | |
| parent | c4056a861a4a383b3bea18225e71435bdf75f6d0 (diff) | |
| download | tangerine-wallet-browser-e14efa8f175e17bd671e0c38b3e743716ea4aa19.tar.gz tangerine-wallet-browser-e14efa8f175e17bd671e0c38b3e743716ea4aa19.tar.zst tangerine-wallet-browser-e14efa8f175e17bd671e0c38b3e743716ea4aa19.zip | |
Merge pull request #858 from MetaMask/i842-WaitForSeedWord
I842 wait for seed word
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app/actions.js | 6 | ||||
| -rw-r--r-- | ui/lib/account-link.js | 6 |
2 files changed, 7 insertions, 5 deletions
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 = '' |