diff --git a/react/src/components/dashboard/main/dashboard.scss b/react/src/components/dashboard/main/dashboard.scss
index 638aa79..0df5362 100755
--- a/react/src/components/dashboard/main/dashboard.scss
+++ b/react/src/components/dashboard/main/dashboard.scss
@@ -147,4 +147,22 @@
.ReactTable .rt-tfoot .rt-td {
text-align: center;
+}
+
+.ReactTable .rt-thead .rt-th.-sort-asc,
+.ReactTable .rt-thead .rt-td.-sort-asc,
+.ReactTable .rt-thead .rt-th.-sort-desc,
+.ReactTable .rt-thead .rt-td.-sort-desc{
+ box-shadow: none;
+}
+
+.ReactTable .rt-thead .rt-th.-sort-asc div:nth-child(1):after {
+ font-family: FontAwesome;
+ padding-left: 5px;
+ content: "\f106";
+}
+.ReactTable .rt-thead .rt-th.-sort-desc div:nth-child(1):after {
+ font-family: FontAwesome;
+ padding-left: 5px;
+ content: "\f107";
}
\ No newline at end of file
diff --git a/react/src/components/dashboard/walletsData/pagination.render.js b/react/src/components/dashboard/walletsData/pagination.render.js
index 2e930f0..f90af8a 100644
--- a/react/src/components/dashboard/walletsData/pagination.render.js
+++ b/react/src/components/dashboard/walletsData/pagination.render.js
@@ -50,7 +50,6 @@ const PaginationRender = function() {
type={this.state.page === '' ? 'text' : 'number'}
onChange={e => {
const val = e.target.value;
- console.error('onchange', val);
this.changePage(val - 1);
}}
value={this.state.page === '' ? '' : this.state.page + 1}
diff --git a/react/src/components/dashboard/walletsData/walletsData.js b/react/src/components/dashboard/walletsData/walletsData.js
index 2f59532..11384d9 100644
--- a/react/src/components/dashboard/walletsData/walletsData.js
+++ b/react/src/components/dashboard/walletsData/walletsData.js
@@ -23,6 +23,7 @@ import {
AddressTypeRender,
TransactionDetailRender,
AddressItemRender,
+ TxTypeRender,
TxHistoryListRender,
AddressListRender,
WalletsDataRender
@@ -97,7 +98,7 @@ class WalletsData extends React.Component {
id: 'direction',
Header: translate('INDEX.DIRECTION'),
Footer: translate('INDEX.DIRECTION'),
- accessor: (tx) => this.renderTxType(tx.category || tx.type)
+ accessor: (tx) => TxTypeRender.call(this, tx.category || tx.type)
},
{
Header: translate('INDEX.CONFIRMATIONS'),
@@ -308,46 +309,6 @@ class WalletsData extends React.Component {
});
}
- renderTxType(category) {
- if (category === 'send' ||
- category === 'sent') {
- return (
-
- { translate('DASHBOARD.OUT') }
-
- );
- }
- if (category === 'receive' ||
- category === 'received') {
- return (
-
- { translate('DASHBOARD.IN') }
-
- );
- }
- if (category === 'generate') {
- return (
-
- { translate('DASHBOARD.MINED') }
-
- );
- }
- if (category === 'immature') {
- return (
-
- { translate('DASHBOARD.IMMATURE') }
-
- );
- }
- if (category === 'unknown') {
- return (
-
- { translate('DASHBOARD.UNKNOWN') }
-
- );
- }
- }
-
isFullySynced() {
if (this.props.Dashboard.progress &&
(Number(this.props.Dashboard.progress.balances) +
diff --git a/react/src/components/dashboard/walletsData/walletsData.render.js b/react/src/components/dashboard/walletsData/walletsData.render.js
index 5c7345a..c9d8cb8 100644
--- a/react/src/components/dashboard/walletsData/walletsData.render.js
+++ b/react/src/components/dashboard/walletsData/walletsData.render.js
@@ -67,6 +67,46 @@ export const AddressListRender = function() {
);
};
+export const TxTypeRender = function(category) {
+ if (category === 'send' ||
+ category === 'sent') {
+ return (
+
+ { translate('DASHBOARD.OUT') }
+
+ );
+ }
+ if (category === 'receive' ||
+ category === 'received') {
+ return (
+
+ { translate('DASHBOARD.IN') }
+
+ );
+ }
+ if (category === 'generate') {
+ return (
+
+ { translate('DASHBOARD.MINED') }
+
+ );
+ }
+ if (category === 'immature') {
+ return (
+
+ { translate('DASHBOARD.IMMATURE') }
+
+ );
+ }
+ if (category === 'unknown') {
+ return (
+
+ { translate('DASHBOARD.UNKNOWN') }
+
+ );
+ }
+};
+
export const TxHistoryListRender = function() {
return (