zecfoundation
/
zepio
mirror of https://github.com/ZcashFoundation/zepio.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: remove loading states from dashboard and transactions

This commit is contained in:
George Lima 2019-01-05 16:31:19 -03:00
parent 1891e21b5a
commit 2130e6e810
2 changed files with 27 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/views/dashboard.js
View File

@ -4,6 +4,7 @@ import React, { PureComponent, Fragment } from 'react';
import { WalletSummaryComponent } from '../components/wallet-summary'; import { WalletSummaryComponent } from '../components/wallet-summary';
import { TransactionDailyComponent } from '../components/transaction-daily'; import { TransactionDailyComponent } from '../components/transaction-daily';
import { TextComponent } from '../components/text';
import type { Transaction } from '../components/transaction-item'; import type { Transaction } from '../components/transaction-item';
@ -13,7 +14,6 @@ type Props = {
shielded: number, shielded: number,
transparent: number, transparent: number,
error: string | null, error: string | null,
isLoading: boolean,
zecPrice: number, zecPrice: number,
addresses: string[], addresses: string[],
transactions: { [day: string]: Transaction[] }, transactions: { [day: string]: Transaction[] },
@ -28,7 +28,6 @@ export class DashboardView extends PureComponent<Props> {
render() { render() {
const { const {
error, error,
isLoading,
total, total,
shielded, shielded,
transparent, transparent,
@ -40,32 +39,26 @@ export class DashboardView extends PureComponent<Props> {
const days = Object.keys(transactions); const days = Object.keys(transactions);
if (error) { if (error) {
return error; return <TextComponent value={error} />;
} }
return ( return (
<Fragment> <Fragment>
{isLoading ? ( <WalletSummaryComponent
'Loading' total={total}
) : ( shielded={shielded}
<Fragment> transparent={transparent}
<WalletSummaryComponent zecPrice={zecPrice}
total={total} addresses={addresses}
shielded={shielded} />
transparent={transparent} {days.map(day => (
zecPrice={zecPrice} <TransactionDailyComponent
addresses={addresses} transactionsDate={day}
/> transactions={transactions[day]}
{days.map(day => ( zecPrice={zecPrice}
<TransactionDailyComponent key={day}
transactionsDate={day} />
transactions={transactions[day]} ))}
zecPrice={zecPrice}
key={day}
/>
))}
</Fragment>
)}
</Fragment> </Fragment>
); );
} }

24
app/views/transactions.js
View File

@ -2,11 +2,11 @@
import React, { PureComponent, Fragment } from 'react'; import React, { PureComponent, Fragment } from 'react';
import { TransactionDailyComponent } from '../components/transaction-daily'; import { TransactionDailyComponent } from '../components/transaction-daily';
import { TextComponent } from '../components/text';
import type { Transaction } from '../components/transaction-item'; import type { Transaction } from '../components/transaction-item';
type Props = { type Props = {
isLoading: boolean,
error: string | null, error: string | null,
transactions: { [day: string]: Transaction[] }, transactions: { [day: string]: Transaction[] },
zecPrice: number, zecPrice: number,
@ -20,27 +20,23 @@ export class TransactionsView extends PureComponent<Props> {
} }
render() { render() {
const { const { error, transactions, zecPrice } = this.props;
error, isLoading, transactions, zecPrice,
} = this.props;
if (error) { if (error) {
return error; return <TextComponent value={error} />;
} }
const days = Object.keys(transactions); const days = Object.keys(transactions);
return ( return (
<Fragment> <Fragment>
{isLoading {days.map(day => (
? 'Loading' <TransactionDailyComponent
: days.map(day => ( transactionsDate={day}
<TransactionDailyComponent transactions={transactions[day]}
transactionsDate={day} zecPrice={zecPrice}
transactions={transactions[day]} />
zecPrice={zecPrice} ))}
/>
))}
</Fragment> </Fragment>
); );
} }