Merge branch 'master' into mascara

3 files changed, 4 insertions, 4 deletions

diff --git a/ui/lib/account-link.js b/ui/lib/account-link.js
index 948f32da1..4f27b35c0 100644
--- a/ui/lib/account-link.js
+++ b/ui/lib/account-link.js
@@ -9,7 +9,7 @@ module.exports = function (address, network) {
       link = `http://morden.etherscan.io/address/${address}`
       break
     case 3: // ropsten test net
-      link = `http://testnet.etherscan.io/address/${address}`
+      link = `http://ropsten.etherscan.io/address/${address}`
       break
     case 42: // kovan test net
       link = `http://kovan.etherscan.io/address/${address}`
diff --git a/ui/lib/explorer-link.js b/ui/lib/explorer-link.js
index 7ae19cca0..ca89f8b25 100644
--- a/ui/lib/explorer-link.js
+++ b/ui/lib/explorer-link.js
@@ -6,7 +6,7 @@ module.exports = function (hash, network) {
       prefix = ''
       break
     case 3: // ropsten test net
-      prefix = 'testnet.'
+      prefix = 'ropsten.'
       break
     case 42: // kovan test net
       prefix = 'kovan.'
diff --git a/ui/lib/tx-helper.js b/ui/lib/tx-helper.js
index 2eefdff68..ec19daf64 100644
--- a/ui/lib/tx-helper.js
+++ b/ui/lib/tx-helper.js
@@ -4,7 +4,7 @@ module.exports = function (unapprovedTxs, unapprovedMsgs, personalMsgs, network)
   log.debug('tx-helper called with params:')
   log.debug({ unapprovedTxs, unapprovedMsgs, personalMsgs, network })
 
-  const txValues = network ? valuesFor(unapprovedTxs).filter(tx => tx.txParams.metamaskNetworkId === network) : valuesFor(unapprovedTxs)
+  const txValues = network ? valuesFor(unapprovedTxs).filter(txMeta => txMeta.metamaskNetworkId === network) : valuesFor(unapprovedTxs)
   log.debug(`tx helper found ${txValues.length} unapproved txs`)
   const msgValues = valuesFor(unapprovedMsgs)
   log.debug(`tx helper found ${msgValues.length} unsigned messages`)
@@ -13,5 +13,5 @@ module.exports = function (unapprovedTxs, unapprovedMsgs, personalMsgs, network)
   log.debug(`tx helper found ${personalValues.length} unsigned personal messages`)
   allValues = allValues.concat(personalValues)
 
-  return allValues.sort(tx => tx.time)
+  return allValues.sort(txMeta => txMeta.time)
 }