aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/app/components/transaction-list.js44
-rw-r--r--ui/app/send.js2
2 files changed, 33 insertions, 13 deletions
diff --git a/ui/app/components/transaction-list.js b/ui/app/components/transaction-list.js
index d1cdf8604..e01c8c1f0 100644
--- a/ui/app/components/transaction-list.js
+++ b/ui/app/components/transaction-list.js
@@ -31,19 +31,39 @@ __proto__
Object
*/
const h = require('react-hyperscript')
+const formatBalance = require('../util').formatBalance
module.exports = function(transactions) {
- return h('.tx-list',
- transactions.map((transaction) => {
- return h('.tx.flex-row.flex-space-around', [
- h('a.font-small',
- {
- href: 'http://testnet.etherscan.io/tx/0xfc37bda95ce571bd0a393e8e7f6da394f1420a57b7d53f7c93821bff61f9b580',
- target: '_blank',
+ return h('details', [
+
+ h('summary', [
+ h('div.font-small', {style: {display: 'inline'}}, 'Transaction Summary'),
+ ]),
+
+ h('.flex-row.flex-space-around', [
+ h('div.font-small','Transaction'),
+ h('div.font-small','Amount'),
+ ]),
+
+ h('.tx-list', {
+ style: {
+ overflowY: 'auto',
+ height: '180px',
},
- '0xfc37bda...b580'),
- h('div.font-small', '0.5000 ETH')
- ])
- })
- )
+ },
+
+ transactions.map((transaction) => {
+ return h('.tx.flex-row.flex-space-around', [
+ h('a.font-small',
+ {
+ href: 'http://testnet.etherscan.io/tx/0xfc37bda95ce571bd0a393e8e7f6da394f1420a57b7d53f7c93821bff61f9b580',
+ target: '_blank',
+ },
+ '0xfc37bda...b580'),
+ h('div.font-small', formatBalance(transaction.txParams.value))
+ ])
+ })
+ )
+
+ ])
}
diff --git a/ui/app/send.js b/ui/app/send.js
index 3cb56cb6e..ad4a27604 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -96,7 +96,7 @@ SendTransactionScreen.prototype.render = function() {
}, 'Send')
]),
- state.warning ? h('span.error', state.warning) : null,
+ state.warning ? h('span.error', state.warning.split('.')[0]) : null,
])
)
}