diff --git a/app/views/console.js b/app/views/console.js index 4b4ccfc..b762398 100644 --- a/app/views/console.js +++ b/app/views/console.js @@ -34,6 +34,18 @@ const initialLog = ` In order to ensure you are adequately protecting your privacy when using Zcash, please see . `; +const defaultState = ` + \n + Block height | 0 + Connections | 0 + Network solution rate | 0 Sol/s + + You are currently not mining. + To enable mining, add 'gen=1' to your zcash.conf and restart. + Since starting this node 0 minutes, 0 seconds ago: +- You have validated 0 transactions! +`; + const breakpoints = [1, 4, 7, 10, 13]; type Props = {}; @@ -44,7 +56,7 @@ type State = { export class ConsoleView extends Component { state = { - log: '', + log: initialLog + defaultState, }; componentDidMount() { @@ -58,19 +70,15 @@ export class ConsoleView extends Component { return ( - {log ? ( - - - {log.split('\n').map((item, idx) => ( - - - {breakpoints.includes(idx) ?
: null} -
- ))} -
- ) : ( - - )} + + + {log.split('\n').map((item, idx) => ( + + + {breakpoints.includes(idx) ?
: null} +
+ ))} +
); } diff --git a/app/views/dashboard.js b/app/views/dashboard.js index 0c7381c..8f1f012 100644 --- a/app/views/dashboard.js +++ b/app/views/dashboard.js @@ -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 { render() { const { error, - isLoading, total, shielded, transparent, @@ -40,32 +39,26 @@ export class DashboardView extends PureComponent { const days = Object.keys(transactions); if (error) { - return error; + return ; } return ( - {isLoading ? ( - 'Loading' - ) : ( - - - {days.map(day => ( - - ))} - - )} + + {days.map(day => ( + + ))} ); } diff --git a/app/views/transactions.js b/app/views/transactions.js index 8fa7bff..19419d6 100644 --- a/app/views/transactions.js +++ b/app/views/transactions.js @@ -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 { } render() { - const { - error, isLoading, transactions, zecPrice, - } = this.props; + const { error, transactions, zecPrice } = this.props; if (error) { - return error; + return ; } const days = Object.keys(transactions); return ( - {isLoading - ? 'Loading' - : days.map(day => ( - - ))} + {days.map(day => ( + + ))} ); }