diff --git a/react/src/components/dashboard/main/dashboard.render.js b/react/src/components/dashboard/main/dashboard.render.js index ad59caa..0d201a2 100644 --- a/react/src/components/dashboard/main/dashboard.render.js +++ b/react/src/components/dashboard/main/dashboard.render.js @@ -30,7 +30,7 @@ const DashboardRender = function() { { !this.isNativeMode() && } { !this.isNativeMode() && } - + { !this.isNativeMode() && } diff --git a/react/src/components/dashboard/walletsData/walletsData.js b/react/src/components/dashboard/walletsData/walletsData.js index 72400e9..2915a55 100644 --- a/react/src/components/dashboard/walletsData/walletsData.js +++ b/react/src/components/dashboard/walletsData/walletsData.js @@ -24,7 +24,6 @@ import { PaginationItemsPerPageSelectorRender, PaginationRender, TxHistoryListRender, - UseCacheToggleRender, AddressListRender, WalletsDataRender } from './walletsData.render'; @@ -342,9 +341,11 @@ class WalletsData extends React.Component { renderTxHistoryList() { if (this.state.itemsList === 'loading') { - return ( -
{ translate('INDEX.LOADING_HISTORY') }...
- ); + if (!this.isNativeMode() || this.isFullySynced()) { + return ( +
{ translate('INDEX.LOADING_HISTORY') }...
+ ); + } } else if (this.state.itemsList === 'no data') { return (
{ translate('INDEX.NO_DATA') }
@@ -400,6 +401,18 @@ class WalletsData extends React.Component { })); } + renderAddress(tx) { + if (!tx.address) { + return ( + + { translate('DASHBOARD.ZADDR_NOT_LISTED') } + + ); + } + + return tx.address; + } + renderAddressByType(type) { const _addresses = this.props.ActiveCoin.addresses; @@ -422,7 +435,7 @@ class WalletsData extends React.Component {
  • this.updateAddressSelection(address, type, _amount) }>    - [ { _amount } { _coin } ]  { address } + [ { _amount } { _coin } ] { address }
  • @@ -454,8 +467,8 @@ class WalletsData extends React.Component { return _addresses.public[i].amount; } else { const address = _addresses.public[i].address; - const _amount = _cache[_coin] && _cache[_coin][address] && _cache[_coin][address].getbalance.data && _cache[_coin][address].getbalance.data.balance ? _cache[_coin][address].getbalance.data.balance : 'N/A'; - + const _amount = _cache && _cache[_coin] && _cache[_coin][address] && _cache[_coin][address].getbalance.data && _cache[_coin][address].getbalance.data.balance ? _cache[_coin][address].getbalance.data.balance : 'N/A'; + return _amount; } } @@ -491,11 +504,26 @@ class WalletsData extends React.Component { } } + isActiveCoinMode(coinMode) { + return this.props.ActiveCoin.mode === coinMode; + } + + isNativeMode() { + return this.isActiveCoinMode('native'); + } + + isFullMode() { + return this.isActiveCoinMode('full'); + } + + isBasiliskMode() { + return this.isActiveCoinMode('basilisk'); + } + render() { if (this.props && this.props.ActiveCoin && this.props.ActiveCoin.coin && - this.props.ActiveCoin.mode !== 'native' && !this.props.ActiveCoin.send && !this.props.ActiveCoin.receive) { return WalletsDataRender.call(this); diff --git a/react/src/components/dashboard/walletsData/walletsData.render.js b/react/src/components/dashboard/walletsData/walletsData.render.js index 2e1432f..877e743 100644 --- a/react/src/components/dashboard/walletsData/walletsData.render.js +++ b/react/src/components/dashboard/walletsData/walletsData.render.js @@ -74,12 +74,22 @@ export const PaginationRender = function(paginationFrom, paginationTo) { export const TxHistoryListRender = function(tx, index) { return ( + { this.isNativeMode() ? + + + { translate('IAPI.PUBLIC_SM') } + + + : + null + } { this.renderTxType(tx.category || tx.type) } { tx.confirmations } { tx.amount || translate('DASHBOARD.UNKNOWN') } - { secondsToString(tx.blocktime || tx.timestamp) } - { tx.address } - + { secondsToString(tx.blocktime || tx.timestamp || tx.time) } + { tx.address } + { this.renderAddress(tx) } + - - - ); -}; - -export const WalletsNativeTxHistoryRender = function() { - return ( -
    -
    -
    -
    -
    -
    -
    -
    -

    { translate('INDEX.TRANSACTION_HISTORY') }

    -
    -
    -
    -
    - { this.renderPaginationItemsPerPageSelector() } -
    -
    -
    - -
    -
    -
    -
    - - - - - - - - - - - - - - { this.renderTxHistoryList() } - - - - - - - - - - - - -
    { translate('INDEX.TYPE') }{ translate('INDEX.DIRECTION') }{ translate('INDEX.CONFIRMATIONS') }{ translate('INDEX.AMOUNT') }{ translate('INDEX.TIME') }{ translate('INDEX.DEST_ADDRESS') }{ translate('INDEX.TX_DETAIL') }
    { translate('INDEX.TYPE') }{ translate('INDEX.DIRECTION') }{ translate('INDEX.CONFIRMATIONS') }{ translate('INDEX.AMOUNT') }{ translate('INDEX.TIME') }{ translate('INDEX.DEST_ADDRESS') }{ translate('INDEX.TX_DETAIL') }
    -
    - { this.renderPagination() } -
    -
    -
    -
    -
    -
    -
    -
    - ); -}; \ No newline at end of file