diff options
author | kumavis <kumavis@users.noreply.github.com> | 2016-05-06 05:35:44 +0800 |
---|---|---|
committer | kumavis <kumavis@users.noreply.github.com> | 2016-05-06 05:35:44 +0800 |
commit | b863fe16e885e8548f371898532c914a6540ebed (patch) | |
tree | 9a58a4bd5fc4e9c87c388cd9c2a8fc380453cc88 | |
parent | e0a91c6fc915a495443821f5586216fe2a5e655c (diff) | |
parent | ebb0aac7ddcc077a671390648231178b53801e53 (diff) | |
download | tangerine-wallet-browser-b863fe16e885e8548f371898532c914a6540ebed.tar tangerine-wallet-browser-b863fe16e885e8548f371898532c914a6540ebed.tar.gz tangerine-wallet-browser-b863fe16e885e8548f371898532c914a6540ebed.tar.bz2 tangerine-wallet-browser-b863fe16e885e8548f371898532c914a6540ebed.tar.lz tangerine-wallet-browser-b863fe16e885e8548f371898532c914a6540ebed.tar.xz tangerine-wallet-browser-b863fe16e885e8548f371898532c914a6540ebed.tar.zst tangerine-wallet-browser-b863fe16e885e8548f371898532c914a6540ebed.zip |
Merge pull request #178 from MetaMask/AlwaysShowTransactionList
Always show transaction list
-rw-r--r-- | CHANGELOG.md | 1 | ||||
-rw-r--r-- | ui/app/components/transaction-list.js | 28 |
2 files changed, 11 insertions, 18 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6165b8789..e5687a0ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Added buttons to the account export process. - Improved visual appearance of account detail transition where button heights would change. - Restored back button to account detail view. +- Show transaction list always, never collapsed. ## 1.7.0 2016-04-29 diff --git a/ui/app/components/transaction-list.js b/ui/app/components/transaction-list.js index 90f2955e6..115fd91f8 100644 --- a/ui/app/components/transaction-list.js +++ b/ui/app/components/transaction-list.js @@ -4,23 +4,16 @@ const addressSummary = require('../util').addressSummary const explorerLink = require('../../lib/explorer-link') module.exports = function(transactions, network) { - return h('details', { key: 'transaction-list' }, [ + return h('.tx-list', { + style: { + overflowY: 'auto', + height: '180px', + textAlign: 'center', + }, + }, - h('summary', [ + [ h('div.font-small', {style: {display: 'inline'}}, 'Transactions'), - ]), - - h('.flex-row.flex-space-around', [ - h('div.font-small','To'), - h('div.font-small','Amount'), - ]), - - h('.tx-list', { - style: { - overflowY: 'auto', - height: '180px', - }, - }, transactions.map((transaction) => { return h('.tx.flex-row.flex-space-around', [ @@ -33,7 +26,6 @@ module.exports = function(transactions, network) { h('div.font-small', formatBalance(transaction.txParams.value)) ]) }) - ) - - ]) + ] + ) } |