Merge pull request #858 from MetaMask/i842-WaitForSeedWord

I842 wait for seed word

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 = ''