From 32e6762ba84b7622628cf0223ab3cf041bf86a8b Mon Sep 17 00:00:00 2001 From: Anthony Date: Thu, 19 Aug 2021 17:26:37 +0200 Subject: [PATCH] getting real transactions --- ui/component/txoList/view.jsx | 112 +++++++++++------- .../walletFiatPaymentHistory/view.jsx | 4 + ui/page/wallet/view.jsx | 8 +- 3 files changed, 78 insertions(+), 46 deletions(-) diff --git a/ui/component/txoList/view.jsx b/ui/component/txoList/view.jsx index 1b2f4f95a..ea053e9e4 100644 --- a/ui/component/txoList/view.jsx +++ b/ui/component/txoList/view.jsx @@ -14,6 +14,15 @@ import HelpLink from 'component/common/help-link'; import FileExporter from 'component/common/file-exporter'; import WalletFiatPaymentHistory from 'component/walletFiatPaymentHistory'; import WalletFiatAccountHistory from 'component/walletFiatAccountHistory'; +import { STRIPE_PUBLIC_KEY } from '../../../config'; +import { Lbryio } from 'lbryinc'; + +let stripeEnvironment = 'test'; +// if the key contains pk_live it's a live key +// update the environment for the calls to the backend to indicate which environment to hit +if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) { + stripeEnvironment = 'live'; +} type Props = { search: string, @@ -48,6 +57,62 @@ function TxoList(props: Props) { transactionsFile, } = props; + const [accountTransactionResponse, setAccountTransactionResponse] = React.useState([]); + const [customerTransactions, setCustomerTransactions] = React.useState([]); + + function getPaymentHistory() { + return Lbryio.call( + 'customer', + 'list', + { + environment: stripeEnvironment, + }, + 'post' + ); + } + + function getAccountTransactionsa() { + return Lbryio.call( + 'account', + 'list', + { + environment: stripeEnvironment, + }, + 'post' + ); + } + + // calculate account transactions section + React.useEffect(() => { + (async function() { + try { + const getAccountTransactions = await getAccountTransactionsa(); + + setAccountTransactionResponse(getAccountTransactions); + } catch (err) { + console.log(err); + } + })(); + }, []); + + // populate customer payment data + React.useEffect(() => { + (async function() { + try { + // get card payments customer has made + let customerTransactionResponse = await getPaymentHistory(); + // console.log('amount of transactions'); + // console.log(customerTransactionResponse.length); + + customerTransactionResponse.reverse(); + + setCustomerTransactions(customerTransactionResponse); + } catch (err) { + console.log(err); + } + })(); + }, []); + const urlParams = new URLSearchParams(search); const page = urlParams.get(TXO.PAGE) || String(1); const pageSize = urlParams.get(TXO.PAGE_SIZE) || String(TXO.PAGE_SIZE_DEFAULT); @@ -376,49 +441,6 @@ function TxoList(props: Props) {
- {/*
*/} - {/* */} - {/* {__('Type')}*/} - {/* */} - {/* */} - {/* }*/} - {/* value={type || 'all'}*/} - {/* onChange={(e) => handleChange({ dkey: TXO.TYPE, value: e.target.value, tab, currency: 'fiat' })}*/} - {/* >*/} - {/* {Object.values(TXO.DROPDOWN_TYPES).map((v) => {*/} - {/* const stringV = String(v);*/} - {/* return (*/} - {/* */} - {/* );*/} - {/* })}*/} - {/* */} - {/*
*/} - {(type === TXO.SENT || type === TXO.RECEIVED) && ( -
- handleChange({ dkey: TXO.SUB_TYPE, value: e.target.value, tab, currency: 'fiat' })} - > - {Object.values(TXO.DROPDOWN_SUBTYPES).map((v) => { - const stringV = String(v); - return ( - - ); - })} - -
- )} {!hideStatus && (
@@ -455,8 +477,8 @@ function TxoList(props: Props) {
{/* listing of the transactions */} - { fiatType === 'incoming' && } - { fiatType === 'outgoing' && } + { fiatType === 'incoming' && } + { fiatType === 'outgoing' && }
diff --git a/ui/component/walletFiatPaymentHistory/view.jsx b/ui/component/walletFiatPaymentHistory/view.jsx index 861a91982..c1a45965e 100644 --- a/ui/component/walletFiatPaymentHistory/view.jsx +++ b/ui/component/walletFiatPaymentHistory/view.jsx @@ -22,6 +22,10 @@ const WalletBalance = (props: Props) => { // receive transactions from parent component const { transactions: accountTransactions } = props; + // console.log(accountTransactions.length); + // console.log('wallet transactions length'); + + // const [accountStatusResponse, setAccountStatusResponse] = React.useState(); // const [subscriptions, setSubscriptions] = React.useState(); diff --git a/ui/page/wallet/view.jsx b/ui/page/wallet/view.jsx index 144eccd84..3987f855b 100644 --- a/ui/page/wallet/view.jsx +++ b/ui/page/wallet/view.jsx @@ -196,7 +196,13 @@ const WalletPage = (props: Props) => {
-

Coming soon!

+ + +
+
+ +
+

Coming soon!