aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/app/account-detail.js1
-rw-r--r--ui/app/components/transaction-list.js33
-rw-r--r--ui/lib/account-link.js18
3 files changed, 45 insertions, 7 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 2c98af0dd..cafc03503 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -248,6 +248,7 @@ AccountDetailScreen.prototype.transactionList = function () {
network,
unconfTxs,
unconfMsgs,
+ address,
viewPendingTx: (txId) => {
this.props.dispatch(actions.viewPendingTx(txId))
},
diff --git a/ui/app/components/transaction-list.js b/ui/app/components/transaction-list.js
index 886aa7c00..eae1965ff 100644
--- a/ui/app/components/transaction-list.js
+++ b/ui/app/components/transaction-list.js
@@ -1,6 +1,8 @@
const Component = require('react').Component
const h = require('react-hyperscript')
const inherits = require('util').inherits
+const genAccountLink = require('../../lib/account-link')
+const extension = require('../../../app/scripts/lib/extension')
const TransactionListItem = require('./transaction-list-item')
@@ -13,9 +15,10 @@ function TransactionList () {
}
TransactionList.prototype.render = function () {
- const { txsToRender, network, unconfMsgs } = this.props
+ const { txsToRender, network, unconfMsgs, address } = this.props
const transactions = txsToRender.concat(unconfMsgs)
.sort((a, b) => b.time - a.time)
+ const accountLink = genAccountLink(address, network)
return (
@@ -45,11 +48,11 @@ TransactionList.prototype.render = function () {
h('.tx-list', {
style: {
overflowY: 'auto',
- height: '305px',
+ height: '300px',
padding: '0 20px',
textAlign: 'center',
},
- }, (
+ }, [
transactions.length
? transactions.map((transaction, i) => {
@@ -59,13 +62,29 @@ TransactionList.prototype.render = function () {
this.props.viewPendingTx(txId)
},
})
- })
- : [h('.flex-center', {
+ }).concat(viewMoreButton(accountLink))
+ : h('.flex-center', {
style: {
+ flexDirection: 'column',
height: '100%',
},
- }, 'No transaction history...')]
- )),
+ }, [
+ 'No transaction history.',
+ viewMoreButton(accountLink),
+ ]),
+ ]),
])
)
}
+
+function viewMoreButton(url) {
+ return url ? h('button', {
+ style: {
+ margin: '10px',
+ },
+ onClick: (ev) => {
+ ev.preventDefault()
+ extension.tabs.create({ url })
+ }
+ }, 'View More') : null
+}
diff --git a/ui/lib/account-link.js b/ui/lib/account-link.js
new file mode 100644
index 000000000..eb958e22d
--- /dev/null
+++ b/ui/lib/account-link.js
@@ -0,0 +1,18 @@
+module.exports = function(address, network) {
+ const net = parseInt(network)
+ let link
+
+ switch (net) {
+ case 1: // main net
+ link = `http://etherscan.io/address/${address}`
+ break
+ case 2: // morden test net
+ link = `http://testnet.etherscan.io/address/${address}`
+ break
+ default:
+ link = ''
+ break
+ }
+
+ return link
+}