From 3e07d6b6847d7389a94c00f16bfaf0c3d79d6262 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Tue, 2 Jul 2024 11:57:07 +0000 Subject: [PATCH 1/2] [accelerator] disable for txs not in mempool --- frontend/src/app/components/tracker/tracker.component.ts | 2 ++ .../src/app/components/transaction/transaction.component.ts | 2 ++ 2 files changed, 4 insertions(+) diff --git a/frontend/src/app/components/tracker/tracker.component.ts b/frontend/src/app/components/tracker/tracker.component.ts index 64991b8ed..68ce46a83 100644 --- a/frontend/src/app/components/tracker/tracker.component.ts +++ b/frontend/src/app/components/tracker/tracker.component.ts @@ -757,6 +757,8 @@ export class TrackerComponent implements OnInit, OnDestroy { get showAccelerationSummary(): boolean { return ( this.tx + && !this.replaced + && !this.isCached && !this.tx.acceleration && this.acceleratorAvailable && this.eligibleForAcceleration diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts index 93c91ef4b..7b401f8da 100644 --- a/frontend/src/app/components/transaction/transaction.component.ts +++ b/frontend/src/app/components/transaction/transaction.component.ts @@ -985,6 +985,8 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy { get showAccelerationSummary(): boolean { return ( this.tx + && !this.replaced + && !this.isCached && !this.tx.acceleration && this.acceleratorAvailable && this.eligibleForAcceleration From 642bf86423eb6182d43dd178b4b1570a708f2106 Mon Sep 17 00:00:00 2001 From: Mononaut Date: Tue, 2 Jul 2024 12:20:14 +0000 Subject: [PATCH 2/2] [accelerator] streamline payment method logic --- .../accelerate-checkout.component.html | 24 +++++++------------ .../accelerate-checkout.component.ts | 7 ++++-- .../components/tracker/tracker.component.ts | 2 +- 3 files changed, 14 insertions(+), 19 deletions(-) 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 0594bf67e..fbc83aa59 100644 --- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html +++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html @@ -21,7 +21,7 @@
-
-
You are currently on the waitlist for Mempool Accelerator™
-
- @if (showDetails) {
Your transaction
@@ -105,7 +101,7 @@ - @if (isLoggedIn()) { + @if (hasAccessToBalanceMode) { Next block market rate @@ -180,7 +176,7 @@ - + Estimated acceleration cost ~{{ estimate.targetFeeRate | number : '1.0-0' }} sat/vB @@ -201,7 +197,7 @@ - @if (isLoggedIn()) { + @if (hasAccessToBalanceMode) { Maximum acceleration cost } @else { Acceleration cost @@ -215,14 +211,14 @@ sats - + - + Available balance @@ -276,10 +272,6 @@
} -
-
You are currently on the waitlist for Mempool Accelerator™
-
- @if (!advancedEnabled) {
@@ -530,7 +522,7 @@ Accelerate to ~{{ x | number : '1.0-0' }} sat/vB - @if (isLoggedIn() || canPayWithBitcoin || canPayWithCashapp) { + @if (canPayWithBalance || canPayWithBitcoin || canPayWithCashapp) {