touchup frontend to show balance

This commit is contained in:
Anthony 2021-07-03 20:12:11 +02:00 committed by jessopb
parent 8a5230ed6a
commit 434030e007

View file

@ -38,6 +38,7 @@ type State = {
stripeConnectionUrl: string, stripeConnectionUrl: string,
alreadyUpdated: boolean, alreadyUpdated: boolean,
accountConfirmed: boolean, accountConfirmed: boolean,
accountNotConfirmedButReceivedTips: boolean,
unpaidBalance: string unpaidBalance: string
}; };
@ -50,6 +51,7 @@ class StripeAccountConnection extends React.Component<Props, State> {
loading: true, loading: true,
accountConfirmed: false, accountConfirmed: false,
accountPendingConfirmation: false, accountPendingConfirmation: false,
accountNotConfirmedButReceivedTips: false,
unpaidBalance: 0, unpaidBalance: 0,
}; };
} }
@ -61,7 +63,7 @@ class StripeAccountConnection extends React.Component<Props, State> {
var that = this; var that = this;
function getAndSetAccountLink() { function getAndSetAccountLink(stillNeedToConfirmAccount) {
Lbryio.call('account', 'link', { Lbryio.call('account', 'link', {
return_url: successStripeRedirectUrl, return_url: successStripeRedirectUrl,
refresh_url: failureStripeRedirectUrl, refresh_url: failureStripeRedirectUrl,
@ -70,10 +72,17 @@ class StripeAccountConnection extends React.Component<Props, State> {
// stripe link for user to navigate to and confirm account // stripe link for user to navigate to and confirm account
const stripeConnectionUrl = accountLinkResponse.url; const stripeConnectionUrl = accountLinkResponse.url;
// set connection url on frontend
that.setState({ that.setState({
stripeConnectionUrl, stripeConnectionUrl,
});
// show the account confirmation link if not created already
if (stillNeedToConfirmAccount) {
that.setState({
accountPendingConfirmation: true, accountPendingConfirmation: true,
}); });
}
}); });
} }
@ -81,9 +90,6 @@ class StripeAccountConnection extends React.Component<Props, State> {
Lbryio.call('account', 'status', { Lbryio.call('account', 'status', {
environment: stripeEnvironment, environment: stripeEnvironment,
}, 'post').then(accountStatusResponse => { }, 'post').then(accountStatusResponse => {
// if charges already enabled, no need to generate an account link
if (accountStatusResponse.charges_enabled) {
// account has already been confirmed
const yetToBeCashedOutBalance = accountStatusResponse.total_received_unpaid; const yetToBeCashedOutBalance = accountStatusResponse.total_received_unpaid;
if (yetToBeCashedOutBalance) { if (yetToBeCashedOutBalance) {
@ -92,14 +98,27 @@ class StripeAccountConnection extends React.Component<Props, State> {
}); });
} }
console.log(accountStatusResponse.total_received_unpaid); // if charges already enabled, no need to generate an account link
if (accountStatusResponse.charges_enabled) {
// account has already been confirmed
that.setState({ that.setState({
accountConfirmed: true, accountConfirmed: true,
}); });
// user has not confirmed an account but have received payments
} else if (accountStatusResponse.total_received_unpaid > 0) {
that.setState({
accountNotConfirmedButReceivedTips: true,
});
getAndSetAccountLink();
// user has not received any amount or confirmed an account
} else { } else {
// get stripe link and set it on the frontend // get stripe link and set it on the frontend
getAndSetAccountLink(); // pass true so it updates the frontend
getAndSetAccountLink(true);
} }
}).catch(function(error) { }).catch(function(error) {
// errorString passed from the API (with a 403 error) // errorString passed from the API (with a 403 error)
@ -117,7 +136,7 @@ class StripeAccountConnection extends React.Component<Props, State> {
} }
render() { render() {
const { stripeConnectionUrl, accountConfirmed, accountPendingConfirmation, unpaidBalance } = this.state; const { stripeConnectionUrl, accountConfirmed, accountPendingConfirmation, unpaidBalance, accountNotConfirmedButReceivedTips } = this.state;
const { user } = this.props; const { user } = this.props;
@ -129,7 +148,7 @@ class StripeAccountConnection extends React.Component<Props, State> {
body={ body={
<div> <div>
{/* show while waiting for account status */} {/* show while waiting for account status */}
{!accountConfirmed && !accountPendingConfirmation && {!accountConfirmed && !accountPendingConfirmation && !accountNotConfirmedButReceivedTips &&
<div className="card__body-actions"> <div className="card__body-actions">
<div> <div>
<div> <div>
@ -164,22 +183,37 @@ class StripeAccountConnection extends React.Component<Props, State> {
<div> <div>
<h3>Congratulations! Your account has been connected with Odysee.</h3> <h3>Congratulations! Your account has been connected with Odysee.</h3>
{unpaidBalance > 0 ? <div><br></br> {unpaidBalance > 0 ? <div><br></br>
<h3>Your account balance is ${unpaidBalance/100} USD. When the functionality exists you will be able to withdraw your balance.</h3> <h3>Your account balance is ${unpaidBalance/100} USD. Functionality to view your transactions and withdraw your balance will be landing shortly.</h3>
</div> : <div><br></br> </div> : <div><br></br>
<h3>Your account balance is $0 USD. When you receive a tip you will see it here.</h3> <h3>Your account balance is $0 USD. When you receive a tip you will see it here.</h3>
</div>} </div>}
</div> </div>
</div>
</div>
}
{accountNotConfirmedButReceivedTips &&
<div className="card__body-actions">
<div>
<div>
<h3>Congratulations, you have already begun receiving tips on Odysee!</h3>
<div><br></br>
<h3>Your pending account balance is ${unpaidBalance/100} USD. Functionality to view and receive your transactions will land soon.</h3>
</div><br></br>
<div>
<h3>Connect your Bank Account to be able to cash your pending balance out to your account.</h3>
</div>
<div className="section__actions"> <div className="section__actions">
<a href="/$/wallet"> <a href={stripeConnectionUrl}>
<Button <Button
button="secondary" button="secondary"
label={__('View Your Transaction History')} label={__('Connect Your Bank Account')}
icon={ICONS.SETTINGS} icon={ICONS.FINANCE}
/> />
</a> </a>
</div> </div>
</div> </div>
</div> </div>
</div>
} }
</div> </div>
} }