ecency/ecency-mobile
1
1
Fork 0
mirror of https://github.com/ecency/ecency-mobile.git synced 2024-12-19 03:11:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix wallet information

Browse Source
This commit is contained in:
feruz 2020-10-15 21:48:01 +03:00
parent b30d2f33be
commit ba844ef150
2 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/providers/steem/dsteem.js
View File

@ -124,6 +124,16 @@ export const getAccount = (user) =>
}
});
export const getAccountHistory = (user) =>
new Promise((resolve, reject) => {
try {
const ah = client.call('condenser_api', 'get_account_history', [user, -1, 1000]);
resolve(ah);
} catch (error) {
reject(error);
}
});
/**
* @method getAccount get account data
* @param user username

37
src/utils/wallet.js
View File

@ -2,7 +2,7 @@ import get from 'lodash/get';
import parseDate from './parseDate';
import parseToken from './parseToken';
import { vestsToSp } from './conversions';
import { getState, getFeedHistory } from '../providers/steem/dsteem';
import { getState, getFeedHistory, getAccount, getAccountHistory } from '../providers/steem/dsteem';
import { getCurrencyTokenRate } from '../providers/esteem/esteem';
export const groomingTransactionData = (transaction, steemPerMVests) => {
@ -161,12 +161,13 @@ export const groomingWalletData = async (user, globalProps, userCurrency) => {
if (!user) {
return walletData;
}
const state = await getState(`/@${get(user, 'name')}/transfers`);
const { accounts } = state;
if (!accounts) {
return walletData;
}
const userdata = get(accounts, get(user, 'name'), '');
const state = await getAccount(get(user, 'name'));
//const { accounts } = state;
//if (!accounts) {
// return walletData;
//}
const [userdata] = state;
// TODO: move them to utils these so big for a lifecycle function
walletData.rewardSteemBalance = parseToken(
@ -223,16 +224,22 @@ export const groomingWalletData = async (user, globalProps, userCurrency) => {
const timeDiff = Math.abs(parseDate(userdata.next_vesting_withdrawal) - new Date());
walletData.nextVestingWithdrawal = Math.round(timeDiff / (1000 * 3600));
const { transfer_history: transferHistory, other_history: virtualHistory } = userdata;
/*const history = await getAccountHistory(get(user, 'name'));
const realHistory = transferHistory
? transferHistory.slice(Math.max(transferHistory.length - 50, 0))
: [];
realHistory.push(...virtualHistory); //concat
realHistory.sort(compare); //sort desc
walletData.transactions = realHistory;
const transfers = history.filter((tx) => {
return tx[1] && tx[1].op && tx[1].op[0] === 'claim_reward_balance'
});
const actualTransfers = transfers.reduce((arr, tx) => {
console.log('tx', tx[1])
const transaction = tx[1].op[1];
const date = new Date(`${tx[1].timestamp}Z`);
transaction.date = date;
arr.push(transaction);
return arr;
}, []);
*/
walletData.transactions = [];
return walletData;
};