From ea56426b2355c1076c18256fb0b4e74f47ff4b39 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 21 Nov 2016 20:08:36 -0800
Subject: Use callback in placeSeedWord method.

When displaying seed words, we were not using a callback, which had some race condition potential.  This is simply a little cleaner and more correct.

Fixes #842
---
 ui/app/actions.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/ui/app/actions.js b/ui/app/actions.js
index e69b743e9..4a5507d33 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())
+      })
     })
   }
 }
-- 
cgit 


From 869d7313192df9ffa0941c3dc808dc73b812e656 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 22 Nov 2016 13:00:13 -0800
Subject: Restore ropsten link support

---
 ui/lib/account-link.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ui')

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