fix: remove loading states from dashboard and transactions
This commit is contained in:
parent
1891e21b5a
commit
2130e6e810
|
@ -4,6 +4,7 @@ import React, { PureComponent, Fragment } from 'react';
|
|||
|
||||
import { WalletSummaryComponent } from '../components/wallet-summary';
|
||||
import { TransactionDailyComponent } from '../components/transaction-daily';
|
||||
import { TextComponent } from '../components/text';
|
||||
|
||||
import type { Transaction } from '../components/transaction-item';
|
||||
|
||||
|
@ -13,7 +14,6 @@ type Props = {
|
|||
shielded: number,
|
||||
transparent: number,
|
||||
error: string | null,
|
||||
isLoading: boolean,
|
||||
zecPrice: number,
|
||||
addresses: string[],
|
||||
transactions: { [day: string]: Transaction[] },
|
||||
|
@ -28,7 +28,6 @@ export class DashboardView extends PureComponent<Props> {
|
|||
render() {
|
||||
const {
|
||||
error,
|
||||
isLoading,
|
||||
total,
|
||||
shielded,
|
||||
transparent,
|
||||
|
@ -40,32 +39,26 @@ export class DashboardView extends PureComponent<Props> {
|
|||
const days = Object.keys(transactions);
|
||||
|
||||
if (error) {
|
||||
return error;
|
||||
return <TextComponent value={error} />;
|
||||
}
|
||||
|
||||
return (
|
||||
<Fragment>
|
||||
{isLoading ? (
|
||||
'Loading'
|
||||
) : (
|
||||
<Fragment>
|
||||
<WalletSummaryComponent
|
||||
total={total}
|
||||
shielded={shielded}
|
||||
transparent={transparent}
|
||||
zecPrice={zecPrice}
|
||||
addresses={addresses}
|
||||
/>
|
||||
{days.map(day => (
|
||||
<TransactionDailyComponent
|
||||
transactionsDate={day}
|
||||
transactions={transactions[day]}
|
||||
zecPrice={zecPrice}
|
||||
key={day}
|
||||
/>
|
||||
))}
|
||||
</Fragment>
|
||||
)}
|
||||
<WalletSummaryComponent
|
||||
total={total}
|
||||
shielded={shielded}
|
||||
transparent={transparent}
|
||||
zecPrice={zecPrice}
|
||||
addresses={addresses}
|
||||
/>
|
||||
{days.map(day => (
|
||||
<TransactionDailyComponent
|
||||
transactionsDate={day}
|
||||
transactions={transactions[day]}
|
||||
zecPrice={zecPrice}
|
||||
key={day}
|
||||
/>
|
||||
))}
|
||||
</Fragment>
|
||||
);
|
||||
}
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
import React, { PureComponent, Fragment } from 'react';
|
||||
|
||||
import { TransactionDailyComponent } from '../components/transaction-daily';
|
||||
import { TextComponent } from '../components/text';
|
||||
|
||||
import type { Transaction } from '../components/transaction-item';
|
||||
|
||||
type Props = {
|
||||
isLoading: boolean,
|
||||
error: string | null,
|
||||
transactions: { [day: string]: Transaction[] },
|
||||
zecPrice: number,
|
||||
|
@ -20,27 +20,23 @@ export class TransactionsView extends PureComponent<Props> {
|
|||
}
|
||||
|
||||
render() {
|
||||
const {
|
||||
error, isLoading, transactions, zecPrice,
|
||||
} = this.props;
|
||||
const { error, transactions, zecPrice } = this.props;
|
||||
|
||||
if (error) {
|
||||
return error;
|
||||
return <TextComponent value={error} />;
|
||||
}
|
||||
|
||||
const days = Object.keys(transactions);
|
||||
|
||||
return (
|
||||
<Fragment>
|
||||
{isLoading
|
||||
? 'Loading'
|
||||
: days.map(day => (
|
||||
<TransactionDailyComponent
|
||||
transactionsDate={day}
|
||||
transactions={transactions[day]}
|
||||
zecPrice={zecPrice}
|
||||
/>
|
||||
))}
|
||||
{days.map(day => (
|
||||
<TransactionDailyComponent
|
||||
transactionsDate={day}
|
||||
transactions={transactions[day]}
|
||||
zecPrice={zecPrice}
|
||||
/>
|
||||
))}
|
||||
</Fragment>
|
||||
);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue