aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/app/account-detail.js3
-rw-r--r--ui/lib/explorer-link.js5
2 files changed, 6 insertions, 2 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 57f932a2b..250e7318c 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -16,7 +16,7 @@ function mapStateToProps(state) {
address: state.appState.currentView.context,
accountDetail: state.appState.accountDetail,
transactions: state.metamask.transactions,
- networkVersion: state.networkVersion,
+ networkVersion: state.metamask.network,
}
}
@@ -79,6 +79,7 @@ AccountDetailScreen.prototype.render = function() {
transactionList(transactions
.filter(tx => tx.txParams.from === state.address)
+ .filter(tx => tx.txParams.metamaskNetworkId === state.networkVersion)
.sort((a, b) => b.time - a.time), state.networkVersion),
this.exportedAccount(accountDetail),
diff --git a/ui/lib/explorer-link.js b/ui/lib/explorer-link.js
index a2e7872f9..92b3376fa 100644
--- a/ui/lib/explorer-link.js
+++ b/ui/lib/explorer-link.js
@@ -1,10 +1,13 @@
module.exports = function(hash, network) {
+ const net = parseInt(network)
let prefix
- switch (network) {
+ switch (net) {
case 1: // main net
prefix = ''
+ break
case 2: // morden test net
prefix = 'testnet.'
+ break
default:
prefix = ''
}