@@ -219,12 +224,17 @@ export const WalletsDataRender = function() {
+ { this.isNativeMode() ?
+ { translate('INDEX.TYPE') } |
+ :
+ null
+ }
{ translate('INDEX.DIRECTION') } |
{ translate('INDEX.CONFIRMATIONS') } |
{ translate('INDEX.AMOUNT') } |
{ translate('INDEX.TIME') } |
- { translate('INDEX.DEST_ADDRESS') } |
- { translate('INDEX.TX_DETAIL') } |
+ { translate('INDEX.DEST_ADDRESS') } |
+ { translate('INDEX.TX_DETAIL') } |
@@ -232,12 +242,17 @@ export const WalletsDataRender = function() {
+ { this.isNativeMode() ?
+ { translate('INDEX.TYPE') } |
+ :
+ null
+ }
{ translate('INDEX.DIRECTION') } |
{ translate('INDEX.CONFIRMATIONS') } |
{ translate('INDEX.AMOUNT') } |
{ translate('INDEX.TIME') } |
- { translate('INDEX.DEST_ADDRESS') } |
- { translate('INDEX.TX_DETAIL') } |
+ { translate('INDEX.DEST_ADDRESS') } |
+ { translate('INDEX.TX_DETAIL') } |
diff --git a/react/src/components/dashboard/walletsNative/walletsNative.render.js b/react/src/components/dashboard/walletsNative/walletsNative.render.js
index 290299f..72ecaaf 100644
--- a/react/src/components/dashboard/walletsNative/walletsNative.render.js
+++ b/react/src/components/dashboard/walletsNative/walletsNative.render.js
@@ -3,7 +3,7 @@ import WalletsBalance from '../walletsBalance/walletsBalance';
import WalletsNativeInfo from '../walletsNativeInfo/walletsNativeInfo';
import WalletsNativeSend from '../walletsNativeSend/walletsNativeSend';
import WalletsProgress from '../walletsProgress/walletsProgress';
-import WalletsNativeTxHistory from '../walletsNativeTxHistory/walletsNativeTxHistory';
+import WalletsData from '../walletsData/walletsData';
import ReceiveCoin from '../receiveCoin/receiveCoin';
const WalletsNativeRender = function() {
@@ -30,7 +30,7 @@ const WalletsNativeRender = function() {
-
+
diff --git a/react/src/components/dashboard/walletsNativeTxHistory/walletsNativeTxHistory.js b/react/src/components/dashboard/walletsNativeTxHistory/walletsNativeTxHistory.js
deleted file mode 100644
index 935c907..0000000
--- a/react/src/components/dashboard/walletsNativeTxHistory/walletsNativeTxHistory.js
+++ /dev/null
@@ -1,219 +0,0 @@
-import React from 'react';
-import { translate } from '../../../translate/translate';
-import { sortByDate } from '../../../util/sort';
-import { toggleDashboardTxInfoModal } from '../../../actions/actionCreators';
-import Store from '../../../store';
-import {
- PaginationItemsPerPageSelectorRender,
- PaginationRender,
- TxHistoryListRender,
- WalletsNativeTxHistoryRender
-} from './walletsNativeTxHistory.render';
-
-class WalletsNativeTxHistory extends React.Component {
- constructor(props) {
- super(props);
- this.state = {
- itemsPerPage: 10,
- activePage: 1,
- itemsList: null,
- };
- this.updateInput = this.updateInput.bind(this);
- }
-
- // TODO: implement sorting
- // implement pagination past X items should call listtransactions to get new chunk of data
- // z transactions
- // filter based on addr
-
- toggleTxInfoModal(display, txIndex) {
- Store.dispatch(
- toggleDashboardTxInfoModal(
- display,
- txIndex
- )
- );
- }
-
- isFullySynced() {
- if (this.props.Dashboard &&
- this.props.Dashboard.progress &&
- this.props.Dashboard.progress.balances &&
- (Number(this.props.Dashboard.progress.balances) +
- Number(this.props.Dashboard.progress.validated) +
- Number(this.props.Dashboard.progress.bundles) +
- Number(this.props.Dashboard.progress.utxo)) / 4 === 100) {
- return true;
- } else {
- return false;
- }
- }
-
- updateInput(e) {
- let historyToSplit = sortByDate(this.props.ActiveCoin.txhistory);
- historyToSplit = historyToSplit.slice(0, e.target.value);
-
- this.setState({
- [e.target.name]: e.target.value,
- activePage: 1,
- itemsList: historyToSplit,
- });
- }
-
- renderTxType(category) {
- if (category === 'send') {
- return (
-
- { translate('DASHBOARD.OUT') }
-
- );
- }
- if (category === 'receive') {
- return (
-
- { translate('DASHBOARD.IN') }
-
- );
- }
- if (category === 'generate') {
- return (
-
- { translate('DASHBOARD.MINED') }
-
- );
- }
- if (category === 'immature') {
- return (
-
- { translate('DASHBOARD.IMMATURE') }
-
- );
- }
- }
-
- renderAddress(tx) {
- if (!tx.address) {
- return (
-
- { translate('DASHBOARD.ZADDR_NOT_LISTED') }
-
- );
- } else {
- return (tx.address);
- }
- }
-
- componentWillReceiveProps(props) {
- if (!this.state.itemsList ||
- (this.state.itemsList && !this.state.itemsList.length) ||
- (props.ActiveCoin.txhistory !== this.props.ActiveCoin.txhistory)) {
- if (this.props.ActiveCoin.txhistory &&
- this.props.ActiveCoin.txhistory !== 'loading' &&
- this.props.ActiveCoin.txhistory !== 'no data') {
- let historyToSplit = sortByDate(this.props.ActiveCoin.txhistory);
- historyToSplit = historyToSplit.slice(
- (this.state.activePage - 1) * this.state.itemsPerPage,
- this.state.activePage * this.state.itemsPerPage
- );
-
- this.setState(Object.assign({}, this.state, {
- itemsList: historyToSplit,
- }));
- }
- }
- }
-
- updateCurrentPage(page) {
- let historyToSplit = sortByDate(this.props.ActiveCoin.txhistory);
- historyToSplit = historyToSplit.slice(
- (page - 1) * this.state.itemsPerPage,
- page * this.state.itemsPerPage
- );
-
- this.setState(Object.assign({}, this.state, {
- activePage: page,
- itemsList: historyToSplit,
- }));
- }
-
- renderPaginationItems() {
- let items = [];
-
- for (let i = 0; i < Math.floor(this.props.ActiveCoin.txhistory.length / this.state.itemsPerPage); i++) {
- items.push(
-
- this.updateCurrentPage(i + 1) : null }>{ i + 1 }
-
- );
- }
-
- return items;
- }
-
- renderPaginationItemsPerPageSelector() {
- if (this.props.ActiveCoin.txhistory &&
- this.props.ActiveCoin.txhistory !== 'loading' &&
- this.props.ActiveCoin.txhistory.length > 10) {
- return PaginationItemsPerPageSelectorRender.call(this);
- } else {
- return null;
- }
- }
-
- renderPagination() {
- if (this.props.ActiveCoin.txhistory &&
- this.props.ActiveCoin.txhistory !== 'loading' &&
- this.props.ActiveCoin.txhistory.length > 10) {
- const _paginationStart = ((this.state.activePage - 1) * this.state.itemsPerPage) + 1;
- const _paginationEnd = this.state.activePage * this.state.itemsPerPage;
- const _paginationNextState = this.state.activePage > Math.floor(this.props.ActiveCoin.txhistory.length / this.state.itemsPerPage);
-
- return PaginationRender.call(
- this,
- _paginationStart,
- _paginationEnd,
- _paginationNextState
- );
- }
-
- return null;
- }
-
- renderTxHistoryList() {
- if (this.props.ActiveCoin.txhistory &&
- this.props.ActiveCoin.txhistory === 'no data') {
- return translate('INDEX.NO_DATA');
- } else if (
- this.props.ActiveCoin.txhistory &&
- this.props.ActiveCoin.txhistory === 'loading') {
- if (this.isFullySynced()) {
- return translate('INDEX.LOADING_HISTORY');
- } else {
- return translate('INDEX.WAIT_UNTIL_SYNCED');
- }
- } else if (
- this.props.ActiveCoin.txhistory &&
- (this.props.ActiveCoin.txhistory !== 'loading' && this.props.ActiveCoin.txhistory !== 'no data')) {
- if (this.state.itemsList &&
- this.state.itemsList.length &&
- this.props.ActiveCoin.nativeActiveSection === 'default') {
- return TxHistoryListRender.call(this);
- }
-
- return null;
- }
- }
-
- render() {
- if (this.props &&
- this.props.ActiveCoin.nativeActiveSection === 'default') {
- return WalletsNativeTxHistoryRender.call(this);
- }
-
- return null;
- }
-}
-
-export default WalletsNativeTxHistory;
diff --git a/react/src/components/dashboard/walletsNativeTxHistory/walletsNativeTxHistory.render.js b/react/src/components/dashboard/walletsNativeTxHistory/walletsNativeTxHistory.render.js
deleted file mode 100644
index e0a72fc..0000000
--- a/react/src/components/dashboard/walletsNativeTxHistory/walletsNativeTxHistory.render.js
+++ /dev/null
@@ -1,152 +0,0 @@
-import React from 'react';
-import { translate } from '../../../translate/translate';
-import { secondsToString } from '../../../util/time';
-
-export const PaginationItemsPerPageSelectorRender = function() {
- return (
-
-
-
- );
-};
-
-export const PaginationRender = function(paginationStart, paginationEnd, paginationNextState) {
- return (
-
-
-
- { translate('INDEX.SHOWING') }
- { paginationStart }
- { translate('INDEX.TO') }
- { paginationEnd }
- { translate('INDEX.OF') }
- { this.props.ActiveCoin.txhistory.length }
- { translate('INDEX.ENTRIES_SM') }
-
-
-
-
- );
-};
-
-export const TxHistoryListRender = function() {
- return this.state.itemsList.map((tx, index) =>
-
-
-
- { translate('IAPI.PUBLIC_SM') }
-
- |
- { this.renderTxType(tx.category) } |
- { tx.confirmations } |
- { tx.amount } |
- { secondsToString(tx.time) } |
- { this.renderAddress(tx) } |
-
-
- |
-
- );
-};
-
-export const WalletsNativeTxHistoryRender = function() {
- return (
-
-
-
-
-
-
-
-
- { translate('INDEX.TRANSACTION_HISTORY') }
-
-
-
-
- { this.renderPaginationItemsPerPageSelector() }
-
-
-
-
-
-
-
-
-
-
-
- { translate('INDEX.TYPE') } |
- { translate('INDEX.DIRECTION') } |
- { translate('INDEX.CONFIRMATIONS') } |
- { translate('INDEX.AMOUNT') } |
- { translate('INDEX.TIME') } |
- { translate('INDEX.DEST_ADDRESS') } |
- { translate('INDEX.TX_DETAIL') } |
-
-
-
- { 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') } |
-
-
-
-
- { this.renderPagination() }
-
-
-
-
-
-
-
-
- );
-};
\ No newline at end of file