LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

cleanups for PR

Browse source
This commit is contained in:
Anthony 2021-08-20 17:06:04 +02:00
parent bcb1197dfb
commit 82a39e6562
No known key found for this signature in database
GPG key ID: C386D3C93D50E356
1 changed files with 44 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
ui/component/txoList/view.jsx
View file

@ -14,15 +14,14 @@ import HelpLink from 'component/common/help-link';
import FileExporter from 'component/common/file-exporter'; import FileExporter from 'component/common/file-exporter';
import WalletFiatPaymentHistory from 'component/walletFiatPaymentHistory'; import WalletFiatPaymentHistory from 'component/walletFiatPaymentHistory';
import WalletFiatAccountHistory from 'component/walletFiatAccountHistory'; import WalletFiatAccountHistory from 'component/walletFiatAccountHistory';
import { STRIPE_PUBLIC_KEY } from '../../../config';
import { Lbryio } from 'lbryinc'; import { Lbryio } from 'lbryinc';
import { getStripeEnvironment } from 'util/stripe';
let stripeEnvironment = getStripeEnvironment();
let stripeEnvironment = 'test'; // constants to be used in query params
// if the key contains pk_live it's a live key const Q_CURRENCY = 'currency';
// update the environment for the calls to the backend to indicate which environment to hit const Q_TAB = 'tab';
if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) { const Q_FIAT_TYPE = 'fiatType';
stripeEnvironment = 'live';
}
type Props = { type Props = {
search: string, search: string,
@ -123,8 +122,12 @@ function TxoList(props: Props) {
const type = urlParams.get(TXO.TYPE) || TXO.ALL; const type = urlParams.get(TXO.TYPE) || TXO.ALL;
const subtype = urlParams.get(TXO.SUB_TYPE); const subtype = urlParams.get(TXO.SUB_TYPE);
const active = urlParams.get(TXO.ACTIVE) || TXO.ALL; const active = urlParams.get(TXO.ACTIVE) || TXO.ALL;
const currency = urlParams.get('currency') || 'credits'; const currency = urlParams.get(Q_CURRENCY) || 'credits';
const fiatType = urlParams.get('fiatType') || 'incoming'; const fiatType = urlParams.get(Q_FIAT_TYPE) || 'incoming';
// tab used in the wallet section
// TODO: need to change this eventually
const tab = urlParams.get(Q_TAB) || 'fiat-payment-history';
const currentUrlParams = { const currentUrlParams = {
page, page,
@ -134,6 +137,7 @@ function TxoList(props: Props) {
subtype, subtype,
currency, currency,
fiatType, fiatType,
tab
}; };
const hideStatus = const hideStatus =
@ -204,22 +208,22 @@ function TxoList(props: Props) {
delta.value = ''; delta.value = '';
} }
const existingFiatType = newUrlParams.get('fiatType') || 'incoming'; const existingFiatType = newUrlParams.get(Q_FIAT_TYPE) || 'incoming';
if (delta.tab) { if (delta.tab) {
// set tab name to account for wallet page tab // set tab name to account for wallet page tab
newUrlParams.set('tab', delta.tab); newUrlParams.set(Q_TAB, delta.tab);
} }
// only update currency if it's being changed // only update currency if it's being changed
if (delta.currency) { if (delta.currency) {
newUrlParams.set('currency', delta.currency); newUrlParams.set(Q_CURRENCY, delta.currency);
} }
if (delta.fiatType) { if (delta.fiatType) {
newUrlParams.set('fiatType', delta.fiatType); newUrlParams.set(Q_FIAT_TYPE, delta.fiatType);
} else { } else {
newUrlParams.set('fiatType', existingFiatType); newUrlParams.set(Q_FIAT_TYPE, existingFiatType);
} }
switch (delta.dkey) { switch (delta.dkey) {
@ -280,10 +284,6 @@ function TxoList(props: Props) {
const paramsString = JSON.stringify(params); const paramsString = JSON.stringify(params);
// tab used in the wallet section
// TODO: change the name of this eventually
const tab = 'fiat-payment-history';
useEffect(() => { useEffect(() => {
if (paramsString && updateTxoPageParams) { if (paramsString && updateTxoPageParams) {
const params = JSON.parse(paramsString); const params = JSON.parse(paramsString);
@ -323,6 +323,7 @@ function TxoList(props: Props) {
isBodyList isBodyList
body={currency === 'credits' body={currency === 'credits'
? <div> ? <div>
{/* LBC transactions section */}
<div className="card__body-actions"> <div className="card__body-actions">
<div className="card__actions"> <div className="card__actions">
<div> <div>
@ -419,40 +420,38 @@ function TxoList(props: Props) {
</div> </div>
</div> </div>
</div> </div>
{/* listing of the transactions */} {/* listing of the lbc transactions */}
<TransactionListTable txos={txoPage} /> <TransactionListTable txos={txoPage} />
<Paginate totalPages={Math.ceil(txoItemCount / Number(pageSize))} /> <Paginate totalPages={Math.ceil(txoItemCount / Number(pageSize))} />
</div> </div>
: <div> : <div>
{/* fiat section (buttons and transactions) */} {/* FIAT SECTION ( toggle buttons and transactions) */}
<div className="section card-stack"> <div className="section card-stack">
<div className="card__body-actions"> <div className="card__body-actions">
<div className="card__actions"> <div className="card__actions">
{!hideStatus && ( <div>
<div> <fieldset-section>
<fieldset-section> <label>{__('Type')}</label>
<label>{__('Type')}</label> <div className={'txo__radios'}>
<div className={'txo__radios'}> <Button
<Button button="alt"
button="alt" onClick={(e) => handleChange({ tab, fiatType: 'incoming', currency: 'fiat' })}
onClick={(e) => handleChange({ tab, fiatType: 'incoming', currency: 'fiat' })} className={classnames(`button-toggle`, {
className={classnames(`button-toggle`, { 'button-toggle--active': fiatType === 'incoming',
'button-toggle--active': fiatType === 'incoming', })}
})} label={__('Incoming')}
label={__('Incoming')} />
/> <Button
<Button button="alt"
button="alt" onClick={(e) => handleChange({ tab, fiatType: 'outgoing', currency: 'fiat' })}
onClick={(e) => handleChange({ tab, fiatType: 'outgoing', currency: 'fiat' })} className={classnames(`button-toggle`, {
className={classnames(`button-toggle`, { 'button-toggle--active': fiatType === 'outgoing',
'button-toggle--active': fiatType === 'outgoing', })}
})} label={__('Outgoing')}
label={__('Outgoing')} />
/> </div>
</div> </fieldset-section>
</fieldset-section> </div>
</div>
)}
</div> </div>
</div> </div>
{/* listing of the transactions */} {/* listing of the transactions */}