}
- @if (loadingCashapp || loadingApplePay) {
+ @if (loadingCashapp || loadingApplePay || loadingGooglePay) {
Loading payment method...
diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
index 71c46e2da..f2a2e6e7c 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -47,7 +47,7 @@ export const MIN_BID_RATIO = 1;
export const DEFAULT_BID_RATIO = 2;
export const MAX_BID_RATIO = 4;
-type CheckoutStep = 'quote' | 'summary' | 'checkout' | 'cashapp' | 'applepay' | 'processing' | 'paid' | 'success';
+type CheckoutStep = 'quote' | 'summary' | 'checkout' | 'cashapp' | 'applepay' | 'googlepay' | 'processing' | 'paid' | 'success';
@Component({
selector: 'app-accelerate-checkout',
@@ -62,6 +62,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
@Input() scrollEvent: boolean;
@Input() cashappEnabled: boolean = true;
@Input() applePayEnabled: boolean = false;
+ @Input() googlePayEnabled: boolean = true;
@Input() advancedEnabled: boolean = false;
@Input() forceMobile: boolean = false;
@Input() showDetails: boolean = false;
@@ -83,7 +84,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
private _step: CheckoutStep = 'summary';
simpleMode: boolean = true;
- paymentMethod: 'cashapp' | 'btcpay';
timeoutTimer: any;
authSubscription$: Subscription;
@@ -112,11 +112,13 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
// square
loadingCashapp = false;
loadingApplePay = false;
+ loadingGooglePay = false;
cashappError = false;
cashappSubmit: any;
payments: any;
cashAppPay: any;
applePay: any;
+ googlePay: any;
conversionsSubscription: Subscription;
conversions: any;
@@ -228,6 +230,11 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
this.insertSquare();
this.setupSquare();
this.scrollToElementWithTimeout('confirm-title', 'center', 100);
+ } else if (this._step === 'googlepay' && this.googlePayEnabled) {
+ this.loadingGooglePay = true;
+ this.insertSquare();
+ this.setupSquare();
+ this.scrollToElementWithTimeout('confirm-title', 'center', 100);
} else if (this._step === 'paid') {
this.timePaid = Date.now();
this.timeoutTimer = setTimeout(() => {
@@ -443,6 +450,8 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
await this.requestCashAppPayment();
} else if (this._step === 'applepay') {
await this.requestApplePayPayment();
+ } else if (this._step === 'googlepay') {
+ await this.requestGooglePayPayment();
}
} catch (e) {
console.debug('Error loading Square Payments', e);
@@ -541,6 +550,92 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
);
}
+ /**
+ * GOOGLE PAY
+ */
+ async requestGooglePayPayment() {
+ if (this.conversionsSubscription) {
+ this.conversionsSubscription.unsubscribe();
+ }
+
+ this.conversionsSubscription = this.stateService.conversions$.subscribe(
+ async (conversions) => {
+ this.conversions = conversions;
+ if (this.googlePay) {
+ this.googlePay.destroy();
+ }
+
+ const costUSD = this.cost / 100_000_000 * conversions.USD;
+ const paymentRequest = this.payments.paymentRequest({
+ countryCode: 'US',
+ currencyCode: 'USD',
+ total: {
+ amount: costUSD.toFixed(2),
+ label: 'Total'
+ }
+ });
+ this.googlePay = await this.payments.googlePay(paymentRequest , {
+ referenceId: `accelerator-${this.tx.txid.substring(0, 15)}-${Math.round(new Date().getTime() / 1000)}`,
+ });
+
+ await this.googlePay.attach(`#google-pay-button`, {
+ buttonType: 'pay',
+ onClick: (e) => { console.log(e, 'hi') }
+ });
+ this.loadingGooglePay = false;
+
+ document.getElementById('google-pay-button').addEventListener('click', async event => {
+ event.preventDefault();
+ const tokenResult = await this.googlePay.tokenize();
+ if (tokenResult?.status === 'OK') {
+ const card = tokenResult.details?.card;
+ if (!card || !card.brand || !card.expMonth || !card.expYear || !card.last4) {
+ console.error(`Cannot retreive payment card details`);
+ this.accelerateError = 'apple_pay_no_card_details';
+ return;
+ }
+ const cardTag = md5(`${card.brand}${card.expMonth}${card.expYear}${card.last4}`.toLowerCase());
+ this.servicesApiService.accelerateWithGooglePay$(
+ this.tx.txid,
+ tokenResult.token,
+ cardTag,
+ `accelerator-${this.tx.txid.substring(0, 15)}-${Math.round(new Date().getTime() / 1000)}`,
+ this.accelerationUUID
+ ).subscribe({
+ next: () => {
+ this.audioService.playSound('ascend-chime-cartoon');
+ if (this.googlePay) {
+ this.googlePay.destroy();
+ }
+ setTimeout(() => {
+ this.moveToStep('paid');
+ }, 1000);
+ },
+ error: (response) => {
+ this.accelerateError = response.error;
+ if (!(response.status === 403 && response.error === 'not_available')) {
+ setTimeout(() => {
+ // Reset everything by reloading the page :D, can be improved
+ const urlParams = new URLSearchParams(window.location.search);
+ window.location.assign(window.location.toString().replace(`?cash_request_id=${urlParams.get('cash_request_id')}`, ``));
+ }, 3000);
+ }
+ }
+ });
+ } else {
+ let errorMessage = `Tokenization failed with status: ${tokenResult.status}`;
+ if (tokenResult.errors) {
+ errorMessage += ` and errors: ${JSON.stringify(
+ tokenResult.errors,
+ )}`;
+ }
+ throw new Error(errorMessage);
+ }
+ });
+ }
+ );
+ }
+
/**
* CASHAPP
*/
@@ -566,18 +661,14 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
label: 'Total',
pending: true,
productUrl: `${redirectHostname}/tracker/${this.tx.txid}`,
- },
- button: { shape: 'semiround', size: 'small', theme: 'light'}
+ }
});
this.cashAppPay = await this.payments.cashAppPay(paymentRequest, {
redirectURL: `${redirectHostname}/tracker/${this.tx.txid}`,
- referenceId: `accelerator-${this.tx.txid.substring(0, 15)}-${Math.round(new Date().getTime() / 1000)}`,
- button: { shape: 'semiround', size: 'small', theme: 'light'}
+ referenceId: `accelerator-${this.tx.txid.substring(0, 15)}-${Math.round(new Date().getTime() / 1000)}`
});
- if (this.step === 'cashapp') {
- await this.cashAppPay.attach(`#cash-app-pay`, { theme: 'light', size: 'small', shape: 'semiround' })
- }
+ await this.cashAppPay.attach(`#cash-app-pay`, { theme: 'light', size: 'small', shape: 'semiround' })
this.loadingCashapp = false;
this.cashAppPay.addEventListener('ontokenization', event => {
@@ -686,6 +777,13 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
return !!this.estimate?.availablePaymentMethods?.applePay;
}
+ get couldPayWithGooglePay() {
+ if (!this.googlePayEnabled) {
+ return false;
+ }
+ return !!this.estimate?.availablePaymentMethods?.googlePay;
+ }
+
get couldPayWithBalance() {
if (!this.hasAccessToBalanceMode) {
return false;
@@ -734,6 +832,22 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
return false;
}
+ get canPayWithGooglePay() {
+ if (!this.googlePayEnabled || !this.conversions) {
+ return false;
+ }
+
+ const paymentMethod = this.estimate?.availablePaymentMethods?.googlePay;
+ 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() {
if (!this.hasAccessToBalanceMode) {
return false;
diff --git a/frontend/src/app/services/services-api.service.ts b/frontend/src/app/services/services-api.service.ts
index c26075198..919fc72da 100644
--- a/frontend/src/app/services/services-api.service.ts
+++ b/frontend/src/app/services/services-api.service.ts
@@ -141,6 +141,10 @@ export class ServicesApiServices {
return this.httpClient.post
(`${this.stateService.env.SERVICES_API}/accelerator/accelerate/applePay`, { txInput: txInput, cardTag: cardTag, token: token, referenceId: referenceId, accelerationUUID: accelerationUUID });
}
+ accelerateWithGooglePay$(txInput: string, token: string, cardTag: string, referenceId: string, accelerationUUID: string) {
+ return this.httpClient.post(`${this.stateService.env.SERVICES_API}/accelerator/accelerate/googlePay`, { txInput: txInput, cardTag: cardTag, token: token, referenceId: referenceId, accelerationUUID: accelerationUUID });
+ }
+
getAccelerations$(): Observable {
return this.httpClient.get(`${this.stateService.env.SERVICES_API}/accelerator/accelerations`);
}
diff --git a/frontend/src/resources/google-pay.png b/frontend/src/resources/google-pay.png
new file mode 100644
index 0000000000000000000000000000000000000000..77b6a6574c925d5cd2f408b78993452263e17a8a
GIT binary patch
literal 34146
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
aBf{IdzfRh8_SnG4AxMhKeJ&B!|NcKUOg29N
literal 0
HcmV?d00001
From d3e3650cac33a88403cccc3a4c80a02468cbefcc Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Thu, 25 Jul 2024 21:49:48 +0200
Subject: [PATCH 2/9] [accelerator] avoid premature square setup call
---
.../accelerate-checkout.component.ts | 40 +++++++++----------
1 file changed, 19 insertions(+), 21 deletions(-)
diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
index f2a2e6e7c..72dfc5de2 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -90,7 +90,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
auth: IAuth | null = null;
// accelerator stuff
- square: { appId: string, locationId: string};
accelerationUUID: string;
accelerationSubscription: Subscription;
difficultySubscription: Subscription;
@@ -113,7 +112,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
loadingCashapp = false;
loadingApplePay = false;
loadingGooglePay = false;
- cashappError = false;
cashappSubmit: any;
payments: any;
cashAppPay: any;
@@ -170,13 +168,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
this.moveToStep('summary');
}
- this.servicesApiService.setupSquare$().subscribe(ids => {
- this.square = {
- appId: ids.squareAppId,
- locationId: ids.squareLocationId
- };
- });
-
this.conversionsSubscription = this.stateService.conversions$.subscribe(
async (conversions) => {
this.conversions = conversions;
@@ -443,20 +434,27 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
}
async initSquare(): Promise {
try {
- //@ts-ignore
- this.payments = window.Square.payments(this.square.appId, this.square.locationId)
- const urlParams = new URLSearchParams(window.location.search);
- if (this._step === 'cashapp' || urlParams.get('cash_request_id')) {
- await this.requestCashAppPayment();
- } else if (this._step === 'applepay') {
- await this.requestApplePayPayment();
- } else if (this._step === 'googlepay') {
- await this.requestGooglePayPayment();
- }
+ this.servicesApiService.setupSquare$().subscribe({
+ next: async (ids) => {
+ //@ts-ignore
+ this.payments = window.Square.payments(ids.squareAppId, ids.squareLocationId)
+ const urlParams = new URLSearchParams(window.location.search);
+ if (this._step === 'cashapp' || urlParams.get('cash_request_id')) {
+ await this.requestCashAppPayment();
+ } else if (this._step === 'applepay') {
+ await this.requestApplePayPayment();
+ } else if (this._step === 'googlepay') {
+ await this.requestGooglePayPayment();
+ }
+ },
+ error: () => {
+ console.debug('Error loading Square Payments');
+ this.accelerateError = 'cannot_setup_square';
+ }
+ });
} catch (e) {
console.debug('Error loading Square Payments', e);
- this.cashappError = true;
- return;
+ this.accelerateError = 'cannot_setup_square';
}
}
From 845123fc636ec62efc30b58be090115066c65743 Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Thu, 25 Jul 2024 23:04:53 +0200
Subject: [PATCH 3/9] [services] getJWT call returns nothing if non official
---
frontend/src/app/services/services-api.service.ts | 3 +++
1 file changed, 3 insertions(+)
diff --git a/frontend/src/app/services/services-api.service.ts b/frontend/src/app/services/services-api.service.ts
index c26075198..d12fc959f 100644
--- a/frontend/src/app/services/services-api.service.ts
+++ b/frontend/src/app/services/services-api.service.ts
@@ -118,6 +118,9 @@ export class ServicesApiServices {
}
getJWT$() {
+ if (!this.stateService.env.OFFICIAL_MEMPOOL_SPACE) {
+ return of(null);
+ }
return this.httpClient.get(`${this.stateService.env.SERVICES_API}/auth/getJWT`);
}
From 3c7deafffdeea2e3364e2a7836fd07838c311c6d Mon Sep 17 00:00:00 2001
From: natsoni
Date: Fri, 26 Jul 2024 00:00:14 +0200
Subject: [PATCH 4/9] Fix loading spinner z-index
---
.../acceleration-fees-graph.component.ts | 2 +-
.../components/address-graph/address-graph.component.ts | 2 +-
.../block-fee-rates-graph.component.ts | 2 +-
.../block-fees-graph/block-fees-graph.component.ts | 2 +-
.../block-fees-subsidy-graph.component.ts | 2 +-
.../block-health-graph/block-health-graph.component.ts | 2 +-
.../block-rewards-graph/block-rewards-graph.component.ts | 2 +-
.../block-sizes-weights-graph.component.ts | 2 +-
.../difficulty-adjustments-table.components.ts | 2 +-
.../components/hashrate-chart/hashrate-chart.component.ts | 2 +-
.../hashrate-chart-pools.component.scss | 2 +-
.../hashrate-chart-pools.component.ts | 2 +-
.../incoming-transactions-graph.component.ts | 2 +-
.../lbtc-pegs-graph/lbtc-pegs-graph.component.ts | 2 +-
.../reserves-ratio/reserves-ratio.component.scss | 2 +-
.../loading-indicator/loading-indicator.component.scss | 2 +-
.../components/mempool-graph/mempool-graph.component.ts | 2 +-
.../components/pool-ranking/pool-ranking.component.scss | 2 +-
frontend/src/app/components/pool/pool.component.scss | 2 +-
.../src/app/components/tracker/tracker.component.scss | 2 +-
frontend/src/app/lightning/channel/channel.component.scss | 2 +-
.../lightning/node-fee-chart/node-fee-chart.component.ts | 2 +-
.../node-statistics-chart.component.ts | 2 +-
.../nodes-channels-map/nodes-channels-map.component.scss | 8 ++++----
.../lightning/nodes-channels/node-channels.component.scss | 2 +-
.../src/app/lightning/nodes-map/nodes-map.component.scss | 2 +-
.../nodes-networks-chart.component.ts | 2 +-
.../nodes-per-isp-chart.component.scss | 2 +-
.../lightning-statistics-chart.component.ts | 2 +-
29 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/frontend/src/app/components/acceleration/acceleration-fees-graph/acceleration-fees-graph.component.ts b/frontend/src/app/components/acceleration/acceleration-fees-graph/acceleration-fees-graph.component.ts
index b5e575409..d78b663a4 100644
--- a/frontend/src/app/components/acceleration/acceleration-fees-graph/acceleration-fees-graph.component.ts
+++ b/frontend/src/app/components/acceleration/acceleration-fees-graph/acceleration-fees-graph.component.ts
@@ -23,7 +23,7 @@ import { RelativeUrlPipe } from '../../../shared/pipes/relative-url/relative-url
position: absolute;
top: 50%;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
}
`],
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/frontend/src/app/components/address-graph/address-graph.component.ts b/frontend/src/app/components/address-graph/address-graph.component.ts
index 9793c6a2e..6d40a8ebb 100644
--- a/frontend/src/app/components/address-graph/address-graph.component.ts
+++ b/frontend/src/app/components/address-graph/address-graph.component.ts
@@ -30,7 +30,7 @@ const periodSeconds = {
position: absolute;
top: 50%;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
}
`],
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/frontend/src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.ts b/frontend/src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.ts
index ba3489e17..c533626e7 100644
--- a/frontend/src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.ts
+++ b/frontend/src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.ts
@@ -23,7 +23,7 @@ import { ActivatedRoute, Router } from '@angular/router';
position: absolute;
top: 50%;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
}
`],
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/frontend/src/app/components/block-fees-graph/block-fees-graph.component.ts b/frontend/src/app/components/block-fees-graph/block-fees-graph.component.ts
index eb567c2a6..33e3eb19e 100644
--- a/frontend/src/app/components/block-fees-graph/block-fees-graph.component.ts
+++ b/frontend/src/app/components/block-fees-graph/block-fees-graph.component.ts
@@ -23,7 +23,7 @@ import { StateService } from '../../services/state.service';
position: absolute;
top: 50%;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
}
`],
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/frontend/src/app/components/block-fees-subsidy-graph/block-fees-subsidy-graph.component.ts b/frontend/src/app/components/block-fees-subsidy-graph/block-fees-subsidy-graph.component.ts
index 18e57ada8..42d05510f 100644
--- a/frontend/src/app/components/block-fees-subsidy-graph/block-fees-subsidy-graph.component.ts
+++ b/frontend/src/app/components/block-fees-subsidy-graph/block-fees-subsidy-graph.component.ts
@@ -24,7 +24,7 @@ import { RelativeUrlPipe } from '../../shared/pipes/relative-url/relative-url.pi
position: absolute;
top: 50%;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
}
`],
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/frontend/src/app/components/block-health-graph/block-health-graph.component.ts b/frontend/src/app/components/block-health-graph/block-health-graph.component.ts
index 59f34cd45..6a7168d6b 100644
--- a/frontend/src/app/components/block-health-graph/block-health-graph.component.ts
+++ b/frontend/src/app/components/block-health-graph/block-health-graph.component.ts
@@ -21,7 +21,7 @@ import { StateService } from '../../services/state.service';
position: absolute;
top: 50%;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
}
`],
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/frontend/src/app/components/block-rewards-graph/block-rewards-graph.component.ts b/frontend/src/app/components/block-rewards-graph/block-rewards-graph.component.ts
index d0c154420..63a543674 100644
--- a/frontend/src/app/components/block-rewards-graph/block-rewards-graph.component.ts
+++ b/frontend/src/app/components/block-rewards-graph/block-rewards-graph.component.ts
@@ -23,7 +23,7 @@ import { StateService } from '../../services/state.service';
position: absolute;
top: 50%;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
}
`],
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/frontend/src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts b/frontend/src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts
index bf591ad70..b0069dca2 100644
--- a/frontend/src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts
+++ b/frontend/src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts
@@ -21,7 +21,7 @@ import { StateService } from '../../services/state.service';
position: absolute;
top: 50%;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
}
`],
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/frontend/src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.components.ts b/frontend/src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.components.ts
index 7db1367ea..438a50f74 100644
--- a/frontend/src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.components.ts
+++ b/frontend/src/app/components/difficulty-adjustments-table/difficulty-adjustments-table.components.ts
@@ -15,7 +15,7 @@ import { StateService } from '../../services/state.service';
position: absolute;
top: 50%;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
}
`],
})
diff --git a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts
index 8aaa983fa..0d193514d 100644
--- a/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts
+++ b/frontend/src/app/components/hashrate-chart/hashrate-chart.component.ts
@@ -23,7 +23,7 @@ import { seoDescriptionNetwork } from '../../shared/common.utils';
position: absolute;
top: 50%;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
}
`],
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.scss b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.scss
index fe38ce89b..87ee1b45d 100644
--- a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.scss
+++ b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.scss
@@ -59,7 +59,7 @@
position: absolute;
top: 50%;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
}
.loadingGraphs.widget {
top: 75%;
diff --git a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts
index 5ac2cc10d..3fca15bf3 100644
--- a/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts
+++ b/frontend/src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts
@@ -28,7 +28,7 @@ interface Hashrate {
position: absolute;
top: 50%;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
}
`],
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/frontend/src/app/components/incoming-transactions-graph/incoming-transactions-graph.component.ts b/frontend/src/app/components/incoming-transactions-graph/incoming-transactions-graph.component.ts
index d3d7d8237..3487d6fb0 100644
--- a/frontend/src/app/components/incoming-transactions-graph/incoming-transactions-graph.component.ts
+++ b/frontend/src/app/components/incoming-transactions-graph/incoming-transactions-graph.component.ts
@@ -17,7 +17,7 @@ const OUTLIERS_MEDIAN_MULTIPLIER = 4;
position: absolute;
top: 50%;
left: calc(50% - 16px);
- z-index: 100;
+ z-index: 99;
}
`],
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/frontend/src/app/components/lbtc-pegs-graph/lbtc-pegs-graph.component.ts b/frontend/src/app/components/lbtc-pegs-graph/lbtc-pegs-graph.component.ts
index aca469ff8..a8ec36bec 100644
--- a/frontend/src/app/components/lbtc-pegs-graph/lbtc-pegs-graph.component.ts
+++ b/frontend/src/app/components/lbtc-pegs-graph/lbtc-pegs-graph.component.ts
@@ -11,7 +11,7 @@ import { StateService } from '../../services/state.service';
position: absolute;
top: 50%;
left: calc(50% - 16px);
- z-index: 100;
+ z-index: 99;
}
`],
templateUrl: './lbtc-pegs-graph.component.html',
diff --git a/frontend/src/app/components/liquid-reserves-audit/reserves-ratio/reserves-ratio.component.scss b/frontend/src/app/components/liquid-reserves-audit/reserves-ratio/reserves-ratio.component.scss
index 9881148fc..b58e706e5 100644
--- a/frontend/src/app/components/liquid-reserves-audit/reserves-ratio/reserves-ratio.component.scss
+++ b/frontend/src/app/components/liquid-reserves-audit/reserves-ratio/reserves-ratio.component.scss
@@ -2,5 +2,5 @@
position: absolute;
top: 50%;
left: calc(50% - 16px);
- z-index: 100;
+ z-index: 99;
}
\ No newline at end of file
diff --git a/frontend/src/app/components/loading-indicator/loading-indicator.component.scss b/frontend/src/app/components/loading-indicator/loading-indicator.component.scss
index b919fa2b8..9217263bd 100644
--- a/frontend/src/app/components/loading-indicator/loading-indicator.component.scss
+++ b/frontend/src/app/components/loading-indicator/loading-indicator.component.scss
@@ -1,7 +1,7 @@
.sticky-loading {
position: absolute;
right: 10px;
- z-index: 100;
+ z-index: 99;
font-size: 14px;
@media (width >= 992px) {
left: 32px;
diff --git a/frontend/src/app/components/mempool-graph/mempool-graph.component.ts b/frontend/src/app/components/mempool-graph/mempool-graph.component.ts
index 63fb52a0c..3a707987f 100644
--- a/frontend/src/app/components/mempool-graph/mempool-graph.component.ts
+++ b/frontend/src/app/components/mempool-graph/mempool-graph.component.ts
@@ -18,7 +18,7 @@ import { download, formatterXAxis, formatterXAxisLabel } from '../../shared/grap
position: absolute;
top: 50%;
left: calc(50% - 16px);
- z-index: 100;
+ z-index: 99;
}
`],
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/frontend/src/app/components/pool-ranking/pool-ranking.component.scss b/frontend/src/app/components/pool-ranking/pool-ranking.component.scss
index 9001fc085..cf53ebe14 100644
--- a/frontend/src/app/components/pool-ranking/pool-ranking.component.scss
+++ b/frontend/src/app/components/pool-ranking/pool-ranking.component.scss
@@ -60,7 +60,7 @@
position: absolute;
top: 50%;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
}
.pool-distribution {
diff --git a/frontend/src/app/components/pool/pool.component.scss b/frontend/src/app/components/pool/pool.component.scss
index 36bdc93e9..5c2fedd26 100644
--- a/frontend/src/app/components/pool/pool.component.scss
+++ b/frontend/src/app/components/pool/pool.component.scss
@@ -167,7 +167,7 @@ div.scrollable {
.loadingGraphs {
position: absolute;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
top: 475px;
@media (max-width: 992px) {
top: 600px;
diff --git a/frontend/src/app/components/tracker/tracker.component.scss b/frontend/src/app/components/tracker/tracker.component.scss
index 56f0b5f0a..614691426 100644
--- a/frontend/src/app/components/tracker/tracker.component.scss
+++ b/frontend/src/app/components/tracker/tracker.component.scss
@@ -49,7 +49,7 @@
position: relative;
background: var(--nav-bg);
box-shadow: 0 -5px 15px #000;
- z-index: 100;
+ z-index: 99;
align-items: center;
justify-content: space-between;
diff --git a/frontend/src/app/lightning/channel/channel.component.scss b/frontend/src/app/lightning/channel/channel.component.scss
index 9451c8112..89a43acf3 100644
--- a/frontend/src/app/lightning/channel/channel.component.scss
+++ b/frontend/src/app/lightning/channel/channel.component.scss
@@ -68,7 +68,7 @@ h3 {
.loading-spinner {
position: absolute;
top: 400px;
- z-index: 100;
+ z-index: 99;
width: 100%;
left: 0;
@media (max-width: 767.98px) {
diff --git a/frontend/src/app/lightning/node-fee-chart/node-fee-chart.component.ts b/frontend/src/app/lightning/node-fee-chart/node-fee-chart.component.ts
index 7f329eaf2..aa0837fce 100644
--- a/frontend/src/app/lightning/node-fee-chart/node-fee-chart.component.ts
+++ b/frontend/src/app/lightning/node-fee-chart/node-fee-chart.component.ts
@@ -16,7 +16,7 @@ import { StateService } from '../../services/state.service';
position: absolute;
top: 50%;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
}
`],
})
diff --git a/frontend/src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts b/frontend/src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts
index 35cd8b236..91813400d 100644
--- a/frontend/src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts
+++ b/frontend/src/app/lightning/node-statistics-chart/node-statistics-chart.component.ts
@@ -19,7 +19,7 @@ import { StateService } from '../../services/state.service';
position: absolute;
top: 50%;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
}
`],
})
diff --git a/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.scss b/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.scss
index 16482a0da..ad71cfb8e 100644
--- a/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.scss
+++ b/frontend/src/app/lightning/nodes-channels-map/nodes-channels-map.component.scss
@@ -102,7 +102,7 @@
position: absolute;
top: 50%;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
@media (max-width: 767.98px) {
top: 550px;
}
@@ -110,7 +110,7 @@
.loading-spinner.widget {
position: absolute;
top: 200px;
- z-index: 100;
+ z-index: 99;
width: 100%;
left: 0;
@media (max-width: 767.98px) {
@@ -120,7 +120,7 @@
.loading-spinner.nodepage {
position: absolute;
top: 200px;
- z-index: 100;
+ z-index: 99;
width: 100%;
left: 0;
}
@@ -128,7 +128,7 @@
.loading-spinner.channelpage {
position: absolute;
top: 400px;
- z-index: 100;
+ z-index: 99;
width: 100%;
left: 0;
@media (max-width: 767.98px) {
diff --git a/frontend/src/app/lightning/nodes-channels/node-channels.component.scss b/frontend/src/app/lightning/nodes-channels/node-channels.component.scss
index 78510203f..08dc5c2cb 100644
--- a/frontend/src/app/lightning/nodes-channels/node-channels.component.scss
+++ b/frontend/src/app/lightning/nodes-channels/node-channels.component.scss
@@ -8,7 +8,7 @@
left: 0;
right: 0;
width: 100%;
- z-index: 100;
+ z-index: 99;
}
.spinner-border {
diff --git a/frontend/src/app/lightning/nodes-map/nodes-map.component.scss b/frontend/src/app/lightning/nodes-map/nodes-map.component.scss
index 82362a257..d0fa1016f 100644
--- a/frontend/src/app/lightning/nodes-map/nodes-map.component.scss
+++ b/frontend/src/app/lightning/nodes-map/nodes-map.component.scss
@@ -68,7 +68,7 @@
position: absolute;
top: 50%;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
@media (max-width: 767.98px) {
top: 550px;
}
diff --git a/frontend/src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts b/frontend/src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts
index 9784e0a5b..d947bb327 100644
--- a/frontend/src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts
+++ b/frontend/src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts
@@ -22,7 +22,7 @@ import { StateService } from '../../services/state.service';
position: absolute;
top: 50%;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
}
`],
changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.scss b/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.scss
index b9490d579..e1b66cc2b 100644
--- a/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.scss
+++ b/frontend/src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.scss
@@ -46,7 +46,7 @@
position: absolute;
top: 50%;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
}
.pool-distribution {
diff --git a/frontend/src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts b/frontend/src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts
index 44f359ae8..77ce42f26 100644
--- a/frontend/src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts
+++ b/frontend/src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts
@@ -22,7 +22,7 @@ import { StateService } from '../../services/state.service';
position: absolute;
top: 50%;
left: calc(50% - 15px);
- z-index: 100;
+ z-index: 99;
}
`],
})
From 6081daaceffd11d7de77855554d87cc9c092136a Mon Sep 17 00:00:00 2001
From: Mononaut
Date: Fri, 26 Jul 2024 09:06:47 +0000
Subject: [PATCH 5/9] [accelerator] add missing getters etc
---
.../accelerate-checkout.component.ts | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
index 72dfc5de2..3d97b336e 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -11,7 +11,7 @@ import { IAuth, AuthServiceMempool } from '../../services/auth.service';
import { EnterpriseService } from '../../services/enterprise.service';
import { ApiService } from '../../services/api.service';
-export type PaymentMethod = 'balance' | 'bitcoin' | 'cashapp';
+export type PaymentMethod = 'balance' | 'bitcoin' | 'cashapp' | 'applepay' | 'googlepay';
export type AccelerationEstimate = {
hasAccess: boolean;
@@ -24,7 +24,7 @@ export type AccelerationEstimate = {
mempoolBaseFee: number;
vsizeFee: number;
pools: number[];
- availablePaymentMethods: {[method: string]: {min: number, max: number}};
+ availablePaymentMethods: Record;
unavailable?: boolean;
options: { // recommended bid options
fee: number; // recommended userBid in sats
@@ -512,6 +512,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
this.accelerationUUID
).subscribe({
next: () => {
+ this.apiService.logAccelerationRequest$(this.tx.txid).subscribe();
this.audioService.playSound('ascend-chime-cartoon');
if (this.applePay) {
this.applePay.destroy();
@@ -601,6 +602,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
this.accelerationUUID
).subscribe({
next: () => {
+ this.apiService.logAccelerationRequest$(this.tx.txid).subscribe();
this.audioService.playSound('ascend-chime-cartoon');
if (this.googlePay) {
this.googlePay.destroy();
@@ -790,7 +792,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
}
get couldPay() {
- return this.couldPayWithBalance || this.couldPayWithBitcoin || this.couldPayWithCashapp || this.couldPayWithApplePay;
+ return this.couldPayWithBalance || this.couldPayWithBitcoin || this.couldPayWithCashapp || this.couldPayWithApplePay || this.couldPayWithGooglePay;
}
get canPayWithBitcoin() {
@@ -855,7 +857,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
}
get canPay() {
- return this.canPayWithBalance || this.canPayWithBitcoin || this.canPayWithCashapp || this.canPayWithApplePay;
+ return this.canPayWithBalance || this.canPayWithBitcoin || this.canPayWithCashapp || this.canPayWithApplePay || this.canPayWithGooglePay;
}
get hasAccessToBalanceMode() {
From 6adbda5185ca4fd4dd76763ce812bdd051f87132 Mon Sep 17 00:00:00 2001
From: Mononaut
Date: Fri, 26 Jul 2024 09:27:18 +0000
Subject: [PATCH 6/9] Fix accelerator checkout linting & type errors
---
.../accelerate-checkout.component.ts | 100 +++++++++---------
.../src/app/interfaces/websocket.interface.ts | 2 +-
frontend/src/app/services/state.service.ts | 2 +-
3 files changed, 50 insertions(+), 54 deletions(-)
diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
index 3d97b336e..d9f270111 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -1,7 +1,8 @@
+/* eslint-disable no-console */
import { Component, OnInit, OnDestroy, Output, EventEmitter, Input, ChangeDetectorRef, SimpleChanges, HostListener } from '@angular/core';
import { Subscription, tap, of, catchError, Observable, switchMap } from 'rxjs';
import { ServicesApiServices } from '../../services/services-api.service';
-import { md5, nextRoundNumber, insecureRandomUUID } from '../../shared/common.utils';
+import { md5, insecureRandomUUID } from '../../shared/common.utils';
import { StateService } from '../../services/state.service';
import { AudioService } from '../../services/audio.service';
import { ETA, EtaService } from '../../services/eta.service';
@@ -11,7 +12,7 @@ import { IAuth, AuthServiceMempool } from '../../services/auth.service';
import { EnterpriseService } from '../../services/enterprise.service';
import { ApiService } from '../../services/api.service';
-export type PaymentMethod = 'balance' | 'bitcoin' | 'cashapp' | 'applepay' | 'googlepay';
+export type PaymentMethod = 'balance' | 'bitcoin' | 'cashapp' | 'applePay' | 'googlePay';
export type AccelerationEstimate = {
hasAccess: boolean;
@@ -112,14 +113,13 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
loadingCashapp = false;
loadingApplePay = false;
loadingGooglePay = false;
- cashappSubmit: any;
payments: any;
cashAppPay: any;
applePay: any;
googlePay: any;
conversionsSubscription: Subscription;
- conversions: any;
-
+ conversions: Record;
+
// btcpay
loadingBtcpayInvoice = false;
invoice = undefined;
@@ -137,13 +137,13 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
this.accelerationUUID = insecureRandomUUID();
// Check if Apple Pay available
- // @ts-ignore https://developer.apple.com/documentation/apple_pay_on_the_web/apple_pay_js_api/checking_for_apple_pay_availability#overview
- if (window.ApplePaySession) {
+ // https://developer.apple.com/documentation/apple_pay_on_the_web/apple_pay_js_api/checking_for_apple_pay_availability#overview
+ if (window['ApplePaySession']) {
this.applePayEnabled = true;
}
}
- ngOnInit() {
+ ngOnInit(): void {
this.authSubscription$ = this.authService.getAuth$().subscribe((auth) => {
if (this.auth?.user?.userId !== auth?.user?.userId) {
this.auth = auth;
@@ -175,7 +175,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
);
}
- ngOnDestroy() {
+ ngOnDestroy(): void {
if (this.estimateSubscription) {
this.estimateSubscription.unsubscribe();
}
@@ -195,7 +195,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
}
}
- moveToStep(step: CheckoutStep) {
+ moveToStep(step: CheckoutStep): void {
this._step = step;
if (this.timeoutTimer) {
clearTimeout(this.timeoutTimer);
@@ -232,7 +232,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
if (this.step === 'paid') {
this.accelerateError = 'internal_server_error';
}
- }, 120000)
+ }, 120000);
}
this.hasDetails.emit(this._step === 'quote');
}
@@ -250,7 +250,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
this.scrollToElement(id, position);
}, timeout);
}
- scrollToElement(id: string, position: ScrollLogicalPosition) {
+ scrollToElement(id: string, position: ScrollLogicalPosition): void {
const acceleratePreviewAnchor = document.getElementById(id);
if (acceleratePreviewAnchor) {
this.cd.markForCheck();
@@ -265,7 +265,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
/**
* Accelerator
*/
- fetchEstimate() {
+ fetchEstimate(): void {
if (this.estimateSubscription) {
this.estimateSubscription.unsubscribe();
}
@@ -329,7 +329,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
}
}),
- catchError((response) => {
+ catchError(() => {
this.estimate = undefined;
this.quoteError = `cannot_accelerate_tx`;
this.estimateSubscription.unsubscribe();
@@ -400,8 +400,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
* Square
*/
insertSquare(): void {
- //@ts-ignore
- if (window.Square) {
+ if (window['Square']) {
return;
}
let statsUrl = 'https://sandbox.web.squarecdn.com/v1/square.js';
@@ -413,19 +412,17 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
statsUrl = 'https://web.squarecdn.com/v1/square.js';
}
- (function() {
+ (function(): void {
const d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
- // @ts-ignore
g.type='text/javascript'; g.src=statsUrl; s.parentNode.insertBefore(g, s);
})();
}
- setupSquare() {
- const init = () => {
+ setupSquare(): void {
+ const init = (): void => {
this.initSquare();
};
- //@ts-ignore
- if (!window.Square) {
+ if (!window['Square']) {
console.debug('Square.js failed to load properly. Retrying in 1 second.');
setTimeout(init, 1000);
} else {
@@ -436,8 +433,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
try {
this.servicesApiService.setupSquare$().subscribe({
next: async (ids) => {
- //@ts-ignore
- this.payments = window.Square.payments(ids.squareAppId, ids.squareLocationId)
+ this.payments = window['Square'].payments(ids.squareAppId, ids.squareLocationId);
const urlParams = new URLSearchParams(window.location.search);
if (this._step === 'cashapp' || urlParams.get('cash_request_id')) {
await this.requestCashAppPayment();
@@ -451,7 +447,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
console.debug('Error loading Square Payments');
this.accelerateError = 'cannot_setup_square';
}
- });
+ });
} catch (e) {
console.debug('Error loading Square Payments', e);
this.accelerateError = 'cannot_setup_square';
@@ -461,11 +457,11 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
/**
* APPLE PAY
*/
- async requestApplePayPayment() {
+ async requestApplePayPayment(): Promise {
if (this.conversionsSubscription) {
this.conversionsSubscription.unsubscribe();
}
-
+
this.conversionsSubscription = this.stateService.conversions$.subscribe(
async (conversions) => {
this.conversions = conversions;
@@ -552,11 +548,11 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
/**
* GOOGLE PAY
*/
- async requestGooglePayPayment() {
+ async requestGooglePayPayment(): Promise {
if (this.conversionsSubscription) {
this.conversionsSubscription.unsubscribe();
}
-
+
this.conversionsSubscription = this.stateService.conversions$.subscribe(
async (conversions) => {
this.conversions = conversions;
@@ -579,7 +575,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
await this.googlePay.attach(`#google-pay-button`, {
buttonType: 'pay',
- onClick: (e) => { console.log(e, 'hi') }
+ onClick: (e) => { console.log(e); }
});
this.loadingGooglePay = false;
@@ -630,7 +626,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
)}`;
}
throw new Error(errorMessage);
- }
+ }
});
}
);
@@ -639,11 +635,11 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
/**
* CASHAPP
*/
- async requestCashAppPayment() {
+ async requestCashAppPayment(): Promise {
if (this.conversionsSubscription) {
this.conversionsSubscription.unsubscribe();
}
-
+
this.conversionsSubscription = this.stateService.conversions$.subscribe(
async (conversions) => {
this.conversions = conversions;
@@ -668,7 +664,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
referenceId: `accelerator-${this.tx.txid.substring(0, 15)}-${Math.round(new Date().getTime() / 1000)}`
});
- await this.cashAppPay.attach(`#cash-app-pay`, { theme: 'light', size: 'small', shape: 'semiround' })
+ await this.cashAppPay.attach(`#cash-app-pay`, { theme: 'light', size: 'small', shape: 'semiround' });
this.loadingCashapp = false;
this.cashAppPay.addEventListener('ontokenization', event => {
@@ -717,7 +713,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
/**
* BTCPay
*/
- async requestBTCPayInvoice() {
+ async requestBTCPayInvoice(): Promise {
this.servicesApiService.generateBTCPayAcceleratorInvoice$(this.tx.txid, this.userBid).pipe(
switchMap(response => {
return this.servicesApiService.retreiveInvoice$(response.btcpayInvoiceId);
@@ -747,60 +743,60 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
/**
* UI events
*/
- selectedOptionChanged(event) {
+ selectedOptionChanged(event): void {
this.selectedOption = event.target.id;
}
- get step() {
+ get step(): CheckoutStep {
return this._step;
}
- get paymentMethods() {
- return Object.keys(this.estimate?.availablePaymentMethods || {});
+ get paymentMethods(): PaymentMethod[] {
+ return Object.keys(this.estimate?.availablePaymentMethods || {}) as PaymentMethod[];
}
- get couldPayWithBitcoin() {
+ get couldPayWithBitcoin(): boolean {
return !!this.estimate?.availablePaymentMethods?.bitcoin;
}
- get couldPayWithCashapp() {
+ get couldPayWithCashapp(): boolean {
if (!this.cashappEnabled) {
return false;
}
return !!this.estimate?.availablePaymentMethods?.cashapp;
}
- get couldPayWithApplePay() {
+ get couldPayWithApplePay(): boolean {
if (!this.applePayEnabled) {
return false;
}
return !!this.estimate?.availablePaymentMethods?.applePay;
}
- get couldPayWithGooglePay() {
+ get couldPayWithGooglePay(): boolean {
if (!this.googlePayEnabled) {
return false;
}
return !!this.estimate?.availablePaymentMethods?.googlePay;
}
- get couldPayWithBalance() {
+ get couldPayWithBalance(): boolean {
if (!this.hasAccessToBalanceMode) {
return false;
}
return !!this.estimate?.availablePaymentMethods?.balance;
}
- get couldPay() {
+ get couldPay(): boolean {
return this.couldPayWithBalance || this.couldPayWithBitcoin || this.couldPayWithCashapp || this.couldPayWithApplePay || this.couldPayWithGooglePay;
}
- get canPayWithBitcoin() {
+ get canPayWithBitcoin(): boolean {
const paymentMethod = this.estimate?.availablePaymentMethods?.bitcoin;
return paymentMethod && this.cost >= paymentMethod.min && this.cost <= paymentMethod.max;
}
- get canPayWithCashapp() {
+ get canPayWithCashapp(): boolean {
if (!this.cashappEnabled || !this.conversions) {
return false;
}
@@ -816,7 +812,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
return false;
}
- get canPayWithApplePay() {
+ get canPayWithApplePay(): boolean {
if (!this.applePayEnabled || !this.conversions) {
return false;
}
@@ -832,7 +828,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
return false;
}
- get canPayWithGooglePay() {
+ get canPayWithGooglePay(): boolean {
if (!this.googlePayEnabled || !this.conversions) {
return false;
}
@@ -848,7 +844,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
return false;
}
- get canPayWithBalance() {
+ get canPayWithBalance(): boolean {
if (!this.hasAccessToBalanceMode) {
return false;
}
@@ -856,11 +852,11 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
return paymentMethod && this.cost >= paymentMethod.min && this.cost <= paymentMethod.max && this.cost <= this.estimate?.userBalance;
}
- get canPay() {
+ get canPay(): boolean {
return this.canPayWithBalance || this.canPayWithBitcoin || this.canPayWithCashapp || this.canPayWithApplePay || this.canPayWithGooglePay;
}
- get hasAccessToBalanceMode() {
+ get hasAccessToBalanceMode(): boolean {
return this.isLoggedIn() && this.estimate?.hasAccess;
}
diff --git a/frontend/src/app/interfaces/websocket.interface.ts b/frontend/src/app/interfaces/websocket.interface.ts
index 22789986e..35e0ffa09 100644
--- a/frontend/src/app/interfaces/websocket.interface.ts
+++ b/frontend/src/app/interfaces/websocket.interface.ts
@@ -7,7 +7,7 @@ export interface WebsocketResponse {
backend?: 'esplora' | 'electrum' | 'none';
block?: BlockExtended;
blocks?: BlockExtended[];
- conversions?: any;
+ conversions?: Record;
txConfirmed?: string;
historicalDate?: string;
mempoolInfo?: MempoolInfo;
diff --git a/frontend/src/app/services/state.service.ts b/frontend/src/app/services/state.service.ts
index 05f1ac69f..8928245a7 100644
--- a/frontend/src/app/services/state.service.ts
+++ b/frontend/src/app/services/state.service.ts
@@ -138,7 +138,7 @@ export class StateService {
blocksSubject$ = new BehaviorSubject([]);
blocks$: Observable;
transactions$ = new BehaviorSubject(null);
- conversions$ = new ReplaySubject(1);
+ conversions$ = new ReplaySubject>(1);
bsqPrice$ = new ReplaySubject(1);
mempoolInfo$ = new ReplaySubject(1);
mempoolBlocks$ = new ReplaySubject(1);
From 8d3b4733f5a0c86da68a97b6c574fbbf5b3312e1 Mon Sep 17 00:00:00 2001
From: Mononaut
Date: Fri, 26 Jul 2024 09:49:42 +0000
Subject: [PATCH 7/9] [accelerator] remove dumb 405 log request response
---
backend/src/api/mining/mining-routes.ts | 4 ----
backend/src/api/services/acceleration.ts | 7 +++++--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/backend/src/api/mining/mining-routes.ts b/backend/src/api/mining/mining-routes.ts
index 08ea0d1bc..f49abd7b0 100644
--- a/backend/src/api/mining/mining-routes.ts
+++ b/backend/src/api/mining/mining-routes.ts
@@ -465,10 +465,6 @@ class MiningRoutes {
}
private async $requestAcceleration(req: Request, res: Response): Promise {
- if (config.MEMPOOL_SERVICES.ACCELERATIONS || config.MEMPOOL.OFFICIAL) {
- res.status(405).send('not available.');
- return;
- }
res.setHeader('Pragma', 'no-cache');
res.setHeader('Cache-control', 'private, no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0');
res.setHeader('expires', -1);
diff --git a/backend/src/api/services/acceleration.ts b/backend/src/api/services/acceleration.ts
index 386c40b8e..88289382b 100644
--- a/backend/src/api/services/acceleration.ts
+++ b/backend/src/api/services/acceleration.ts
@@ -37,6 +37,7 @@ export interface AccelerationHistory {
};
class AccelerationApi {
+ private onDemandPollingEnabled = !config.MEMPOOL_SERVICES.ACCELERATIONS;
private apiPath = config.MEMPOOL.OFFICIAL ? (config.MEMPOOL_SERVICES.API + '/accelerator/accelerations') : (config.EXTERNAL_DATA_SERVER.MEMPOOL_API + '/accelerations');
private _accelerations: Acceleration[] | null = null;
private lastPoll = 0;
@@ -52,7 +53,9 @@ class AccelerationApi {
}
public accelerationRequested(txid: string): void {
- this.myAccelerations[txid] = { status: 'requested', added: Date.now() };
+ if (this.onDemandPollingEnabled) {
+ this.myAccelerations[txid] = { status: 'requested', added: Date.now() };
+ }
}
public accelerationConfirmed(): void {
@@ -70,7 +73,7 @@ class AccelerationApi {
}
public async $updateAccelerations(): Promise {
- if (config.MEMPOOL_SERVICES.ACCELERATIONS) {
+ if (!this.onDemandPollingEnabled) {
const accelerations = await this.$fetchAccelerations();
if (accelerations) {
this._accelerations = accelerations;
From 62a72755c7ecc5c9b33b3f4ac12508b4b32f4480 Mon Sep 17 00:00:00 2001
From: softsimon
Date: Fri, 26 Jul 2024 10:25:29 -0500
Subject: [PATCH 8/9] pull from transifex
---
frontend/src/locale/messages.nl.xlf | 112 ++++++++++++++++++++++++++++
frontend/src/locale/messages.pt.xlf | 83 +++++++++++++++++++--
frontend/src/locale/messages.ru.xlf | 4 +-
3 files changed, 192 insertions(+), 7 deletions(-)
diff --git a/frontend/src/locale/messages.nl.xlf b/frontend/src/locale/messages.nl.xlf
index a8f5537c4..390a9df3b 100644
--- a/frontend/src/locale/messages.nl.xlf
+++ b/frontend/src/locale/messages.nl.xlf
@@ -417,6 +417,7 @@
Sorry, something went wrong!
+ Sorry, er ging iets mis!
src/app/components/accelerate-checkout/accelerate-checkout.component.html
5
@@ -425,6 +426,7 @@
We were not able to accelerate this transaction. Please try again later.
+ We hebben deze transactie niet kunnen versnellen. Probeer het later opnieuw.
src/app/components/accelerate-checkout/accelerate-checkout.component.html
11
@@ -433,6 +435,7 @@
Close
+ Sluiten
src/app/components/accelerate-checkout/accelerate-checkout.component.html
18
@@ -633,6 +636,7 @@
How much faster?
+ Hoeveel sneller?
src/app/components/accelerate-checkout/accelerate-checkout.component.html
71
@@ -641,6 +645,7 @@
This will reduce your expected waiting time until the first confirmation to
+ Dit verkort de verwachte wachttijd tot de eerste bevestiging tot
src/app/components/accelerate-checkout/accelerate-checkout.component.html
76,77
@@ -649,6 +654,7 @@
Summary
+ Samenvatting
src/app/components/accelerate-checkout/accelerate-checkout.component.html
100
@@ -697,6 +703,7 @@
Target rate
+ Doeltarief
src/app/components/accelerate-checkout/accelerate-checkout.component.html
131
@@ -705,6 +712,7 @@
Extra fee required
+ Extra vergoeding vereist
src/app/components/accelerate-checkout/accelerate-checkout.component.html
139
@@ -758,6 +766,7 @@
Acceleration cost
+ Acceleratiekosten
src/app/components/accelerate-checkout/accelerate-checkout.component.html
206
@@ -775,6 +784,7 @@
Go back
+ Ga terug
src/app/components/accelerate-checkout/accelerate-checkout.component.html
258
@@ -791,6 +801,7 @@
Accelerate your Bitcoin transaction?
+ Bitcoin-transactie versnellen?
src/app/components/accelerate-checkout/accelerate-checkout.component.html
273
@@ -799,6 +810,7 @@
Wait
+ Wacht
src/app/components/accelerate-checkout/accelerate-checkout.component.html
285
@@ -807,6 +819,7 @@
Confirmation expected
+ Bevestiging verwacht
src/app/components/accelerate-checkout/accelerate-checkout.component.html
287
@@ -819,6 +832,7 @@
Confirmation not expected any time soon
+ Bevestiging wordt niet snel verwacht
src/app/components/accelerate-checkout/accelerate-checkout.component.html
290
@@ -827,6 +841,7 @@
For an additional
+ Voor een extra
src/app/components/accelerate-checkout/accelerate-checkout.component.html
345
@@ -835,6 +850,7 @@
Reducing expected confirmation time to
+ Verkort verwachte bevestigingstijd naar
src/app/components/accelerate-checkout/accelerate-checkout.component.html
351,352
@@ -843,6 +859,7 @@
Payment to mempool.space for acceleration of txid ..
+ Betaling aan mempool.space voor versnelling van txid ..
src/app/components/accelerate-checkout/accelerate-checkout.component.html
362,363
@@ -855,6 +872,7 @@
Your account will be debited no more than
+ Er wordt maximaal van uw rekening afgeschreven
src/app/components/accelerate-checkout/accelerate-checkout.component.html
367
@@ -863,6 +881,7 @@
Pay
+ Betalen
src/app/components/accelerate-checkout/accelerate-checkout.component.html
378
@@ -884,6 +903,7 @@
Failed to load invoice
+ Kan betaling niet laden
src/app/components/accelerate-checkout/accelerate-checkout.component.html
381
@@ -892,6 +912,7 @@
Loading invoice...
+ Betaling laden...
src/app/components/accelerate-checkout/accelerate-checkout.component.html
386
@@ -900,6 +921,7 @@
OR
+ OF
src/app/components/accelerate-checkout/accelerate-checkout.component.html
394
@@ -908,6 +930,7 @@
Confirm your payment
+ Bevestig uw betaling
src/app/components/accelerate-checkout/accelerate-checkout.component.html
428
@@ -916,6 +939,7 @@
Total additional cost
+ Totale extra kosten
src/app/components/accelerate-checkout/accelerate-checkout.component.html
444
@@ -924,6 +948,7 @@
with
+ met
src/app/components/accelerate-checkout/accelerate-checkout.component.html
448
@@ -932,6 +957,7 @@
Loading payment method...
+ Betaalmethode laden...
src/app/components/accelerate-checkout/accelerate-checkout.component.html
462
@@ -940,6 +966,7 @@
Confirming your payment
+ Betaling aan het bevestigen
src/app/components/accelerate-checkout/accelerate-checkout.component.html
480
@@ -948,6 +975,7 @@
We are processing your payment...
+ Wij verwerken uw betaling...
src/app/components/accelerate-checkout/accelerate-checkout.component.html
490
@@ -956,6 +984,7 @@
Accelerating your transaction
+ Transactie aan het versnellen
src/app/components/accelerate-checkout/accelerate-checkout.component.html
500
@@ -964,6 +993,7 @@
Confirming your acceleration with our mining pool partners...
+ Bevestiging van uw versnelling met onze mining-partners...
src/app/components/accelerate-checkout/accelerate-checkout.component.html
507
@@ -972,6 +1002,7 @@
...sorry, this is taking longer than expected...
+ ...sorry, dit duurt langer dan verwacht...
src/app/components/accelerate-checkout/accelerate-checkout.component.html
509
@@ -980,6 +1011,7 @@
Your transaction is being accelerated!
+ Uw transactie wordt versneld!
src/app/components/accelerate-checkout/accelerate-checkout.component.html
518
@@ -988,6 +1020,7 @@
Your transaction has been accepted for acceleration by our mining pool partners.
+ Uw transactie is geaccepteerd voor versnelling door onze mining-partners.
src/app/components/accelerate-checkout/accelerate-checkout.component.html
524
@@ -996,6 +1029,7 @@
Calculating cost...
+ Kosten berekenen...
src/app/components/accelerate-checkout/accelerate-checkout.component.html
543
@@ -1004,6 +1038,7 @@
customize
+ aanpassen
src/app/components/accelerate-checkout/accelerate-checkout.component.html
549
@@ -1012,6 +1047,7 @@
Accelerate to ~ sat/vB
+ Versnellen naar ~ sat/vB
src/app/components/accelerate-checkout/accelerate-checkout.component.html
552
@@ -1038,6 +1074,7 @@
Your transaction will be prioritized by up to % of miners.
+ Uw transactie krijgt prioriteit door maximaal % van de miners.
src/app/components/accelerate-checkout/accelerate-checkout.component.html
580
@@ -1116,6 +1153,7 @@
accelerated
+ versneld
src/app/components/accelerate-checkout/accelerate-fee-graph.component.ts
91
@@ -1405,6 +1443,7 @@
Total vSize
+ Totaal vSize
src/app/components/acceleration/acceleration-stats/acceleration-stats.component.html
20
@@ -1425,6 +1464,7 @@
of blocks
+ van blokken
src/app/components/acceleration/acceleration-stats/acceleration-stats.component.html
23
@@ -1674,6 +1714,7 @@
(1 day)
+ (1 dag)
src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html
27
@@ -1682,6 +1723,7 @@
(1 week)
+ (1 week)
src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html
30
@@ -1690,6 +1732,7 @@
(1 month)
+ (1 maand)
src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html
33
@@ -1698,6 +1741,7 @@
(all time)
+ (altijd)
src/app/components/acceleration/accelerator-dashboard/accelerator-dashboard.component.html
36
@@ -1752,6 +1796,7 @@
Accelerated to
+ Versneld naar
src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html
7
@@ -1761,6 +1806,7 @@
Accelerated by
+ Versneld door
src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html
30
@@ -1770,6 +1816,7 @@
of hashrate
+ van hashrate
src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html
32
@@ -1778,6 +1825,7 @@
not accelerating
+ niet versneld
src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts
85
@@ -1807,6 +1855,7 @@
of block
+ van blok
src/app/components/acceleration/pending-stats/pending-stats.component.html
23
@@ -2099,6 +2148,7 @@
all
+ alle
src/app/components/address/address.component.html
84
@@ -2107,6 +2157,7 @@
recent
+ recent
src/app/components/address/address.component.html
87
@@ -2115,6 +2166,7 @@
of transaction
+ van transactie
src/app/components/address/address.component.html
101
@@ -2123,6 +2175,7 @@
of transactions
+ van transacties
src/app/components/address/address.component.html
102
@@ -2144,6 +2197,7 @@
There are too many transactions on this address, more than your backend can handle. See more on setting up a stronger backend. Consider viewing this address on the official Mempool website instead:
+ Er zijn te veel transacties op dit adres, meer dan uw backend aankan. Bekijk meer informatie over het opzetten van een sterkere backend. Bekijk in plaats daarvan dit adres op de officiële Mempool-website:
src/app/components/address/address.component.html
204,207
@@ -2152,6 +2206,7 @@
Confirmed balance
+ Bevestigd saldo
src/app/components/address/address.component.html
247
@@ -2160,6 +2215,7 @@
Confirmed UTXOs
+ Bevestigde UTXO's
src/app/components/address/address.component.html
257
@@ -2168,6 +2224,7 @@
Pending UTXOs
+ UTXO's in behandeling
src/app/components/address/address.component.html
262
@@ -2553,6 +2610,7 @@
Change (7d)
+ Wijziging (7d)
src/app/components/balance-widget/balance-widget.component.html
14
@@ -2565,6 +2623,7 @@
Change (30d)
+ Wijziging (30d)
src/app/components/balance-widget/balance-widget.component.html
23
@@ -2689,6 +2748,7 @@
Block Fees Vs Subsidy
+ Blokkosten versus subsidie
src/app/components/block-fees-subsidy-graph/block-fees-subsidy-graph.component.html
6
@@ -2705,6 +2765,7 @@
See the mining fees earned per Bitcoin block compared to the Bitcoin block subsidy, visualized in BTC and USD over time.
+ Bekijk de verdiende miningkosten per Bitcoin-blok ten opzichte van de Bitcoin-bloksubsidie, gevisualiseerd in BTC en USD in de loop van de tijd.
src/app/components/block-fees-subsidy-graph/block-fees-subsidy-graph.component.ts
79
@@ -2712,6 +2773,7 @@
At block
+ Bij blok
src/app/components/block-fees-subsidy-graph/block-fees-subsidy-graph.component.ts
185
@@ -2719,6 +2781,7 @@
Around block
+ Rond blok
src/app/components/block-fees-subsidy-graph/block-fees-subsidy-graph.component.ts
187
@@ -3459,6 +3522,7 @@
transaction
+ transactie
src/app/components/block/block-transactions.component.html
4
@@ -3479,6 +3543,7 @@
transactions
+ transacties
src/app/components/block/block-transactions.component.html
5
@@ -3875,6 +3940,7 @@
Error loading block data.
+ Fout bij het laden van blokgegevens.
src/app/components/block/block.component.html
367
@@ -4343,6 +4409,7 @@
Treasury
+ Schatkist
src/app/components/custom-dashboard/custom-dashboard.component.html
228
@@ -4351,6 +4418,7 @@
Treasury Transactions
+ Schatkisttransacties
src/app/components/custom-dashboard/custom-dashboard.component.html
251
@@ -4359,6 +4427,7 @@
X Timeline
+ X Tijdlijn
src/app/components/custom-dashboard/custom-dashboard.component.html
265
@@ -4706,6 +4775,7 @@
Testnet4 Faucet
+ Testnet4 kraan
src/app/components/faucet/faucet.component.html
4
@@ -4714,6 +4784,7 @@
Amount (sats)
+ Bedrag (sat)
src/app/components/faucet/faucet.component.html
51
@@ -4722,6 +4793,7 @@
Request Testnet4 Coins
+ Testnet4-munten aanvragen
src/app/components/faucet/faucet.component.html
70
@@ -5467,6 +5539,7 @@
Number of times that the Federation's BTC holdings fall below 95% of the total L-BTC supply
+ Aantal keren dat de BTC-bezit van de Federatie onder de 95% van het totale L-BTC-aanbod daalt
src/app/components/liquid-reserves-audit/reserves-ratio-stats/reserves-ratio-stats.component.html
6
@@ -5575,6 +5648,7 @@
Faucet
+ Kraan
src/app/components/master-page/master-page.component.html
105
@@ -6094,6 +6168,7 @@
Error loading pool data.
+ Fout bij het laden van poolgegevens.
src/app/components/pool/pool.component.html
467
@@ -6390,6 +6465,7 @@
Mining Pools
+ Mining pools
src/app/components/search-form/search-results/search-results.component.html
47
@@ -6530,6 +6606,7 @@
Test Transactions
+ Test-transacties
src/app/components/test-transactions/test-transactions.component.html
2
@@ -6547,6 +6624,7 @@
Raw hex
+ Ruwe hexcode
src/app/components/test-transactions/test-transactions.component.html
5
@@ -6555,6 +6633,7 @@
Comma-separated list of raw transactions
+ Komma-gescheiden lijst met ruwe transacties
src/app/components/test-transactions/test-transactions.component.html
7
@@ -6563,6 +6642,7 @@
Maximum fee rate (sat/vB)
+ Maximale kosten (sat/vB)
src/app/components/test-transactions/test-transactions.component.html
9
@@ -6571,6 +6651,7 @@
Allowed?
+ Toegestaan?
src/app/components/test-transactions/test-transactions.component.html
23
@@ -6579,6 +6660,7 @@
Rejection reason
+ Reden van afwijzing
src/app/components/test-transactions/test-transactions.component.html
26
@@ -6731,6 +6813,7 @@
within ~
+ binnen ~
src/app/components/time/time.component.ts
211
@@ -6910,6 +6993,7 @@
Sent
+ Verstuurd
src/app/components/tracker/tracker-bar.component.html
2
@@ -6918,6 +7002,7 @@
Soon
+ Spoedig
src/app/components/tracker/tracker-bar.component.html
6
@@ -6954,6 +7039,7 @@
Not any time soon
+ Niet snel
src/app/components/tracker/tracker.component.html
74
@@ -6967,6 +7053,7 @@
Confirmed at
+ Bevestigd om
src/app/components/tracker/tracker.component.html
87
@@ -6975,6 +7062,7 @@
Block height
+ Blokhoogte
src/app/components/tracker/tracker.component.html
96
@@ -6983,6 +7071,7 @@
Your transaction has been accelerated
+ Uw transactie is versneld
src/app/components/tracker/tracker.component.html
143
@@ -6991,6 +7080,7 @@
Waiting for your transaction to appear in the mempool
+ Wachten tot uw transactie in de mempool verschijnt
src/app/components/tracker/tracker.component.html
150
@@ -6999,6 +7089,7 @@
Your transaction is in the mempool, but it will not be confirmed for some time.
+ Uw transactie staat in de mempool, maar wordt binnenkort niet bevestigd.
src/app/components/tracker/tracker.component.html
156
@@ -7007,6 +7098,7 @@
Your transaction is near the top of the mempool, and is expected to confirm soon.
+ Uw transactie staat bovenaan de mempool en zal naar verwachting binnenkort worden bevestigd.
src/app/components/tracker/tracker.component.html
162
@@ -7015,6 +7107,7 @@
Your transaction is expected to confirm in the next block
+ Uw transactie wordt naar verwachting in het volgende blok bevestigd
src/app/components/tracker/tracker.component.html
168
@@ -7023,6 +7116,7 @@
Your transaction is confirmed!
+ Uw transactie is bevestigd!
src/app/components/tracker/tracker.component.html
174
@@ -7031,6 +7125,7 @@
Your transaction has been replaced by a newer version!
+ Uw transactie is vervangen door een nieuwere versie!
src/app/components/tracker/tracker.component.html
180
@@ -7039,6 +7134,7 @@
See more details
+ Zie meer details
src/app/components/tracker/tracker.component.html
189
@@ -7124,6 +7220,7 @@
Hide accelerator
+ Verberg versneller
src/app/components/transaction/transaction.component.html
131
@@ -7132,6 +7229,7 @@
RBF Timeline
+ RBF-geschiedenis
src/app/components/transaction/transaction.component.html
158
@@ -7141,6 +7239,7 @@
Acceleration Timeline
+ Accelatiegeschiedenis
src/app/components/transaction/transaction.component.html
167
@@ -9650,6 +9749,7 @@
fee
+ kosten
src/app/shared/components/address-type/address-type.component.html
3
@@ -9658,6 +9758,7 @@
empty
+ leeg
src/app/shared/components/address-type/address-type.component.html
6
@@ -9666,6 +9767,7 @@
provably unspendable
+ aantoonbaar onbruikbaar
src/app/shared/components/address-type/address-type.component.html
18
@@ -9674,6 +9776,7 @@
bare multisig
+ kale multisig
src/app/shared/components/address-type/address-type.component.html
21
@@ -9758,6 +9861,7 @@
Test Transaction
+ Test transactie
src/app/shared/components/global-footer/global-footer.component.html
64
@@ -9839,6 +9943,7 @@
Research
+ Onderzoek
src/app/shared/components/global-footer/global-footer.component.html
75
@@ -9865,6 +9970,7 @@
Testnet3 Explorer
+ Testnet3 Verkenner
src/app/shared/components/global-footer/global-footer.component.html
81
@@ -9873,6 +9979,7 @@
Testnet4 Explorer
+ Testnet4 Verkenner
src/app/shared/components/global-footer/global-footer.component.html
82
@@ -9975,6 +10082,7 @@
Your balance is too low.Please top up your account.
+ Uw saldo is te laag.waardeer alstublieft uw account op .
src/app/shared/components/mempool-error/mempool-error.component.html
9
@@ -9992,6 +10100,7 @@
Testnet3 is deprecated, and will soon be replaced by Testnet4
+ Testnet3 is verouderd en wordt binnenkort vervangen door Testnet4
src/app/shared/components/testnet-alert/testnet-alert.component.html
6
@@ -10000,6 +10109,7 @@
Testnet4 is not yet finalized, and may be reset at anytime.
+ Testnet4 is nog niet afgerond en kan op elk moment worden gereset.
src/app/shared/components/testnet-alert/testnet-alert.component.html
9
@@ -10008,6 +10118,7 @@
Batch payment
+ Batchbetaling
src/app/shared/filters.utils.ts
108
@@ -10167,6 +10278,7 @@
Multisig of
+ Multisig van
src/app/shared/script.utils.ts
168
diff --git a/frontend/src/locale/messages.pt.xlf b/frontend/src/locale/messages.pt.xlf
index e13c9c7ea..01f35e4b1 100644
--- a/frontend/src/locale/messages.pt.xlf
+++ b/frontend/src/locale/messages.pt.xlf
@@ -409,6 +409,7 @@
Learn more about The Mempool Open Source Project®: enterprise sponsors, individual sponsors, integrations, who contributes, FOSS licensing, and more.
+ Saiba mais sobre o Mempool Open Source Project®: patrocinadores empresariais, patrocinadores individuais, integrações, quem contribui, licenciamento FOSS e muito mais.
src/app/components/about/about.component.ts
50
@@ -2122,6 +2123,7 @@
See mempool transactions, confirmed transactions, balance, and more for address .
+ Veja transações no mempool, transações confirmadas, saldo, e mais para o endereço .
src/app/components/address/address-preview.component.ts
72
@@ -2195,6 +2197,7 @@
There are too many transactions on this address, more than your backend can handle. See more on setting up a stronger backend. Consider viewing this address on the official Mempool website instead:
+ Há muitas transações neste endereço, mais do que seu back-end pode suportar. Veja mais sobre como configurar um back-end mais robusto. Considere visualizar este endereço no site oficial do Mempool:
src/app/components/address/address.component.html
204,207
@@ -2221,6 +2224,7 @@
Pending UTXOs
+ UTXOs pendentes
src/app/components/address/address.component.html
262
@@ -2409,6 +2413,7 @@
Browse an overview of the Liquid asset (): see issued amount, burned amount, circulating amount, related transactions, and more.
+ Navegue por uma visão geral do ativo Liquid (): veja valor emitido, valor queimado, valor circulante, transações relacionadas e mais.
src/app/components/asset/asset.component.ts
108
@@ -2532,6 +2537,7 @@
Explore all the assets issued on the Liquid network like L-BTC, L-CAD, USDT, and more.
+ Explore todos os ativos emitidos na rede Liquid, como L-BTC, L-CAD, USDT e muito mais.
src/app/components/assets/assets-nav/assets-nav.component.ts
43
@@ -2673,6 +2679,7 @@
See Bitcoin feerates visualized over time, including minimum and maximum feerates per block along with feerates at various percentiles.
+ Veja as taxas de Bitcoin visualizadas ao longo do tempo, incluindo taxas mínimas e máximas por bloco, juntamente com taxas em vários percentis.
src/app/components/block-fee-rates-graph/block-fee-rates-graph.component.ts
73
@@ -2697,6 +2704,7 @@
See the average mining fees earned per Bitcoin block visualized in BTC and USD over time.
+ Veja as taxas médias de mineração ganhas por bloco Bitcoin visualizadas em BTC e USD ao longo do tempo.
src/app/components/block-fees-graph/block-fees-graph.component.ts
70
@@ -2740,6 +2748,7 @@
Block Fees Vs Subsidy
+ Taxas dos blocos versus subsídio
src/app/components/block-fees-subsidy-graph/block-fees-subsidy-graph.component.html
6
@@ -2756,6 +2765,7 @@
See the mining fees earned per Bitcoin block compared to the Bitcoin block subsidy, visualized in BTC and USD over time.
+ Veja as taxas de mineração ganhas por bloco Bitcoin em comparação com o subsídio do bloco Bitcoin, visualizadas em BTC e USD ao longo do tempo.
src/app/components/block-fees-subsidy-graph/block-fees-subsidy-graph.component.ts
79
@@ -2779,6 +2789,7 @@
select filter categories to highlight matching transactions
+ selecione categorias de filtro para destacar as transações correspondentes
src/app/components/block-filters/block-filters.component.html
2
@@ -2812,7 +2823,7 @@
Match
- Selecionar
+ Confere
src/app/components/block-filters/block-filters.component.html
19
@@ -2882,6 +2893,7 @@
See Bitcoin block health visualized over time. Block health is a measure of how many expected transactions were included in an actual mined block. Expected transactions are determined using Mempool's re-implementation of Bitcoin Core's transaction selection algorithm.
+ Veja a integridade do bloco Bitcoin visualizada ao longo do tempo. A integridade do bloco é uma medida de quantas transações esperadas foram incluídas em um bloco minado de fato. As transações esperadas são determinadas usando a reimplementação do algoritmo de seleção de transações do Bitcoin Core pelo Mempool.
src/app/components/block-health-graph/block-health-graph.component.ts
64
@@ -3216,6 +3228,7 @@
See Bitcoin block rewards in BTC and USD visualized over time. Block rewards are the total funds miners earn from the block subsidy and fees.
+ Veja as recompensas do bloco Bitcoin em BTC e USD visualizadas ao longo do tempo. As recompensas do bloco são o total de fundos que os mineradores ganham com os subsídios e taxas do bloco.
src/app/components/block-rewards-graph/block-rewards-graph.component.ts
68
@@ -3240,6 +3253,7 @@
See Bitcoin block sizes (MB) and block weights (weight units) visualized over time.
+ Veja os tamanhos dos blocos Bitcoin (MB) e os pesos dos blocos (unidades de peso) visualizados ao longo do tempo.
src/app/components/block-sizes-weights-graph/block-sizes-weights-graph.component.ts
65
@@ -3363,6 +3377,7 @@
See size, weight, fee range, included transactions, and more for Liquid block ().
+ Veja tamanho, peso, faixa de taxas, transações incluídas e muito mais para o bloco Liquid ().
src/app/components/block-view/block-view.component.ts
112
@@ -3378,6 +3393,7 @@
See size, weight, fee range, included transactions, audit (expected v actual), and more for Bitcoin block ().
+ Veja tamanho, peso, faixa de taxas, transações incluídas, auditoria (esperada x real) e muito mais para Bitcoin bloco ( ).
src/app/components/block-view/block-view.component.ts
114
@@ -4109,6 +4125,7 @@
See the most recent Liquid blocks along with basic stats such as block height, block size, and more.
+ Veja os blocos Liquid mais recentes junto com estatísticas básicas, como altura e tamanho do bloco e muito mais.
src/app/components/blocks-list/blocks-list.component.ts
71
@@ -4116,6 +4133,7 @@
See the most recent Bitcoin blocks along with basic stats such as block height, block reward, block size, and more.
+ Veja os blocos Bitcoin mais recentes junto com estatísticas básicas, como altura do bloco, recompensa do bloco, tamanho do bloco e muito mais.
src/app/components/blocks-list/blocks-list.component.ts
73
@@ -4409,6 +4427,7 @@
X Timeline
+ Linha do Tempo no 𝕏
src/app/components/custom-dashboard/custom-dashboard.component.html
265
@@ -5097,6 +5116,7 @@
See hashrate and difficulty for the Bitcoin network visualized over time.
+ Veja o hashrate e a dificuldade da rede Bitcoin visualizados ao longo do tempo.
src/app/components/hashrate-chart/hashrate-chart.component.ts
76
@@ -5124,6 +5144,7 @@
See Bitcoin mining pool dominance visualized over time: see how top mining pools' share of total hashrate has fluctuated over time.
+ Veja o domínio do pool de mineração de Bitcoin visualizado ao longo do tempo: veja como a participação dos principais pools de mineração no hashrate total flutuou ao longo do tempo.
src/app/components/hashrates-chart-pools/hashrate-chart-pools.component.ts
75
@@ -5237,6 +5258,7 @@
Non-Dust Expired
+ Poeira Expirada
src/app/components/liquid-reserves-audit/expired-utxos-stats/expired-utxos-stats.component.html
3
@@ -5245,6 +5267,7 @@
Total amount of BTC held in non-dust Federation UTXOs that have expired timelocks
+ Quantidade total de BTC mantidos em UTXOs da Federação sem poeira que têm timelocks expirados
src/app/components/liquid-reserves-audit/expired-utxos-stats/expired-utxos-stats.component.html
5
@@ -5279,6 +5302,7 @@
Total amount of BTC held in Federation UTXOs that have expired timelocks
+ Quantidade total de BTC mantidos em UTXOs da Federação que possuem timelocks expirados
src/app/components/liquid-reserves-audit/expired-utxos-stats/expired-utxos-stats.component.html
15
@@ -5388,6 +5412,7 @@
Timelock-Expired UTXOs
+ UTXOs expirados por timelock
src/app/components/liquid-reserves-audit/federation-wallet/federation-wallet.component.html
12
@@ -5442,6 +5467,7 @@
Fund / Redemption Tx
+ Tx de Depósito/Resgate
src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.html
15
@@ -5459,6 +5485,7 @@
Peg out in progress...
+ Peg out em andamento...
src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.html
70
@@ -5467,6 +5494,7 @@
24h Peg-In Volume
+ Volume de Peg-In 24h
src/app/components/liquid-reserves-audit/recent-pegs-stats/recent-pegs-stats.component.html
12
@@ -5484,6 +5512,7 @@
24h Peg-Out Volume
+ Volume de Peg-Out 24h
src/app/components/liquid-reserves-audit/recent-pegs-stats/recent-pegs-stats.component.html
18
@@ -5510,6 +5539,7 @@
Number of times that the Federation's BTC holdings fall below 95% of the total L-BTC supply
+ Número de vezes que as participações de BTC da Federação caem abaixo de 95% do fornecimento total de L-BTC
src/app/components/liquid-reserves-audit/reserves-ratio-stats/reserves-ratio-stats.component.html
6
@@ -5527,6 +5557,7 @@
Avg Peg Ratio
+ Razão Média de Peg
src/app/components/liquid-reserves-audit/reserves-ratio-stats/reserves-ratio-stats.component.html
14
@@ -5561,7 +5592,7 @@
L-BTC in circulation
- L-BTC em circulação
+ L-BTC circulando
src/app/components/liquid-reserves-audit/reserves-supply-stats/reserves-supply-stats.component.html
3
@@ -5626,6 +5657,7 @@
See stats for transactions in the mempool: fee range, aggregate size, and more. Mempool blocks are updated in real-time as the network receives new transactions.
+ Veja estatísticas de transações no mempool: faixa de taxas, tamanho agregado e muito mais. Os blocos no mempool são atualizados em tempo real à medida que a rede recebe novas transações.
src/app/components/mempool-block/mempool-block.component.ts
62
@@ -5721,6 +5753,7 @@
Get real-time Bitcoin mining stats like hashrate, difficulty adjustment, block rewards, pool dominance, and more.
+ Obtenha estatísticas de mineração de Bitcoin em tempo real, como hashrate, ajuste de dificuldade, recompensas de bloco, domínio de pool e muito mais.
src/app/components/mining-dashboard/mining-dashboard.component.ts
30
@@ -5905,6 +5938,7 @@
See the top Bitcoin mining pools ranked by number of blocks mined, over your desired timeframe.
+ Veja os principais pools de mineração de Bitcoin classificados por número de blocos minerados, durante o período desejado.
src/app/components/pool-ranking/pool-ranking.component.ts
60
@@ -5998,6 +6032,7 @@
See mining pool stats for : most recent mined blocks, hashrate over time, total block reward to date, known coinbase addresses, and more.
+ Veja as estatísticas do pool de mineração : blocos minerados mais recentes, taxa de hash ao longo do tempo, recompensa total do bloco até o momento, endereços de coinbase conhecidos e muito mais.
src/app/components/pool/pool-preview.component.ts
86
@@ -6202,6 +6237,7 @@
Broadcast a transaction to the network using the transaction's hash.
+ Transmita uma transação para a rede usando o hash da transação.
src/app/components/push-transaction/push-transaction.component.ts
39
@@ -6231,6 +6267,7 @@
See the most recent RBF replacements on the Bitcoin network, updated in real-time.
+ Veja as substituições de RBF mais recentes na rede Bitcoin, atualizadas em tempo real.
src/app/components/rbf-list/rbf-list.component.ts
62
@@ -6553,6 +6590,7 @@
See mempool size (in MvB) and transactions per second (in vB/s) visualized over time.
+ Veja o tamanho do mempool (em MvB) e as transações por segundo (em vB/s) visualizadas ao longo do tempo.
src/app/components/statistics/statistics.component.ts
66
@@ -6560,6 +6598,7 @@
See Bitcoin blocks and mempool congestion in real-time in a simplified format perfect for a TV.
+ Veja blocos de Bitcoin e congestionamento da mempool em tempo real em um formato simplificado, perfeito para uma TV.
src/app/components/television/television.component.ts
40
@@ -6621,6 +6660,7 @@
Rejection reason
+ Motivo da rejeição
src/app/components/test-transactions/test-transactions.component.html
26
@@ -6833,7 +6873,7 @@
After
- Depois de
+ Depois de
src/app/components/time/time.component.ts
234
@@ -6893,6 +6933,7 @@
before
+ antes
src/app/components/time/time.component.ts
257
@@ -7118,6 +7159,7 @@
Get real-time status, addresses, fees, script info, and more for transaction with txid .
+ Obtenha status em tempo real, endereços, taxas, informações de script e muito mais para transações com txid .
src/app/components/tracker/tracker.component.ts
410
@@ -7247,7 +7289,7 @@
Inputs & Outputs
- Entradas & Saídas
+ Entradas e Saídas
src/app/components/transaction/transaction.component.html
218
@@ -7289,6 +7331,7 @@
Sigops
+ Sigops
src/app/components/transaction/transaction.component.html
273
@@ -7343,6 +7386,7 @@
This transaction was projected to be included in the block
+ Esta transação foi projetada para ser incluída no bloco
src/app/components/transaction/transaction.component.html
520
@@ -7361,6 +7405,7 @@
This transaction was seen in the mempool prior to mining
+ Esta transação foi vista na mempool antes da mineração
src/app/components/transaction/transaction.component.html
522
@@ -7379,6 +7424,7 @@
This transaction was missing from our mempool prior to mining
+ Esta transação estava faltando em nossa mempool antes da mineração
src/app/components/transaction/transaction.component.html
524
@@ -7793,6 +7839,7 @@
Liquid Federation Holdings
+ Holdings da Liquid Federation
src/app/dashboard/dashboard.component.html
165
@@ -7805,6 +7852,7 @@
Federation Timelock-Expired UTXOs
+ UTXOs expirados por timelock da Federação
src/app/dashboard/dashboard.component.html
174
@@ -7817,6 +7865,7 @@
L-BTC Supply Against BTC Holdings
+ Oferta de L-BTC contra holdings BTC
src/app/dashboard/dashboard.component.html
184
@@ -7846,6 +7895,7 @@
mempool.space merely provides data about the Bitcoin network. It cannot help you with retrieving funds, wallet issues, etc.For any such requests, you need to get in touch with the entity that helped make the transaction (wallet software, exchange company, etc).
+ mempool.space apenas fornece dados sobre a rede Bitcoin. Ele não pode ajudá-lo a recuperar fundos, problemas de carteira etc.Para qualquer solicitação desse tipo, você precisa entrar em contato com a entidade que ajudou a fazer a transação (software de carteira, corretora, etc.).
src/app/docs/api-docs/api-docs.component.html
15,16
@@ -7948,6 +7998,7 @@
Get answers to common questions like: What is a mempool? Why isn't my transaction confirming? How can I run my own instance of The Mempool Open Source Project? And more.
+ Obtenha respostas para perguntas comuns como: O que é um mempool? Por que minha transação não está sendo confirmada? Como posso executar minha própria instância do The Mempool Open Source Project? E mais.
src/app/docs/docs/docs.component.ts
47
@@ -7963,6 +8014,7 @@
Documentation for the liquid.network REST API service: get info on addresses, transactions, assets, blocks, and more.
+ Documentação para o serviço API REST liquid.network: obtenha informações sobre endereços, transações, ativos, blocos e muito mais.
src/app/docs/docs/docs.component.ts
53
@@ -7970,6 +8022,7 @@
Documentation for the mempool.space REST API service: get info on addresses, transactions, blocks, fees, mining, the Lightning network, and more.
+ Documentação para o serviço REST API mempool.space: obtenha informações sobre endereços, transações, blocos, taxas, mineração, rede Lightning e muito mais.
src/app/docs/docs/docs.component.ts
55
@@ -7985,6 +8038,7 @@
Documentation for the liquid.network WebSocket API service: get real-time info on blocks, mempools, transactions, addresses, and more.
+ Documentação para o serviço API WebSocket liquid.network: obtenha informações em tempo real sobre blocos, mempools, transações, endereços e muito mais.
src/app/docs/docs/docs.component.ts
61
@@ -7992,6 +8046,7 @@
Documentation for the mempool.space WebSocket API service: get real-time info on blocks, mempools, transactions, addresses, and more.
+ Documentação para o serviço API WebSocket mempool.space: obtenha informações em tempo real sobre blocos, mempools, transações, endereços e muito mais.
src/app/docs/docs/docs.component.ts
63
@@ -8007,6 +8062,7 @@
Documentation for our Electrum RPC interface: get instant, convenient, and reliable access to an Esplora instance.
+ Documentação para nossa interface Electrum RPC: obtenha acesso instantâneo, conveniente e confiável a uma instância Esplora.
src/app/docs/docs/docs.component.ts
68
@@ -8323,6 +8379,7 @@
Overview for Lightning channel . See channel capacity, the Lightning nodes involved, related on-chain transactions, and more.
+ Visão geral do canal Lightning . Veja a capacidade do canal, os nós do Lightning envolvidos, as transações relacionadas on-chain e muito mais.
src/app/lightning/channel/channel-preview.component.ts
37
@@ -8950,6 +9007,7 @@
Get stats on the Lightning network (aggregate capacity, connectivity, etc), Lightning nodes (channels, liquidity, etc) and Lightning channels (status, fees, etc).
+ Obtenha estatísticas sobre a rede Lightning (capacidade agregada, conectividade, etc.), nós Lightning (canais, liquidez, etc.) e canais Lightning (status, taxas, etc.).
src/app/lightning/lightning-dashboard/lightning-dashboard.component.ts
34
@@ -9059,6 +9117,7 @@
Overview for the Lightning network node named . See channels, capacity, location, fee stats, and more.
+ Visão geral do nó da rede Lightning denominado . Veja canais, capacidade, localização, estatísticas de taxas e muito mais.
src/app/lightning/node/node-preview.component.ts
52
@@ -9258,6 +9317,7 @@
See the channels of non-Tor Lightning network nodes visualized on a world map. Hover/tap on points on the map for node names and details.
+ Veja os canais de nós da rede não-Tor Lightning visualizados em um mapa mundial. Passe o mouse/toque nos pontos do mapa para obter nomes e detalhes dos nós.
src/app/lightning/nodes-channels-map/nodes-channels-map.component.ts
74
@@ -9282,6 +9342,7 @@
See the locations of non-Tor Lightning network nodes visualized on a world map. Hover/tap on points on the map for node names and details.
+ Veja as localizações dos nós da rede não-Tor Lightning visualizados em um mapa mundial. Passe o mouse/toque nos pontos do mapa para obter nomes e detalhes dos nós.
src/app/lightning/nodes-map/nodes-map.component.ts
52
@@ -9289,6 +9350,7 @@
See the number of Lightning network nodes visualized over time by network: clearnet only (IPv4, IPv6), darknet (Tor, I2p, cjdns), and both.
+ Veja o número de nós da rede Lightning visualizados ao longo do tempo por rede: somente clearnet (IPv4, IPv6), darknet (Tor, I2p, cjdns) e ambos.
src/app/lightning/nodes-networks-chart/nodes-networks-chart.component.ts
74
@@ -9344,7 +9406,7 @@
Share
- Compartilhar
+ Cota
src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.html
29
@@ -9357,6 +9419,7 @@
See a geographical breakdown of the Lightning network: how many Lightning nodes are hosted in countries around the world, aggregate BTC capacity for each country, and more.
+ Veja um detalhamento geográfico da rede Lightning: quantos nós Lightning estão hospedados em países ao redor do mundo, capacidade agregada de BTC para cada país e muito mais.
src/app/lightning/nodes-per-country-chart/nodes-per-country-chart.component.ts
47
@@ -9427,6 +9490,7 @@
Explore all the Lightning nodes hosted in and see an overview of each node's capacity, number of open channels, and more.
+ Explore todos os nós do Lightning hospedados em e tenha uma visão geral da capacidade de cada nó, número de canais abertos e muito mais.
src/app/lightning/nodes-per-country/nodes-per-country.component.ts
44
@@ -9509,6 +9573,7 @@
Browse the top 100 ISPs hosting Lightning nodes along with stats like total number of nodes per ISP, aggregate BTC capacity per ISP, and more
+ Navegue pelos 100 principais provedores que hospedam nós Lightning junto com estatísticas como número total de nós por provedor, capacidade agregada de BTC por provedor e muito mais
src/app/lightning/nodes-per-isp-chart/nodes-per-isp-chart.component.ts
54
@@ -9571,6 +9636,7 @@
Browse all Bitcoin Lightning nodes using the [AS] ISP and see aggregate stats like total number of nodes, total capacity, and more for the ISP.
+ Navegue por todos os nós Bitcoin Lightning usando o provedor [AS] e veja estatísticas agregadas, como número total de nós, capacidade total, e muito mais para o provedor.
src/app/lightning/nodes-per-isp/nodes-per-isp-preview.component.ts
45
@@ -9626,6 +9692,7 @@
See the oldest nodes on the Lightning network along with their capacity, number of channels, location, etc.
+ Veja os nós mais antigos da rede Lightning junto com sua capacidade, número de canais, localização, etc.
src/app/lightning/nodes-ranking/oldest-nodes/oldest-nodes.component.ts
28
@@ -9633,6 +9700,7 @@
See Lightning nodes with the most BTC liquidity deployed along with high-level stats like number of open channels, location, node age, and more.
+ Veja os nós do Lightning com a maior liquidez BTC implantada, juntamente com estatísticas de alto nível, como número de canais abertos, localização, idade do nó e muito mais.
src/app/lightning/nodes-ranking/top-nodes-per-capacity/top-nodes-per-capacity.component.ts
35
@@ -9640,6 +9708,7 @@
See Lightning nodes with the most channels open along with high-level stats like total node capacity, node age, and more.
+ Veja os nós do Lightning com o maior número de canais abertos, juntamente com estatísticas de alto nível, como capacidade total do nó, idade do nó e muito mais.
src/app/lightning/nodes-ranking/top-nodes-per-channels/top-nodes-per-channels.component.ts
39
@@ -9664,6 +9733,7 @@
See the top Lightning network nodes ranked by liquidity, connectivity, and age.
+ Veja os principais nós da rede Lightning classificados por liquidez, conectividade e idade.
src/app/lightning/nodes-rankings-dashboard/nodes-rankings-dashboard.component.ts
23
@@ -9671,6 +9741,7 @@
See the capacity of the Lightning network visualized over time in terms of the number of open channels and total bitcoin capacity.
+ Veja a capacidade da rede Lightning visualizada ao longo do tempo em termos de número de canais abertos e capacidade total de bitcoin.
src/app/lightning/statistics-chart/lightning-statistics-chart.component.ts
71
@@ -9696,6 +9767,7 @@
provably unspendable
+ comprovadamente impossível de gastar
src/app/shared/components/address-type/address-type.component.html
18
@@ -9704,6 +9776,7 @@
bare multisig
+ multisig simples
src/app/shared/components/address-type/address-type.component.html
21
diff --git a/frontend/src/locale/messages.ru.xlf b/frontend/src/locale/messages.ru.xlf
index 82b63285f..b2c7867ad 100644
--- a/frontend/src/locale/messages.ru.xlf
+++ b/frontend/src/locale/messages.ru.xlf
@@ -645,7 +645,7 @@
This will reduce your expected waiting time until the first confirmation to
- Это сократит время ожидания до первого подтверждения на
+ Это сократит время ожидания до первого подтверждения
src/app/components/accelerate-checkout/accelerate-checkout.component.html
76,77
@@ -6813,7 +6813,7 @@
within ~
- в пределах ~
+ примерно на
src/app/components/time/time.component.ts
211
From 12456735754d43c97289f9f7818253b41150332e Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Fri, 26 Jul 2024 17:39:58 +0200
Subject: [PATCH 9/9] [accelerator] polish UI
---
.../accelerate-checkout.component.html | 18 ++--
.../accelerate-checkout.component.ts | 4 +-
frontend/src/resources/apple-pay.png | Bin 0 -> 47582 bytes
frontend/src/resources/apple-pay.svg | 84 ------------------
frontend/src/resources/google-pay.png | Bin 34146 -> 30980 bytes
5 files changed, 13 insertions(+), 93 deletions(-)
create mode 100644 frontend/src/resources/apple-pay.png
delete mode 100755 frontend/src/resources/apple-pay.svg
diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
index 04b76055c..b9a176055 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -402,12 +402,16 @@
}
@if (canPayWithApplePay) {
- @if (canPayWithCashapp) {
}
- 
+ @if (canPayWithCashapp) { }
+
+
+
}
- 
+ @if (canPayWithCashapp || canPayWithApplePay) { }
+
+
+