This commit is contained in:
Anthony 2021-07-29 21:01:21 +02:00
parent d98eabbcb9
commit 982f30c01d
No known key found for this signature in database
GPG key ID: C386D3C93D50E356
3 changed files with 22 additions and 22 deletions

View file

@ -28,7 +28,7 @@ const WalletBalance = (props: Props) => {
return ( return (
<>{1 == 1 && <Card <>{1 == 1 && <Card
title={<><Icon size="18" icon={ICONS.FINANCE} />{accountDetails && accountDetails.total_received_unpaid/100} USD</>} title={<><Icon size="18" icon={ICONS.FINANCE} />{accountDetails && accountDetails.total_received_unpaid/100} || 0 USD</>}
subtitle={ subtitle={
<I18nMessage> <I18nMessage>
This is your remaining balance that can still be withdrawn to your bank account This is your remaining balance that can still be withdrawn to your bank account
@ -37,11 +37,11 @@ const WalletBalance = (props: Props) => {
actions={ actions={
<> <>
<h2 className="section__title--small"> <h2 className="section__title--small">
${accountDetails && accountDetails.total_tipped / 100 } Received Total ${accountDetails && accountDetails.total_tipped / 100 || 0} Received Total
</h2> </h2>
<h2 className="section__title--small"> <h2 className="section__title--small">
${accountDetails && accountDetails.total_paid_out/100 } Withdrawn ${accountDetails && accountDetails.total_paid_out/100 || 0} Withdrawn
<Button <Button
button="link" button="link"
label={detailsExpanded ? __('View less') : __('View more')} label={detailsExpanded ? __('View less') : __('View more')}

View file

@ -45,11 +45,11 @@ const WalletBalance = (props: Props) => {
actions={ actions={
<> <>
<h2 className="section__title--small"> <h2 className="section__title--small">
${accountDetails && accountDetails.total_tipped / 100 } Received Total ${accountDetails && accountDetails.total_tipped / 100 || 0 } Received Total
</h2> </h2>
<h2 className="section__title--small"> <h2 className="section__title--small">
${accountDetails && accountDetails.total_paid_out/100 } Withdrawn ${accountDetails && accountDetails.total_paid_out/100 || 0 } Withdrawn
<Button <Button
button="link" button="link"
label={detailsExpanded ? __('View less') : __('View more')} label={detailsExpanded ? __('View less') : __('View more')}

View file

@ -168,25 +168,29 @@ const WalletPage = (props: Props) => {
return ( return (
<Page> <Page>
{/* tabs to switch between fiat and lbc */} {/* tabs to switch between fiat and lbc */}
{/* lbc button */}
<h2 className="lbc-tab-switcher" <h2 className="lbc-tab-switcher"
style={{display: 'inline-block', paddingBottom: '16px', marginRight: '14px', textUnderlineOffset: '4px', textDecoration: 'underline', fontSize: '18px', marginLeft: '3px'}} style={{display: 'inline-block', paddingBottom: '16px', marginRight: '14px', textUnderlineOffset: '4px', textDecoration: 'underline', fontSize: '18px', marginLeft: '3px'}}
onClick={() => { onClick={() => {
focusLBCTab(); focusLBCTab();
}} }}
>LBC Wallet</h2> >LBC Wallet</h2>
{/* account history button */}
<h2 className="fiat-tab-switcher" <h2 className="fiat-tab-switcher"
style={{display: 'inline-block', textUnderlineOffset: '4px', fontSize: '18px', marginRight: '14px'}} style={{display: 'inline-block', textUnderlineOffset: '4px', fontSize: '18px', marginRight: '14px'}}
onClick={() => { onClick={() => {
focusAccountHistoryTab(); focusAccountHistoryTab();
}} }}
>Account History</h2> >Account History</h2>
{/* payment history button */}
<h2 className="fiat-payment-history-switcher" <h2 className="fiat-payment-history-switcher"
style={{display: 'inline-block', textUnderlineOffset: '4px', fontSize: '18px'}} style={{display: 'inline-block', textUnderlineOffset: '4px', fontSize: '18px'}}
onClick={() => { onClick={() => {
focusPaymentHistoryTab(); focusPaymentHistoryTab();
}} }}
>Payment History</h2> >Payment History</h2>
{/* lbc wallet section */}
<div className="lbc-transactions"> <div className="lbc-transactions">
{/* if the transactions are loading */} {/* if the transactions are loading */}
{ loading && ( { loading && (
@ -208,24 +212,20 @@ const WalletPage = (props: Props) => {
</> </>
)} )}
</div> </div>
{(
<> {/* account received transactions section */}
<div className="fiat-transactions" style={{display: 'none'}}> <div className="fiat-transactions" style={{display: 'none'}}>
<WalletFiatBalance accountDetails={accountStatusResponse} /> <WalletFiatBalance accountDetails={accountStatusResponse} />
<div style={{paddingTop: '25px'}}></div> <div style={{paddingTop: '25px'}}></div>
<WalletFiatAccountHistory transactions={accountTransactionResponse}/> <WalletFiatAccountHistory transactions={accountTransactionResponse}/>
</div> </div>
</>
)}
<>
{/* fiat payment history for tips made by user */} {/* fiat payment history for tips made by user */}
<div className="payment-history-tab" style={{display: 'none'}}> <div className="payment-history-tab" style={{display: 'none'}}>
<WalletFiatPaymentBalance totalTippedAmount={totalTippedAmount} accountDetails={accountStatusResponse} /> <WalletFiatPaymentBalance totalTippedAmount={totalTippedAmount} accountDetails={accountStatusResponse} />
<div style={{paddingTop: '25px'}}></div> <div style={{paddingTop: '25px'}}></div>
<WalletFiatPaymentHistory transactions={customerTransactions}/> <WalletFiatPaymentHistory transactions={customerTransactions}/>
</div> </div>
</>
</Page> </Page>
); );