Skip to content
This repository was archived by the owner on Apr 15, 2019. It is now read-only.

Transactions tab should provide "No transactions" message- Closes #522 #602

Merged
merged 2 commits into from
Aug 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/components/transactions/transactions.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
--btn: rgb(2,136,209);
}


.grayButton, .inButton, .outButton, .smallButton {
background-color: #eee;
border-radius: 3px;
Expand All @@ -19,7 +18,10 @@
.inButton {
background: color(var(--in) alpha(45%))!important;
}

.empty{
color: #777;
text-align: right;
}
.outButton {
background: color(var(--out) alpha(45%))!important;
}
Expand Down
10 changes: 7 additions & 3 deletions src/components/transactions/transactionsComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import tableStyle from 'react-toolbox/lib/table/theme.css';
import { transactions } from '../../utils/api/account';
import TransactionsHeader from './transactionsHeader';
import TransactionRow from './transactionRow';
import styles from './transactions.css';

class Transactions extends React.Component {
constructor() {
Expand All @@ -25,8 +26,9 @@ class Transactions extends React.Component {

render() {
return (
<div className='box'>
<table className={tableStyle.table}>
<div className='box noPaddingBox'>
{this.props.transactions.length > 0 ?
<table className={tableStyle.table}>
<TransactionsHeader tableStyle={tableStyle}></TransactionsHeader>
<tbody>
{this.props.transactions.map(transaction => (
Expand All @@ -37,7 +39,9 @@ class Transactions extends React.Component {
</TransactionRow>
))}
</tbody>
</table>
</table> :
<p className={`${styles.empty} hasPaddingRow`}>No transactions</p>
}
<Waypoint onEnter={() => { this.loadMore(); } }></Waypoint>
</div>
);
Expand Down