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 d96c8af36..92041eaca 100644 --- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html +++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html @@ -30,8 +30,6 @@
- -
You are currently on the waitlist
@@ -243,10 +241,7 @@
- +
@@ -258,6 +253,13 @@
+
+
+
+ +
+
+

@@ -282,9 +284,10 @@
+
- @if (isLoggedIn() || canPayWithBitcoin || canPayWithCashapp) { - - } @else { - - } +
@@ -327,7 +320,7 @@
- Accelerate to ~{{ ((userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB + Accelerate to ~{{ ((userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB @if (!calculating) { For an additional ({{ cost | number }} sats) @@ -393,6 +386,8 @@
+ +
@@ -487,4 +482,22 @@
} -
\ No newline at end of file +
+ + + + + + + @if (isLoggedIn() || canPayWithBitcoin || canPayWithCashapp) { + + } @else { + + } + \ No newline at end of file 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 4f8c5b163..49eb990fa 100644 --- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts +++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts @@ -56,7 +56,9 @@ export class AccelerateCheckout implements OnInit, OnDestroy { @Input() cashappEnabled: boolean = true; @Input() advancedEnabled: boolean = false; @Input() forceMobile: boolean = false; + @Input() showDetails: boolean = false; @Input() noCTA: boolean = false; + @Output() hasDetails = new EventEmitter(); @Output() changeMode = new EventEmitter(); calculating = true; @@ -67,7 +69,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy { private _step: CheckoutStep = 'summary'; simpleMode: boolean = true; - showDetails: boolean = false; paymentMethod: 'cashapp' | 'btcpay'; user: any = undefined; @@ -159,6 +160,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy { this.insertSquare(); this.setupSquare(); } + this.hasDetails.emit(this._step === 'quote'); } /** diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html index 7876f4f4c..47c368dfc 100644 --- a/frontend/src/app/components/transaction/transaction.component.html +++ b/frontend/src/app/components/transaction/transaction.component.html @@ -82,6 +82,7 @@ +
@@ -94,7 +95,9 @@ [eta]="eta" [miningStats]="miningStats" [scrollEvent]="scrollIntoAccelPreview" + [showDetails]="showAccelerationDetails" [noCTA]="true" + (hasDetails)="setHasAccelerationDetails($event)" class="h-100 w-100" >
diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts index fb3f8cb1a..7ad683cce 100644 --- a/frontend/src/app/components/transaction/transaction.component.ts +++ b/frontend/src/app/components/transaction/transaction.component.ts @@ -139,6 +139,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy { acceleratorAvailable: boolean = this.stateService.env.ACCELERATOR && this.stateService.network === ''; showAccelerationSummary = false; showAccelerationDetails = false; + hasAccelerationDetails = false; accelerationFlowCompleted = false; scrollIntoAccelPreview = false; accelerationEligible = false; @@ -866,6 +867,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy { this.rbfReplaces = []; this.filters = []; this.showCpfpDetails = false; + this.showAccelerationDetails = false; this.accelerationInfo = null; this.accelerationEligible = false; this.txInBlockIndex = null; @@ -934,6 +936,10 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy { } } + setHasAccelerationDetails(hasDetails: boolean): void { + this.hasAccelerationDetails = hasDetails; + } + @HostListener('window:resize', ['$event']) setGraphSize(): void { this.isMobile = window.innerWidth < 850;