machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5246 from mempool/nymkappa/update-payment-method-handling

Browse Source 
[accelerator] update payment method handling
This commit is contained in:
softsimon 2024-07-01 19:06:26 +09:00 committed by GitHub
commit 6261f83e5e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
View File

@ -22,7 +22,7 @@ export type AccelerationEstimate = {
mempoolBaseFee: number; mempoolBaseFee: number;
vsizeFee: number; vsizeFee: number;
pools: number[]; pools: number[];
availablePaymentMethods: PaymentMethod[]; availablePaymentMethods: {[method: string]: {min: number, max: number}};
} }
export type TxSummary = { export type TxSummary = {
txid: string; // txid of the current transaction txid: string; // txid of the current transaction
@ -100,6 +100,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
cashAppPay: any; cashAppPay: any;
cashAppSubscription: Subscription; cashAppSubscription: Subscription;
conversionsSubscription: Subscription; conversionsSubscription: Subscription;
conversions: any;
// btcpay // btcpay
loadingBtcpayInvoice = false; loadingBtcpayInvoice = false;
@ -133,6 +134,12 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
locationId: ids.squareLocationId locationId: ids.squareLocationId
}; };
}); });
this.conversionsSubscription = this.stateService.conversions$.subscribe(
async (conversions) => {
this.conversions = conversions;
}
);
} }
ngOnDestroy() { ngOnDestroy() {
@ -350,6 +357,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
this.conversionsSubscription = this.stateService.conversions$.subscribe( this.conversionsSubscription = this.stateService.conversions$.subscribe(
async (conversions) => { async (conversions) => {
this.conversions = conversions;
if (this.cashAppPay) { if (this.cashAppPay) {
this.cashAppPay.destroy(); this.cashAppPay.destroy();
} }
@ -464,15 +472,33 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
} }
get canPayWithBitcoin() { get canPayWithBitcoin() {
return this.estimate?.availablePaymentMethods?.includes('bitcoin'); const paymentMethod = this.estimate?.availablePaymentMethods?.bitcoin;
return paymentMethod && this.cost >= paymentMethod.min && this.cost <= paymentMethod.max;
} }
get canPayWithCashapp() { get canPayWithCashapp() {
return this.cashappEnabled && this.estimate?.availablePaymentMethods?.includes('cashapp') && this.cost < 400000 && this.stateService.referrer === 'https://cash.app/'; if (!this.cashappEnabled || !this.conversions || this.stateService.referrer !== 'https://cash.app/') {
return false;
}
const paymentMethod = this.estimate?.availablePaymentMethods?.cashapp;
if (paymentMethod) {
const costUSD = (this.cost / 100_000_000 * this.conversions.USD);
if (costUSD >= paymentMethod.min && costUSD <= paymentMethod.max) {
return true;
}
}
return false;
} }
get canPayWithBalance() { get canPayWithBalance() {
return this.isLoggedIn() && this.estimate?.availablePaymentMethods?.includes('balance') && this.estimate?.hasAccess; if (!this.isLoggedIn() || !this.estimate?.hasAccess) {
return false;
}
const paymentMethod = this.estimate?.availablePaymentMethods?.balance;
return paymentMethod && this.cost >= paymentMethod.min && this.cost <= paymentMethod.max;
} }
get canPay() { get canPay() {

1
frontend/src/app/shared/components/mempool-error/mempool-error.component.ts
View File

@ -30,6 +30,7 @@ const MempoolErrors = {
'faucet_below_minimum': `Requested amount is too small`, 'faucet_below_minimum': `Requested amount is too small`,
'faucet_above_maximum': `Requested amount is too high`, 'faucet_above_maximum': `Requested amount is too high`,
'payment_method_not_allowed': `You are not allowed to use this payment method`, 'payment_method_not_allowed': `You are not allowed to use this payment method`,
'payment_method_not_allowed_out_of_bound': `You are not allowed to use this payment method with this amount`,
} as { [error: string]: string }; } as { [error: string]: string };
export function isMempoolError(error: string) { export function isMempoolError(error: string) {