zecfoundation
/
zepio
mirror of https://github.com/ZcashFoundation/zepio.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore(transactions): fix list transactions

This commit is contained in:
George Lima 2019-02-11 10:50:10 -03:00
parent 23899e0e61
commit 1757398b36
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/containers/dashboard.js
View File

@ -8,13 +8,14 @@ import dateFns from 'date-fns';
import { BigNumber } from 'bignumber.js';
import { DashboardView } from '../views/dashboard';
import rpc from '../../services/api';
import { listShieldedTransactions } from '../../services/shielded-transactions';
import store from '../../config/electron-store';
import {
loadWalletSummary,
loadWalletSummarySuccess,
loadWalletSummaryError,
} from '../redux/modules/wallet';
import { sortBy } from '../utils/sort-by';
import { sortByDescend } from '../utils/sort-by';
import type { AppState } from '../types/app-state';
import type { Dispatch } from '../types/redux';
@ -47,7 +48,7 @@ const mapDispatchToProps = (dispatch: Dispatch) => ({
);
}
const formattedTransactions = flow([
const formattedTransactions: Array<Object> = flow([
arr => arr.map(transaction => ({
transactionId: transaction.txid,
type: transaction.category,
@ -58,10 +59,11 @@ const mapDispatchToProps = (dispatch: Dispatch) => ({
arr => groupBy(arr, obj => dateFns.format(obj.date, 'MMM DD, YYYY')),
obj => Object.keys(obj).map(day => ({
day,
list: sortBy('date')(obj[day]),
jsDay: new Date(day),
list: sortByDescend('date')(obj[day]),
})),
sortBy('day'),
])(transactions);
sortByDescend('jsDay'),
])([...transactions, ...listShieldedTransactions()]);
if (!zAddresses.length) {
const [, newZAddress] = await eres(rpc.z_getnewaddress());

12
app/containers/transactions.js
View File

@ -14,9 +14,10 @@ import {
loadTransactionsError,
} from '../redux/modules/transactions';
import rpc from '../../services/api';
import { listShieldedTransactions } from '../../services/shielded-transactions';
import store from '../../config/electron-store';
import { sortBy } from '../utils/sort-by';
import { sortByDescend } from '../utils/sort-by';
import type { AppState } from '../types/app-state';
import type { Dispatch } from '../types/redux';
@ -32,7 +33,7 @@ const mapDispatchToProps = (dispatch: Dispatch) => ({
getTransactions: async () => {
dispatch(loadTransactions());
const [transactionsErr, transactions = []] = await eres(rpc.listtransactions());
const [transactionsErr, transactions = []] = await eres(rpc.listtransactions('', 200));
if (transactionsErr) {
return dispatch(loadTransactionsError({ error: transactionsErr.message }));
@ -49,10 +50,11 @@ const mapDispatchToProps = (dispatch: Dispatch) => ({
arr => groupBy(arr, obj => dateFns.format(obj.date, 'MMM DD, YYYY')),
obj => Object.keys(obj).map(day => ({
day,
list: sortBy('date')(obj[day]),
jsDay: new Date(day),
list: sortByDescend('date')(obj[day]),
})),
sortBy('day'),
])(transactions);
sortByDescend('jsDay'),
])([...transactions, ...listShieldedTransactions()]);
dispatch(
loadTransactionsSuccess({