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

Merge pull request #5337 from mempool/nymkappa/invoice-check-http-code

Browse Source 
[btcpay] handle new http code 204 when calling /payments/bitcoin/check
This commit is contained in:
wiz 2024-07-14 20:12:23 +09:00 committed by GitHub
commit 6177b97bd1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts
View File

@ -74,7 +74,10 @@ export class BitcoinInvoiceComponent implements OnInit, OnChanges, OnDestroy {
} }
this.paymentStatusSubscription = this.apiService.getPaymentStatus$(this.invoice.btcpayInvoiceId).pipe( this.paymentStatusSubscription = this.apiService.getPaymentStatus$(this.invoice.btcpayInvoiceId).pipe(
retry({ delay: () => timer(2000)}) retry({ delay: () => timer(2000)})
).subscribe((result) => { ).subscribe((response) => {
if (response.status === 204 || response.status === 404) {
return;
}
this.paymentStatus = 3; this.paymentStatus = 3;
this.completed.emit(); this.completed.emit();
}); });

4
frontend/src/app/services/services-api.service.ts
View File

@ -181,7 +181,7 @@ export class ServicesApiServices {
return this.httpClient.get<any[]>(`${this.stateService.env.SERVICES_API}/payments/bitcoin/invoice?id=${invoiceId}`); return this.httpClient.get<any[]>(`${this.stateService.env.SERVICES_API}/payments/bitcoin/invoice?id=${invoiceId}`);
} }
getPaymentStatus$(orderId: string): Observable<any[]> { getPaymentStatus$(orderId: string): Observable<any> {
return this.httpClient.get<any[]>(`${this.stateService.env.SERVICES_API}/payments/bitcoin/check?order_id=${orderId}`); return this.httpClient.get<any>(`${this.stateService.env.SERVICES_API}/payments/bitcoin/check?order_id=${orderId}`, { observe: 'response' });
} }
} }