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

tabs coming along well need to stack the cards

Browse source
This commit is contained in:
Anthony 2021-08-19 16:30:47 +02:00
parent 78acb8d570
commit 32e8672be5
No known key found for this signature in database
GPG key ID: C386D3C93D50E356
2 changed files with 106 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,6 +13,7 @@ import classnames from 'classnames';
import HelpLink from 'component/common/help-link';
import FileExporter from 'component/common/file-exporter';
import WalletFiatPaymentHistory from 'component/walletFiatPaymentHistory';
import WalletFiatAccountHistory from 'component/walletFiatAccountHistory';
type Props = {
search: string,
@ -54,6 +55,7 @@ function TxoList(props: Props) {
const subtype = urlParams.get(TXO.SUB_TYPE);
const active = urlParams.get(TXO.ACTIVE) || TXO.ALL;
const currency = urlParams.get('currency') || 'credits';
const fiatType = urlParams.get('fiatType') || 'incoming';
const currentUrlParams = {
page,
@ -62,6 +64,7 @@ function TxoList(props: Props) {
type,
subtype,
currency,
fiatType,
};
const hideStatus =
@ -128,7 +131,10 @@ function TxoList(props: Props) {
const newUrlParams = new URLSearchParams();
const existingCurrency = newUrlParams.get('currency') || 'credits';
console.log(existingCurrency);
const existingFiatType = newUrlParams.get('fiatType') || 'incoming';
console.log(existingFiatType);
console.log(newUrlParams);
@ -140,6 +146,12 @@ function TxoList(props: Props) {
newUrlParams.set('currency', delta.currency);
}
if (delta.fiatType) {
newUrlParams.set('fiatType', delta.fiatType);
} else {
newUrlParams.set('fiatType', existingFiatType);
}
switch (delta.dkey) {
case TXO.PAGE:
if (currentUrlParams.type) {
@ -363,29 +375,29 @@ function TxoList(props: Props) {
: <div>
<div className="card__body-actions">
<div className="card__actions">
<div>
<FormField
type="select"
name="type"
label={
<>
{__('Type')}
<HelpLink href="https://lbry.com/faq/transaction-types" />
</>
}
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 (
<option key={stringV} value={stringV}>
{stringV && __(toCapitalCase(stringV))}
</option>
);
})}
</FormField>
</div>
{/*<div>*/}
{/* <FormField*/}
{/* type="select"*/}
{/* name="type"*/}
{/* label={*/}
{/* <>*/}
{/* {__('Type')}*/}
{/* <HelpLink href="https://lbry.com/faq/transaction-types" />*/}
{/* </>*/}
{/* }*/}
{/* 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 (*/}
{/* <option key={stringV} value={stringV}>*/}
{/* {stringV && __(toCapitalCase(stringV))}*/}
{/* </option>*/}
{/* );*/}
{/* })}*/}
{/* </FormField>*/}
{/*</div>*/}
{(type === TXO.SENT || type === TXO.RECEIVED) && (
<div>
<FormField
@ -409,32 +421,32 @@ function TxoList(props: Props) {
{!hideStatus && (
<div>
<fieldset-section>
<label>{__('Status')}</label>
<label>{__('Type')}</label>
<div className={'txo__radios'}>
<Button
button="alt"
onClick={(e) => handleChange({ dkey: TXO.ACTIVE, value: 'active', tab, currency: 'fiat' })}
onClick={(e) => handleChange({ tab, fiatType: 'incoming', currency: 'fiat' })}
className={classnames(`button-toggle`, {
'button-toggle--active': active === TXO.ACTIVE,
'button-toggle--active': fiatType === 'incoming',
})}
label={__('Active')}
label={__('Incoming')}
/>
<Button
button="alt"
onClick={(e) => handleChange({ dkey: TXO.ACTIVE, value: 'spent', tab, currency: 'fiat' })}
onClick={(e) => handleChange({ tab, fiatType: 'outgoing', currency: 'fiat' })}
className={classnames(`button-toggle`, {
'button-toggle--active': active === 'spent',
'button-toggle--active': fiatType === 'outgoing',
})}
label={__('Historical')}
/>
<Button
button="alt"
onClick={(e) => handleChange({ dkey: TXO.ACTIVE, value: 'all', tab, currency: 'fiat' })}
className={classnames(`button-toggle`, {
'button-toggle--active': active === 'all',
})}
label={__('All')}
label={__('Outgoing')}
/>
{/*<Button*/}
{/* button="alt"*/}
{/* onClick={(e) => handleChange({ dkey: TXO.ACTIVE, value: 'all', tab, currency: 'fiat' })}*/}
{/* className={classnames(`button-toggle`, {*/}
{/* 'button-toggle--active': active === 'all',*/}
{/* })}*/}
{/* label={__('Payouts')}*/}
{/*/>*/}
</div>
</fieldset-section>
</div>
@ -442,7 +454,8 @@ function TxoList(props: Props) {
</div>
</div>
{/* listing of the transactions */}
<WalletFiatPaymentHistory transactions={[]} />
{ fiatType === 'incoming' && <WalletFiatAccountHistory transactions={[]} /> }
{ fiatType === 'outgoing' && <WalletFiatPaymentHistory transactions={[]} /> }
<Paginate totalPages={Math.ceil(txoItemCount / Number(pageSize))} />
</div>
}

3
ui/component/walletFiatPaymentHistory/view.jsx
View file

@ -52,8 +52,8 @@ const WalletBalance = (props: Props) => {
return (
<>
<div className="section card-stack">
<Card
title={__('Payment History')}
body={
<>
<div className="table__wrapper">
@ -105,6 +105,7 @@ const WalletBalance = (props: Props) => {
</>
}
/>
</div>
</>
);
};