From 1bcacf53be74a4b7b109bcb8f255921eab4a745b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Jun 2024 03:01:16 +0000
Subject: [PATCH 01/77] Bump braces from 3.0.2 to 3.0.3 in /unfurler

Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 unfurler/package-lock.json | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/unfurler/package-lock.json b/unfurler/package-lock.json
index ded1af081..45c40f097 100644
--- a/unfurler/package-lock.json
+++ b/unfurler/package-lock.json
@@ -491,12 +491,12 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -1252,9 +1252,9 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
@@ -3114,12 +3114,12 @@
       }
     },
     "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "requires": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       }
     },
     "buffer": {
@@ -3681,9 +3681,9 @@
       }
     },
     "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "requires": {
         "to-regex-range": "^5.0.1"

From 517e82ec8bb36ee7e7848a218168d5e5bf6385e3 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Mon, 24 Jun 2024 02:06:22 +0000
Subject: [PATCH 02/77] Add projected acceleration ETA to tracker page

---
 .../accelerate-checkout.component.html        |  2 +-
 .../accelerate-checkout.component.ts          | 20 ++++--
 .../accelerate-preview.component.html         |  6 +-
 .../accelerate-preview.component.ts           | 66 ++++---------------
 .../transaction/transaction.component.html    |  2 +-
 frontend/src/app/services/eta.service.ts      | 62 ++++++++++++++---
 frontend/src/app/services/state.service.ts    |  2 +-
 7 files changed, 85 insertions(+), 75 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 44b027ae2..8f82fe69c 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 @@
             <input type="radio" class="form-check-input" id="accelerate" name="accelerate" (change)="selectedOptionChanged($event)">
             <label class="form-check-label d-flex flex-column" for="accelerate">
               <span class="font-weight-bold">Accelerate</span>
-              <span style="color: rgb(186, 186, 186); font-size: 14px;">Confirmation expected within ~30 minutes<br>
+              <span style="color: rgb(186, 186, 186); font-size: 14px;" *ngIf="(etaInfo$ | async) as etaInfo">Confirmation expected <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time><br>
                 @if (!calculating) {
                   <app-fiat [value]="cost"></app-fiat>fee (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
                 } @else {
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 bd9bc453a..16400a70a 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -1,9 +1,11 @@
 import { Component, OnInit, OnDestroy, Output, EventEmitter, Input, ChangeDetectorRef, SimpleChanges } from '@angular/core';
-import { Subscription, tap, of, catchError } from 'rxjs';
+import { Subscription, tap, of, catchError, Observable } from 'rxjs';
 import { ServicesApiServices } from '../../services/services-api.service';
 import { nextRoundNumber } from '../../shared/common.utils';
 import { StateService } from '../../services/state.service';
 import { AudioService } from '../../services/audio.service';
+import { AccelerationEstimate } from '../accelerate-preview/accelerate-preview.component';
+import { EtaService } from '../../services/eta.service';
 
 @Component({
   selector: 'app-accelerate-checkout',
@@ -24,8 +26,10 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   square: { appId: string, locationId: string};
   accelerationUUID: string;
   estimateSubscription: Subscription;
+  estimate: AccelerationEstimate;
   maxBidBoost: number; // sats
   cost: number; // sats
+  etaInfo$: Observable<{ hashratePercentage: number, ETA: number, acceleratedETA: number }>;
 
   // square
   loadingCashapp = false;
@@ -39,6 +43,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   constructor(
     private servicesApiService: ServicesApiServices,
     private stateService: StateService,
+    private etaService: EtaService,
     private audioService: AudioService,
     private cd: ChangeDetectorRef
   ) {
@@ -59,7 +64,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
         locationId: ids.squareLocationId
       };
       if (this.step === 'cta') {
-        this.estimate();
+        this.fetchEstimate();
       }
     });
   }
@@ -99,7 +104,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   /**
    * Accelerator
    */
-  estimate() {
+  fetchEstimate() {
     if (this.estimateSubscription) {
       this.estimateSubscription.unsubscribe();
     }
@@ -110,16 +115,17 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
         if (response.status === 204) {
           this.error = `cannot_accelerate_tx`;
         } else {
-          const estimation = response.body;
-          if (!estimation) {
+          this.estimate = response.body;
+          if (!this.estimate) {
             this.error = `cannot_accelerate_tx`;
             return;
           }
           // Make min extra fee at least 50% of the current tx fee
-          const minExtraBoost = nextRoundNumber(Math.max(estimation.cost * 2, estimation.txSummary.effectiveFee));
+          const minExtraBoost = nextRoundNumber(Math.max(this.estimate.cost * 2, this.estimate.txSummary.effectiveFee));
           const DEFAULT_BID_RATIO = 1.5;
           this.maxBidBoost = minExtraBoost * DEFAULT_BID_RATIO;
-          this.cost = this.maxBidBoost + estimation.mempoolBaseFee + estimation.vsizeFee;
+          this.cost = this.maxBidBoost + this.estimate.mempoolBaseFee + this.estimate.vsizeFee;
+          this.etaInfo$ = this.etaService.getProjectedEtaObservable(this.estimate);
         }
       }),
 
diff --git a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
index 4c92269d8..c8778480e 100644
--- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
+++ b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
@@ -68,8 +68,10 @@
       <h5 *ngIf="estimate?.pools?.length" i18n="accelerator.how-much-faster">How much faster?</h5>
       <div class="row">
         <div class="col">
-          <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to {{ hashratePercentage | number : '1.1-1' }}% of miners.</small>
-          <small class="form-text text-muted mb-2" i18n="accelerator.time-estimate-description">This will reduce your expected waiting time until the first confirmation to <app-time kind="within" [time]="acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time></small>
+          <ng-container *ngIf="(etaInfo$ | async) as etaInfo">
+            <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to {{ etaInfo.hashratePercentage | number : '1.1-1' }}% of miners.</small>
+            <small class="form-text text-muted mb-2" i18n="accelerator.time-estimate-description">This will reduce your expected waiting time until the first confirmation to <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time></small>
+          </ng-container>
         </div>
         <div class="col pie">
           <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
diff --git a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.ts b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.ts
index 6d4c88a00..e839459cd 100644
--- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.ts
+++ b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, Input, OnDestroy, OnChanges, SimpleChanges, HostListener, ChangeDetectorRef } from '@angular/core';
-import { Subscription, catchError, of, tap } from 'rxjs';
+import { Observable, Subscription, catchError, of, tap } from 'rxjs';
 import { StorageService } from '../../services/storage.service';
 import { Transaction } from '../../interfaces/electrs.interface';
 import { nextRoundNumber } from '../../shared/common.utils';
@@ -8,7 +8,6 @@ import { AudioService } from '../../services/audio.service';
 import { StateService } from '../../services/state.service';
 import { MiningStats } from '../../services/mining.service';
 import { EtaService } from '../../services/eta.service';
-import { DifficultyAdjustment, MempoolPosition, SinglePoolStats } from '../../interfaces/node-api.interface';
 
 export type AccelerationEstimate = {
   txSummary: TxSummary;
@@ -19,6 +18,7 @@ export type AccelerationEstimate = {
   cost: number;
   mempoolBaseFee: number;
   vsizeFee: number;
+  pools: number[]
 }
 export type TxSummary = {
   txid: string; // txid of the current transaction
@@ -44,7 +44,6 @@ export const MAX_BID_RATIO = 4;
 })
 export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges {
   @Input() tx: Transaction;
-  @Input() mempoolPosition: MempoolPosition;
   @Input() miningStats: MiningStats;
   @Input() scrollEvent: boolean;
 
@@ -54,11 +53,8 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges
   estimateSubscription: Subscription;
   accelerationSubscription: Subscription;
   difficultySubscription: Subscription;
-  da: DifficultyAdjustment;
   estimate: any;
-  hashratePercentage?: number;
-  ETA?: number;
-  acceleratedETA?: number;
+  etaInfo$: Observable<{ hashratePercentage: number, ETA: number, acceleratedETA: number }>;
   hasAncestors: boolean = false;
   minExtraCost = 0;
   minBidAllowed = 0;
@@ -87,27 +83,19 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges
     if (this.estimateSubscription) {
       this.estimateSubscription.unsubscribe();
     }
-    this.difficultySubscription.unsubscribe();
   }
 
-  ngOnInit() {
+  ngOnInit(): void {
     this.accelerationUUID = window.crypto.randomUUID();
-    this.difficultySubscription = this.stateService.difficultyAdjustment$.subscribe(da => {
-      this.da = da;
-      this.updateETA();
-    })
   }
 
   ngOnChanges(changes: SimpleChanges): void {
     if (changes.scrollEvent) {
       this.scrollToPreview('acceleratePreviewAnchor', 'start');
     }
-    if (changes.miningStats || changes.mempoolPosition) {
-      this.updateETA();
-    }
   }
 
-  ngAfterViewInit() {
+  ngAfterViewInit(): void {
     this.user = this.storageService.getAuth()?.user ?? null;
 
     this.estimateSubscription = this.servicesApiService.estimate$(this.tx.txid).pipe(
@@ -132,7 +120,7 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges
             }
           }
 
-          this.updateETA();
+          this.etaInfo$ = this.etaService.getProjectedEtaObservable(this.estimate, this.miningStats);
 
           this.hasAncestors = this.estimate.txSummary.ancestorCount > 1;
           
@@ -178,40 +166,10 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges
     ).subscribe();
   }
 
-  updateETA(): void {
-    if (!this.mempoolPosition || !this.estimate?.pools?.length || !this.miningStats || !this.da) {
-      this.hashratePercentage = undefined;
-      this.ETA = undefined;
-      this.acceleratedETA = undefined;
-      return;
-    }
-    const pools: { [id: number]: SinglePoolStats } = {};
-    for (const pool of this.miningStats.pools) {
-      pools[pool.poolUniqueId] = pool;
-    }
-
-    let totalAcceleratedHashrate = 0;
-    for (const poolId of this.estimate.pools) {
-      const pool = pools[poolId];
-      if (!pool) {
-        continue;
-      }
-      totalAcceleratedHashrate += pool.lastEstimatedHashrate;
-    }
-    const acceleratingHashrateFraction = (totalAcceleratedHashrate / this.miningStats.lastEstimatedHashrate)
-    this.hashratePercentage = acceleratingHashrateFraction * 100;
-
-    this.ETA = Date.now() + this.da.timeAvg * this.mempoolPosition.block;
-    this.acceleratedETA = this.etaService.calculateETAFromShares([
-      { block: this.mempoolPosition.block, hashrateShare: (1 - acceleratingHashrateFraction) }, 
-      { block: 0, hashrateShare: acceleratingHashrateFraction },
-    ], this.da).time;
-  }
-
   /**
    * User changed his bid
    */
-  setUserBid({ fee, index }: { fee: number, index: number}) {
+  setUserBid({ fee, index }: { fee: number, index: number}): void {
     if (this.estimate) {
       this.selectFeeRateIndex = index;
       this.userBid = Math.max(0, fee);
@@ -222,12 +180,12 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges
   /**
    * Scroll to element id with or without setTimeout
    */
-  scrollToPreviewWithTimeout(id: string, position: ScrollLogicalPosition) {
+  scrollToPreviewWithTimeout(id: string, position: ScrollLogicalPosition): void {
     setTimeout(() => {
       this.scrollToPreview(id, position);
     }, 100);
   }
-  scrollToPreview(id: string, position: ScrollLogicalPosition) {
+  scrollToPreview(id: string, position: ScrollLogicalPosition): void {
     const acceleratePreviewAnchor = document.getElementById(id);
     if (acceleratePreviewAnchor) {
       this.cd.markForCheck();
@@ -242,7 +200,7 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges
   /**
    * Send acceleration request
    */
-  accelerate() {
+  accelerate(): void {
     if (this.accelerationSubscription) {
       this.accelerationSubscription.unsubscribe();
     }
@@ -268,7 +226,7 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges
     });
   }
 
-  isLoggedIn() {
+  isLoggedIn(): boolean {
     const auth = this.storageService.getAuth();
     return auth !== null;
   }
@@ -280,7 +238,7 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges
 
 
   @HostListener('window:scroll', ['$event']) // for window scroll events
-  onScroll() {
+  onScroll(): void {
     if (this.estimate) {
       setTimeout(() => {
         this.onScroll();
diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index 2a2925879..ea7bd284a 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -83,7 +83,7 @@
       <div class="clearfix"></div>
 
       <div class="box">
-        <app-accelerate-preview [tx]="tx" [miningStats]="miningStats" [mempoolPosition]="mempoolPosition" [scrollEvent]="scrollIntoAccelPreview"></app-accelerate-preview>
+        <app-accelerate-preview [tx]="tx" [miningStats]="miningStats" [scrollEvent]="scrollIntoAccelPreview"></app-accelerate-preview>
       </div>
     </ng-container>
 
diff --git a/frontend/src/app/services/eta.service.ts b/frontend/src/app/services/eta.service.ts
index 467f49554..7753a80b5 100644
--- a/frontend/src/app/services/eta.service.ts
+++ b/frontend/src/app/services/eta.service.ts
@@ -3,8 +3,10 @@ import { AccelerationPosition, CpfpInfo, DifficultyAdjustment, MempoolPosition,
 import { StateService } from './state.service';
 import { MempoolBlock } from '../interfaces/websocket.interface';
 import { Transaction } from '../interfaces/electrs.interface';
-import { MiningStats } from './mining.service';
+import { MiningService, MiningStats } from './mining.service';
 import { getUnacceleratedFeeRate } from '../shared/transaction.utils';
+import { AccelerationEstimate } from '../components/accelerate-preview/accelerate-preview.component';
+import { Observable, combineLatest, map, of } from 'rxjs';
 
 export interface ETA {
   now: number, // time at which calculation performed
@@ -19,8 +21,50 @@ export interface ETA {
 export class EtaService {
   constructor(
     private stateService: StateService,
+    private miningService: MiningService,
   ) { }
 
+  getProjectedEtaObservable(estimate: AccelerationEstimate, miningStats?: MiningStats): Observable<{ hashratePercentage: number, ETA: number, acceleratedETA: number }> {
+    return combineLatest([
+      this.stateService.mempoolTxPosition$.pipe(map(p => p.position)),
+      this.stateService.difficultyAdjustment$,
+      miningStats ? of(miningStats) : this.miningService.getMiningStats('1w'),
+    ]).pipe(
+      map(([mempoolPosition, da, miningStats]) => {
+        if (!mempoolPosition || !estimate?.pools?.length || !miningStats || !da) {
+          return {
+            hashratePercentage: undefined,
+            ETA: undefined,
+            acceleratedETA: undefined,
+          };
+        }
+        const pools: { [id: number]: SinglePoolStats } = {};
+        for (const pool of miningStats.pools) {
+          pools[pool.poolUniqueId] = pool;
+        }
+
+        let totalAcceleratedHashrate = 0;
+        for (const poolId of estimate.pools) {
+          const pool = pools[poolId];
+          if (!pool) {
+            continue;
+          }
+          totalAcceleratedHashrate += pool.lastEstimatedHashrate;
+        }
+        const acceleratingHashrateFraction = (totalAcceleratedHashrate / miningStats.lastEstimatedHashrate);
+
+        return {
+          hashratePercentage: acceleratingHashrateFraction * 100,
+          ETA: Date.now() + da.timeAvg * mempoolPosition.block,
+          acceleratedETA: this.calculateETAFromShares([
+            { block: mempoolPosition.block, hashrateShare: (1 - acceleratingHashrateFraction) },
+            { block: 0, hashrateShare: acceleratingHashrateFraction },
+          ], da).time,
+        };
+      })
+    );
+  }
+
   mempoolPositionFromFees(feerate: number, mempoolBlocks: MempoolBlock[]): MempoolPosition {
     for (let txInBlockIndex = 0; txInBlockIndex < mempoolBlocks.length; txInBlockIndex++) {
       const block = mempoolBlocks[txInBlockIndex];
@@ -41,7 +85,7 @@ export class EtaService {
           return {
             block: txInBlockIndex,
             vsize: (1 - feePosition) * blockedFilledPercentage * this.stateService.blockVSize,
-          }
+          };
         }
       }
       if (feerate >= block.feeRange[block.feeRange.length - 1]) {
@@ -49,14 +93,14 @@ export class EtaService {
         return {
           block: txInBlockIndex,
           vsize: 0,
-        }
+        };
       }
     }
     // at the very back of the last block
     return {
       block: mempoolBlocks.length - 1,
       vsize: mempoolBlocks[mempoolBlocks.length - 1].blockVSize,
-    }
+    };
   }
 
   calculateETA(
@@ -88,7 +132,7 @@ export class EtaService {
         time: now + (60_000 * (mempoolPosition.block + 1)),
         wait: (60_000 * (mempoolPosition.block + 1)),
         blocks: mempoolPosition.block + 1,
-      }
+      };
     }
 
     // difficulty adjustment estimate is required to know avg block time on non-Liquid networks
@@ -104,7 +148,7 @@ export class EtaService {
         time: wait + now + da.timeOffset,
         wait,
         blocks,
-      }
+      };
     } else {
       // accelerated transactions
 
@@ -121,7 +165,7 @@ export class EtaService {
         pools[pool.poolUniqueId] = pool;
       }
       const unacceleratedPosition = this.mempoolPositionFromFees(getUnacceleratedFeeRate(tx, true), mempoolBlocks);
-      let totalAcceleratedHashrate = accelerationPositions.reduce((total, pos) => total + (pools[pos.poolId].lastEstimatedHashrate), 0);
+      const totalAcceleratedHashrate = accelerationPositions.reduce((total, pos) => total + (pools[pos.poolId].lastEstimatedHashrate), 0);
       const shares = [
         {
           block: unacceleratedPosition.block,
@@ -163,7 +207,7 @@ export class EtaService {
         // find H_i
         const H = shares.reduce((total, share) => total + (share.block <= i ? share.hashrateShare : 0), 0);
         // find S_i
-        let S = H * (1 - tailProb);
+        const S = H * (1 - tailProb);
         // accumulate sum (S_i x i)
         Q += (S * (i + 1));
         // accumulate sum (S_j)
@@ -178,6 +222,6 @@ export class EtaService {
         time: eta + now + da.timeOffset,
         wait: eta,
         blocks: Math.ceil(eta / da.adjustedTimeAvg),
-      }
+      };
   }
 }
diff --git a/frontend/src/app/services/state.service.ts b/frontend/src/app/services/state.service.ts
index 0d502747c..647e5a972 100644
--- a/frontend/src/app/services/state.service.ts
+++ b/frontend/src/app/services/state.service.ts
@@ -150,7 +150,7 @@ export class StateService {
   utxoSpent$ = new Subject<object>();
   difficultyAdjustment$ = new ReplaySubject<DifficultyAdjustment>(1);
   mempoolTransactions$ = new Subject<Transaction>();
-  mempoolTxPosition$ = new Subject<{ txid: string, position: MempoolPosition, cpfp: CpfpInfo | null, accelerationPositions?: AccelerationPosition[] }>();
+  mempoolTxPosition$ = new BehaviorSubject<{ txid: string, position: MempoolPosition, cpfp: CpfpInfo | null, accelerationPositions?: AccelerationPosition[] }>(null);
   mempoolRemovedTransactions$ = new Subject<Transaction>();
   multiAddressTransactions$ = new Subject<{ [address: string]: { mempool: Transaction[], confirmed: Transaction[], removed: Transaction[] }}>();
   blockTransactions$ = new Subject<Transaction>();

From a9a1ff68abaddd8cb0f3155e2e21f89bcde7a213 Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Mon, 24 Jun 2024 16:25:29 +0900
Subject: [PATCH 03/77] Romanz support for address page

---
 .../components/address/address.component.html | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/frontend/src/app/components/address/address.component.html b/frontend/src/app/components/address/address.component.html
index 8fc09345f..08eb841ee 100644
--- a/frontend/src/app/components/address/address.component.html
+++ b/frontend/src/app/components/address/address.component.html
@@ -26,11 +26,13 @@
               <tbody>
                 <tr><ng-container *ngTemplateOutlet="balanceRow"></ng-container></tr>
                 <tr><ng-container *ngTemplateOutlet="pendingBalanceRow"></ng-container></tr>
-                <tr><ng-container *ngTemplateOutlet="utxoRow"></ng-container></tr>
-                <tr><ng-container *ngTemplateOutlet="pendingUtxoRow"></ng-container></tr>
+                @if (!address.electrum) {
+                  <tr><ng-container *ngTemplateOutlet="utxoRow"></ng-container></tr>
+                  <tr><ng-container *ngTemplateOutlet="pendingUtxoRow"></ng-container></tr>
+                }
                 @if (network === 'liquid' || network === 'liquidtestnet') {
                   <tr><ng-container *ngTemplateOutlet="liquidRow"></ng-container></tr>
-                } @else {
+                } @else if (!address.electrum) {
                   <tr><ng-container *ngTemplateOutlet="volumeRow"></ng-container></tr>
                 }
                 <tr><ng-container *ngTemplateOutlet="typeRow"></ng-container></tr>
@@ -46,17 +48,21 @@
                   <ng-container *ngTemplateOutlet="spacerCell"></ng-container>
                   <ng-container *ngTemplateOutlet="pendingBalanceRow"></ng-container>
                 </tr>
+                @if (!address.electrum) {
                 <tr>
                   <ng-container *ngTemplateOutlet="utxoRow"></ng-container>
                   <ng-container *ngTemplateOutlet="spacerCell"></ng-container>
                   <ng-container *ngTemplateOutlet="pendingUtxoRow"></ng-container>
                 </tr>
+                }
                 <tr>
                   @if (network === 'liquid' || network === 'liquidtestnet') {
                     <ng-container *ngTemplateOutlet="liquidRow"></ng-container>
-                  } @else {
+                  } @else if (!address.electrum) {
                     <ng-container *ngTemplateOutlet="volumeRow"></ng-container>
-                  }
+                  } @else {
+                    <ng-container *ngTemplateOutlet="emptyTd"></ng-container>
+                  }                  
                   <ng-container *ngTemplateOutlet="spacerCell"></ng-container>
                   <ng-container *ngTemplateOutlet="typeRow"></ng-container>
                 </tr>
@@ -232,6 +238,11 @@
   <td class="spacer"></td>
 </ng-template>
 
+<ng-template #emptyTd>
+  <td class="spacer"></td>
+  <td class="spacer"></td>
+</ng-template>
+
 <ng-template #balanceRow>
   <td i18n="address.confirmed-balance">Confirmed balance</td>
   <td *ngIf="chainStats.funded_txo_sum !== undefined; else confidentialTd" class="wrap-cell"><app-amount [satoshis]="chainStats.balance" [noFiat]="true"></app-amount> <span class="fiat"><app-fiat [value]="chainStats.balance"></app-fiat></span></td>

From 563def45d82a84720f6f6b677c8171ecbfcd62e5 Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Mon, 24 Jun 2024 18:27:30 +0900
Subject: [PATCH 04/77] Fix address prefix for non esplora backend

---
 backend/src/api/bitcoin/bitcoin-api.ts           | 10 +++++++++-
 backend/src/api/bitcoin/esplora-api.interface.ts |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/backend/src/api/bitcoin/bitcoin-api.ts b/backend/src/api/bitcoin/bitcoin-api.ts
index 0724065ae..6714070bd 100644
--- a/backend/src/api/bitcoin/bitcoin-api.ts
+++ b/backend/src/api/bitcoin/bitcoin-api.ts
@@ -165,13 +165,21 @@ class BitcoinApi implements AbstractBitcoinApi {
     const mp = mempool.getMempool();
     for (const tx in mp) {
       for (const vout of mp[tx].vout) {
-        if (vout.scriptpubkey_address.indexOf(prefix) === 0) {
+        if (vout.scriptpubkey_address?.indexOf(prefix) === 0) {
           found[vout.scriptpubkey_address] = '';
           if (Object.keys(found).length >= 10) {
             return Object.keys(found);
           }
         }
       }
+      for (const vin of mp[tx].vin) {
+        if (vin.prevout?.scriptpubkey_address?.indexOf(prefix) === 0) {
+          found[vin.prevout?.scriptpubkey_address] = '';
+          if (Object.keys(found).length >= 10) {
+            return Object.keys(found);
+          }
+        }
+      }
     }
     return Object.keys(found);
   }
diff --git a/backend/src/api/bitcoin/esplora-api.interface.ts b/backend/src/api/bitcoin/esplora-api.interface.ts
index 0a0960e46..6e6860a41 100644
--- a/backend/src/api/bitcoin/esplora-api.interface.ts
+++ b/backend/src/api/bitcoin/esplora-api.interface.ts
@@ -54,7 +54,7 @@ export namespace IEsploraApi {
     scriptpubkey: string;
     scriptpubkey_asm: string;
     scriptpubkey_type: string;
-    scriptpubkey_address: string;
+    scriptpubkey_address?: string;
     value: number;
     // Elements
     valuecommitment?: number;

From 3e057f2db1c853c24933338c5aee78ddbed18261 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Tue, 25 Jun 2024 02:20:44 +0000
Subject: [PATCH 05/77] Fix coinbase address type error

---
 backend/src/api/blocks.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/api/blocks.ts b/backend/src/api/blocks.ts
index 53a2ce1ac..c136ce8f7 100644
--- a/backend/src/api/blocks.ts
+++ b/backend/src/api/blocks.ts
@@ -724,7 +724,7 @@ class Blocks {
         }
 
         const coinbaseTx = await bitcoinApi.$getCoinbaseTx(hash);
-        const addresses = new Set<string>(coinbaseTx.vout.map(v => v.scriptpubkey_address).filter(a => a));
+        const addresses = new Set<string>(coinbaseTx.vout.map(v => v.scriptpubkey_address).filter(a => a) as string[]);
         await blocksRepository.$saveCoinbaseAddresses(hash, [...addresses]);
 
         // Logging

From ad2d7af084be5659d6beefb9f39b8b0102cce538 Mon Sep 17 00:00:00 2001
From: natsoni <natsoni@protonmail.com>
Date: Wed, 26 Jun 2024 10:48:17 +0900
Subject: [PATCH 06/77] Force amounts to BTC unit in pool page

---
 frontend/src/app/components/amount/amount.component.html | 4 ++--
 frontend/src/app/components/amount/amount.component.ts   | 1 +
 frontend/src/app/components/pool/pool.component.html     | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/frontend/src/app/components/amount/amount.component.html b/frontend/src/app/components/amount/amount.component.html
index b38cf4c41..b513c89d2 100644
--- a/frontend/src/app/components/amount/amount.component.html
+++ b/frontend/src/app/components/amount/amount.component.html
@@ -1,4 +1,4 @@
-<ng-container *ngIf="!noFiat && (viewAmountMode$ | async) === 'fiat' && (conversions$ | async) as conversions; else viewFiatVin">
+<ng-container *ngIf="!noFiat && ignoreViewMode === false && (viewAmountMode$ | async) === 'fiat' && (conversions$ | async) as conversions; else viewFiatVin">
   <span class="fiat" *ngIf="blockConversion; else noblockconversion">
     {{ addPlus && satoshis >= 0 ? '+' : '' }}{{
       (
@@ -21,7 +21,7 @@
     <span i18n="shared.confidential">Confidential</span>
   </ng-template>
   <ng-template #default>
-    @if ((viewAmountMode$ | async) === 'btc' || (viewAmountMode$ | async) === 'fiat') {
+    @if ((viewAmountMode$ | async) === 'btc' || (viewAmountMode$ | async) === 'fiat' || ignoreViewMode === true) {
       &lrm;{{ addPlus && satoshis >= 0 ? '+' : '' }}{{ satoshis / 100000000 | number : digitsInfo }}
       <span class="symbol">
         <ng-container *ngTemplateOutlet="prefix"></ng-container>BTC
diff --git a/frontend/src/app/components/amount/amount.component.ts b/frontend/src/app/components/amount/amount.component.ts
index 60cbe3117..93715f3c0 100644
--- a/frontend/src/app/components/amount/amount.component.ts
+++ b/frontend/src/app/components/amount/amount.component.ts
@@ -24,6 +24,7 @@ export class AmountComponent implements OnInit, OnDestroy {
   @Input() addPlus = false;
   @Input() blockConversion: Price;
   @Input() forceBtc: boolean = false;
+  @Input() ignoreViewMode: boolean = false;
   @Input() forceBlockConversion: boolean = false; // true = displays fiat price as 0 if blockConversion is undefined instead of falling back to conversions
 
   constructor(
diff --git a/frontend/src/app/components/pool/pool.component.html b/frontend/src/app/components/pool/pool.component.html
index a446b552b..bd4f3bbee 100644
--- a/frontend/src/app/components/pool/pool.component.html
+++ b/frontend/src/app/components/pool/pool.component.html
@@ -97,7 +97,7 @@
                       </tr>
                     </thead>
                     <tbody>
-                      <td class="text-center"><app-amount [satoshis]="poolStats.totalReward" digitsInfo="1.0-0" [noFiat]="true"></app-amount></td>
+                      <td class="text-center"><app-amount [satoshis]="poolStats.totalReward" digitsInfo="1.0-0" [noFiat]="true" [ignoreViewMode]="true"></app-amount></td>
                       <td class="text-center">{{ poolStats.estimatedHashrate | amountShortener : 1 : 'H/s' }}</td>
                       <td class="text-center" *ngIf="auditAvailable; else emptyTd"><span class="health-badge badge" [class.badge-success]="poolStats.avgBlockHealth >= 99"
                           [class.badge-warning]="poolStats.avgBlockHealth >= 75 && poolStats.avgBlockHealth < 99" [class.badge-danger]="poolStats.avgBlockHealth < 75"
@@ -146,7 +146,7 @@
                       </tr>
                     </thead>
                     <tbody>
-                      <td *ngFor="let total of oob" class="text-center clip"><app-amount [satoshis]="total.cost" [digitsInfo]="isMobile() ? '1.2-4' : '1.8-8'"></app-amount></td>
+                      <td *ngFor="let total of oob" class="text-center clip"><app-amount [satoshis]="total.cost" [digitsInfo]="isMobile() ? '1.2-4' : '1.8-8'" [ignoreViewMode]="true"></app-amount></td>
                     </tbody>
                   </table>
                 </td>
@@ -219,10 +219,10 @@
             </ng-template>
           </td>
           <td class="reward text-right">
-            <app-amount [satoshis]="block.extras.reward" digitsInfo="1.2-2" [noFiat]="true"></app-amount>
+            <app-amount [satoshis]="block.extras.reward" digitsInfo="1.2-2" [noFiat]="true" [ignoreViewMode]="true"></app-amount>
           </td>
           <td *ngIf="!auditAvailable" class="fees text-right">
-            <app-amount [satoshis]="block.extras.totalFees" digitsInfo="1.2-2" [noFiat]="true"></app-amount>
+            <app-amount [satoshis]="block.extras.totalFees" digitsInfo="1.2-2" [noFiat]="true" [ignoreViewMode]="true"></app-amount>
           </td>
           <td class="txs text-right">
             {{ block.tx_count | number }}

From a1f1b09c55f762490cf848328c97cf2308a06639 Mon Sep 17 00:00:00 2001
From: natsoni <natsoni@protonmail.com>
Date: Wed, 26 Jun 2024 11:13:32 +0900
Subject: [PATCH 07/77] Fix loading indicator when changing page

---
 .../accelerations-list/accelerations-list.component.ts           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts b/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts
index 237b14317..e25c87bb8 100644
--- a/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts
+++ b/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts
@@ -44,6 +44,7 @@ export class AccelerationsListComponent implements OnInit, OnDestroy {
     
     this.accelerationList$ = this.pageSubject.pipe(
       switchMap((page) => {
+        this.isLoading = true;
         const accelerationObservable$ = this.accelerations$ || (this.pending ? this.stateService.liveAccelerations$ : this.servicesApiService.getAccelerationHistoryObserveResponse$({ page: page }));
         if (!this.accelerations$ && this.pending) {
           this.websocketService.ensureTrackAccelerations();

From fc8f8abc7ec049ce2c78f0112f4ff16555369fc5 Mon Sep 17 00:00:00 2001
From: natsoni <natsoni@protonmail.com>
Date: Wed, 26 Jun 2024 11:42:22 +0900
Subject: [PATCH 08/77] Add SEO title to Accelerations page

---
 .../accelerations-list/accelerations-list.component.ts         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts b/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts
index e25c87bb8..06887cc9c 100644
--- a/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts
+++ b/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts
@@ -4,6 +4,7 @@ import { Acceleration, BlockExtended } from '../../../interfaces/node-api.interf
 import { StateService } from '../../../services/state.service';
 import { WebsocketService } from '../../../services/websocket.service';
 import { ServicesApiServices } from '../../../services/services-api.service';
+import { SeoService } from '../../../services/seo.service';
 
 @Component({
   selector: 'app-accelerations-list',
@@ -31,12 +32,14 @@ export class AccelerationsListComponent implements OnInit, OnDestroy {
     private websocketService: WebsocketService,
     public stateService: StateService,
     private cd: ChangeDetectorRef,
+    private seoService: SeoService,
   ) {
   }
 
   ngOnInit(): void {
     if (!this.widget) {
       this.websocketService.want(['blocks']);
+      this.seoService.setTitle($localize`:@@02573b6980a2d611b4361a2595a4447e390058cd:Accelerations`);
     }
 
     this.skeletonLines = this.widget === true ? [...Array(6).keys()] : [...Array(15).keys()];

From a0402b92f91c35bc2d5ed0d869c116567c7fbb4e Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Wed, 26 Jun 2024 12:12:49 +0900
Subject: [PATCH 09/77] Fix ETA loading error

---
 .../accelerate-preview/accelerate-preview.component.html      | 2 +-
 frontend/src/app/components/time/time.component.ts            | 4 ++++
 frontend/src/app/services/eta.service.ts                      | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
index c8778480e..436dd138e 100644
--- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
+++ b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
@@ -68,7 +68,7 @@
       <h5 *ngIf="estimate?.pools?.length" i18n="accelerator.how-much-faster">How much faster?</h5>
       <div class="row">
         <div class="col">
-          <ng-container *ngIf="(etaInfo$ | async) as etaInfo">
+          <ng-container *ngIf="(etaInfo$ | async) as etaInfo; else loadingEstimate">
             <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to {{ etaInfo.hashratePercentage | number : '1.1-1' }}% of miners.</small>
             <small class="form-text text-muted mb-2" i18n="accelerator.time-estimate-description">This will reduce your expected waiting time until the first confirmation to <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time></small>
           </ng-container>
diff --git a/frontend/src/app/components/time/time.component.ts b/frontend/src/app/components/time/time.component.ts
index 376786d00..979940e8d 100644
--- a/frontend/src/app/components/time/time.component.ts
+++ b/frontend/src/app/components/time/time.component.ts
@@ -78,6 +78,10 @@ export class TimeComponent implements OnInit, OnChanges, OnDestroy {
   }
 
   calculate() {
+    if (!this.time) {
+      return;
+    }
+
     let seconds: number;
     switch (this.kind) {
       case 'since':
diff --git a/frontend/src/app/services/eta.service.ts b/frontend/src/app/services/eta.service.ts
index 7753a80b5..2e80fd31c 100644
--- a/frontend/src/app/services/eta.service.ts
+++ b/frontend/src/app/services/eta.service.ts
@@ -26,7 +26,7 @@ export class EtaService {
 
   getProjectedEtaObservable(estimate: AccelerationEstimate, miningStats?: MiningStats): Observable<{ hashratePercentage: number, ETA: number, acceleratedETA: number }> {
     return combineLatest([
-      this.stateService.mempoolTxPosition$.pipe(map(p => p.position)),
+      this.stateService.mempoolTxPosition$.pipe(map(p => p?.position)),
       this.stateService.difficultyAdjustment$,
       miningStats ? of(miningStats) : this.miningService.getMiningStats('1w'),
     ]).pipe(

From a8d213840410fb9cb0107e8e5589afe68082fdab Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Wed, 26 Jun 2024 11:05:26 +0900
Subject: [PATCH 10/77] Simplify advanced acceleration

---
 .../accelerate-fee-graph.component.scss       |   2 +-
 .../accelerate-preview.component.html         | 143 ++++++++----------
 .../accelerate-preview.component.scss         |   5 +
 .../accelerate-preview.component.ts           |   1 +
 .../transaction/transaction.component.html    |   4 +-
 .../transaction/transaction.component.ts      |   1 +
 6 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.scss b/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.scss
index cd48f42fa..396317093 100644
--- a/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.scss
+++ b/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.scss
@@ -4,7 +4,7 @@
   width: 120px;
   margin-left: 4em;
   margin-right: 1.5em;
-  padding-bottom: 63px;
+  padding-bottom: 17px;
 
   .column {
     width: 100%;
diff --git a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
index 436dd138e..003156c76 100644
--- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
+++ b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
@@ -32,56 +32,56 @@
         <div class="alert alert-mempool">You are currently on the waitlist</div>
       </div>
 
-      <h5 i18n="accelerator.your-transaction">Your transaction</h5>
-      <div class="row">
-        <div class="col">
-          <small *ngIf="hasAncestors" class="form-text text-muted mb-2">
-            <ng-container i18n="accelerator.plus-unconfirmed-ancestors">Plus {{ estimate.txSummary.ancestorCount - 1 }} unconfirmed ancestor(s)</ng-container>
-          </small>
-          <table class="table table-borderless table-border table-dark table-background table-accelerator">
-            <tbody>
-              <tr class="group-first">
-                <td class="item" i18n="transaction.vsize|Transaction Virtual Size">Virtual size</td>
-                <td style="text-align: end;" [innerHTML]="'&lrm;' + (estimate.txSummary.effectiveVsize | vbytes: 2)"></td>
-              </tr>
-              <tr class="info">
-                <td class="info" colspan=3>
-                  <i><small i18n="accelerator.transaction-vbytes-size-description">Size in vbytes of this transaction (including unconfirmed ancestors)</small></i>
-                </td>
-              </tr>
-              <tr>
-                <td class="item" i18n="accelerator.in-band-fees">In-band fees</td>
-                <td style="text-align: end;">
-                  {{ estimate.txSummary.effectiveFee | number : '1.0-0' }} <span class="symbol" i18n="shared.sats">sats</span>
-                </td>
-              </tr>
-              <tr class="info group-last">
-                <td class="info" colspan=3>
-                  <i><small i18n="accelerator.fees-already-paid-description">Fees already paid by this transaction (including unconfirmed ancestors)</small></i>
-                </td>
-              </tr>
-            </tbody>
-          </table>
+      <ng-template [ngIf]="showDetails">
+        <h5 i18n="accelerator.your-transaction">Your transaction</h5>
+        <div class="row">
+          <div class="col">
+            <small *ngIf="hasAncestors" class="form-text text-muted mb-2">
+              <ng-container i18n="accelerator.plus-unconfirmed-ancestors">Plus {{ estimate.txSummary.ancestorCount - 1 }} unconfirmed ancestor(s)</ng-container>
+            </small>
+            <table class="table table-borderless table-border table-dark table-background table-accelerator">
+              <tbody>
+                <tr class="group-first">
+                  <td class="item" i18n="transaction.vsize|Transaction Virtual Size">Virtual size</td>
+                  <td style="text-align: end;" [innerHTML]="'&lrm;' + (estimate.txSummary.effectiveVsize | vbytes: 2)"></td>
+                </tr>
+                <tr class="info">
+                  <td class="info" colspan=3>
+                    <i><small i18n="accelerator.transaction-vbytes-size-description">Size in vbytes of this transaction (including unconfirmed ancestors)</small></i>
+                  </td>
+                </tr>
+                <tr>
+                  <td class="item" i18n="accelerator.in-band-fees">In-band fees</td>
+                  <td style="text-align: end;">
+                    {{ estimate.txSummary.effectiveFee | number : '1.0-0' }} <span class="symbol" i18n="shared.sats">sats</span>
+                  </td>
+                </tr>
+                <tr class="info group-last">
+                  <td class="info" colspan=3>
+                    <i><small i18n="accelerator.fees-already-paid-description">Fees already paid by this transaction (including unconfirmed ancestors)</small></i>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
         </div>
-      </div>
-      <br>
+        <br>
+      </ng-template>
       <h5 *ngIf="estimate?.pools?.length" i18n="accelerator.how-much-faster">How much faster?</h5>
       <div class="row">
         <div class="col">
           <ng-container *ngIf="(etaInfo$ | async) as etaInfo; else loadingEstimate">
-            <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to {{ etaInfo.hashratePercentage | number : '1.1-1' }}% of miners.</small>
-            <small class="form-text text-muted mb-2" i18n="accelerator.time-estimate-description">This will reduce your expected waiting time until the first confirmation to <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time></small>
+            <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to <strong>{{ etaInfo.hashratePercentage | number : '1.1-1' }}%</strong> of miners.</small>
+            <small class="form-text text-muted mb-2" i18n="accelerator.time-estimate-description">This will reduce your expected waiting time until the first confirmation to <strong><app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time></strong></small>
           </ng-container>
         </div>
         <div class="col pie">
           <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
         </div>
       </div>
-      <br>
-      <h5 i18n="accelerator.pay-how-much">How much more are you willing to pay?</h5>
+
       <div class="row">
         <div class="col">
-          <small class="form-text text-muted mb-2" i18n="accelerator.transaction-fee-description">Choose the maximum extra transaction fee you're willing to pay.</small>
           <div class="form-group">
             <div class="fee-card">
               <div class="d-flex mb-0">
@@ -97,13 +97,13 @@
         </div>
       </div>
   
-      <h5>Acceleration summary</h5>
+      <h5>Summary</h5>
       <div class="row mb-3">
         <div class="col">
           <table class="table table-borderless table-border table-dark table-background table-accelerator">
             <tbody>
               <!-- ESTIMATED FEE -->
-              <ng-container>
+              <ng-template [ngIf]="showDetails">
                 <tr class="group-first">
                   <td class="item" i18n="accelerator.next-block-rate">Next block market rate</td>
                   <td class="amt" style="font-size: 16px">
@@ -123,24 +123,23 @@
                     <span class="fiat ml-1"><app-fiat [value]="math.max(0, estimate.nextBlockFee - estimate.txSummary.effectiveFee)"></app-fiat></span>
                   </td>
                 </tr>
-              </ng-container>
-  
-              <!-- MEMPOOL BASE FEE -->
-              <tr>
-                <td class="item" i18n="accelerator.mempool-accelerator-fees">Mempool Accelerator™ fees</td>
-              </tr>
-              <tr class="info">
-                <td class="info">
-                  <i><small i18n="accelerator.service-fee">Accelerator Service Fee</small></i>
-                </td>
-                <td class="amt">
-                  +{{ estimate.mempoolBaseFee | number }}
-                </td>
-                <td class="units">
-                  <span class="symbol" i18n="shared.sats">sats</span>
-                  <span class="fiat ml-1"><app-fiat [value]="estimate.mempoolBaseFee"></app-fiat></span>
-                </td>
-              </tr>
+                
+                <!-- MEMPOOL BASE FEE -->
+                <tr>
+                  <td class="item" i18n="accelerator.mempool-accelerator-fees">Mempool Accelerator™ fees</td>
+                </tr>
+                <tr class="info">
+                  <td class="info">
+                    <i><small i18n="accelerator.service-fee">Accelerator Service Fee</small></i>
+                  </td>
+                  <td class="amt">
+                    +{{ estimate.mempoolBaseFee | number }}
+                  </td>
+                  <td class="units">
+                    <span class="symbol" i18n="shared.sats">sats</span>
+                    <span class="fiat ml-1"><app-fiat [value]="estimate.mempoolBaseFee"></app-fiat></span>
+                  </td>
+                </tr>
               <tr class="info group-last">
                 <td class="info">
                   <i><small i18n="accelerator.tx-size-surcharge">Transaction Size Surcharge</small></i>
@@ -153,13 +152,13 @@
                   <span class="fiat ml-1"><app-fiat [value]="estimate.vsizeFee"></app-fiat></span>
                 </td>
               </tr>
-
+            </ng-template>
               
               <!-- NEXT BLOCK ESTIMATE -->
               <ng-container>
-                <tr class="group-first" style="border-top: 1px dashed grey; border-collapse: collapse;">
+                <tr class="group-first">
                   <td class="item">
-                    <b style="background-color: #5E35B1" class="p-1 pl-0" i18n="accelerator.estimated-cost">Estimated acceleration cost</b>
+                    <b style="background-color: #5E35B1" class="p-1 pl-0" i18n="accelerator.estimated-cost">Estimated acceleration cost</b> ~{{ estimate.targetFeeRate | number : '1.0-0' }} sat/vB
                   </td>
                   <td class="amt">
                     <span style="background-color: #5E35B1" class="p-1 pl-0">
@@ -171,18 +170,13 @@
                     <span class="fiat ml-1"><app-fiat [value]="estimate.cost + estimate.mempoolBaseFee + estimate.vsizeFee"></app-fiat></span>
                   </td>
                 </tr>
-                <tr class="info group-last" style="border-bottom: 1px solid lightgrey">
-                  <td class="info" colspan=3>
-                    <i><small><ng-container *ngTemplateOutlet="acceleratedTo; context: {$implicit: estimate.targetFeeRate }"></ng-container></small></i>
-                  </td>
-                </tr>
               </ng-container>
 
               <!-- MAX COST -->
               <ng-container>
                 <tr class="group-first">
                   <td class="item">
-                    <b style="background-color: var(--primary);" class="p-1 pl-0" i18n="accelerator.maximum-cost">Maximum acceleration cost</b>
+                    <b style="background-color: var(--primary);" class="p-1 pl-0" i18n="accelerator.maximum-cost">Maximum acceleration cost</b> 
                   </td>
                   <td class="amt">
                     <span style="background-color: var(--primary)" class="p-1 pl-0">
@@ -196,11 +190,6 @@
                     </span>
                   </td>
                 </tr>
-                <tr class="info group-last">
-                  <td class="info" colspan=3>
-                    <i><small><ng-container *ngTemplateOutlet="acceleratedTo; context: {$implicit: (estimate.txSummary.effectiveFee + userBid) / estimate.txSummary.effectiveVsize }"></ng-container></small></i>
-                  </td>
-                </tr>
               </ng-container>
   
               <!-- USER BALANCE -->
@@ -218,7 +207,11 @@
                   </td>
                 </tr>
               </ng-container>
-
+              <tr>
+                <td colspan="3">
+                  <div style="border-top: 1px dashed grey; margin-top: 10px;"></div>
+                </td>
+              </tr>
               <!-- LOGIN CTA -->
               <ng-container *ngIf="stateService.isMempoolSpaceBuild && !isLoggedIn()">
                 <tr class="group-first group-last" style="border-top: 1px dashed grey">
@@ -230,7 +223,7 @@
                 </tr>
               </ng-container>
               <ng-container *ngIf="!stateService.isMempoolSpaceBuild">
-                <tr class="group-first group-last" style="border-top: 1px dashed grey">
+                <tr class="group-first group-last">
                   <td class="item"></td>
                   <td class="amt"></td>
                   <td class="units d-flex">
@@ -258,6 +251,4 @@
 <ng-template #loadingEstimate>
   <div class="skeleton-loader"></div>
   <br>
-</ng-template>
-
-<ng-template #acceleratedTo let-i i18n="accelerator.accelerated-to-description">If your tx is accelerated to ~{{ i | number : '1.0-0' }} sat/vB</ng-template>
\ No newline at end of file
+</ng-template>
\ No newline at end of file
diff --git a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.scss b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.scss
index 1191d882e..8d9b713a4 100644
--- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.scss
+++ b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.scss
@@ -118,4 +118,9 @@
 
 .table-background {
   background-color: var(--bg);
+}
+
+.col.pie {
+  position: relative;
+  top: -15px;
 }
\ No newline at end of file
diff --git a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.ts b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.ts
index e839459cd..8ec675041 100644
--- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.ts
+++ b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.ts
@@ -46,6 +46,7 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges
   @Input() tx: Transaction;
   @Input() miningStats: MiningStats;
   @Input() scrollEvent: boolean;
+  @Input() showDetails: boolean;
 
   math = Math;
   error = '';
diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index 7fef8efc7..43ead974d 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -80,10 +80,12 @@
       <div class="title float-left">
         <h2 i18n="transaction.accelerate|Accelerate button label">Accelerate</h2>
       </div>
+      <button type="button" class="btn btn-outline-info flow-toggle btn-sm float-right" (click)="showAccelerationDetails = !showAccelerationDetails" i18n="transaction.details|Transaction Details">Details</button>
+
       <div class="clearfix"></div>
 
       <div class="box">
-        <app-accelerate-preview [tx]="tx" [miningStats]="miningStats" [scrollEvent]="scrollIntoAccelPreview"></app-accelerate-preview>
+        <app-accelerate-preview [tx]="tx" [miningStats]="miningStats" [scrollEvent]="scrollIntoAccelPreview" [showDetails]="showAccelerationDetails"></app-accelerate-preview>
       </div>
     </ng-container>
 
diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts
index 37c83f008..0348bf50a 100644
--- a/frontend/src/app/components/transaction/transaction.component.ts
+++ b/frontend/src/app/components/transaction/transaction.component.ts
@@ -138,6 +138,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
   accelerateCtaType: 'alert' | 'button' = 'button';
   acceleratorAvailable: boolean = this.stateService.env.OFFICIAL_MEMPOOL_SPACE && this.stateService.env.ACCELERATOR && this.stateService.network === '';
   showAccelerationSummary = false;
+  showAccelerationDetails = false;
   scrollIntoAccelPreview = false;
   auditEnabled: boolean = this.stateService.env.AUDIT && this.stateService.env.BASE_MODULE === 'mempool' && this.stateService.env.MINING_DASHBOARD === true;
 

From 7b6246a0354df6289fd55162ad4fec65ea8e75d6 Mon Sep 17 00:00:00 2001
From: natsoni <natsoni@protonmail.com>
Date: Wed, 26 Jun 2024 14:20:49 +0900
Subject: [PATCH 11/77] Fix loading state in blocks table issue

---
 .../src/app/components/blocks-list/blocks-list.component.ts   | 4 +++-
 .../recent-pegs-list/recent-pegs-list.component.ts            | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/components/blocks-list/blocks-list.component.ts b/frontend/src/app/components/blocks-list/blocks-list.component.ts
index 29b23e608..4903499bc 100644
--- a/frontend/src/app/components/blocks-list/blocks-list.component.ts
+++ b/frontend/src/app/components/blocks-list/blocks-list.component.ts
@@ -85,15 +85,16 @@ export class BlocksList implements OnInit {
       this.keyNavigationSubscription = this.stateService.keyNavigation$
       .pipe(
         tap((event) => {
-          this.isLoading = true;
           const prevKey = this.dir === 'ltr' ? 'ArrowLeft' : 'ArrowRight';
           const nextKey = this.dir === 'ltr' ? 'ArrowRight' : 'ArrowLeft';
           if (event.key === prevKey && this.page > 1) {
             this.page--;
+            this.isLoading = true;
             this.cd.markForCheck();
           }
           if (event.key === nextKey && this.page * 15 < this.blocksCount) {
             this.page++;
+            this.isLoading = true;
             this.cd.markForCheck();
           }
         }),
@@ -118,6 +119,7 @@ export class BlocksList implements OnInit {
                 if (this.blocksCount === undefined) {
                   this.blocksCount = blocks[0].height + 1;
                   this.blocksCountInitialized$.next(true);
+                  this.blocksCountInitialized$.complete();
                 }
                 this.isLoading = false;
                 this.lastBlockHeight = Math.max(...blocks.map(o => o.height));
diff --git a/frontend/src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.ts b/frontend/src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.ts
index b818dff78..0e2a003af 100644
--- a/frontend/src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.ts
+++ b/frontend/src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.ts
@@ -76,15 +76,16 @@ export class RecentPegsListComponent implements OnInit {
       this.keyNavigationSubscription = this.stateService.keyNavigation$
       .pipe(
         tap((event) => {
-          this.isLoading = true;
           const prevKey = this.dir === 'ltr' ? 'ArrowLeft' : 'ArrowRight';
           const nextKey = this.dir === 'ltr' ? 'ArrowRight' : 'ArrowLeft';
           if (event.key === prevKey && this.page > 1) {
             this.page--;
+            this.isLoading = true;
             this.cd.markForCheck();
           }
           if (event.key === nextKey && this.page < this.pegsCount / this.pageSize) {
             this.page++;
+            this.isLoading = true;
             this.cd.markForCheck();
           }
         }),

From f7ad45939cee8f5fd006aec04e3cd91ab9052224 Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Wed, 26 Jun 2024 15:08:00 +0900
Subject: [PATCH 12/77] Hide surcharge row if zero

---
 .../accelerate-preview/accelerate-preview.component.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
index 003156c76..742369042 100644
--- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
+++ b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
@@ -140,7 +140,7 @@
                     <span class="fiat ml-1"><app-fiat [value]="estimate.mempoolBaseFee"></app-fiat></span>
                   </td>
                 </tr>
-              <tr class="info group-last">
+              <tr class="info group-last" *ngIf="estimate.vsizeFee">
                 <td class="info">
                   <i><small i18n="accelerator.tx-size-surcharge">Transaction Size Surcharge</small></i>
                 </td>

From 09f7dddf1469ade02653c86beb933fb73331e675 Mon Sep 17 00:00:00 2001
From: natsoni <natsoni@protonmail.com>
Date: Wed, 26 Jun 2024 15:09:52 +0900
Subject: [PATCH 13/77] Use url parameter instead of query parameter

---
 .../app/components/blocks-list/blocks-list.component.ts   | 5 ++---
 .../recent-pegs-list/recent-pegs-list.component.ts        | 8 ++++----
 frontend/src/app/liquid/liquid-master-page.module.ts      | 6 +++++-
 frontend/src/app/master-page.module.ts                    | 6 +++++-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/frontend/src/app/components/blocks-list/blocks-list.component.ts b/frontend/src/app/components/blocks-list/blocks-list.component.ts
index 4903499bc..9bf4e9814 100644
--- a/frontend/src/app/components/blocks-list/blocks-list.component.ts
+++ b/frontend/src/app/components/blocks-list/blocks-list.component.ts
@@ -73,12 +73,11 @@ export class BlocksList implements OnInit {
         this.seoService.setDescription($localize`:@@meta.description.bitcoin.blocks:See the most recent Bitcoin${seoDescriptionNetwork(this.stateService.network)} blocks along with basic stats such as block height, block reward, block size, and more.`);
       }
 
-      this.blocksCountInitializedSubscription = combineLatest([this.blocksCountInitialized$, this.route.queryParams]).pipe(
+      this.blocksCountInitializedSubscription = combineLatest([this.blocksCountInitialized$, this.route.params]).pipe(
         filter(([blocksCountInitialized, _]) => blocksCountInitialized),
         tap(([_, params]) => {
           this.page = +params['page'] || 1;
           this.page === 1 ? this.fromHeightSubject.next(undefined) : this.fromHeightSubject.next((this.blocksCount - 1) - (this.page - 1) * 15);
-          this.cd.markForCheck();
         })
       ).subscribe();
 
@@ -181,7 +180,7 @@ export class BlocksList implements OnInit {
   }
 
   pageChange(page: number): void {
-    this.router.navigate([], { queryParams: { page: page } });
+    this.router.navigate(['blocks', page]);
   }
 
   trackByBlock(index: number, block: BlockExtended): number {
diff --git a/frontend/src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.ts b/frontend/src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.ts
index 0e2a003af..31a52fd9d 100644
--- a/frontend/src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.ts
+++ b/frontend/src/app/components/liquid-reserves-audit/recent-pegs-list/recent-pegs-list.component.ts
@@ -36,7 +36,7 @@ export class RecentPegsListComponent implements OnInit {
   lastPegBlockUpdate: number = 0;
   lastPegAmount: string = '';
   isLoad: boolean = true;
-  queryParamSubscription: Subscription;
+  paramSubscription: Subscription;
   keyNavigationSubscription: Subscription;
   dir: 'rtl' | 'ltr' = 'ltr';
 
@@ -66,7 +66,7 @@ export class RecentPegsListComponent implements OnInit {
       this.seoService.setTitle($localize`:@@a8b0889ea1b41888f1e247f2731cc9322198ca04:Recent Peg-In / Out's`);
       this.websocketService.want(['blocks']);
 
-      this.queryParamSubscription = this.route.queryParams.pipe(
+      this.paramSubscription = this.route.params.pipe(
         tap((params) => {
           this.page = +params['page'] || 1;
           this.startingIndexSubject.next((this.page - 1) * 15);
@@ -173,12 +173,12 @@ export class RecentPegsListComponent implements OnInit {
   ngOnDestroy(): void {
     this.destroy$.next(1);
     this.destroy$.complete();
-    this.queryParamSubscription?.unsubscribe();
+    this.paramSubscription?.unsubscribe();
     this.keyNavigationSubscription?.unsubscribe();
   }
 
   pageChange(page: number): void {
-    this.router.navigate([], { queryParams: { page: page } });
+    this.router.navigate(['audit', 'pegs', page]);
   }
 
 }
diff --git a/frontend/src/app/liquid/liquid-master-page.module.ts b/frontend/src/app/liquid/liquid-master-page.module.ts
index 5df9a5447..3375a066a 100644
--- a/frontend/src/app/liquid/liquid-master-page.module.ts
+++ b/frontend/src/app/liquid/liquid-master-page.module.ts
@@ -84,10 +84,14 @@ const routes: Routes = [
         ]
       },
       {
-        path: 'audit/pegs',
+        path: 'audit/pegs/:page',
         data: { networks: ['liquid'] },
         component: RecentPegsListComponent,
       },
+      {
+        path: 'audit/pegs',
+        redirectTo: 'audit/pegs/1'
+      },
       {
         path: 'assets',
         data: { networks: ['liquid'] },
diff --git a/frontend/src/app/master-page.module.ts b/frontend/src/app/master-page.module.ts
index 6ea8bfd93..510756cbc 100644
--- a/frontend/src/app/master-page.module.ts
+++ b/frontend/src/app/master-page.module.ts
@@ -45,9 +45,13 @@ const routes: Routes = [
         loadChildren: () => import('./components/about/about.module').then(m => m.AboutModule),
       },
       {
-        path: 'blocks',
+        path: 'blocks/:page',
         component: BlocksList,
       },
+      {
+        path: 'blocks',
+        redirectTo: 'blocks/1',
+      },
       {
         path: 'rbf',
         component: RbfList,

From 122b4b05c4c3d1f308fdbcf1fe929dc11efb84d3 Mon Sep 17 00:00:00 2001
From: natsoni <natsoni@protonmail.com>
Date: Wed, 26 Jun 2024 15:37:39 +0900
Subject: [PATCH 14/77] Add pagination in URL to accelerations table

---
 .../accelerations-list.component.ts           | 45 +++++++++++++++++--
 .../src/app/graphs/graphs.routing.module.ts   |  6 ++-
 2 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts b/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts
index 06887cc9c..f6224c17d 100644
--- a/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts
+++ b/frontend/src/app/components/acceleration/accelerations-list/accelerations-list.component.ts
@@ -1,10 +1,11 @@
-import { Component, OnInit, ChangeDetectionStrategy, Input, ChangeDetectorRef, OnDestroy } from '@angular/core';
-import { BehaviorSubject, Observable, catchError, of, switchMap, tap } from 'rxjs';
+import { Component, OnInit, ChangeDetectionStrategy, Input, ChangeDetectorRef, OnDestroy, Inject, LOCALE_ID } from '@angular/core';
+import { BehaviorSubject, Observable, Subscription, catchError, of, switchMap, tap, throttleTime } from 'rxjs';
 import { Acceleration, BlockExtended } from '../../../interfaces/node-api.interface';
 import { StateService } from '../../../services/state.service';
 import { WebsocketService } from '../../../services/websocket.service';
 import { ServicesApiServices } from '../../../services/services-api.service';
 import { SeoService } from '../../../services/seo.service';
+import { ActivatedRoute, Router } from '@angular/router';
 
 @Component({
   selector: 'app-accelerations-list',
@@ -26,6 +27,9 @@ export class AccelerationsListComponent implements OnInit, OnDestroy {
   maxSize = window.innerWidth <= 767.98 ? 3 : 5;
   skeletonLines: number[] = [];
   pageSubject: BehaviorSubject<number> = new BehaviorSubject(this.page);
+  keyNavigationSubscription: Subscription;
+  dir: 'rtl' | 'ltr' = 'ltr';
+  paramSubscription: Subscription;
 
   constructor(
     private servicesApiService: ServicesApiServices,
@@ -33,7 +37,13 @@ export class AccelerationsListComponent implements OnInit, OnDestroy {
     public stateService: StateService,
     private cd: ChangeDetectorRef,
     private seoService: SeoService,
+    private route: ActivatedRoute,
+    private router: Router,
+    @Inject(LOCALE_ID) private locale: string,
   ) {
+    if (this.locale.startsWith('ar') || this.locale.startsWith('fa') || this.locale.startsWith('he')) {
+      this.dir = 'rtl';
+    }
   }
 
   ngOnInit(): void {
@@ -45,6 +55,13 @@ export class AccelerationsListComponent implements OnInit, OnDestroy {
     this.skeletonLines = this.widget === true ? [...Array(6).keys()] : [...Array(15).keys()];
     this.paginationMaxSize = window.matchMedia('(max-width: 670px)').matches ? 3 : 5;
     
+    this.paramSubscription = this.route.params.pipe(
+      tap(params => {
+        this.page = +params['page'] || 1;
+        this.pageSubject.next(this.page);
+      })
+    ).subscribe();
+
     this.accelerationList$ = this.pageSubject.pipe(
       switchMap((page) => {
         this.isLoading = true;
@@ -83,10 +100,30 @@ export class AccelerationsListComponent implements OnInit, OnDestroy {
         );
       })
     );
+
+    this.keyNavigationSubscription = this.stateService.keyNavigation$.pipe(
+      tap((event) => {
+        const prevKey = this.dir === 'ltr' ? 'ArrowLeft' : 'ArrowRight';
+        const nextKey = this.dir === 'ltr' ? 'ArrowRight' : 'ArrowLeft';
+        if (event.key === prevKey && this.page > 1) {
+          this.page--;
+          this.isLoading = true;
+          this.cd.markForCheck();
+        }
+        if (event.key === nextKey && this.page * 15 < this.accelerationCount) {
+          this.page++;
+          this.isLoading = true;
+          this.cd.markForCheck();
+        }
+      }),
+      throttleTime(1000, undefined, { leading: true, trailing: true }),
+    ).subscribe(() => {
+      this.pageChange(this.page);
+    });
   }
 
   pageChange(page: number): void {
-    this.pageSubject.next(page);
+    this.router.navigate(['acceleration', 'list', page]);
   }
 
   trackByBlock(index: number, block: BlockExtended): number {
@@ -95,5 +132,7 @@ export class AccelerationsListComponent implements OnInit, OnDestroy {
 
   ngOnDestroy(): void {
     this.websocketService.stopTrackAccelerations();
+    this.paramSubscription?.unsubscribe();
+    this.keyNavigationSubscription?.unsubscribe();
   }
 }
\ No newline at end of file
diff --git a/frontend/src/app/graphs/graphs.routing.module.ts b/frontend/src/app/graphs/graphs.routing.module.ts
index 64ccb299f..dd3535f65 100644
--- a/frontend/src/app/graphs/graphs.routing.module.ts
+++ b/frontend/src/app/graphs/graphs.routing.module.ts
@@ -60,10 +60,14 @@ const routes: Routes = [
         ]
       },
       {
-        path: 'acceleration/list',
+        path: 'acceleration/list/:page',
         data: { networks: ['bitcoin'] },
         component: AccelerationsListComponent,
       },
+      {
+        path: 'acceleration/list',
+        redirectTo: 'acceleration/list/1',
+      },
       {
         path: 'mempool-block/:id',
         data: { networks: ['bitcoin', 'liquid'] },

From 87ee14f189eba9811ff16d7028ba9f9ac8f956eb Mon Sep 17 00:00:00 2001
From: natsoni <natsoni@protonmail.com>
Date: Wed, 26 Jun 2024 16:12:21 +0900
Subject: [PATCH 15/77] Show loading indicator on toggle in RBF list

---
 frontend/src/app/components/rbf-list/rbf-list.component.html | 2 +-
 frontend/src/app/components/rbf-list/rbf-list.component.ts   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/components/rbf-list/rbf-list.component.html b/frontend/src/app/components/rbf-list/rbf-list.component.html
index 133cdfe33..a3baa8537 100644
--- a/frontend/src/app/components/rbf-list/rbf-list.component.html
+++ b/frontend/src/app/components/rbf-list/rbf-list.component.html
@@ -15,7 +15,7 @@
 
   <div class="clearfix"></div>
 
-  <div class="rbf-trees" style="min-height: 295px">
+  <div class="rbf-trees" [ngStyle]="{ 'min-height': '295px', 'opacity': isLoading ? '0.75' : '1' }">
     <ng-container *ngIf="rbfTrees$ | async as trees">
       <div *ngFor="let tree of trees" class="tree">
         <p class="info">
diff --git a/frontend/src/app/components/rbf-list/rbf-list.component.ts b/frontend/src/app/components/rbf-list/rbf-list.component.ts
index ff30dd1c9..25f7dea2e 100644
--- a/frontend/src/app/components/rbf-list/rbf-list.component.ts
+++ b/frontend/src/app/components/rbf-list/rbf-list.component.ts
@@ -38,6 +38,7 @@ export class RbfList implements OnInit, OnDestroy {
       this.fullRbf = (fragment === 'fullrbf');
       this.websocketService.startTrackRbf(this.fullRbf ? 'fullRbf' : 'all');
       this.nextRbfSubject.next(null);
+      this.isLoading = true;
     });
 
     this.rbfTrees$ = merge(

From 124c0acbe17bb5a147fa4102e380e7e8545b0d11 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Wed, 26 Jun 2024 08:03:52 +0000
Subject: [PATCH 16/77] Minor layout tweaks for the acceleration preview

---
 .../accelerate-fee-graph.component.scss       |  1 -
 .../accelerate-preview.component.html         | 53 +++++++------------
 .../accelerate-preview.component.scss         |  8 ++-
 3 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.scss b/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.scss
index 396317093..919fdec4a 100644
--- a/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.scss
+++ b/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.scss
@@ -4,7 +4,6 @@
   width: 120px;
   margin-left: 4em;
   margin-right: 1.5em;
-  padding-bottom: 17px;
 
   .column {
     width: 100%;
diff --git a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
index 742369042..92dc8d0f8 100644
--- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
+++ b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
@@ -98,7 +98,7 @@
       </div>
   
       <h5>Summary</h5>
-      <div class="row mb-3">
+      <div class="row">
         <div class="col">
           <table class="table table-borderless table-border table-dark table-background table-accelerator">
             <tbody>
@@ -128,7 +128,7 @@
                 <tr>
                   <td class="item" i18n="accelerator.mempool-accelerator-fees">Mempool Accelerator™ fees</td>
                 </tr>
-                <tr class="info">
+                <tr class="info" [class.group-last]="!estimate.vsizeFee" [class.dashed-bottom]="!estimate.vsizeFee">
                   <td class="info">
                     <i><small i18n="accelerator.service-fee">Accelerator Service Fee</small></i>
                   </td>
@@ -140,7 +140,7 @@
                     <span class="fiat ml-1"><app-fiat [value]="estimate.mempoolBaseFee"></app-fiat></span>
                   </td>
                 </tr>
-              <tr class="info group-last" *ngIf="estimate.vsizeFee">
+              <tr class="info group-last dashed-bottom" *ngIf="estimate.vsizeFee">
                 <td class="info">
                   <i><small i18n="accelerator.tx-size-surcharge">Transaction Size Surcharge</small></i>
                 </td>
@@ -174,7 +174,7 @@
 
               <!-- MAX COST -->
               <ng-container>
-                <tr class="group-first">
+                <tr class="group-first" [class.group-last]="!isLoggedIn() || estimate.userBalance >= maxCost">
                   <td class="item">
                     <b style="background-color: var(--primary);" class="p-1 pl-0" i18n="accelerator.maximum-cost">Maximum acceleration cost</b> 
                   </td>
@@ -186,7 +186,7 @@
                   <td class="units">
                     <span class="symbol" i18n="shared.sats">sats</span>
                     <span class="fiat ml-1">
-                      <app-fiat [value]="maxCost" [colorClass]="estimate.userBalance < maxCost ? 'red-color' : 'green-color'"></app-fiat>
+                      <app-fiat [value]="maxCost" [colorClass]="isLoggedIn() && estimate.userBalance < maxCost ? 'red-color' : 'green-color'"></app-fiat>
                     </span>
                   </td>
                 </tr>
@@ -194,7 +194,7 @@
   
               <!-- USER BALANCE -->
               <ng-container *ngIf="isLoggedIn() && estimate.userBalance < maxCost">
-                <tr class="group-first group-last" style="border-top: 1px dashed grey">
+                <tr class="group-first group-last dashed-top">
                   <td class="item" i18n="accelerator.available-balance">Available balance</td>
                   <td class="amt">
                     {{ estimate.userBalance | number }}
@@ -207,27 +207,21 @@
                   </td>
                 </tr>
               </ng-container>
-              <tr>
-                <td colspan="3">
-                  <div style="border-top: 1px dashed grey; margin-top: 10px;"></div>
-                </td>
-              </tr>
-              <!-- LOGIN CTA -->
-              <ng-container *ngIf="stateService.isMempoolSpaceBuild && !isLoggedIn()">
+              <ng-container *ngIf="user && estimate?.hasAccess || !isLoggedIn()">
                 <tr class="group-first group-last" style="border-top: 1px dashed grey">
                   <td class="item"></td>
-                  <td class="amt"></td>
-                  <td class="units d-flex">
-                    <a [routerLink]="['/login']" [queryParams]="{redirectTo: '/tx/' + tx.txid + '#accelerate'}" class="btn btn-purple flex-grow-1" i18n="shared.sign-in">Sign In</a>
-                  </td>
-                </tr>
-              </ng-container>
-              <ng-container *ngIf="!stateService.isMempoolSpaceBuild">
-                <tr class="group-first group-last">
-                  <td class="item"></td>
-                  <td class="amt"></td>
-                  <td class="units d-flex">
-                    <a [href]="'https://mempool.space/tx/' + tx.txid + '#accelerate'" class="btn btn-purple flex-grow-1" i18n="accelerator.accelerate-on-mempoolspace">Accelerate on mempool.space</a>
+                  <td colspan="2">
+                    <div class="d-flex">
+                      @if (isLoggedIn()) {
+                        @if (user && estimate.hasAccess) {
+                          <button class="btn btn-sm btn-primary btn-success flex-grow-1" style="width: 150px" (click)="accelerate()" i18n="transaction.accelerate|Accelerate button label">Accelerate</button>
+                        }
+                      } @else if (stateService.isMempoolSpaceBuild) {
+                        <a [routerLink]="['/login']" [queryParams]="{redirectTo: '/tx/' + tx.txid + '#accelerate'}" class="btn btn-purple flex-grow-1" i18n="shared.sign-in">Sign In</a>
+                      } @else {
+                        <a [href]="'https://mempool.space/tx/' + tx.txid + '#accelerate'" class="btn btn-purple flex-grow-1" i18n="accelerator.accelerate-on-mempoolspace">Accelerate on mempool.space</a>
+                      }
+                    </div>
                   </td>
                 </tr>
               </ng-container>
@@ -235,15 +229,6 @@
           </table>
         </div>
       </div>
-  
-      <div class="row mb-3" *ngIf="isLoggedIn()">
-        <div class="col">
-          <div class="d-flex justify-content-end" *ngIf="user && estimate.hasAccess">
-            <button class="btn btn-sm btn-primary btn-success" style="width: 150px" (click)="accelerate()" i18n="transaction.accelerate|Accelerate button label">Accelerate</button>
-          </div>
-        </div>
-      </div>
-  
     </div>
   </ng-container>
 </div>
diff --git a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.scss b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.scss
index 8d9b713a4..7194a4782 100644
--- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.scss
+++ b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.scss
@@ -72,11 +72,17 @@
         padding-top: 0.75rem;
       }
     }
-    &.group-last {
+    &.group-last, &:last-child {
       td {
         padding-bottom: 0.75rem;
       }
     }
+    &.dashed-top {
+      border-top: 1px dashed grey;
+    }
+    &.dashed-bottom {
+      border-bottom: 1px dashed grey
+    }
   }
   td {
     &:first-child {

From d45104f7c955aef4451fca9b3087c4a3051865fa Mon Sep 17 00:00:00 2001
From: natsoni <natsoni@protonmail.com>
Date: Wed, 26 Jun 2024 18:03:14 +0900
Subject: [PATCH 17/77] Align acceleration pie chart

---
 .../active-acceleration-box.component.html               | 9 ++++++---
 .../active-acceleration-box.component.scss               | 7 +++++++
 .../active-acceleration-box.component.ts                 | 4 ++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html
index 711269a47..ec2636be2 100644
--- a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html
+++ b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html
@@ -4,8 +4,11 @@
 <table>
   <tbody>
     <tr>
-      <td class="td-width field-label" i18n="transaction.accelerated-to-feerate|Accelerated to feerate">Accelerated to</td>
-      <td class="field-value">
+      <td class="td-width field-label" [class]="isMobile() ? 'mobile' : ''" i18n="transaction.accelerated-to-feerate|Accelerated to feerate">Accelerated to</td>
+      <td class="pie-chart" rowspan="2" *ngIf="isMobile()">
+        <ng-container *ngTemplateOutlet="pieChart"></ng-container>
+      </td>
+      <td class="field-value" [class]="isMobile() ? 'mobile' : ''">
         <div class="effective-fee-container">
           @if (accelerationInfo?.acceleratedFeeRate && (!tx.effectiveFeePerVsize || accelerationInfo.acceleratedFeeRate >= tx.effectiveFeePerVsize)) {
             <app-fee-rate [fee]="accelerationInfo.acceleratedFeeRate"></app-fee-rate>
@@ -14,7 +17,7 @@
           }
         </div>
       </td>
-      <td class="pie-chart" rowspan="2">
+      <td class="pie-chart" rowspan="2" *ngIf="!isMobile()">
         <ng-container *ngTemplateOutlet="pieChart"></ng-container>
       </td>
     </tr>
diff --git a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss
index 12849dc65..e9cbb9a6a 100644
--- a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss
+++ b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss
@@ -16,6 +16,9 @@
     width: auto;
     min-width: auto;
   }
+  &.mobile {
+    width: 100%;
+  }
 }
 
 .field-value {
@@ -23,6 +26,10 @@
     width: 100%;
   }
 
+  &.mobile {
+    width: auto;
+  }
+
   .hashrate-label {
     @media (max-width: 420px) {
       display: none;
diff --git a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts
index 2d94cad50..4b6bb116b 100644
--- a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts
+++ b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts
@@ -128,4 +128,8 @@ export class ActiveAccelerationBox implements OnChanges {
     }
     this.chartInstance = ec;
   }
+
+  isMobile() {
+    return window.innerWidth <= 767.98;
+  }
 }
\ No newline at end of file

From b6d03953b9900a320564a12e6b6d2dd8b5346761 Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Wed, 26 Jun 2024 21:42:30 +0900
Subject: [PATCH 18/77] Show accelerator estimates on local instances

---
 .../src/api/acceleration/acceleration.routes.ts   | 15 +++++++++++++++
 .../app/components/tracker/tracker.component.ts   |  2 +-
 .../transaction/transaction.component.ts          |  6 ++----
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/backend/src/api/acceleration/acceleration.routes.ts b/backend/src/api/acceleration/acceleration.routes.ts
index ae0c3f7a8..082d53330 100644
--- a/backend/src/api/acceleration/acceleration.routes.ts
+++ b/backend/src/api/acceleration/acceleration.routes.ts
@@ -14,6 +14,7 @@ class AccelerationRoutes {
       .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations/history', this.$getAcceleratorAccelerationsHistory.bind(this))
       .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations/history/aggregated', this.$getAcceleratorAccelerationsHistoryAggregated.bind(this))
       .get(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/accelerations/stats', this.$getAcceleratorAccelerationsStats.bind(this))
+      .post(config.MEMPOOL.API_URL_PREFIX + 'services/accelerator/estimate', this.$getAcceleratorEstimate.bind(this))
     ;
   }
 
@@ -64,6 +65,20 @@ class AccelerationRoutes {
       res.status(500).end();
     }
   }
+
+  private async $getAcceleratorEstimate(req: Request, res: Response): Promise<void> {
+    const url = `${config.MEMPOOL_SERVICES.API}/${req.originalUrl.replace('/api/v1/services/', '')}`;
+    try {
+      const response = await axios.post(url, req.body, { responseType: 'stream', timeout: 10000 });
+      for (const key in response.headers) {
+        res.setHeader(key, response.headers[key]);
+      }
+      response.data.pipe(res);
+    } catch (e) {
+      logger.err(`Unable to get acceleration estimate from ${url} in $getAcceleratorEstimate(), ${e}`, this.tag);
+      res.status(500).end();
+    }
+  }
 }
 
 export default new AccelerationRoutes();
\ No newline at end of file
diff --git a/frontend/src/app/components/tracker/tracker.component.ts b/frontend/src/app/components/tracker/tracker.component.ts
index 62ecc9bf0..fe42ef0dd 100644
--- a/frontend/src/app/components/tracker/tracker.component.ts
+++ b/frontend/src/app/components/tracker/tracker.component.ts
@@ -116,7 +116,7 @@ export class TrackerComponent implements OnInit, OnDestroy {
 
   hasEffectiveFeeRate: boolean;
   accelerateCtaType: 'alert' | 'button' = 'button';
-  acceleratorAvailable: boolean = this.stateService.env.OFFICIAL_MEMPOOL_SPACE && this.stateService.env.ACCELERATOR && this.stateService.network === '';
+  acceleratorAvailable: boolean = this.stateService.env.ACCELERATOR && this.stateService.network === '';
   accelerationEligible: boolean = false;
   showAccelerationSummary = false;
   accelerationFlowCompleted = false;
diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts
index 0348bf50a..570242a9a 100644
--- a/frontend/src/app/components/transaction/transaction.component.ts
+++ b/frontend/src/app/components/transaction/transaction.component.ts
@@ -136,7 +136,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
   taprootEnabled: boolean;
   hasEffectiveFeeRate: boolean;
   accelerateCtaType: 'alert' | 'button' = 'button';
-  acceleratorAvailable: boolean = this.stateService.env.OFFICIAL_MEMPOOL_SPACE && this.stateService.env.ACCELERATOR && this.stateService.network === '';
+  acceleratorAvailable: boolean = this.stateService.env.ACCELERATOR && this.stateService.network === '';
   showAccelerationSummary = false;
   showAccelerationDetails = false;
   scrollIntoAccelPreview = false;
@@ -167,15 +167,13 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
   ) {}
 
   ngOnInit() {
-    this.acceleratorAvailable = this.stateService.env.OFFICIAL_MEMPOOL_SPACE && this.stateService.env.ACCELERATOR && this.stateService.network === '';
-
     this.enterpriseService.page();
 
     this.websocketService.want(['blocks', 'mempool-blocks']);
     this.stateService.networkChanged$.subscribe(
       (network) => {
         this.network = network;
-        this.acceleratorAvailable = this.stateService.env.OFFICIAL_MEMPOOL_SPACE && this.stateService.env.ACCELERATOR && this.stateService.network === '';
+        this.acceleratorAvailable = this.stateService.env.ACCELERATOR && this.stateService.network === '';
       }
     );
 

From d6d8c854199a842d68d702c647e6bb43a8ea5bc0 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Thu, 27 Jun 2024 03:40:03 +0000
Subject: [PATCH 19/77] Show more detail in acceleration pools pie chart

---
 .../active-acceleration-box.component.scss    |  7 ++
 .../active-acceleration-box.component.ts      | 79 ++++++++++---------
 2 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss
index 12849dc65..43e18ab6e 100644
--- a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss
+++ b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss
@@ -47,4 +47,11 @@
   @media (max-width: 420px) {
     padding-left: 0;
   }
+}
+
+::ng-deep .chart {
+  overflow: visible;
+  & > div, & > div > svg {
+    overflow: visible !important;
+  }
 }
\ No newline at end of file
diff --git a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts
index 2d94cad50..c957a4837 100644
--- a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts
+++ b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts
@@ -4,6 +4,17 @@ import { Acceleration, SinglePoolStats } from '../../../interfaces/node-api.inte
 import { EChartsOption, PieSeriesOption } from '../../../graphs/echarts';
 import { MiningStats } from '../../../services/mining.service';
 
+function lighten(color, p): { r, g, b } {
+  return {
+    r: color.r + ((255 - color.r) * p),
+    g: color.g + ((255 - color.g) * p),
+    b: color.b + ((255 - color.b) * p),
+  };
+}
+
+function toRGB({r,g,b}): string {
+  return `rgb(${r},${g},${b})`;
+}
 
 @Component({
   selector: 'app-active-acceleration-box',
@@ -43,57 +54,32 @@ export class ActiveAccelerationBox implements OnChanges {
       pools[pool.poolUniqueId] = pool;
     }
 
-    const getDataItem = (value, color, tooltip) => ({
+    const getDataItem = (value, color, tooltip, emphasis) => ({
       value,
+      name: tooltip,
       itemStyle: {
         color,
-        borderColor: 'rgba(0,0,0,0)',
-        borderWidth: 1,
       },
-      avoidLabelOverlap: false,
-      label: {
-        show: false,
-      },
-      labelLine: {
-        show: false
-      },
-      emphasis: {
-        disabled: true,
-      },
-      tooltip: {
-        show: true,
-        backgroundColor: 'rgba(17, 19, 31, 1)',
-        borderRadius: 4,
-        shadowColor: 'rgba(0, 0, 0, 0.5)',
-        textStyle: {
-          color: 'var(--tooltip-grey)',
-        },
-        borderColor: '#000',
-        formatter: () => {
-          return tooltip;
-        }
-      }
     });
 
-    let totalAcceleratedHashrate = 0;
-    for (const poolId of poolList || []) {
+    const acceleratingPools = (poolList || []).filter(id => pools[id]).sort((a,b) => pools[a].lastEstimatedHashrate - pools[b].lastEstimatedHashrate);
+    const totalAcceleratedHashrate = acceleratingPools.reduce((total, pool) => total + pools[pool].lastEstimatedHashrate, 0);
+    acceleratingPools.forEach((poolId, index) => {
       const pool = pools[poolId];
-      if (!pool) {
-        continue;
-      }
-      totalAcceleratedHashrate += pool.lastEstimatedHashrate;
-    }
+      data.push(getDataItem(
+        pool.lastEstimatedHashrate,
+        toRGB(lighten({ r: 147, g: 57, b: 244 }, index * .08)),
+        `${((pool.lastEstimatedHashrate / this.miningStats.lastEstimatedHashrate) * 100).toFixed(1)}% ${pool.name} accelerating`,
+        true,
+      ) as PieSeriesOption);
+    })
     this.acceleratedByPercentage = ((totalAcceleratedHashrate / this.miningStats.lastEstimatedHashrate) * 100).toFixed(1) + '%';
-    data.push(getDataItem(
-      totalAcceleratedHashrate,
-      'var(--mainnet-alt)',
-      `${this.acceleratedByPercentage} accelerating`,
-    ) as PieSeriesOption);
     const notAcceleratedByPercentage = ((1 - (totalAcceleratedHashrate / this.miningStats.lastEstimatedHashrate)) * 100).toFixed(1) + '%';
     data.push(getDataItem(
       (this.miningStats.lastEstimatedHashrate - totalAcceleratedHashrate),
       'rgba(127, 127, 127, 0.3)',
       `${notAcceleratedByPercentage} not accelerating`,
+      false,
     ) as PieSeriesOption);
 
     return data;
@@ -111,11 +97,28 @@ export class ActiveAccelerationBox implements OnChanges {
       tooltip: {
         show: true,
         trigger: 'item',
+        backgroundColor: 'rgba(17, 19, 31, 1)',
+        borderRadius: 4,
+        shadowColor: 'rgba(0, 0, 0, 0.5)',
+        textStyle: {
+          color: 'var(--tooltip-grey)',
+        },
+        borderColor: '#000',
+        formatter: (item) => {
+          return item.name;
+        }
       },
       series: [
         {
           type: 'pie',
           radius: '100%',
+          label: {
+            show: false
+          },
+          labelLine: {
+            show: false
+          },
+          animationDuration: 0,
           data: this.getChartData(pools),
         }
       ]

From ebd4408b8d7fb22d7d776ff5fb35e8b18762ec1b Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Thu, 27 Jun 2024 06:19:43 +0000
Subject: [PATCH 20/77] Adjust acceleration pool pie labels

---
 .../active-acceleration-box.component.ts                     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts
index c957a4837..904b9bd08 100644
--- a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts
+++ b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts
@@ -66,10 +66,11 @@ export class ActiveAccelerationBox implements OnChanges {
     const totalAcceleratedHashrate = acceleratingPools.reduce((total, pool) => total + pools[pool].lastEstimatedHashrate, 0);
     acceleratingPools.forEach((poolId, index) => {
       const pool = pools[poolId];
+      const poolShare = ((pool.lastEstimatedHashrate / this.miningStats.lastEstimatedHashrate) * 100).toFixed(1);
       data.push(getDataItem(
         pool.lastEstimatedHashrate,
         toRGB(lighten({ r: 147, g: 57, b: 244 }, index * .08)),
-        `${((pool.lastEstimatedHashrate / this.miningStats.lastEstimatedHashrate) * 100).toFixed(1)}% ${pool.name} accelerating`,
+        `<b style="color: white">${pool.name} (${poolShare}%)</b>`,
         true,
       ) as PieSeriesOption);
     })
@@ -78,7 +79,7 @@ export class ActiveAccelerationBox implements OnChanges {
     data.push(getDataItem(
       (this.miningStats.lastEstimatedHashrate - totalAcceleratedHashrate),
       'rgba(127, 127, 127, 0.3)',
-      `${notAcceleratedByPercentage} not accelerating`,
+      `not accelerating (${notAcceleratedByPercentage})`,
       false,
     ) as PieSeriesOption);
 

From 575fc737ca09a9c6b58eb6e1aca3f071c20faf14 Mon Sep 17 00:00:00 2001
From: hunicus <93150691+hunicus@users.noreply.github.com>
Date: Thu, 27 Jun 2024 15:34:53 +0900
Subject: [PATCH 21/77] Replace bitcoin-s with coldcard on about page

---
 .../app/components/about/about.component.html    |   6 +++---
 .../app/components/about/about.component.scss    |   6 ++++++
 frontend/src/resources/profile/coldcard.png      | Bin 0 -> 1210 bytes
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 frontend/src/resources/profile/coldcard.png

diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html
index d1e52efa5..0acc07322 100644
--- a/frontend/src/app/components/about/about.component.html
+++ b/frontend/src/app/components/about/about.component.html
@@ -311,9 +311,9 @@
         <img class="image" src="/resources/profile/nunchuk.svg" />
         <span>Nunchuk</span>
       </a>
-      <a href="https://github.com/bitcoin-s/bitcoin-s" target="_blank" title="bitcoin-s">
-        <img class="image" src="/resources/profile/bitcoin-s.svg" />
-        <span>bitcoin-s</span>
+      <a href="http://github.com/COLDCARD" target="_blank" title="COLDCARD">
+        <img class="image coldcard" src="/resources/profile/coldcard.png" />
+        <span>COLDCARD</span>
       </a>
       <a href="https://github.com/EdgeApp" target="_blank" title="Edge">
         <img class="image not-rounded" src="/resources/profile/edge.svg" />
diff --git a/frontend/src/app/components/about/about.component.scss b/frontend/src/app/components/about/about.component.scss
index aecff02fc..a360e180c 100644
--- a/frontend/src/app/components/about/about.component.scss
+++ b/frontend/src/app/components/about/about.component.scss
@@ -156,6 +156,12 @@
         }
         img, svg {
           margin: 40px 29px 10px;
+          &.image.coldcard {
+            border-radius: 0;
+            width: auto;
+            max-height: 50px;
+            margin: 40px 29px 14px 29px;
+          }
         }
       }
     }
diff --git a/frontend/src/resources/profile/coldcard.png b/frontend/src/resources/profile/coldcard.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f4118747cd55390984760f376d4d66599751e2d
GIT binary patch
literal 1210
zcmXX_c`(~~98H;u8rF8zS&@)mqE)Qup^dtwnvR>UIEyO1RyCAHQl`3#P{b895?eZT
zEoBfQ44SIA>MA10Dk-h2i&R&Y>`!&(ecyYZ&-cxn?>}FvtFwcWf|ddV0#U+Ww08&9
z4?I@#vLO4oU15PjcXjl{fhs_w_kco80Kh(v1HibR9>@X!m_VV%bag=nulDdgxxWX;
zaU>G-AVBjY0|2An{r(8{faa}+23Y>~y9dLg2*d~i0q%bQ0NP=&{m#7&8r`~jIum>u
zCd%E}1H$VJFQ7if8ChQD!mCm^8v$3l(oLh>&0aE{kek^g{b8j9*cM(>wf<w-E$H>h
z(a$~vc?d+d7;kUmN#L#IuS6G{{G8ZTAx|)Jt+hVv+pt*Cz}Rl%^y}YA)*jcHup)o`
zX6o?(Yi+7&n-$T4y>{5csZU^6YC><{S-Ze=Hzov6rDkF0GbitfB4P^3goT|m+7~Nm
z)`aqz!KtSH+iYF+c&v$M*zXwx$J=XV7Y<Z<X9w{W;RTAzdasL_OQB~}n7CKTY51&K
zEx~xSt8n{qBvE{FEEFC|QYM*4i<Pzu@6LOPYZm-=tqXI`8ImGC$~|C`-~m8T<dGp(
zrqo?}_tj93MOA)?al+!Kw(9P2q)i`CZZuFu&Nb;szqF<OIXFMr=F^k&BO9{_xfkqj
z_^rUAwLcNT16a2DqqWnVf_7PqhChEvi)LguyzZAI3a5Lm5Q_{8`*tQzN;9Q=bH+lP
zbd*o_@87UEZo5nRP(5fa=2TqEYI5@pRy{9lK;6!U#@;JopQ@b2%t)9O0`(4jiNTu$
zE%;@(bY8Q>j)h4&y{Su6;PBe{)6+6Uty;M{HVjQO&+HxBVzt=vQ4i<njxaM*Xc+%p
zq92Ah&4+~xDQ8!CI$WzM+O2Or*+(!Bn_N43%v9p$C(6+1%0+98zJutvw184qcq!4h
z)Z2I9&~ly!&jiy!ObeVsyCAtp8DE|I(!Zynp=;0J#H$LVJmNo;1JQl10+&7rmuqX`
z#ky&>%s;x>tBQSnvu1@h_p<#^xM1?P4=ScmoSmiHjh2Y9W`mbXT)O(N3HGS^(e-jg
zmQQRa%UPy-WoA<p)VM^79c<`aRc#!?S-?~IiGlFHg!k*Q$F_S!RL2Zhe55k0s#9^-
zGqP?L?sa9c1X*OaI~`Dait(^UN<X>?D`;#`GmMX0c-$sD^I@cw2-)i11Yo^(WE&=y
zZl#_;WevyhkxF8x`7e@`6F51}+-`M?qs$lP^$~-NuTc!`*4fHqsb0-~|5C^=2sANH
zwfe-mf&4EL-~NE1J7neD&76{WHdjyi{d;_hkEP4O$<AvpG)$7-U13P`PPESE*SCbN
z)=dV`+2?az)JxU=>n`J{1gVM7-kE3)7j~Q8YV(#Ll6InW;d3o0;Y?)&<N1!`6R2B>
z<bBQ`MTXJ#<=KtrJc{#i88>rORk~}{e#$tcX&Kf<5K#tr!M*973`&UTS?CStr}oCw
znwU4Cy3diz{@ej7J8!xfj$~`Y-potT17v3A0)-l?Qitl2&K!w#kU({`n$w&PhKRwh
O4#DG`?W=7A6aEJ|XGB&2

literal 0
HcmV?d00001


From c3963d6a0d1c25717f236815d80457cbdb33bafe Mon Sep 17 00:00:00 2001
From: natsoni <natsoni@protonmail.com>
Date: Thu, 27 Jun 2024 16:32:20 +0900
Subject: [PATCH 22/77] Fix acceleration preview showing with fragment on accel
 txs

---
 .../transaction/transaction.component.ts        | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts
index 570242a9a..c3421969b 100644
--- a/frontend/src/app/components/transaction/transaction.component.ts
+++ b/frontend/src/app/components/transaction/transaction.component.ts
@@ -747,6 +747,11 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
       this.tx.acceleratedBy = cpfpInfo.acceleratedBy;
       this.setIsAccelerated(firstCpfp);
     }
+
+    if (!this.isAcceleration && this.fragmentParams.has('accelerate')) {
+      this.onAccelerateClicked();
+    }
+
     this.txChanged$.next(true);
 
     this.cpfpInfo = cpfpInfo;
@@ -884,14 +889,10 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
   // simulate normal anchor fragment behavior
   applyFragment(): void {
     const anchor = Array.from(this.fragmentParams.entries()).find(([frag, value]) => value === '');
-    if (anchor?.length) {
-      if (anchor[0] === 'accelerate') {
-        setTimeout(this.onAccelerateClicked.bind(this), 100);
-      } else {
-        const anchorElement = document.getElementById(anchor[0]);
-        if (anchorElement) {
-          anchorElement.scrollIntoView();
-        }
+    if (anchor?.length && anchor[0] !== 'accelerate') {
+      const anchorElement = document.getElementById(anchor[0]);
+      if (anchorElement) {
+        anchorElement.scrollIntoView();
       }
     }
   }

From bb91f9142e59acc04fbf06f17892b03f72642285 Mon Sep 17 00:00:00 2001
From: natsoni <natsoni@protonmail.com>
Date: Thu, 27 Jun 2024 17:50:45 +0900
Subject: [PATCH 23/77] Fix accel pool pie chart placement

---
 .../active-acceleration-box.component.html                | 8 ++++----
 .../active-acceleration-box.component.scss                | 4 ++--
 .../active-acceleration-box.component.ts                  | 5 +----
 .../app/components/transaction/transaction.component.html | 2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html
index ec2636be2..927fe1792 100644
--- a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html
+++ b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.html
@@ -4,11 +4,11 @@
 <table>
   <tbody>
     <tr>
-      <td class="td-width field-label" [class]="isMobile() ? 'mobile' : ''" i18n="transaction.accelerated-to-feerate|Accelerated to feerate">Accelerated to</td>
-      <td class="pie-chart" rowspan="2" *ngIf="isMobile()">
+      <td class="td-width field-label" [class]="chartPositionLeft ? 'chart-left' : ''" i18n="transaction.accelerated-to-feerate|Accelerated to feerate">Accelerated to</td>
+      <td class="pie-chart" rowspan="2" *ngIf="chartPositionLeft">
         <ng-container *ngTemplateOutlet="pieChart"></ng-container>
       </td>
-      <td class="field-value" [class]="isMobile() ? 'mobile' : ''">
+      <td class="field-value" [class]="chartPositionLeft ? 'chart-left' : ''">
         <div class="effective-fee-container">
           @if (accelerationInfo?.acceleratedFeeRate && (!tx.effectiveFeePerVsize || accelerationInfo.acceleratedFeeRate >= tx.effectiveFeePerVsize)) {
             <app-fee-rate [fee]="accelerationInfo.acceleratedFeeRate"></app-fee-rate>
@@ -17,7 +17,7 @@
           }
         </div>
       </td>
-      <td class="pie-chart" rowspan="2" *ngIf="!isMobile()">
+      <td class="pie-chart" rowspan="2" *ngIf="!chartPositionLeft">
         <ng-container *ngTemplateOutlet="pieChart"></ng-container>
       </td>
     </tr>
diff --git a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss
index deadf4df2..b01a902a4 100644
--- a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss
+++ b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.scss
@@ -16,7 +16,7 @@
     width: auto;
     min-width: auto;
   }
-  &.mobile {
+  &.chart-left {
     width: 100%;
   }
 }
@@ -26,7 +26,7 @@
     width: 100%;
   }
 
-  &.mobile {
+  &.chart-left {
     width: auto;
   }
 
diff --git a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts
index 51495f332..90df9987c 100644
--- a/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts
+++ b/frontend/src/app/components/acceleration/active-acceleration-box/active-acceleration-box.component.ts
@@ -28,6 +28,7 @@ export class ActiveAccelerationBox implements OnChanges {
   @Input() miningStats: MiningStats;
   @Input() pools: number[];
   @Input() chartOnly: boolean = false;
+  @Input() chartPositionLeft: boolean = false;
 
   acceleratedByPercentage: string = '';
 
@@ -132,8 +133,4 @@ export class ActiveAccelerationBox implements OnChanges {
     }
     this.chartInstance = ec;
   }
-
-  isMobile() {
-    return window.innerWidth <= 767.98;
-  }
 }
\ No newline at end of file
diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index 43ead974d..7b9a91c0e 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -650,7 +650,7 @@
 <ng-template #acceleratingRow>
   <tr>
     <td rowspan="2" colspan="2" style="padding: 0;">
-      <app-active-acceleration-box [tx]="tx" [accelerationInfo]="accelerationInfo" [miningStats]="miningStats"></app-active-acceleration-box>
+      <app-active-acceleration-box [tx]="tx" [accelerationInfo]="accelerationInfo" [miningStats]="miningStats" [chartPositionLeft]="isMobile"></app-active-acceleration-box>
     </td>
   </tr>
   <tr></tr>

From 66a88b8422ff299f5ffe0ee98cc337f287a25098 Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Wed, 26 Jun 2024 18:35:36 +0900
Subject: [PATCH 24/77] [accelerator] accelerate with lightning

---
 .../accelerate-checkout.component.html        |  70 ++++----
 .../accelerate-checkout.component.scss        |   8 +
 .../accelerate-checkout.component.ts          |  61 +++++--
 .../bitcoin-invoice.component.html            |  89 +++++++++++
 .../bitcoin-invoice.component.scss            | 149 ++++++++++++++++++
 .../bitcoin-invoice.component.ts              |  94 +++++++++++
 .../components/tracker/tracker.component.html |   4 +-
 .../components/tracker/tracker.component.ts   |   8 +-
 .../src/app/services/services-api.service.ts  |  15 ++
 frontend/src/app/shared/shared.module.ts      |   3 +
 10 files changed, 453 insertions(+), 48 deletions(-)
 create mode 100644 frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
 create mode 100644 frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.scss
 create mode 100644 frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts

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 8f82fe69c..40089ddbf 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -58,12 +58,24 @@
         </div>
       </div>
     </form>
-  }
-    
-  @else if (step === 'checkout') {
-    <!-- Show checkout page -->
+  
+  } @else if (step === 'paymentMethod') {
     <div class="row mb-md-1 text-center">
       <div class="col-sm">
+        <h1 style="font-size: larger;">Select your payment method</h1>
+      </div>
+    </div>
+    <div class="pt-2 d-flex justify-content-around">
+      @if (cashappEnabled) {
+        <img class="paymentMethod" src="/resources/cash-app.svg" height=55 (click)="selectPaymentMethod('cashapp')">
+      }
+      <img class="paymentMethod" src="/resources/btcpay.svg" height=55 (click)="selectPaymentMethod('btcpay')">
+    </div>
+
+  } @else if (step === 'checkout') {
+    <!-- Show checkout page -->
+    <div class="row mb-md-1 text-center">
+      <div class="col-sm" id="confirm-payment-title">
         <h1 style="font-size: larger;">Confirm your payment</h1>
       </div>
     </div>
@@ -76,36 +88,40 @@
       </div>
     </div>
 
-    @if (!loadingCashapp) {
+    @if (paymentMethod === 'cashapp') {
+      @if (!loadingCashapp) {
+        <div class="row text-center mt-1">
+          <div class="col-sm">
+            <div class="form-group w-100">
+              <span><u><strong>Total additional cost</strong></u><br>
+                <span style="font-size: 16px" class="d-block mt-2">
+                  Pay
+                  <strong><app-fiat [value]="cost"></app-fiat></strong>
+                  with
+                </span>
+              </span>
+            </div>
+          </div>
+        </div>
+      }
+
       <div class="row text-center mt-1">
         <div class="col-sm">
           <div class="form-group w-100">
-            <span><u><strong>Total additional cost</strong></u><br>
-              <span style="font-size: 16px" class="d-block mt-2">
-                Pay
-                <strong><app-fiat [value]="cost"></app-fiat></strong>
-                with
-              </span>
-            </span>
+            <div id="cash-app-pay" class="d-inline-block" [style]="loadingCashapp ? 'opacity: 0; width: 0px; height: 0px; pointer-events: none;' : ''"></div>
+            @if (loadingCashapp) {
+            <div display="d-flex flex-row justify-content-center">
+              <span>Loading payment method...</span>
+              <div class="ml-2 spinner-border text-light" style="width: 25px; height: 25px"></div>
+            </div>
+            }
           </div>
         </div>
       </div>
+    } @else if (paymentMethod === 'btcpay' && invoice?.btcpayInvoiceId) {
+      <app-bitcoin-invoice [invoiceId]="invoice.btcpayInvoiceId" (completed)="closeModal(2000)"></app-bitcoin-invoice>
     }
 
-    <div class="row text-center mt-1">
-      <div class="col-sm">
-        <div class="form-group w-100">
-          <div id="cash-app-pay" class="d-inline-block" [style]="loadingCashapp ? 'opacity: 0; width: 0px; height: 0px; pointer-events: none;' : ''"></div>
-          @if (loadingCashapp) {
-          <div display="d-flex flex-row justify-content-center">
-            <span>Loading payment method...</span>
-            <div class="ml-2 spinner-border text-light" style="width: 25px; height: 25px"></div>
-          </div>
-          }
-        </div>
-      </div>
-    </div>
-
     <hr>
     <div class="row mt-2 mb-2 text-center">
       <div class="col-sm d-flex flex-column">
@@ -118,7 +134,7 @@
   @else if (step === 'processing') {
     <div class="row mb-1 text-center">
       <div class="col-sm">
-        <h1 style="font-size: larger;">Confirm your payment</h1>
+        <h1 style="font-size: larger;">Confirming your payment</h1>
       </div>
     </div>
 
diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
index 315bdbbd2..268f03f93 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
@@ -7,3 +7,11 @@
 .estimating {
   color: var(--green)
 }
+
+.paymentMethod {
+  padding: 10px;
+  background-color: var(--secondary);
+  border-radius: 15px;
+  border: 2px solid var(--bg);
+  cursor: pointer;
+}
\ 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 16400a70a..ba867d096 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -16,12 +16,16 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   @Input() eta: number | null = null;
   @Input() txid: string = '70c18d76cdb285a1b5bd87fdaae165880afa189809c30b4083ff7c0e69ee09ad';
   @Input() scrollEvent: boolean;
+  @Input() cashappEnabled: boolean;
   @Output() close = new EventEmitter<null>();
 
   calculating = true;
   choosenOption: 'wait' | 'accelerate' = 'wait';
   error = '';
 
+  step: 'paymentMethod' | 'cta' | 'checkout' | 'processing' = 'cta';
+  paymentMethod: 'cashapp' | 'btcpay';
+
   // accelerator stuff
   square: { appId: string, locationId: string};
   accelerationUUID: string;
@@ -38,7 +42,10 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   cashAppPay: any;
   cashAppSubscription: Subscription;
   conversionsSubscription: Subscription;
-  step: 'cta' | 'checkout' | 'processing' = 'cta';
+  
+  // btcpay
+  loadingBtcpayInvoice = false;
+  invoice = undefined;
 
   constructor(
     private servicesApiService: ServicesApiServices,
@@ -77,19 +84,19 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
 
   ngOnChanges(changes: SimpleChanges): void {
     if (changes.scrollEvent) {
-      this.scrollToPreview('acceleratePreviewAnchor', 'start');
+      this.scrollToElement('acceleratePreviewAnchor', 'start');
     }
   }
 
   /**
   * Scroll to element id with or without setTimeout
   */
-  scrollToPreviewWithTimeout(id: string, position: ScrollLogicalPosition) {
+  scrollToElementWithTimeout(id: string, position: ScrollLogicalPosition, timeout: number = 1000) {
     setTimeout(() => {
-      this.scrollToPreview(id, position);
-    }, 1000);
+      this.scrollToElement(id, position);
+    }, timeout);
   }
-  scrollToPreview(id: string, position: ScrollLogicalPosition) {
+  scrollToElement(id: string, position: ScrollLogicalPosition) {
     const acceleratePreviewAnchor = document.getElementById(id);
     if (acceleratePreviewAnchor) {
       this.cd.markForCheck();
@@ -111,7 +118,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
     this.calculating = true;
     this.estimateSubscription = this.servicesApiService.estimate$(this.txid).pipe(
       tap((response) => {
-        this.calculating = false;
         if (response.status === 204) {
           this.error = `cannot_accelerate_tx`;
         } else {
@@ -126,6 +132,8 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
           this.maxBidBoost = minExtraBoost * DEFAULT_BID_RATIO;
           this.cost = this.maxBidBoost + this.estimate.mempoolBaseFee + this.estimate.vsizeFee;
           this.etaInfo$ = this.etaService.getProjectedEtaObservable(this.estimate);
+          this.calculating = false;
+          this.cd.markForCheck();
         }
       }),
 
@@ -265,19 +273,48 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
     );
   }
 
+  /**
+   * BTCPay
+   */
+  async requestBTCPayInvoice() {
+    this.servicesApiService.generateBTCPayAcceleratorInvoice$(this.txid).subscribe({
+      next: (response) => {
+        this.invoice = response;
+        this.cd.markForCheck();
+        this.scrollToElementWithTimeout('acceleratePreviewAnchor', 'start', 500);
+      },
+      error: (response) => {
+        console.log(response);
+      }
+    });
+  }
+
   /**
    * UI events
    */
   enableCheckoutPage() {
+    this.step = 'paymentMethod';
+  }
+  selectPaymentMethod(paymentMethod: 'cashapp' | 'btcpay') {
     this.step = 'checkout';
-    this.loadingCashapp = true;
-    this.insertSquare();
-    this.setupSquare();
+    this.paymentMethod = paymentMethod;
+    if (paymentMethod === 'cashapp') {
+      this.loadingCashapp = true;
+      this.insertSquare();
+      this.setupSquare();
+    } else if (paymentMethod === 'btcpay') {
+      this.loadingBtcpayInvoice = true;
+      this.requestBTCPayInvoice();
+    }
   }
   selectedOptionChanged(event) {
     this.choosenOption = event.target.id;
   }
-  closeModal(): void {
-    this.close.emit();
+  closeModal(timeout: number = 0): void {
+    setTimeout(() => {
+      this.step = 'processing';
+      this.cd.markForCheck();
+      this.close.emit();
+    }, timeout);
   }
 }
diff --git a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
new file mode 100644
index 000000000..dabaf991e
--- /dev/null
+++ b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
@@ -0,0 +1,89 @@
+<div class="wrapper">
+
+  <span *ngIf="paymentStatus === 3" class="valid-feedback d-block mt-5">
+    Payment successful. You can close this page.
+  </span>
+  
+  <span *ngIf="paymentStatus === 4" class="valid-feedback d-block mt-5">
+    A transaction <a [href]="'/tx/' + invoice.cryptoInfo[0].payments[0].id.split('-')[0]">has been detected in the mempool</a> fully paying for this invoice. Waiting for on-chain confirmation.
+  </span>
+
+  <div *ngIf="paymentStatus === 2">
+    
+    <form [formGroup]="paymentForm">
+
+      <div class="form-group">
+        <div class="btn-group btn-group-toggle" data-toggle="buttons">
+          <!-- <label *ngIf="invoice.addresses.BTC" class="btn btn-primary" [ngClass]="{'active': paymentForm.get('method')?.value === 'chain'}">
+            <input type="radio" value="chain" formControlName="method"> <fa-icon [icon]="['fas', 'link']" [fixedWidth]="true" title="Onchain"></fa-icon>
+          </label> -->
+          <label *ngIf="invoice.addresses.BTC_LightningLike" class="btn btn-primary" [ngClass]="{'active': paymentForm.get('method')?.value === 'lightning'}">
+            <input type="radio" value="lightning" formControlName="method"> <fa-icon [icon]="['fas', 'bolt']" [fixedWidth]="true" title="Lightning"></fa-icon>
+          </label>
+          <!-- <label *ngIf="invoice.addresses.LBTC" class="btn btn-primary" [ngClass]="{'active': paymentForm.get('method')?.value === 'lbtc'}">
+            <input type="radio" value="lbtc" formControlName="method"> <fa-icon [icon]="['fas', 'tint']" [fixedWidth]="true" title="Liquid Bitcoin"></fa-icon>
+          </label> -->
+        </div>
+      </div>
+
+    </form>
+
+    <ng-template [ngIf]="paymentForm.get('method')?.value === 'chain' && invoice">
+
+        <div class="qr-wrapper">
+          <a [href]="bypassSecurityTrustUrl('bitcoin:' + invoice.addresses.BTC + '?amount=' + invoice.amount)" target="_blank">
+              <app-qrcode imageUrl="/resources/bitcoin-logo.png" [size]="200" [data]="'bitcoin:' + invoice.addresses.BTC + '?amount=' + invoice.amount"></app-qrcode>
+          </a>
+        </div>
+        
+        <div class="input-group input-group-sm info-group">
+          <input type="text" class="form-control input-dark" readonly [value]="invoice.addresses.BTC">
+          <div class="input-group-append">
+              <button class="btn btn-outline-secondary" type="button" ><app-clipboard [text]="invoice.addresses.BTC"></app-clipboard></button>
+          </div>
+        </div>
+        <p>{{ invoice.amount }} <span class="symbol">BTC</span></p>
+
+    </ng-template>
+
+    <ng-template [ngIf]="paymentForm.get('method')?.value === 'lightning' && invoice">
+
+        <div class="qr-wrapper">
+          <a [href]="bypassSecurityTrustUrl('lightning:' + invoice.addresses.BTC_LightningLike)" target="_blank">
+              <app-qrcode imageUrl="/resources/bitcoin-logo.png" [size]="200" [data]="invoice.addresses.BTC_LightningLike.toUpperCase()"></app-qrcode>
+          </a>
+        </div>
+
+        <div class="input-group input-group-sm info-group">
+          <input type="text" class="form-control input-dark" readonly [value]="invoice.addresses.BTC_LightningLike">
+          <div class="input-group-append">
+              <button class="btn btn-outline-secondary" type="button"><app-clipboard [text]="invoice.addresses.BTC_LightningLike"></app-clipboard></button>
+          </div>
+        </div>
+
+        <p>{{ invoice.amount * 100_000_000 }} <span class="symbol">sats</span></p>
+
+    </ng-template>
+
+    <ng-template [ngIf]="invoice && (paymentForm.get('method')?.value === 'lbtc' || paymentForm.get('method')?.value === 'tlbtc')">
+
+        <div class="qr-wrapper">
+          <a [href]="bypassSecurityTrustUrl('liquidnetwork:' + invoice.addresses.LBTC + '?amount=' + invoice.amount + '&assetid=6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d')" target="_blank">
+              <app-qrcode imageUrl="/resources/liquid-bitcoin.png" [size]="200" [data]="'liquidnetwork:' + invoice.addresses.LBTC + '?amount=' + invoice.amount + '&assetid=6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d'"></app-qrcode>
+          </a>
+        </div>
+        <br>
+        <div class="input-group input-group-sm info-group">
+          <input type="text" class="form-control input-dark" readonly [value]="invoice.addresses.LBTC" />
+          <div class="input-group-append">
+              <button class="btn btn-outline-secondary" type="button" ><app-clipboard [text]="invoice.addresses.LBTC"></app-clipboard></button>
+          </div>
+        </div>
+        <p>{{ invoice.amount }} <span class="symbol">BTC</span></p>
+
+    </ng-template>
+
+    <p>Waiting for transaction... </p>
+    <div class="spinner-border text-light"></div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.scss b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.scss
new file mode 100644
index 000000000..7582b70f0
--- /dev/null
+++ b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.scss
@@ -0,0 +1,149 @@
+.form-panel {
+  background-color: #292b45;
+  padding: 20px;
+}
+
+
+.sponsor-page {
+  text-align: center;
+}
+
+.qr-wrapper {
+    background-color: #FFF;
+    padding: 10px;
+    display: inline-block;
+    padding-bottom: 5px;
+    margin: 20px auto 0px;
+}
+
+.info-group {
+  max-width: 400px;
+}
+
+.card {
+  width: 240px;
+  height: 220px;
+  background-color: var(--bg);
+  border: 2px solid var(--bg);
+  cursor: pointer;
+  position: relative;
+  transition: 100ms all;
+  margin: 30px 30px 20px 30px;
+  @media(min-width: 476px) {
+    margin: 30px 100px 20px 100px;
+  }
+  @media(min-width: 851px) {
+    margin: 60px 20px 40px 20px;
+  }
+
+  .card-title {
+    font-weight: bold;
+    span {
+      font-weight: 100;
+    }
+  }
+
+  &.bigger {
+    height: 220px;
+    width: 240px;
+    margin-top: 40px;
+  }
+
+  &:hover {
+    background-color: #5058926b;
+    border: 2px solid #505892;
+    transform: scale(1.1) translateY(-10px);
+    margin-top: 70px;
+
+    .card-header {
+      background-color: #505892;
+    }
+  }
+}
+
+.donation-form {
+  max-width: 280px;
+  margin: auto;
+  button {
+    width: 100%;
+  }
+}
+
+.card-header {
+  background-color: #171929;
+}
+
+.flex-container {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: center;
+}
+
+.middle-card {
+  width: 280px;
+  height: 260px;
+  margin-top: 40px;
+  &:hover {
+    margin-top: 50px;
+  }
+}
+
+.shiny-border {
+  background-color: #5058926b;
+  border: 2px solid #505892;
+  transform: scale(1.1) translateY(-10px);
+  margin-top: 70px;
+  box-shadow: 0px 0px 100px #9858ff52;
+  .card-header {
+    background-color: #505892;
+  }
+
+  &.middle-card {
+    margin-top: 50px;
+  }
+}
+
+.input-group {
+  margin: 20px auto;
+}
+
+.donation-confirmed {
+  h2 {
+    margin-top: 50px;
+    span {
+      display: block;
+      &:last-child {
+        color: #9858ff;
+        font-weight: bold;
+        font-size: 2rem;
+      }
+    }
+  }
+
+  .order-details {
+    margin-top: 50px;
+    span {
+      color: #d81b60;
+      margin-left: 10px;
+    }
+  }
+}
+
+.card-body {
+  align-items: center;
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  height: 100%;
+}
+
+.wrapper {
+  text-align: center;
+}
+
+.input-dark {
+  background-color: var(--bg);
+  border-color: var(--active-bg);
+  color: white;
+}
diff --git a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts
new file mode 100644
index 000000000..2e12f54ba
--- /dev/null
+++ b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts
@@ -0,0 +1,94 @@
+import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output } from '@angular/core';
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { DomSanitizer, SafeUrl } from '@angular/platform-browser';
+import { ActivatedRoute } from '@angular/router';
+import { Subscription, timer } from 'rxjs';
+import { retry, switchMap, tap } from 'rxjs/operators';
+import { ServicesApiServices } from '../../services/services-api.service';
+
+@Component({
+  selector: 'app-bitcoin-invoice',
+  templateUrl: './bitcoin-invoice.component.html',
+  styleUrls: ['./bitcoin-invoice.component.scss']
+})
+export class BitcoinInvoiceComponent implements OnInit, OnDestroy {
+  @Input() invoiceId: string;
+  @Input() redirect = true;
+  @Output() completed = new EventEmitter();
+
+  paymentForm: FormGroup;
+  requestSubscription: Subscription | undefined;
+  paymentStatusSubscription: Subscription | undefined;
+  invoice: any;
+  paymentStatus = 1; // 1 - Waiting for invoice | 2 - Pending payment | 3 - Payment completed
+  paramMapSubscription: Subscription | undefined;
+  invoiceSubscription: Subscription | undefined;
+  invoiceTimeout; // Wait for angular to load all the things before making a request
+
+  constructor(
+    private formBuilder: FormBuilder,
+    private apiService: ServicesApiServices,
+    private sanitizer: DomSanitizer,
+    private activatedRoute: ActivatedRoute
+  ) { }
+
+  ngOnDestroy() {
+    if (this.requestSubscription) {
+      this.requestSubscription.unsubscribe();
+    }
+    if (this.paramMapSubscription) {
+      this.paramMapSubscription.unsubscribe();
+    }
+    if (this.invoiceSubscription) {
+      this.invoiceSubscription.unsubscribe();
+    }
+    if (this.paymentStatusSubscription) {
+      this.paymentStatusSubscription.unsubscribe();
+    }
+  }
+
+  ngOnInit(): void {
+    this.paymentForm = this.formBuilder.group({
+      'method': 'lightning'
+    });
+
+    /**
+     * If the invoice is passed in the url, fetch it and display btcpay payment
+     * Otherwise get a new invoice
+     */
+    this.paramMapSubscription = this.activatedRoute.paramMap
+      .pipe(
+        tap((paramMap) => {
+          const invoiceId = paramMap.get('invoiceId') ?? this.invoiceId;
+          if (invoiceId) {
+            this.paymentStatusSubscription = this.apiService.retreiveInvoice$(invoiceId).pipe(
+              tap((invoice: any) => {
+                this.invoice = invoice;
+                this.invoice.amount = invoice.btcDue ?? (invoice.cryptoInfo.length ? parseFloat(invoice.cryptoInfo[0].totalDue) : 0) ?? 0;
+
+                if (this.invoice.amount > 0) {
+                  this.paymentStatus = 2;
+                } else {
+                  this.paymentStatus = 4;
+                }
+              }),
+              switchMap(() => this.apiService.getPaymentStatus$(this.invoice.id)
+                .pipe(
+                  retry({ delay: () => timer(2000)})
+                )
+              ),
+            ).subscribe({
+              next: ((result) => {
+                this.paymentStatus = 3;
+                this.completed.emit();
+              }),
+            });
+          }
+        })
+      ).subscribe();
+  }
+
+  bypassSecurityTrustUrl(text: string): SafeUrl {
+    return this.sanitizer.bypassSecurityTrustUrl(text);
+  }
+}
diff --git a/frontend/src/app/components/tracker/tracker.component.html b/frontend/src/app/components/tracker/tracker.component.html
index 571c02f96..1380990df 100644
--- a/frontend/src/app/components/tracker/tracker.component.html
+++ b/frontend/src/app/components/tracker/tracker.component.html
@@ -75,7 +75,7 @@
                   } @else {
                     <app-time kind="until" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time>
                   }
-                  @if (!showAccelerationSummary && isMobile && paymentType === 'cashapp' && accelerationEligible && !tx.acceleration && acceleratorAvailable && accelerateCtaType === 'button' && !tx?.acceleration) {
+                  @if (!showAccelerationSummary && isMobile && !tx.acceleration && acceleratorAvailable && accelerateCtaType === 'button' && !tx?.acceleration) {
                     <a class="btn btn-sm accelerate btn-small-height" i18n="transaction.accelerate|Accelerate button label" (click)="onAccelerateClicked()">Accelerate</a>
                   }
                 </span>
@@ -116,7 +116,7 @@
 
     <div class="bottom-panel">
       @if (showAccelerationSummary && !accelerationFlowCompleted) {
-        <app-accelerate-checkout *ngIf="(da$ | async) as da;" [txid]="tx.txid" [eta]="mempoolPosition?.block >= 7 ? null : da.adjustedTimeAvg * (mempoolPosition.block + 1) + now + da.timeOffset" (close)="accelerationFlowCompleted = true" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100"></app-accelerate-checkout>
+        <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [txid]="tx.txid" [eta]="mempoolPosition?.block >= 7 ? null : da.adjustedTimeAvg * (mempoolPosition.block + 1) + now + da.timeOffset" (close)="accelerationFlowCompleted = true" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100"></app-accelerate-checkout>
       } @else {
         @if (tx?.acceleration && !tx.status?.confirmed) {
           <div class="progress-icon">
diff --git a/frontend/src/app/components/tracker/tracker.component.ts b/frontend/src/app/components/tracker/tracker.component.ts
index fe42ef0dd..508c8db19 100644
--- a/frontend/src/app/components/tracker/tracker.component.ts
+++ b/frontend/src/app/components/tracker/tracker.component.ts
@@ -107,7 +107,6 @@ export class TrackerComponent implements OnInit, OnDestroy {
   now = Date.now();
   da$: Observable<DifficultyAdjustment>;
   isMobile: boolean;
-  paymentType: 'bitcoin' | 'cashapp' = 'bitcoin';
 
   trackerStage: TrackerStage = 'waiting';
 
@@ -158,9 +157,6 @@ export class TrackerComponent implements OnInit, OnDestroy {
 
     this.acceleratorAvailable = this.stateService.env.OFFICIAL_MEMPOOL_SPACE && this.stateService.env.ACCELERATOR && this.stateService.network === '';
 
-    if (this.acceleratorAvailable && this.stateService.referrer === 'https://cash.app/') {
-      this.paymentType = 'cashapp';
-    }
     const urlParams = new URLSearchParams(window.location.search);
     if (urlParams.get('cash_request_id')) {
       this.showAccelerationSummary = true;
@@ -390,11 +386,9 @@ export class TrackerComponent implements OnInit, OnDestroy {
             this.trackerStage = 'replaced';
           }
 
+          this.showAccelerationSummary = true;
           if (txPosition.position?.block > 0 && this.tx.weight < 4000) {
             this.accelerationEligible = true;
-            if (this.acceleratorAvailable && this.paymentType === 'cashapp') {
-              this.showAccelerationSummary = true;
-            }
           }
         }
       } else {
diff --git a/frontend/src/app/services/services-api.service.ts b/frontend/src/app/services/services-api.service.ts
index bdc6d18c2..534f45b4e 100644
--- a/frontend/src/app/services/services-api.service.ts
+++ b/frontend/src/app/services/services-api.service.ts
@@ -167,4 +167,19 @@ export class ServicesApiServices {
   requestTestnet4Coins$(address: string, sats: number) {
     return this.httpClient.get<{txid: string}>(`${SERVICES_API_PREFIX}/testnet4/faucet/request?address=${address}&sats=${sats}`, { responseType: 'json' });
   }
+
+  generateBTCPayAcceleratorInvoice$(txid: string): Observable<any> {
+    const params = {
+      product: txid
+    };
+    return this.httpClient.post<any>(`${SERVICES_API_PREFIX}/payments/bitcoin`, params);
+  }
+
+  retreiveInvoice$(invoiceId: string): Observable<any[]> {
+    return this.httpClient.get<any[]>(`${SERVICES_API_PREFIX}/payments/bitcoin/invoice?id=${invoiceId}`);
+  }
+
+  getPaymentStatus$(orderId: string): Observable<any[]> {
+    return this.httpClient.get<any[]>(`${SERVICES_API_PREFIX}/payments/bitcoin/check?order_id=${orderId}`);
+  }
 }
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index 2f7bd4dc4..e3f219aba 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -115,6 +115,7 @@ import { HttpErrorComponent } from '../shared/components/http-error/http-error.c
 import { TwitterWidgetComponent } from '../components/twitter-widget/twitter-widget.component';
 import { FaucetComponent } from '../components/faucet/faucet.component';
 import { TwitterLogin } from '../components/twitter-login/twitter-login.component';
+import { BitcoinInvoiceComponent } from '../components/bitcoin-invoice/bitcoin-invoice.component';
 
 import { OnlyVsizeDirective, OnlyWeightDirective } from './components/weight-directives/weight-directives';
 
@@ -230,6 +231,7 @@ import { OnlyVsizeDirective, OnlyWeightDirective } from './components/weight-dir
     TwitterWidgetComponent,
     FaucetComponent,
     TwitterLogin,
+    BitcoinInvoiceComponent,
   ],
   imports: [
     CommonModule,
@@ -359,6 +361,7 @@ import { OnlyVsizeDirective, OnlyWeightDirective } from './components/weight-dir
     HttpErrorComponent,
     TwitterWidgetComponent,
     TwitterLogin,
+    BitcoinInvoiceComponent,
 
     MempoolBlockOverviewComponent,
     ClockchainComponent,

From 790e76ab26ed3fb262dc66ea3545ae409a6963b9 Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Wed, 26 Jun 2024 18:38:19 +0900
Subject: [PATCH 25/77] [accelerator] add payment methods assets

---
 frontend/src/resources/btcpay.svg   | 1 +
 frontend/src/resources/cash-app.svg | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 frontend/src/resources/btcpay.svg
 create mode 100644 frontend/src/resources/cash-app.svg

diff --git a/frontend/src/resources/btcpay.svg b/frontend/src/resources/btcpay.svg
new file mode 100644
index 000000000..5d8592b71
--- /dev/null
+++ b/frontend/src/resources/btcpay.svg
@@ -0,0 +1 @@
+<svg id="レイヤー_1" data-name="レイヤー 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 236.18 102.3"><defs><style>.cls-1{fill:#cedc21;}.cls-2{fill:#51b13e;}.cls-3{fill:#1e7a44;}.cls-4{fill:#fff;}</style></defs><title>btcpay3</title><path class="cls-1" d="M38.55,201.73a6,6,0,0,1-6-6V105.44a6,6,0,0,1,12,0v90.29A6,6,0,0,1,38.55,201.73Z" transform="translate(-32.55 -99.43)"/><path class="cls-2" d="M38.56,201.73A6,6,0,0,1,36,190.31l36.18-17.17L35,145.76a6,6,0,1,1,7.11-9.66l45.24,33.33a6,6,0,0,1-1,10.25L41.13,201.15A5.9,5.9,0,0,1,38.56,201.73Z" transform="translate(-32.55 -99.43)"/><path class="cls-1" d="M38.56,166.24A6,6,0,0,1,35,155.41L72.16,128,36,110.86A6,6,0,1,1,41.13,100l45.24,21.47a6,6,0,0,1,1,10.25L42.11,165.07A6,6,0,0,1,38.56,166.24Z" transform="translate(-32.55 -99.43)"/><polygon class="cls-3" points="12 38.46 12 63.84 29.21 51.16 12 38.46"/><rect class="cls-4" y="27.82" width="12" height="29.25"/><path class="cls-1" d="M44.55,105.44a6,6,0,0,0-12,0V181h12Z" transform="translate(-32.55 -99.43)"/><path class="cls-4" d="M123.92,149.86c3.84,1.09,6,4.57,6,8.93,0,6.81-4.15,10-9.82,10H107.14V132.4h11.43c5.56,0,9.87,2.65,9.87,9.56C128.44,145.44,127,148.66,123.92,149.86Zm-5.3-.89c4.1,0,7.43-1.45,7.43-7.06s-3.43-7.17-7.59-7.17h-8.88V149Zm1.3,17.41c4.15,0,7.48-2.18,7.48-7.59,0-5.82-3.79-7.58-8.52-7.58h-9.3v15.17Z" transform="translate(-32.55 -99.43)"/><path class="cls-4" d="M154.21,132.4v2.23h-10v34.14h-2.44V134.63h-10V132.4Z" transform="translate(-32.55 -99.43)"/><path class="cls-4" d="M171.3,131.88c6.19,0,11.8,3.12,13.57,10.55h-2.34c-1.66-6.08-6.55-8.32-11.28-8.32-8.57,0-13.09,7-13.09,16.47,0,10,4.52,16.37,13.14,16.37,5.1,0,9.67-2.29,11.44-9h2.33a13.6,13.6,0,0,1-13.77,11.33c-9.71,0-15.53-7.17-15.53-18.71C155.77,139.52,161.9,131.88,171.3,131.88Z" transform="translate(-32.55 -99.43)"/><path class="cls-4" d="M203.36,132.4c6.29,0,10.86,4.1,10.86,12,0,7.48-4.57,12-10.86,12H193.8v12.32h-2.39V132.4Zm0,21.66c4.63,0,8.42-3,8.42-9.66s-3.64-9.71-8.42-9.71H193.8v19.37Z" transform="translate(-32.55 -99.43)"/><path class="cls-4" d="M214.64,168.77v-.31l14.49-36.16h1.1l14.34,36.16v.31H242l-4.1-10.5H221.34l-4.1,10.5Zm15-32.16L222.17,156h14.91Z" transform="translate(-32.55 -99.43)"/><path class="cls-4" d="M266.13,132.4h2.6v.36L257.4,153.65v15.12h-2.49V153.65l-11.38-20.94v-.31h2.65l4.93,9.25,5,9.61h0l5-9.61Z" transform="translate(-32.55 -99.43)"/></svg>
\ No newline at end of file
diff --git a/frontend/src/resources/cash-app.svg b/frontend/src/resources/cash-app.svg
new file mode 100644
index 000000000..4dc645081
--- /dev/null
+++ b/frontend/src/resources/cash-app.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 946.72 210"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-2,.cls-3{fill-rule:evenodd;}.cls-3{fill:#00d633;}</style></defs><g><g><path class="cls-1" d="M389.04,75.26c.08-.05,.16-.1,.23-.16,1.75-1.29,2.12-3.75,.84-5.5-9.47-13.18-24.86-20.8-41.09-20.35-30.6,0-51.65,22.24-51.65,55.1s21.05,55.39,51.97,55.39c16.52,.46,32.11-7.6,41.28-21.34,.07-.1,.14-.21,.2-.31,1.08-1.87,.45-4.26-1.42-5.34l-9.2-5.34c-1.75-1.01-3.97-.51-5.12,1.14-5.62,8.59-15.28,13.66-25.55,13.43-19.43,0-31.57-15.66-31.57-37.61s11.95-37.32,31.37-37.32c10.1-.29,19.66,4.52,25.45,12.8,1.19,1.62,3.44,2.06,5.15,1l9.11-5.56Z"/><path class="cls-1" d="M451.79,157.8h10.2c2.15,0,3.89-1.74,3.89-3.89v-50.75c0-18.38-13.06-25.98-31.57-25.98-10.39,.03-20.62,2.61-29.77,7.53-1.83,1.01-2.54,3.28-1.6,5.15l3.4,6.9s.05,.1,.08,.15c1.03,1.87,3.37,2.55,5.24,1.53,6.55-3.4,13.8-5.24,21.17-5.37,6.44,0,14.06,1.77,14.06,8.35,0,7.43-9.71,8.21-21.05,9.86-10.61,1.48-27.78,4.78-27.78,24.04,0,15.47,11.19,24.28,27.32,24.28,10.9,0,17.7-3.89,22.56-10.15v4.47c0,2.14,1.72,3.87,3.86,3.89Zm-4.91-29.94c0,11.8-8.52,16.88-17.63,16.88-7.31,0-12.38-3.28-12.38-10.3,0-7.62,5.8-9.49,12.82-10.76,7.02-1.26,13.6-2.16,17.19-4.86v9.03Z"/><path class="cls-1" d="M477.5,143.81s-.03,.04-.05,.06c-1.36,1.67-1.11,4.14,.56,5.5,9,7.02,20.16,10.67,31.57,10.32,20.86,0,34-10.15,34-26.59s-11.95-20.98-30.74-24.28c-8.81-1.48-17.63-2.67-17.63-8.96,0-5.66,6.14-7.75,13.43-7.75,7.36-.04,14.54,2.29,20.47,6.65,1.66,1.25,4.01,.98,5.34-.61l4.86-5.71c.06-.06,.11-.13,.16-.19,1.3-1.69,.99-4.11-.69-5.42-8.5-6.46-18.93-9.87-29.6-9.71-17.02,0-31.96,7.31-31.96,24.62s13.96,21.47,28.53,23.89c13.74,2.28,19.43,3.59,19.43,9.57,0,6.56-6.19,9.25-14.57,9.25-8.13,.19-16.08-2.38-22.56-7.28-1.64-1.32-4.03-1.09-5.39,.51l-5.15,6.12Z"/><path class="cls-1" d="M558.85,157.8h11.19c2.15,0,3.89-1.74,3.89-3.89v-40.58c0-11.95,7.77-19.11,17.92-19.11,10.76,0,13.43,7.6,13.43,15.98v43.71c0,2.15,1.74,3.89,3.89,3.89h11.19c2.15,0,3.89-1.74,3.89-3.89v-48.08c0-16.85-9.69-28.65-26.27-28.65-9.43-.26-18.4,4.07-24.04,11.63V55.08c0-2.15-1.74-3.89-3.89-3.89h-11.19c-2.15,0-3.89,1.74-3.89,3.89v98.83c0,2.15,1.74,3.89,3.89,3.89Z"/><path class="cls-1" d="M751.12,157.8h13.89c.45,0,.9-.08,1.33-.24,2.02-.74,3.05-2.97,2.31-4.98l-36.55-98.86c-.6-1.48-2.04-2.45-3.64-2.43h-18.04c-1.6-.02-3.04,.95-3.64,2.43l-36.67,98.83c-.16,.44-.25,.9-.25,1.36,0,2.15,1.74,3.88,3.89,3.88h13.11c1.67,0,3.16-1.06,3.69-2.65l8.06-23.77h40.7l8.11,23.77c.53,1.58,2.02,2.65,3.69,2.65Zm-16.83-42.98h-30.74l15.66-46.31,15.08,46.31Z"/><path class="cls-1" d="M796.73,82.66c-.05-2.15-1.84-3.84-3.98-3.79h-11.1c-2.15,0-3.89,1.74-3.89,3.89v97.13h0c0,2.15,1.74,3.89,3.89,3.89h11.19c2.15,0,3.89-1.74,3.89-3.89v-32.32c5.56,7.82,14.69,12.31,24.28,11.95,21.51,0,35.4-17.99,35.4-41.28s-13.89-41.06-35.4-41.06c-9.56-.4-18.69,4.03-24.28,11.8v-6.12c0-.07,0-.13,0-.2Zm0,35.58c0-13.6,7.16-24.5,20.3-24.5s19.57,10.93,19.57,24.5-6.43,24.77-19.57,24.77-20.3-11.17-20.3-24.77Z"/><path class="cls-1" d="M887.06,82.71c-.01-2.13-1.75-3.85-3.89-3.83h-11.17s-.03,0-.05,0c-2.13,.01-3.85,1.75-3.84,3.89v97.13h0c0,2.15,1.74,3.89,3.89,3.89h11.17c2.15,0,3.89-1.74,3.89-3.89v-32.32c5.57,7.81,14.7,12.3,24.28,11.95,21.49,0,35.38-17.99,35.38-41.28s-13.89-41.06-35.38-41.06c-9.56-.39-18.68,4.04-24.28,11.8v-6.12s0-.1,0-.15Zm20.32,60.3c-13.28,0-20.32-11.17-20.32-24.77s7.31-24.5,20.32-24.5,19.43,10.93,19.43,24.5-6.29,24.77-19.43,24.77h0Z"/></g><path id="RGB_Dollar-3" class="cls-3" d="M73.14,0c-21.05,0-31.59,0-42.84,3.5C17.88,8,8.09,17.79,3.59,30.22,0,41.59,0,52.11,0,73.17v63.55c0,21.18,0,31.61,3.5,42.95,4.5,12.43,14.29,22.22,26.71,26.72,11.36,3.6,21.88,3.6,42.93,3.6h63.62c21.08,0,31.59,0,42.93-3.6,12.43-4.5,22.21-14.29,26.71-26.72,3.59-11.37,3.59-21.89,3.59-42.95v-63.46c0-21.09,0-31.61-3.59-42.95-4.5-12.43-14.29-22.22-26.71-26.72-11.44-3.6-21.85-3.6-43.03-3.6h-63.52Zm20.11,79.47c0,7.82,9.11,10.42,19.65,14.38,18.43,6.22,33.61,13.85,33.61,31.92,0,19.63-15.23,33.04-40.14,34.57l-2.26,10.52c-.42,1.96-2.17,3.36-4.18,3.35h-15.66c-.26,0-.52-.04-.77-.09-2.34-.48-3.84-2.77-3.36-5.11l2.43-11.1c-9.4-2.4-18.05-7.14-25.13-13.77-.04-.03-.07-.07-.11-.11-1.61-1.67-1.56-4.33,.11-5.94l8.69-8.5c1.64-1.62,4.28-1.62,5.93,0,7.96,7.6,18.6,11.76,29.6,11.59,11.34,0,19.04-4.81,19.04-12.44s-7.72-9.64-22.29-15.06c-15.4-5.49-29.97-13.34-29.97-31.58,0-21.11,17.63-31.41,38.42-32.43l2.19-10.71c.43-1.95,2.16-3.33,4.15-3.33h15.61c.29,0,.58,.03,.86,.09,2.29,.47,3.76,2.7,3.29,4.99l-2.43,11.98c7.95,2.6,15.31,6.73,21.68,12.15,.08,.07,.16,.15,.24,.22,1.62,1.63,1.61,4.26-.02,5.88l-8.11,8.14c-1.62,1.6-4.21,1.65-5.9,.12-7.87-6.67-17.85-10.33-28.17-10.35-8.5,0-17,2.82-17,10.64Z"/></g><path class="cls-2" d="M93.25,79.47c0,7.82,9.11,10.42,19.65,14.38,18.43,6.22,33.61,13.85,33.61,31.92,0,19.63-15.23,33.04-40.14,34.57l-2.26,10.52c-.42,1.96-2.17,3.36-4.18,3.35h-15.66c-.26,0-.52-.04-.77-.09-2.34-.48-3.84-2.77-3.36-5.11l2.43-11.1c-9.4-2.4-18.05-7.14-25.13-13.77-.04-.03-.07-.07-.11-.11-1.61-1.67-1.56-4.33,.11-5.94l8.69-8.5c1.64-1.62,4.28-1.62,5.93,0,7.96,7.6,18.6,11.76,29.6,11.59,11.34,0,19.04-4.81,19.04-12.44s-7.72-9.64-22.29-15.06c-15.4-5.49-29.97-13.34-29.97-31.58,0-21.11,17.63-31.41,38.42-32.43l2.19-10.71c.43-1.95,2.16-3.33,4.15-3.33h15.61c.29,0,.58,.03,.86,.09,2.29,.47,3.76,2.7,3.29,4.99l-2.43,11.98c7.95,2.6,15.31,6.73,21.68,12.15,.08,.07,.16,.15,.24,.22,1.62,1.63,1.61,4.26-.02,5.88l-8.11,8.14c-1.62,1.6-4.21,1.65-5.9,.12-7.87-6.67-17.85-10.33-28.17-10.35-8.5,0-17,2.82-17,10.64Z"/></svg>
\ No newline at end of file

From 4445fe408b947d833a022ca2030334c5735a0788 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Thu, 27 Jun 2024 02:02:35 +0000
Subject: [PATCH 26/77] Add simple mode checkout to main transaction page

---
 .../accelerate-checkout.component.html        | 52 ++++++++++---------
 .../accelerate-checkout.component.scss        | 10 ++++
 .../accelerate-checkout.component.ts          | 22 ++++----
 .../components/tracker/tracker.component.html |  4 +-
 .../transaction/transaction.component.html    | 14 +++--
 .../transaction/transaction.component.ts      |  7 +++
 .../transaction/transaction.module.ts         |  6 +++
 frontend/src/app/shared/shared.module.ts      |  9 ----
 8 files changed, 77 insertions(+), 47 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 40089ddbf..aba494d0e 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -1,4 +1,4 @@
-<div class="container-md card w-100" style="padding: 1em; background: var(--box-bg)" id=acceleratePreviewAnchor>
+<div class="box card w-100" style="padding: 1em; background: var(--box-bg)" id=acceleratePreviewAnchor>
 
   @if (error) {
     <div class="mt-2">
@@ -10,18 +10,33 @@
     <!-- Show A/B CTAs -->
     <div class="row mb-1">
       <div class="col-sm">
-        <h1 style="font-size: larger;">Accelerate your Bitcoin transaction?</h1>
+        <h1 style="font-size: larger;"><ng-content select="[slot='cta-title']"></ng-content><span class="default-slot">Accelerate your Bitcoin transaction?</span></h1>
       </div>
     </div>
 
     <form>
-      <div class="row">
-        <div class="col-sm">
+      <div class="row" *ngIf="(etaInfo$ | async) as etaInfo">
+        <div class="col-md">
+          <div class="form-group form-check mb-2">
+            <input type="radio" class="form-check-input" id="wait" name="accelerate" (change)="selectedOptionChanged($event)">
+            <label class="form-check-label d-flex flex-column" for="wait">
+              <span class="font-weight-bold">Wait</span>
+              @if (eta.blocks < 7) {
+                <span style="color: rgb(186, 186, 186); font-size: 14px;">Confirmation expected <app-time kind="within" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time></span>
+              } @else {
+                <span style="color: rgb(186, 186, 186); font-size: 14px;">
+                  <span>Confirmation expected within several hours</span>
+                </span>
+              }
+            </label>
+          </div>
+        </div>
+        <div class="col-md">
           <div class="form-group form-check mb-2">
             <input type="radio" class="form-check-input" id="accelerate" name="accelerate" (change)="selectedOptionChanged($event)">
             <label class="form-check-label d-flex flex-column" for="accelerate">
               <span class="font-weight-bold">Accelerate</span>
-              <span style="color: rgb(186, 186, 186); font-size: 14px;" *ngIf="(etaInfo$ | async) as etaInfo">Confirmation expected <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time><br>
+              <span style="color: rgb(186, 186, 186); font-size: 14px;">Confirmation expected <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time><br>
                 @if (!calculating) {
                   <app-fiat [value]="cost"></app-fiat>fee (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
                 } @else {
@@ -31,22 +46,9 @@
             </label>
           </div>
         </div>
-      </div>
-      <div class="row">
-        <div class="col-sm">
-          <div class="form-group form-check mb-2">
-            <input type="radio" class="form-check-input" id="wait" name="accelerate" (change)="selectedOptionChanged($event)">
-            <label class="form-check-label d-flex flex-column" for="wait">
-              <span class="font-weight-bold">Wait</span>
-              @if (eta) {
-                <span style="color: rgb(186, 186, 186); font-size: 14px;">Confirmation expected <app-time kind="within" [time]="eta" [fastRender]="false" [fixedRender]="true"></app-time></span>
-              } @else {
-                <span style="color: rgb(186, 186, 186); font-size: 14px;">
-                  <span>Settlement expected within several hours</span>
-                </span>
-              }
-            </label>
-          </div>
+        <div class="col-md pie d-none d-lg-flex" *ngIf="estimate && !isTracker">
+          <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to {{ etaInfo.hashratePercentage | number : '1.1-1' }}% of miners.</small>
+          <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
         </div>
       </div>
       <div class="row mt-2 mb-2" [style]="(choosenOption === 'wait' || calculating) ? 'opacity: 0.25; pointer-events: none' : ''">
@@ -62,7 +64,7 @@
   } @else if (step === 'paymentMethod') {
     <div class="row mb-md-1 text-center">
       <div class="col-sm">
-        <h1 style="font-size: larger;">Select your payment method</h1>
+        <h1 style="font-size: larger;"><ng-content select="[slot='payment-title']"></ng-content><span class="default-slot">Select your payment method</span></h1>
       </div>
     </div>
     <div class="pt-2 d-flex justify-content-around">
@@ -76,14 +78,14 @@
     <!-- Show checkout page -->
     <div class="row mb-md-1 text-center">
       <div class="col-sm" id="confirm-payment-title">
-        <h1 style="font-size: larger;">Confirm your payment</h1>
+        <h1 style="font-size: larger;"><ng-content select="[slot='checkout-title']"></ng-content><span class="default-slot">Confirm your payment</span></h1>
       </div>
     </div>
 
     <div class="row text-center">
       <div class="col-sm">
         <div class="form-group w-100" style="font-size: 14px">
-          Payment to mempool.space for acceleration of txid <a [routerLink]="'/tx/' + txid" target="_blank">{{ txid.substr(0, 10) }}..{{ txid.substr(-10) }}</a>
+          Payment to mempool.space for acceleration of txid <a [routerLink]="'/tx/' + tx.txid" target="_blank">{{ tx.txid.substr(0, 10) }}..{{ tx.txid.substr(-10) }}</a>
         </div>
       </div>
     </div>
@@ -134,7 +136,7 @@
   @else if (step === 'processing') {
     <div class="row mb-1 text-center">
       <div class="col-sm">
-        <h1 style="font-size: larger;">Confirming your payment</h1>
+        <h1 style="font-size: larger;"><ng-content select="[slot='processing-title']"></ng-content><span class="default-slot">Confirming your payment</span></h1>
       </div>
     </div>
 
diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
index 268f03f93..af11f6c2b 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
@@ -14,4 +14,14 @@
   border-radius: 15px;
   border: 2px solid var(--bg);
   cursor: pointer;
+}
+
+.default-slot:not(:only-child) {
+  display: none;
+}
+
+.pie {
+  display: flex;
+  align-items: center;
+  max-width: 330px;
 }
\ 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 ba867d096..9e37cb67f 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -5,7 +5,9 @@ import { nextRoundNumber } from '../../shared/common.utils';
 import { StateService } from '../../services/state.service';
 import { AudioService } from '../../services/audio.service';
 import { AccelerationEstimate } from '../accelerate-preview/accelerate-preview.component';
-import { EtaService } from '../../services/eta.service';
+import { ETA, EtaService } from '../../services/eta.service';
+import { Transaction } from '../../interfaces/electrs.interface';
+import { MiningStats } from '../../services/mining.service';
 
 @Component({
   selector: 'app-accelerate-checkout',
@@ -13,10 +15,12 @@ import { EtaService } from '../../services/eta.service';
   styleUrls: ['./accelerate-checkout.component.scss']
 })
 export class AccelerateCheckout implements OnInit, OnDestroy {
-  @Input() eta: number | null = null;
-  @Input() txid: string = '70c18d76cdb285a1b5bd87fdaae165880afa189809c30b4083ff7c0e69ee09ad';
+  @Input() tx: Transaction;
+  @Input() miningStats: MiningStats;
+  @Input() eta: ETA;
   @Input() scrollEvent: boolean;
   @Input() cashappEnabled: boolean;
+  @Input() isTracker: boolean = false;
   @Output() close = new EventEmitter<null>();
 
   calculating = true;
@@ -116,7 +120,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
       this.estimateSubscription.unsubscribe();
     }
     this.calculating = true;
-    this.estimateSubscription = this.servicesApiService.estimate$(this.txid).pipe(
+    this.estimateSubscription = this.servicesApiService.estimate$(this.tx.txid).pipe(
       tap((response) => {
         if (response.status === 204) {
           this.error = `cannot_accelerate_tx`;
@@ -213,13 +217,13 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
             amount: costUSD.toString(),
             label: 'Total',
             pending: true,
-            productUrl: `${redirectHostname}/tracker/${this.txid}`,
+            productUrl: `${redirectHostname}/tracker/${this.tx.txid}`,
           },
           button: { shape: 'semiround', size: 'small', theme: 'light'}
         });
         this.cashAppPay = await this.payments.cashAppPay(paymentRequest, {
-          redirectURL: `${redirectHostname}/tracker/${this.txid}`,
-          referenceId: `accelerator-${this.txid.substring(0, 15)}-${Math.round(new Date().getTime() / 1000)}`,
+          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'}
         });
 
@@ -235,7 +239,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
             this.error = error;
           } else if (tokenResult.status === 'OK') {
             that.servicesApiService.accelerateWithCashApp$(
-              that.txid,
+              that.tx.txid,
               tokenResult.token,
               tokenResult.details.cashAppPay.cashtag,
               tokenResult.details.cashAppPay.referenceId,
@@ -277,7 +281,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
    * BTCPay
    */
   async requestBTCPayInvoice() {
-    this.servicesApiService.generateBTCPayAcceleratorInvoice$(this.txid).subscribe({
+    this.servicesApiService.generateBTCPayAcceleratorInvoice$(this.tx.txid).subscribe({
       next: (response) => {
         this.invoice = response;
         this.cd.markForCheck();
diff --git a/frontend/src/app/components/tracker/tracker.component.html b/frontend/src/app/components/tracker/tracker.component.html
index 1380990df..c0f77c424 100644
--- a/frontend/src/app/components/tracker/tracker.component.html
+++ b/frontend/src/app/components/tracker/tracker.component.html
@@ -116,7 +116,9 @@
 
     <div class="bottom-panel">
       @if (showAccelerationSummary && !accelerationFlowCompleted) {
-        <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [txid]="tx.txid" [eta]="mempoolPosition?.block >= 7 ? null : da.adjustedTimeAvg * (mempoolPosition.block + 1) + now + da.timeOffset" (close)="accelerationFlowCompleted = true" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100"></app-accelerate-checkout>
+        <ng-container *ngIf="(ETA$ | async) as eta;">
+          <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [tx]="tx" [miningStats]="miningStats" [eta]="eta" [isTracker]="true" (close)="accelerationFlowCompleted = true" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100"></app-accelerate-checkout>
+        </ng-container>
       } @else {
         @if (tx?.acceleration && !tx.status?.confirmed) {
           <div class="progress-icon">
diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index 43ead974d..65c859e5c 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -84,9 +84,17 @@
 
       <div class="clearfix"></div>
 
-      <div class="box">
-        <app-accelerate-preview [tx]="tx" [miningStats]="miningStats" [scrollEvent]="scrollIntoAccelPreview" [showDetails]="showAccelerationDetails"></app-accelerate-preview>
-      </div>
+      @if (isLoggedIn()) {
+        <div class="box">
+          <app-accelerate-preview [tx]="tx" [miningStats]="miningStats" [scrollEvent]="scrollIntoAccelPreview" [showDetails]="showAccelerationDetails"></app-accelerate-preview>
+        </div>
+      } @else {
+        <ng-container *ngIf="(ETA$ | async) as eta;">
+          <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [tx]="tx" [eta]="eta" [miningStats]="miningStats" (close)="showAccelerationSummary = false" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100">
+            <span slot="cta-title">Urgent transaction? Get it confirmed faster.</span>
+          </app-accelerate-checkout>
+        </ng-container>
+      }
     </ng-container>
 
     <ng-template [ngIf]="showCpfpDetails">
diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts
index 570242a9a..c84eb8787 100644
--- a/frontend/src/app/components/transaction/transaction.component.ts
+++ b/frontend/src/app/components/transaction/transaction.component.ts
@@ -140,6 +140,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
   showAccelerationSummary = false;
   showAccelerationDetails = false;
   scrollIntoAccelPreview = false;
+  accelerationEligible = false;
   auditEnabled: boolean = this.stateService.env.AUDIT && this.stateService.env.BASE_MODULE === 'mempool' && this.stateService.env.MINING_DASHBOARD === true;
 
   @ViewChild('graphContainer')
@@ -397,6 +398,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
           } else if ((this.tx?.acceleration && txPosition.position.acceleratedBy)) {
             this.tx.acceleratedBy = txPosition.position.acceleratedBy;
           }
+          this.accelerationEligible = txPosition?.position?.block > 0 && this.tx?.weight < 4000;
         }
       } else {
         this.mempoolPosition = null;
@@ -910,6 +912,11 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
     }
   }
 
+  isLoggedIn(): boolean {
+    const auth = this.storageService.getAuth();
+    return auth !== null;
+  }
+
   ngOnDestroy() {
     this.subscription.unsubscribe();
     this.fetchCpfpSubscription.unsubscribe();
diff --git a/frontend/src/app/components/transaction/transaction.module.ts b/frontend/src/app/components/transaction/transaction.module.ts
index eb663c9ac..ac09067de 100644
--- a/frontend/src/app/components/transaction/transaction.module.ts
+++ b/frontend/src/app/components/transaction/transaction.module.ts
@@ -6,7 +6,10 @@ import { SharedModule } from '../../shared/shared.module';
 import { TxBowtieModule } from '../tx-bowtie-graph/tx-bowtie.module';
 import { GraphsModule } from '../../graphs/graphs.module';
 import { AcceleratePreviewComponent } from '../accelerate-preview/accelerate-preview.component';
+import { AccelerateCheckout } from '../accelerate-checkout/accelerate-checkout.component';
 import { AccelerateFeeGraphComponent } from '../accelerate-preview/accelerate-fee-graph.component';
+import { TrackerComponent } from '../tracker/tracker.component';
+import { TrackerBarComponent } from '../tracker/tracker-bar.component';
 
 const routes: Routes = [
   {
@@ -38,7 +41,10 @@ export class TransactionRoutingModule { }
   ],
   declarations: [
     TransactionComponent,
+    TrackerComponent,
+    TrackerBarComponent,
     AcceleratePreviewComponent,
+    AccelerateCheckout,
     AccelerateFeeGraphComponent,
   ]
 })
diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts
index e3f219aba..c060bbbd2 100644
--- a/frontend/src/app/shared/shared.module.ts
+++ b/frontend/src/app/shared/shared.module.ts
@@ -50,8 +50,6 @@ import { BlockOverviewGraphComponent } from '../components/block-overview-graph/
 import { BlockOverviewTooltipComponent } from '../components/block-overview-tooltip/block-overview-tooltip.component';
 import { BlockFiltersComponent } from '../components/block-filters/block-filters.component';
 import { AddressGroupComponent } from '../components/address-group/address-group.component';
-import { TrackerComponent } from '../components/tracker/tracker.component';
-import { TrackerBarComponent } from '../components/tracker/tracker-bar.component';
 import { SearchFormComponent } from '../components/search-form/search-form.component';
 import { AddressLabelsComponent } from '../components/address-labels/address-labels.component';
 import { FooterComponent } from '../components/footer/footer.component';
@@ -100,7 +98,6 @@ import { MempoolErrorComponent } from './components/mempool-error/mempool-error.
 import { AccelerationsListComponent } from '../components/acceleration/accelerations-list/accelerations-list.component';
 import { PendingStatsComponent } from '../components/acceleration/pending-stats/pending-stats.component';
 import { AccelerationStatsComponent } from '../components/acceleration/acceleration-stats/acceleration-stats.component';
-import { AccelerateCheckout } from '../components/accelerate-checkout/accelerate-checkout.component';
 
 import { BlockViewComponent } from '../components/block-view/block-view.component';
 import { EightBlocksComponent } from '../components/eight-blocks/eight-blocks.component';
@@ -165,8 +162,6 @@ import { OnlyVsizeDirective, OnlyWeightDirective } from './components/weight-dir
     BlockFiltersComponent,
     TransactionsListComponent,
     AddressGroupComponent,
-    TrackerComponent,
-    TrackerBarComponent,
     SearchFormComponent,
     AddressLabelsComponent,
     FooterComponent,
@@ -225,7 +220,6 @@ import { OnlyVsizeDirective, OnlyWeightDirective } from './components/weight-dir
     MempoolErrorComponent,
     AccelerationsListComponent,
     AccelerationStatsComponent,
-    AccelerateCheckout,
     PendingStatsComponent,
     HttpErrorComponent,
     TwitterWidgetComponent,
@@ -307,8 +301,6 @@ import { OnlyVsizeDirective, OnlyWeightDirective } from './components/weight-dir
     BlockFiltersComponent,
     TransactionsListComponent,
     AddressGroupComponent,
-    TrackerComponent,
-    TrackerBarComponent,
     SearchFormComponent,
     AddressLabelsComponent,
     FooterComponent,
@@ -356,7 +348,6 @@ import { OnlyVsizeDirective, OnlyWeightDirective } from './components/weight-dir
     MempoolErrorComponent,
     AccelerationsListComponent,
     AccelerationStatsComponent,
-    AccelerateCheckout,
     PendingStatsComponent,
     HttpErrorComponent,
     TwitterWidgetComponent,

From 9fe44bd6ba1d801dcb38e3f0f728015c2eb64448 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Thu, 27 Jun 2024 06:09:23 +0000
Subject: [PATCH 27/77] more simple acceleration UI adjustments

---
 .../accelerate-checkout.component.html        | 37 ++++++++++++-------
 .../accelerate-checkout.component.ts          |  2 +-
 .../bitcoin-invoice.component.html            |  2 +-
 frontend/src/app/services/eta.service.ts      |  5 ++-
 4 files changed, 29 insertions(+), 17 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 aba494d0e..b559f3a09 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -15,10 +15,10 @@
     </div>
 
     <form>
-      <div class="row" *ngIf="(etaInfo$ | async) as etaInfo">
+      <div class="row">
         <div class="col-md">
           <div class="form-group form-check mb-2">
-            <input type="radio" class="form-check-input" id="wait" name="accelerate" (change)="selectedOptionChanged($event)">
+            <input type="radio" [checked]="choosenOption === 'wait'"  class="form-check-input" id="wait" name="accelerate" (change)="selectedOptionChanged($event)">
             <label class="form-check-label d-flex flex-column" for="wait">
               <span class="font-weight-bold">Wait</span>
               @if (eta.blocks < 7) {
@@ -33,10 +33,10 @@
         </div>
         <div class="col-md">
           <div class="form-group form-check mb-2">
-            <input type="radio" class="form-check-input" id="accelerate" name="accelerate" (change)="selectedOptionChanged($event)">
+            <input type="radio" [checked]="choosenOption === 'accelerate'" class="form-check-input" id="accelerate" name="accelerate" (change)="selectedOptionChanged($event)">
             <label class="form-check-label d-flex flex-column" for="accelerate">
               <span class="font-weight-bold">Accelerate</span>
-              <span style="color: rgb(186, 186, 186); font-size: 14px;">Confirmation expected <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time><br>
+              <span style="color: rgb(186, 186, 186); font-size: 14px;" *ngIf="(etaInfo$ | async) as etaInfo">Confirmation expected <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time><br>
                 @if (!calculating) {
                   <app-fiat [value]="cost"></app-fiat>fee (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
                 } @else {
@@ -47,11 +47,11 @@
           </div>
         </div>
         <div class="col-md pie d-none d-lg-flex" *ngIf="estimate && !isTracker">
-          <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to {{ etaInfo.hashratePercentage | number : '1.1-1' }}% of miners.</small>
+          <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description" *ngIf="(etaInfo$ | async) as etaInfo">Your transaction will be prioritized by up to {{ etaInfo.hashratePercentage | number : '1.1-1' }}% of miners.</small>
           <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
         </div>
       </div>
-      <div class="row mt-2 mb-2" [style]="(choosenOption === 'wait' || calculating) ? 'opacity: 0.25; pointer-events: none' : ''">
+      <div class="row mt-2 mb-2" [style]="(choosenOption !== 'accelerate' || calculating) ? 'opacity: 0.25; pointer-events: none' : ''">
         <div class="col-sm d-flex flex-row justify-content-center">
           <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" style="width: 200px" (click)="enableCheckoutPage()">
             <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
@@ -62,16 +62,28 @@
     </form>
   
   } @else if (step === 'paymentMethod') {
-    <div class="row mb-md-1 text-center">
+    <div class="row text-center">
       <div class="col-sm">
-        <h1 style="font-size: larger;"><ng-content select="[slot='payment-title']"></ng-content><span class="default-slot">Select your payment method</span></h1>
+        <h1 class="mb-2" style="font-size: larger;"><ng-content select="[slot='payment-title']"></ng-content><span class="default-slot">Select your payment method</span></h1>
       </div>
     </div>
-    <div class="pt-2 d-flex justify-content-around">
+    <div class="row text-center">
+      <div class="col-sm">
+        <app-fiat [value]="cost"></app-fiat> (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
+      </div>
+    </div>
+    <div class="pt-2 d-flex justify-content-center position-relative">
       @if (cashappEnabled) {
-        <img class="paymentMethod" src="/resources/cash-app.svg" height=55 (click)="selectPaymentMethod('cashapp')">
+        <img class="paymentMethod mx-2" src="/resources/cash-app.svg" height=55 (click)="selectPaymentMethod('cashapp')">
       }
-      <img class="paymentMethod" src="/resources/btcpay.svg" height=55 (click)="selectPaymentMethod('btcpay')">
+      <img class="paymentMethod mx-2" src="/resources/btcpay.svg" height=55 (click)="selectPaymentMethod('btcpay')">
+    </div>
+
+    <hr>
+    <div class="row mt-2 mb-2 text-center">
+      <div class="col-sm d-flex flex-column">
+        <button type="button" class="mt-1 btn btn-secondary btn-sm rounded-pill align-self-center" style="width: 200px" (click)="step = 'cta'">Go Back</button>
+      </div>
     </div>
 
   } @else if (step === 'checkout') {
@@ -127,8 +139,7 @@
     <hr>
     <div class="row mt-2 mb-2 text-center">
       <div class="col-sm d-flex flex-column">
-        <small>Changed your mind?</small>
-        <button type="button" class="mt-1 btn btn-secondary btn-sm rounded-pill align-self-center" style="width: 200px" (click)="step = 'cta'">Go Back</button>
+        <button type="button" class="mt-1 btn btn-secondary btn-sm rounded-pill align-self-center" style="width: 200px" (click)="step = 'paymentMethod'">Go Back</button>
       </div>
     </div>
   }
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 9e37cb67f..f646b7c5a 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -24,7 +24,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   @Output() close = new EventEmitter<null>();
 
   calculating = true;
-  choosenOption: 'wait' | 'accelerate' = 'wait';
+  choosenOption: 'wait' | 'accelerate';
   error = '';
 
   step: 'paymentMethod' | 'cta' | 'checkout' | 'processing' = 'cta';
diff --git a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
index dabaf991e..22205973b 100644
--- a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
+++ b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
@@ -46,7 +46,7 @@
 
     </ng-template>
 
-    <ng-template [ngIf]="paymentForm.get('method')?.value === 'lightning' && invoice">
+    <ng-template [ngIf]="paymentForm.get('method')?.value === 'lightning' && invoice && invoice.addresses.BTC_LightningLike">
 
         <div class="qr-wrapper">
           <a [href]="bypassSecurityTrustUrl('lightning:' + invoice.addresses.BTC_LightningLike)" target="_blank">
diff --git a/frontend/src/app/services/eta.service.ts b/frontend/src/app/services/eta.service.ts
index 2e80fd31c..3dc396a55 100644
--- a/frontend/src/app/services/eta.service.ts
+++ b/frontend/src/app/services/eta.service.ts
@@ -6,7 +6,7 @@ import { Transaction } from '../interfaces/electrs.interface';
 import { MiningService, MiningStats } from './mining.service';
 import { getUnacceleratedFeeRate } from '../shared/transaction.utils';
 import { AccelerationEstimate } from '../components/accelerate-preview/accelerate-preview.component';
-import { Observable, combineLatest, map, of } from 'rxjs';
+import { Observable, combineLatest, map, of, share, shareReplay, tap } from 'rxjs';
 
 export interface ETA {
   now: number, // time at which calculation performed
@@ -61,7 +61,8 @@ export class EtaService {
             { block: 0, hashrateShare: acceleratingHashrateFraction },
           ], da).time,
         };
-      })
+      }),
+      shareReplay()
     );
   }
 

From d7acd389bf43c8877de8968302ccfd7870d937be Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Thu, 27 Jun 2024 06:42:31 +0000
Subject: [PATCH 28/77] fix scrolljacking by #accelerate fragment

---
 .../accelerate-checkout.component.html                    | 8 ++++----
 .../accelerate-checkout/accelerate-checkout.component.ts  | 2 +-
 2 files changed, 5 insertions(+), 5 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 b559f3a09..1b1ca6ca4 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -18,7 +18,7 @@
       <div class="row">
         <div class="col-md">
           <div class="form-group form-check mb-2">
-            <input type="radio" [checked]="choosenOption === 'wait'"  class="form-check-input" id="wait" name="accelerate" (change)="selectedOptionChanged($event)">
+            <input type="radio" [checked]="choosenOption === 'wait'"  class="form-check-input" id="wait" name="accel" (change)="selectedOptionChanged($event)">
             <label class="form-check-label d-flex flex-column" for="wait">
               <span class="font-weight-bold">Wait</span>
               @if (eta.blocks < 7) {
@@ -33,8 +33,8 @@
         </div>
         <div class="col-md">
           <div class="form-group form-check mb-2">
-            <input type="radio" [checked]="choosenOption === 'accelerate'" class="form-check-input" id="accelerate" name="accelerate" (change)="selectedOptionChanged($event)">
-            <label class="form-check-label d-flex flex-column" for="accelerate">
+            <input type="radio" [checked]="choosenOption === 'accel'" class="form-check-input" id="accel" name="accel" (change)="selectedOptionChanged($event)">
+            <label class="form-check-label d-flex flex-column" for="accel">
               <span class="font-weight-bold">Accelerate</span>
               <span style="color: rgb(186, 186, 186); font-size: 14px;" *ngIf="(etaInfo$ | async) as etaInfo">Confirmation expected <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time><br>
                 @if (!calculating) {
@@ -51,7 +51,7 @@
           <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
         </div>
       </div>
-      <div class="row mt-2 mb-2" [style]="(choosenOption !== 'accelerate' || calculating) ? 'opacity: 0.25; pointer-events: none' : ''">
+      <div class="row mt-2 mb-2" [style]="(choosenOption !== 'accel' || calculating) ? 'opacity: 0.25; pointer-events: none' : ''">
         <div class="col-sm d-flex flex-row justify-content-center">
           <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" style="width: 200px" (click)="enableCheckoutPage()">
             <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
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 f646b7c5a..8714373d0 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -24,7 +24,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   @Output() close = new EventEmitter<null>();
 
   calculating = true;
-  choosenOption: 'wait' | 'accelerate';
+  choosenOption: 'wait' | 'accel';
   error = '';
 
   step: 'paymentMethod' | 'cta' | 'checkout' | 'processing' = 'cta';

From d189e7081786f6e920414d60cd03f72a4d1af02c Mon Sep 17 00:00:00 2001
From: Rishabh <rishkwal@gmail.com>
Date: Thu, 27 Jun 2024 15:11:00 +0530
Subject: [PATCH 29/77] fix: redirect `/tx/` routes to `/`

---
 .../src/app/components/transaction/transaction.module.ts     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/src/app/components/transaction/transaction.module.ts b/frontend/src/app/components/transaction/transaction.module.ts
index eb663c9ac..01404db56 100644
--- a/frontend/src/app/components/transaction/transaction.module.ts
+++ b/frontend/src/app/components/transaction/transaction.module.ts
@@ -9,6 +9,11 @@ import { AcceleratePreviewComponent } from '../accelerate-preview/accelerate-pre
 import { AccelerateFeeGraphComponent } from '../accelerate-preview/accelerate-fee-graph.component';
 
 const routes: Routes = [
+  {
+    path: '',
+    redirectTo: '/',
+    pathMatch: 'full',
+  },
   {
     path: ':id',
     component: TransactionComponent,

From 9672928da9a35181c51a73b3f9ee5a2eaecf706b Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Thu, 27 Jun 2024 19:19:28 +0900
Subject: [PATCH 30/77] Adding missing TESTNET4_ENABLED to docker build

---
 docker/frontend/entrypoint.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/frontend/entrypoint.sh b/docker/frontend/entrypoint.sh
index 5e79b262f..5b072ba8d 100644
--- a/docker/frontend/entrypoint.sh
+++ b/docker/frontend/entrypoint.sh
@@ -18,6 +18,7 @@ fi
 
 __MAINNET_ENABLED__=${MAINNET_ENABLED:=true}
 __TESTNET_ENABLED__=${TESTNET_ENABLED:=false}
+__TESTNET4_ENABLED__=${TESTNET_ENABLED:=false}
 __SIGNET_ENABLED__=${SIGNET_ENABLED:=false}
 __LIQUID_ENABLED__=${LIQUID_ENABLED:=false}
 __LIQUID_TESTNET_ENABLED__=${LIQUID_TESTNET_ENABLED:=false}
@@ -46,6 +47,7 @@ __ADDITIONAL_CURRENCIES__=${ADDITIONAL_CURRENCIES:=false}
 # Export as environment variables to be used by envsubst
 export __MAINNET_ENABLED__
 export __TESTNET_ENABLED__
+export __TESTNET4_ENABLED__
 export __SIGNET_ENABLED__
 export __LIQUID_ENABLED__
 export __LIQUID_TESTNET_ENABLED__

From 415ad3de708183ac80b0465b68420b6974a44ed5 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Thu, 27 Jun 2024 09:10:32 +0000
Subject: [PATCH 31/77] Merge simple & advanced acceleration checkout
 components

---
 .../accelerate-checkout.component.html        | 342 +++++++++++++++---
 .../accelerate-checkout.component.scss        | 130 +++++++
 .../accelerate-checkout.component.ts          | 160 +++++++-
 .../accelerate-fee-graph.component.html       |  21 ++
 .../accelerate-fee-graph.component.scss       | 156 ++++++++
 .../accelerate-fee-graph.component.ts         | 100 +++++
 .../components/tracker/tracker.component.html |   2 +-
 .../transaction/transaction.component.html    |  16 +-
 .../transaction/transaction.module.ts         |   4 +-
 frontend/src/app/services/eta.service.ts      |   2 +-
 10 files changed, 854 insertions(+), 79 deletions(-)
 create mode 100644 frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.html
 create mode 100644 frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.scss
 create mode 100644 frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.ts

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 1b1ca6ca4..39e659971 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -1,66 +1,306 @@
-<div class="box card w-100" style="padding: 1em; background: var(--box-bg)" id=acceleratePreviewAnchor>
+<div class="box card w-100" style="background: var(--box-bg)" id=acceleratePreviewAnchor>
 
   @if (error) {
     <div class="mt-2">
       <app-mempool-error [error]="error"></app-mempool-error>
     </div>
   } 
-
-  @else if (step === 'cta') {
-    <!-- Show A/B CTAs -->
-    <div class="row mb-1">
-      <div class="col-sm">
-        <h1 style="font-size: larger;"><ng-content select="[slot='cta-title']"></ng-content><span class="default-slot">Accelerate your Bitcoin transaction?</span></h1>
-      </div>
-    </div>
-
-    <form>
-      <div class="row">
-        <div class="col-md">
-          <div class="form-group form-check mb-2">
-            <input type="radio" [checked]="choosenOption === 'wait'"  class="form-check-input" id="wait" name="accel" (change)="selectedOptionChanged($event)">
-            <label class="form-check-label d-flex flex-column" for="wait">
-              <span class="font-weight-bold">Wait</span>
-              @if (eta.blocks < 7) {
-                <span style="color: rgb(186, 186, 186); font-size: 14px;">Confirmation expected <app-time kind="within" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time></span>
-              } @else {
-                <span style="color: rgb(186, 186, 186); font-size: 14px;">
-                  <span>Confirmation expected within several hours</span>
-                </span>
-              }
-            </label>
+  @else if (step === 'quote') {
+    @if (!simpleMode) {
+      <span id="successAlert" class="m-0 p-0 d-block" style="height: 1px;"></span>
+      <div class="row" *ngIf="showSuccess">
+        <div class="col">
+          <div class="alert alert-success">
+            Transaction has now been <a class="alert-link" routerLink="/services/accelerator/history">submitted</a> to mining pools for acceleration.
           </div>
         </div>
-        <div class="col-md">
-          <div class="form-group form-check mb-2">
-            <input type="radio" [checked]="choosenOption === 'accel'" class="form-check-input" id="accel" name="accel" (change)="selectedOptionChanged($event)">
-            <label class="form-check-label d-flex flex-column" for="accel">
-              <span class="font-weight-bold">Accelerate</span>
-              <span style="color: rgb(186, 186, 186); font-size: 14px;" *ngIf="(etaInfo$ | async) as etaInfo">Confirmation expected <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time><br>
-                @if (!calculating) {
-                  <app-fiat [value]="cost"></app-fiat>fee (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
+      </div>
+
+      <span id="mempoolError" class="m-0 p-0 d-block" style="height: 1px;"></span>
+      <div class="row" *ngIf="error">
+        <div class="col">
+          <app-mempool-error [error]="error" [alertClass]="error === 'waitlisted' ? 'alert-mempool' : 'alert-danger'"></app-mempool-error>
+        </div>
+      </div>
+
+      <div class="accelerate-cols">
+        <ng-container *ngIf="!isMobile">
+          <app-accelerate-fee-graph
+            [tx]="tx"
+            [estimate]="estimate"
+            [showEstimate]="isLoggedIn()"
+            [maxRateOptions]="maxRateOptions"
+            [maxRateIndex]="selectFeeRateIndex"
+            (setUserBid)="setUserBid($event)"
+          ></app-accelerate-fee-graph>
+        </ng-container>
+
+        <ng-container *ngIf="estimate else loadingEstimate">
+          <div [class]="{estimateDisabled: error || showSuccess }">
+
+            <div *ngIf="user && !estimate.hasAccess">
+              <div class="alert alert-mempool">You are currently on the waitlist</div>
+            </div>
+
+            @if (showDetails) {
+              <h5 i18n="accelerator.your-transaction">Your transaction</h5>
+              <div class="row">
+                <div class="col">
+                  <small *ngIf="hasAncestors" class="form-text text-muted mb-2">
+                    <ng-container i18n="accelerator.plus-unconfirmed-ancestors">Plus {{ estimate.txSummary.ancestorCount - 1 }} unconfirmed ancestor(s)</ng-container>
+                  </small>
+                  <table class="table table-borderless table-border table-dark table-background table-accelerator">
+                    <tbody>
+                      <tr class="group-first">
+                        <td class="item" i18n="transaction.vsize|Transaction Virtual Size">Virtual size</td>
+                        <td style="text-align: end;" [innerHTML]="'&lrm;' + (estimate.txSummary.effectiveVsize | vbytes: 2)"></td>
+                      </tr>
+                      <tr class="info">
+                        <td class="info" colspan=3>
+                          <i><small i18n="accelerator.transaction-vbytes-size-description">Size in vbytes of this transaction (including unconfirmed ancestors)</small></i>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td class="item" i18n="accelerator.in-band-fees">In-band fees</td>
+                        <td style="text-align: end;">
+                          {{ estimate.txSummary.effectiveFee | number : '1.0-0' }} <span class="symbol" i18n="shared.sats">sats</span>
+                        </td>
+                      </tr>
+                      <tr class="info group-last">
+                        <td class="info" colspan=3>
+                          <i><small i18n="accelerator.fees-already-paid-description">Fees already paid by this transaction (including unconfirmed ancestors)</small></i>
+                        </td>
+                      </tr>
+                    </tbody>
+                  </table>
+                </div>
+              </div>
+              <br>
+            }
+            <h5 *ngIf="estimate?.pools?.length" i18n="accelerator.how-much-faster">How much faster?</h5>
+            <div class="row">
+              <div class="col">
+                <ng-container *ngIf="(etaInfo$ | async) as etaInfo; else loadingEstimate">
+                  <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to <strong>{{ etaInfo.hashratePercentage | number : '1.1-1' }}%</strong> of miners.</small>
+                  <small class="form-text text-muted mb-2" i18n="accelerator.time-estimate-description">This will reduce your expected waiting time until the first confirmation to <strong><app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time></strong></small>
+                </ng-container>
+              </div>
+              <div class="col pie">
+                <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
+              </div>
+            </div>
+            <div class="row">
+              <div class="col">
+                <div class="form-group">
+                  <div class="fee-card">
+                    <div class="d-flex mb-0">
+                      <ng-container *ngFor="let option of maxRateOptions">
+                        <button type="button" class="btn btn-primary flex-grow-1 btn-border btn-sm feerate" [class]="{active: selectFeeRateIndex === option.index}" (click)="setUserBid(option)">
+                          <span class="fee">{{ option.fee + estimate.mempoolBaseFee + estimate.vsizeFee | number }} <span class="symbol" i18n="shared.sats">sats</span></span>
+                          <span class="rate">~<app-fee-rate [fee]="option.rate" rounding="1.0-0"></app-fee-rate></span>
+                        </button>
+                      </ng-container>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+        
+            <h5>Summary</h5>
+            <div class="row">
+              <div class="col">
+                <table class="table table-borderless table-border table-dark table-background table-accelerator">
+                  <tbody>
+                    <!-- ESTIMATED FEE -->
+                    <ng-container *ngIf="showDetails">
+                      <tr class="group-first">
+                        <td class="item" i18n="accelerator.next-block-rate">Next block market rate</td>
+                        <td class="amt" style="font-size: 16px">
+                          {{ estimate.targetFeeRate | number : '1.0-0' }}
+                        </td>
+                        <td class="units"><span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></td>
+                      </tr>
+                      <tr class="info">
+                        <td class="info">
+                          <i><small i18n="accelerator.estimated-extra-fee-required">Estimated extra fee required</small></i>
+                        </td>
+                        <td class="amt">
+                          {{ math.max(0, estimate.nextBlockFee - estimate.txSummary.effectiveFee) | number }}
+                        </td>
+                        <td class="units">
+                          <span class="symbol" i18n="shared.sats">sats</span>
+                          <span class="fiat ml-1"><app-fiat [value]="math.max(0, estimate.nextBlockFee - estimate.txSummary.effectiveFee)"></app-fiat></span>
+                        </td>
+                      </tr>
+        
+                      <!-- MEMPOOL BASE FEE -->
+                      <tr>
+                        <td class="item" i18n="accelerator.mempool-accelerator-fees">Mempool Accelerator™ fees</td>
+                      </tr>
+                      <tr class="info" [class.group-last]="!estimate.vsizeFee" [class.dashed-bottom]="!estimate.vsizeFee">
+                        <td class="info">
+                          <i><small i18n="accelerator.service-fee">Accelerator Service Fee</small></i>
+                        </td>
+                        <td class="amt">
+                          +{{ estimate.mempoolBaseFee | number }}
+                        </td>
+                        <td class="units">
+                          <span class="symbol" i18n="shared.sats">sats</span>
+                          <span class="fiat ml-1"><app-fiat [value]="estimate.mempoolBaseFee"></app-fiat></span>
+                        </td>
+                      </tr>
+                      <tr class="info group-last dashed-bottom" *ngIf="estimate.vsizeFee">
+                        <td class="info">
+                          <i><small i18n="accelerator.tx-size-surcharge">Transaction Size Surcharge</small></i>
+                        </td>
+                        <td class="amt">
+                          +{{ estimate.vsizeFee | number }}
+                        </td>
+                        <td class="units">
+                          <span class="symbol" i18n="shared.sats">sats</span>
+                          <span class="fiat ml-1"><app-fiat [value]="estimate.vsizeFee"></app-fiat></span>
+                        </td>
+                      </tr>
+                    </ng-container>
+
+                    
+                    <!-- NEXT BLOCK ESTIMATE -->
+                    <ng-container *ngIf="isLoggedIn()">
+                      <tr class="group-first">
+                        <td class="item">
+                          <b style="background-color: #5E35B1" class="p-1 pl-0" i18n="accelerator.estimated-cost">Estimated acceleration cost</b> ~{{ estimate.targetFeeRate | number : '1.0-0' }} sat/vB
+                        </td>
+                        <td class="amt">
+                          <span style="background-color: #5E35B1" class="p-1 pl-0">
+                            {{ estimate.cost + estimate.mempoolBaseFee + estimate.vsizeFee | number }}
+                          </span>
+                        </td>
+                        <td class="units">
+                          <span class="symbol" i18n="shared.sats">sats</span>
+                          <span class="fiat ml-1"><app-fiat [value]="estimate.cost + estimate.mempoolBaseFee + estimate.vsizeFee"></app-fiat></span>
+                        </td>
+                      </tr>
+                    </ng-container>
+
+                    <!-- MAX COST -->
+                    <ng-container>
+                      <tr class="group-first" [class.group-last]="!isLoggedIn() || estimate.userBalance >= cost">
+                        <td class="item">
+                          @if (isLoggedIn()) {
+                            <b style="background-color: var(--primary);" class="p-1 pl-0" i18n="accelerator.maximum-cost">Maximum acceleration cost</b>
+                          } @else {
+                            <b style="background-color: var(--primary);" class="p-1 pl-0" i18n="accelerator.cost">Acceleration cost</b>
+                          }
+                        </td>
+                        <td class="amt">
+                          <span style="background-color: var(--primary)" class="p-1 pl-0">
+                            {{ cost | number }}
+                          </span>
+                        </td>
+                        <td class="units">
+                          <span class="symbol" i18n="shared.sats">sats</span>
+                          <span class="fiat ml-1">
+                            <app-fiat [value]="cost" [colorClass]="isLoggedIn() && estimate.userBalance < cost ? 'red-color' : 'green-color'"></app-fiat>
+                          </span>
+                        </td>
+                      </tr>
+                    </ng-container>
+        
+                    <!-- USER BALANCE -->
+                    <ng-container *ngIf="isLoggedIn() && estimate.userBalance < cost">
+                      <tr class="group-first group-last dashed-top">
+                        <td class="item" i18n="accelerator.available-balance">Available balance</td>
+                        <td class="amt">
+                          {{ estimate.userBalance | number }}
+                        </td>
+                        <td class="units">
+                          <span class="symbol" i18n="shared.sats">sats</span>
+                          <span class="fiat ml-1">
+                            <app-fiat [value]="estimate.userBalance" [colorClass]="estimate.userBalance < cost ? 'red-color' : 'green-color'"></app-fiat>
+                          </span>
+                        </td>
+                      </tr>
+                    </ng-container>
+
+                    <tr class="group-first group-last" style="border-top: 1px dashed grey">
+                      <td class="item"></td>
+                      <td colspan="2">
+                        <div class="d-flex">
+                          <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" style="width: 200px" (click)="accelerate()">
+                            <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
+                            <span>Accelerate</span>
+                          </button>
+                        </div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+            </div>
+          </div>
+        </ng-container>
+      </div>
+
+      <ng-template #loadingEstimate>
+        <div class="skeleton-loader"></div>
+        <br>
+      </ng-template>
+    }
+    @else {
+      <!-- Show A/B CTAs -->
+      <div class="row mb-1">
+        <div class="col-sm">
+          <h1 style="font-size: larger;"><ng-content select="[slot='cta-title']"></ng-content><span class="default-slot">Accelerate your Bitcoin transaction?</span></h1>
+        </div>
+      </div>
+
+      <form>
+        <div class="row">
+          <div class="col-md">
+            <div class="form-group form-check mb-2">
+              <input type="radio" [checked]="choosenOption === 'wait'"  class="form-check-input" id="wait" name="accel" (change)="selectedOptionChanged($event)">
+              <label class="form-check-label d-flex flex-column" for="wait">
+                <span class="font-weight-bold">Wait</span>
+                @if (eta.blocks < 7) {
+                  <span style="color: rgb(186, 186, 186); font-size: 14px;">Confirmation expected <app-time kind="within" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time></span>
                 } @else {
-                  <span class="estimating">Calculating cost...</span>
+                  <span style="color: rgb(186, 186, 186); font-size: 14px;">
+                    <span>Confirmation expected within several hours</span>
+                  </span>
                 }
-              </span>
-            </label>
+              </label>
+            </div>
+          </div>
+          <div class="col-md">
+            <div class="form-group form-check mb-2">
+              <input type="radio" [checked]="choosenOption === 'accel'" class="form-check-input" id="accel" name="accel" (change)="selectedOptionChanged($event)">
+              <label class="form-check-label d-flex flex-column" for="accel">
+                <span class="font-weight-bold">Accelerate</span>
+                <span style="color: rgb(186, 186, 186); font-size: 14px;" *ngIf="(etaInfo$ | async) as etaInfo">Confirmation expected <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time><br>
+                  @if (!calculating) {
+                    <app-fiat [value]="cost"></app-fiat>fee (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
+                  } @else {
+                    <span class="estimating">Calculating cost...</span>
+                  }
+                </span>
+              </label>
+            </div>
+          </div>
+          <div class="col-md pie d-none d-lg-flex" *ngIf="estimate && !forceMobile">
+            <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description" *ngIf="(etaInfo$ | async) as etaInfo">Your transaction will be prioritized by up to {{ etaInfo.hashratePercentage | number : '1.1-1' }}% of miners.</small>
+            <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
           </div>
         </div>
-        <div class="col-md pie d-none d-lg-flex" *ngIf="estimate && !isTracker">
-          <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description" *ngIf="(etaInfo$ | async) as etaInfo">Your transaction will be prioritized by up to {{ etaInfo.hashratePercentage | number : '1.1-1' }}% of miners.</small>
-          <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
+        <div class="row mt-2 mb-2" [style]="(choosenOption !== 'accel' || calculating) ? 'opacity: 0.25; pointer-events: none' : ''">
+          <div class="col-sm d-flex flex-row justify-content-center">
+            <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" style="width: 200px" (click)="enableCheckoutPage()">
+              <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
+              <span>Accelerate</span>
+            </button>
+          </div>
         </div>
-      </div>
-      <div class="row mt-2 mb-2" [style]="(choosenOption !== 'accel' || calculating) ? 'opacity: 0.25; pointer-events: none' : ''">
-        <div class="col-sm d-flex flex-row justify-content-center">
-          <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" style="width: 200px" (click)="enableCheckoutPage()">
-            <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
-            <span>Accelerate</span>
-          </button>
-        </div>
-      </div>
-    </form>
-  
+      </form>
+    }
   } @else if (step === 'paymentMethod') {
     <div class="row text-center">
       <div class="col-sm">
@@ -82,7 +322,7 @@
     <hr>
     <div class="row mt-2 mb-2 text-center">
       <div class="col-sm d-flex flex-column">
-        <button type="button" class="mt-1 btn btn-secondary btn-sm rounded-pill align-self-center" style="width: 200px" (click)="step = 'cta'">Go Back</button>
+        <button type="button" class="mt-1 btn btn-secondary btn-sm rounded-pill align-self-center" style="width: 200px" (click)="step = 'quote'">Go Back</button>
       </div>
     </div>
 
diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
index af11f6c2b..e03f223ca 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
@@ -24,4 +24,134 @@
   display: flex;
   align-items: center;
   max-width: 330px;
+}
+
+.fee-card {
+  padding: 15px;
+  background-color: var(--bg);
+
+  .feerate {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+
+    .rate {
+      font-size: 0.9em;
+      .symbol {
+        color: white;
+      }
+    }
+  }
+}
+
+.btn-border {
+  border: solid 1px black;
+  background-color: #0c4a87;
+}
+
+.feerate.active {
+  background-color: var(--primary) !important;
+  opacity: 1;
+  border: 1px solid #007fff !important;
+}
+.feerate:focus {
+  box-shadow: none !important;
+}
+
+.estimateDisabled {
+  opacity: 0.5;
+  pointer-events: none;
+}
+
+.table-toggle {
+  width: 100%;
+  margin-top: 0.5em;
+}
+
+.tab {
+  &:first-child {
+    margin-right: 1px;
+  }
+  border: solid 1px black;
+  border-bottom: none;
+  background-color: #323655;
+  border-top-left-radius: 10px !important;
+  border-top-right-radius: 10px !important;
+}
+.tab.active {
+  background-color: #5d659d !important;
+  opacity: 1;
+}
+.tab:focus {
+  box-shadow: none !important;
+}
+
+.table-accelerator {
+  tr {
+    td {
+      padding-top: 0;
+      padding-bottom: 0;
+      vertical-align: baseline;
+    }
+
+    &.group-first {
+      td {
+        padding-top: 0.75rem;
+      }
+    }
+    &.group-last, &:last-child {
+      td {
+        padding-bottom: 0.75rem;
+      }
+    }
+    &.dashed-top {
+      border-top: 1px dashed grey;
+    }
+    &.dashed-bottom {
+      border-bottom: 1px dashed grey
+    }
+  }
+  td {
+    &:first-child {
+      width: 100vw;
+    }
+    &.info {
+      color: #6c757d;
+      white-space: initial;
+    }
+    &.amt {
+      text-align: right;
+      padding-right: 0.2em;
+    }
+    &.units {
+      padding-left: 0.2em;
+      white-space: nowrap;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
+  }
+}
+
+.accelerate-cols {
+  display: flex;
+  flex-direction: row;
+  align-items: stretch;
+  margin-top: 1em;
+}
+
+.col.pie {
+  flex-grow: 0;
+  padding: 0 1em;
+  position: relative;
+  top: -15px;
+}
+
+.item {
+  white-space: initial;
+}
+
+.table-background {
+  background-color: var(--bg);
 }
\ 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 8714373d0..3d720e757 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -1,13 +1,42 @@
-import { Component, OnInit, OnDestroy, Output, EventEmitter, Input, ChangeDetectorRef, SimpleChanges } from '@angular/core';
+import { Component, OnInit, OnDestroy, Output, EventEmitter, Input, ChangeDetectorRef, SimpleChanges, HostListener } from '@angular/core';
 import { Subscription, tap, of, catchError, Observable } from 'rxjs';
 import { ServicesApiServices } from '../../services/services-api.service';
 import { nextRoundNumber } from '../../shared/common.utils';
 import { StateService } from '../../services/state.service';
 import { AudioService } from '../../services/audio.service';
-import { AccelerationEstimate } from '../accelerate-preview/accelerate-preview.component';
 import { ETA, EtaService } from '../../services/eta.service';
 import { Transaction } from '../../interfaces/electrs.interface';
 import { MiningStats } from '../../services/mining.service';
+import { StorageService } from '../../services/storage.service';
+
+export type AccelerationEstimate = {
+  hasAccess: boolean;
+  txSummary: TxSummary;
+  nextBlockFee: number;
+  targetFeeRate: number;
+  userBalance: number;
+  enoughBalance: boolean;
+  cost: number;
+  mempoolBaseFee: number;
+  vsizeFee: number;
+  pools: number[]
+}
+export type TxSummary = {
+  txid: string; // txid of the current transaction
+  effectiveVsize: number; // Total vsize of the dependency tree
+  effectiveFee: number;  // Total fee of the dependency tree in sats
+  ancestorCount: number; // Number of ancestors
+}
+
+export interface RateOption {
+  fee: number;
+  rate: number;
+  index: number;
+}
+
+export const MIN_BID_RATIO = 1;
+export const DEFAULT_BID_RATIO = 2;
+export const MAX_BID_RATIO = 4;
 
 @Component({
   selector: 'app-accelerate-checkout',
@@ -20,24 +49,43 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   @Input() eta: ETA;
   @Input() scrollEvent: boolean;
   @Input() cashappEnabled: boolean;
-  @Input() isTracker: boolean = false;
+  @Input() showDetails: boolean;
+  @Input() advancedEnabled: boolean = false;
+  @Input() forceMobile: boolean = false;
+  @Output() changeMode = new EventEmitter<boolean>();
   @Output() close = new EventEmitter<null>();
 
   calculating = true;
   choosenOption: 'wait' | 'accel';
   error = '';
+  math = Math;
+  isMobile: boolean = window.innerWidth <= 767.98;
 
-  step: 'paymentMethod' | 'cta' | 'checkout' | 'processing' = 'cta';
+  step: 'quote' | 'paymentMethod' | 'checkout' | 'processing' = 'quote';
+  simpleMode: boolean = true;
   paymentMethod: 'cashapp' | 'btcpay';
 
+  user: any = undefined;
+
   // accelerator stuff
   square: { appId: string, locationId: string};
   accelerationUUID: string;
+  accelerationSubscription: Subscription;
+  difficultySubscription: Subscription;
   estimateSubscription: Subscription;
   estimate: AccelerationEstimate;
   maxBidBoost: number; // sats
   cost: number; // sats
   etaInfo$: Observable<{ hashratePercentage: number, ETA: number, acceleratedETA: number }>;
+  showSuccess = false;
+  hasAncestors: boolean = false;
+  minExtraCost = 0;
+  minBidAllowed = 0;
+  maxBidAllowed = 0;
+  defaultBid = 0;
+  userBid = 0;
+  selectFeeRateIndex = 1;
+  maxRateOptions: RateOption[] = [];
 
   // square
   loadingCashapp = false;
@@ -52,8 +100,9 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   invoice = undefined;
 
   constructor(
+    public stateService: StateService,
     private servicesApiService: ServicesApiServices,
-    private stateService: StateService,
+    private storageService: StorageService,
     private etaService: EtaService,
     private audioService: AudioService,
     private cd: ChangeDetectorRef
@@ -62,6 +111,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
+    this.user = this.storageService.getAuth()?.user ?? null;
     const urlParams = new URLSearchParams(window.location.search);
     if (urlParams.get('cash_request_id')) { // Redirected from cashapp
       this.insertSquare();
@@ -74,7 +124,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
         appId: ids.squareAppId,
         locationId: ids.squareLocationId
       };
-      if (this.step === 'cta') {
+      if (this.step === 'quote') {
         this.fetchEstimate();
       }
     });
@@ -95,7 +145,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   /**
   * Scroll to element id with or without setTimeout
   */
-  scrollToElementWithTimeout(id: string, position: ScrollLogicalPosition, timeout: number = 1000) {
+  scrollToElementWithTimeout(id: string, position: ScrollLogicalPosition, timeout: number = 1000): void {
     setTimeout(() => {
       this.scrollToElement(id, position);
     }, timeout);
@@ -130,24 +180,100 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
             this.error = `cannot_accelerate_tx`;
             return;
           }
+          if (this.estimate.hasAccess === true && this.estimate.userBalance <= 0) {
+            if (this.isLoggedIn()) {
+              this.error = `not_enough_balance`;
+            }
+          }
+          this.hasAncestors = this.estimate.txSummary.ancestorCount > 1;
+          this.etaInfo$ = this.etaService.getProjectedEtaObservable(this.estimate, this.miningStats);
+
           // Make min extra fee at least 50% of the current tx fee
-          const minExtraBoost = nextRoundNumber(Math.max(this.estimate.cost * 2, this.estimate.txSummary.effectiveFee));
-          const DEFAULT_BID_RATIO = 1.5;
-          this.maxBidBoost = minExtraBoost * DEFAULT_BID_RATIO;
-          this.cost = this.maxBidBoost + this.estimate.mempoolBaseFee + this.estimate.vsizeFee;
-          this.etaInfo$ = this.etaService.getProjectedEtaObservable(this.estimate);
+          this.minExtraCost = nextRoundNumber(Math.max(this.estimate.cost * 2, this.estimate.txSummary.effectiveFee));
+
+          this.maxRateOptions = [1, 2, 4].map((multiplier, index) => {
+            return {
+              fee: this.minExtraCost * multiplier,
+              rate: (this.estimate.txSummary.effectiveFee + (this.minExtraCost * multiplier)) / this.estimate.txSummary.effectiveVsize,
+              index,
+            };
+          });
+
+          this.minBidAllowed = this.minExtraCost * MIN_BID_RATIO;
+          this.defaultBid = this.minExtraCost * DEFAULT_BID_RATIO;
+          this.maxBidAllowed = this.minExtraCost * MAX_BID_RATIO;
+
+          this.userBid = this.defaultBid;
+          if (this.userBid < this.minBidAllowed) {
+            this.userBid = this.minBidAllowed;
+          } else if (this.userBid > this.maxBidAllowed) {
+            this.userBid = this.maxBidAllowed;
+          }
+          this.cost = this.userBid + this.estimate.mempoolBaseFee + this.estimate.vsizeFee;
+
           this.calculating = false;
           this.cd.markForCheck();
         }
       }),
 
       catchError((response) => {
+        this.estimate = undefined;
         this.error = `cannot_accelerate_tx`;
+        this.estimateSubscription.unsubscribe();
         return of(null);
       })
     ).subscribe();
   }
 
+  /**
+   * User changed his bid
+   */
+  setUserBid({ fee, index }: { fee: number, index: number}): void {
+    if (this.estimate) {
+      this.selectFeeRateIndex = index;
+      this.userBid = Math.max(0, fee);
+      this.cost = this.userBid + this.estimate.mempoolBaseFee + this.estimate.vsizeFee;
+    }
+  }
+
+  /**
+   * Advanced mode acceleration button clicked
+   */
+  accelerate(): void {
+    if (this.isLoggedIn()) {
+      this.accelerateWithMempoolAccount();
+    } else {
+      this.step = 'paymentMethod';
+    }
+  }
+
+  /**
+   * Account-based acceleration request
+   */
+  accelerateWithMempoolAccount(): void {
+    if (this.accelerationSubscription) {
+      this.accelerationSubscription.unsubscribe();
+    }
+    this.accelerationSubscription = this.servicesApiService.accelerate$(
+      this.tx.txid,
+      this.userBid,
+      this.accelerationUUID
+    ).subscribe({
+      next: () => {
+        this.audioService.playSound('ascend-chime-cartoon');
+        this.showSuccess = true;
+        this.estimateSubscription.unsubscribe();
+      },
+      error: (response) => {
+        if (response.status === 403 && response.error === 'not_available') {
+          this.error = 'waitlisted';
+        } else {
+          this.error = response.error;
+        }
+      }
+    });
+  }
+
   /**
    * Square
    */
@@ -321,4 +447,14 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
       this.close.emit();
     }, timeout);
   }
+
+  isLoggedIn(): boolean {
+    const auth = this.storageService.getAuth();
+    return auth !== null;
+  }
+
+  @HostListener('window:resize', ['$event'])
+  onResize(): void {
+    this.isMobile = window.innerWidth <= 767.98;
+  }
 }
diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.html b/frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.html
new file mode 100644
index 000000000..fe0718ecc
--- /dev/null
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.html
@@ -0,0 +1,21 @@
+<div class="fee-graph" *ngIf="tx && estimate">
+  <div class="column">
+    <ng-container *ngFor="let bar of bars">
+      <div class="bar {{ bar.class }}" [class.active]="bar.active" [style]="bar.style" (click)="onClick($event, bar);">
+        <div class="fill"></div>
+        <div class="line">
+          <p class="fee-rate">
+            <span class="label">{{ bar.label }}</span>
+            <span class="rate">
+              <app-fee-rate [fee]="bar.rate"></app-fee-rate>
+            </span>
+          </p>
+        </div>
+        <div class="spacer"></div>
+        <span class="fee">{{ bar.class === 'tx' ? '' : '+' }} {{ bar.fee | number }} <span class="symbol" i18n="shared.sat|sat">sat</span></span>
+        <div class="spacer"></div>
+        <div class="spacer"></div>
+      </div>
+    </ng-container>
+  </div>
+</div>
diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.scss b/frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.scss
new file mode 100644
index 000000000..919fdec4a
--- /dev/null
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.scss
@@ -0,0 +1,156 @@
+.fee-graph {
+  height: 100%;
+  min-width: 120px;
+  width: 120px;
+  margin-left: 4em;
+  margin-right: 1.5em;
+
+  .column {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    background: var(--stat-box-bg);
+
+    .bar {
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      min-height: 30px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+
+      .fill {
+        position: absolute;
+        left: 0;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        opacity: 0.75;
+        pointer-events: none;
+      }
+
+      .fee {
+        font-size: 0.9em;
+        opacity: 0;
+        pointer-events: none;
+      }
+
+      .spacer {
+        width: 100%;
+        height: 1px;
+        flex-grow: 1;
+        pointer-events: none;
+      }
+
+      .line {
+        position: absolute;
+        right: 0;
+        top: 0;
+        left: -4.5em;
+        border-top: dashed white 1.5px;
+
+        .fee-rate {
+          width: 100%;
+          position: absolute;
+          left: 0;
+          right: 0.2em;
+          font-size: 0.8em;
+          display: flex;
+          flex-direction: row-reverse;
+          justify-content: space-between;
+          margin: 0;
+
+          .label {
+            margin-right: .2em;
+          }
+
+          .rate .symbol {
+            color: white;
+          }
+        }
+      }
+
+      &.tx {
+        .fill {
+          background: var(--green);
+        }
+        .line {
+          .fee-rate {
+            top: 0;
+          }
+        }
+        .fee {
+          position: absolute;
+          opacity: 1;
+          z-index: 11;
+        }
+      }
+
+      &.target {
+        .fill {
+          background: var(--tertiary);
+        }
+        .fee {
+          position: absolute;
+          opacity: 1;
+          z-index: 11;
+        }
+        .line .fee-rate {
+          bottom: 2px;
+        }
+      }
+
+      &.max {
+        cursor: pointer;
+        .line .fee-rate {
+          .label {
+            opacity: 0;
+          }
+          bottom: 2px;
+        }
+        &.active, &:hover {
+          .fill {
+            background: var(--primary);
+          }
+          .line {
+            .fee-rate .label {
+              opacity: 1;
+            }
+          }
+        }
+      }
+
+      &:hover {
+        .fill {
+          z-index: 10;
+        }
+        .line {
+          z-index: 11;
+        }
+        .fee {
+          opacity: 1;
+          z-index: 12;
+        }
+      }
+    }
+
+    &:hover > .bar:not(:hover) {
+      &.target, &.max {
+        .fee {
+          opacity: 0;
+        }
+        .line .fee-rate .label {
+          opacity: 0;
+        }
+      }
+      &.max {
+        .fill {
+          background: none;
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.ts b/frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.ts
new file mode 100644
index 000000000..c41cb2f87
--- /dev/null
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.ts
@@ -0,0 +1,100 @@
+import { Component, OnInit, Input, Output, OnChanges, EventEmitter, HostListener, Inject, LOCALE_ID } from '@angular/core';
+import { StateService } from '../../services/state.service';
+import { Outspend, Transaction, Vin, Vout } from '../../interfaces/electrs.interface';
+import { Router } from '@angular/router';
+import { ReplaySubject, merge, Subscription, of } from 'rxjs';
+import { tap, switchMap } from 'rxjs/operators';
+import { ApiService } from '../../services/api.service';
+import { AccelerationEstimate, RateOption } from './accelerate-checkout.component';
+
+interface GraphBar {
+  rate: number;
+  style: any;
+  class: 'tx' | 'target' | 'max';
+  label: string;
+  active?: boolean;
+  rateIndex?: number;
+  fee?: number;
+}
+
+@Component({
+  selector: 'app-accelerate-fee-graph',
+  templateUrl: './accelerate-fee-graph.component.html',
+  styleUrls: ['./accelerate-fee-graph.component.scss'],
+})
+export class AccelerateFeeGraphComponent implements OnInit, OnChanges {
+  @Input() tx: Transaction;
+  @Input() estimate: AccelerationEstimate;
+  @Input() showEstimate = false;
+  @Input() maxRateOptions: RateOption[] = [];
+  @Input() maxRateIndex: number = 0;
+  @Output() setUserBid = new EventEmitter<{ fee: number, index: number }>();
+
+  bars: GraphBar[] = [];
+  tooltipPosition = { x: 0, y: 0 };
+
+  ngOnInit(): void {
+    this.initGraph();
+  }
+
+  ngOnChanges(): void {
+    this.initGraph();
+  }
+
+  initGraph(): void {
+    if (!this.tx || !this.estimate) {
+      return;
+    }
+    const maxRate = Math.max(...this.maxRateOptions.map(option => option.rate));
+    const baseRate = this.estimate.txSummary.effectiveFee / this.estimate.txSummary.effectiveVsize;
+    const baseHeight = baseRate / maxRate;
+    console.log(maxRate, baseRate, baseHeight);
+    const bars: GraphBar[] = this.maxRateOptions.slice().reverse().map(option => {
+      return {
+        rate: option.rate,
+        style: this.getStyle(option.rate, maxRate, baseHeight),
+        class: 'max',
+        label: this.showEstimate ? $localize`maximum` : $localize`accelerated`,
+        active: option.index === this.maxRateIndex,
+        rateIndex: option.index,
+        fee: option.fee,
+      }
+    });
+    if (this.estimate.nextBlockFee > this.estimate.txSummary.effectiveFee) {
+      bars.push({
+        rate: this.estimate.targetFeeRate,
+        style: this.getStyle(this.estimate.targetFeeRate, maxRate, baseHeight),
+        class: 'target',
+        label: $localize`:@@bdf0e930eb22431140a2eaeacd809cc5f8ebd38c:Next Block`.toLowerCase(),
+        fee: this.estimate.nextBlockFee - this.estimate.txSummary.effectiveFee
+      });
+    }
+    bars.push({
+      rate: baseRate,
+      style: this.getStyle(baseRate, maxRate, 0),
+      class: 'tx',
+      label: '',
+      fee: this.estimate.txSummary.effectiveFee,
+    });
+    this.bars = bars;
+  }
+
+  getStyle(rate, maxRate, base) {
+    const top = (rate / maxRate);
+    return {
+      height: `${(top - base) * 100}%`,
+      bottom: base ? `${base * 100}%` : '0',
+    }
+  }
+
+  onClick(event, bar): void {
+    if (bar.rateIndex != null) {
+      this.setUserBid.emit({ fee: bar.fee, index: bar.rateIndex });
+    }
+  }
+
+  @HostListener('pointermove', ['$event'])
+  onPointerMove(event) {
+    this.tooltipPosition = { x: event.offsetX, y: event.offsetY };
+  }
+}
diff --git a/frontend/src/app/components/tracker/tracker.component.html b/frontend/src/app/components/tracker/tracker.component.html
index c0f77c424..faa2db793 100644
--- a/frontend/src/app/components/tracker/tracker.component.html
+++ b/frontend/src/app/components/tracker/tracker.component.html
@@ -117,7 +117,7 @@
     <div class="bottom-panel">
       @if (showAccelerationSummary && !accelerationFlowCompleted) {
         <ng-container *ngIf="(ETA$ | async) as eta;">
-          <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [tx]="tx" [miningStats]="miningStats" [eta]="eta" [isTracker]="true" (close)="accelerationFlowCompleted = true" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100"></app-accelerate-checkout>
+          <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [tx]="tx" [miningStats]="miningStats" [eta]="eta" [forceMobile]="true" (close)="accelerationFlowCompleted = true" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100"></app-accelerate-checkout>
         </ng-container>
       } @else {
         @if (tx?.acceleration && !tx.status?.confirmed) {
diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index 65c859e5c..87477c5d7 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -84,17 +84,11 @@
 
       <div class="clearfix"></div>
 
-      @if (isLoggedIn()) {
-        <div class="box">
-          <app-accelerate-preview [tx]="tx" [miningStats]="miningStats" [scrollEvent]="scrollIntoAccelPreview" [showDetails]="showAccelerationDetails"></app-accelerate-preview>
-        </div>
-      } @else {
-        <ng-container *ngIf="(ETA$ | async) as eta;">
-          <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [tx]="tx" [eta]="eta" [miningStats]="miningStats" (close)="showAccelerationSummary = false" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100">
-            <span slot="cta-title">Urgent transaction? Get it confirmed faster.</span>
-          </app-accelerate-checkout>
-        </ng-container>
-      }
+      <ng-container *ngIf="(ETA$ | async) as eta;">
+        <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [tx]="tx" [eta]="eta" [miningStats]="miningStats" (close)="showAccelerationSummary = false" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100">
+          <span slot="cta-title">Urgent transaction? Get it confirmed faster.</span>
+        </app-accelerate-checkout>
+      </ng-container>
     </ng-container>
 
     <ng-template [ngIf]="showCpfpDetails">
diff --git a/frontend/src/app/components/transaction/transaction.module.ts b/frontend/src/app/components/transaction/transaction.module.ts
index ac09067de..b536b3045 100644
--- a/frontend/src/app/components/transaction/transaction.module.ts
+++ b/frontend/src/app/components/transaction/transaction.module.ts
@@ -5,9 +5,8 @@ import { TransactionComponent } from './transaction.component';
 import { SharedModule } from '../../shared/shared.module';
 import { TxBowtieModule } from '../tx-bowtie-graph/tx-bowtie.module';
 import { GraphsModule } from '../../graphs/graphs.module';
-import { AcceleratePreviewComponent } from '../accelerate-preview/accelerate-preview.component';
 import { AccelerateCheckout } from '../accelerate-checkout/accelerate-checkout.component';
-import { AccelerateFeeGraphComponent } from '../accelerate-preview/accelerate-fee-graph.component';
+import { AccelerateFeeGraphComponent } from '../accelerate-checkout/accelerate-fee-graph.component';
 import { TrackerComponent } from '../tracker/tracker.component';
 import { TrackerBarComponent } from '../tracker/tracker-bar.component';
 
@@ -43,7 +42,6 @@ export class TransactionRoutingModule { }
     TransactionComponent,
     TrackerComponent,
     TrackerBarComponent,
-    AcceleratePreviewComponent,
     AccelerateCheckout,
     AccelerateFeeGraphComponent,
   ]
diff --git a/frontend/src/app/services/eta.service.ts b/frontend/src/app/services/eta.service.ts
index 3dc396a55..cc1436e4c 100644
--- a/frontend/src/app/services/eta.service.ts
+++ b/frontend/src/app/services/eta.service.ts
@@ -5,7 +5,7 @@ import { MempoolBlock } from '../interfaces/websocket.interface';
 import { Transaction } from '../interfaces/electrs.interface';
 import { MiningService, MiningStats } from './mining.service';
 import { getUnacceleratedFeeRate } from '../shared/transaction.utils';
-import { AccelerationEstimate } from '../components/accelerate-preview/accelerate-preview.component';
+import { AccelerationEstimate } from '../components/accelerate-checkout/accelerate-checkout.component';
 import { Observable, combineLatest, map, of, share, shareReplay, tap } from 'rxjs';
 
 export interface ETA {

From 473da82caa57c2e63cce9744d971ba74e41cd6a9 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Thu, 27 Jun 2024 12:56:49 +0000
Subject: [PATCH 32/77] acceleration estimate payment methods field

---
 .../accelerate-checkout/accelerate-checkout.component.ts     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 3d720e757..2a7f0d067 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -9,6 +9,8 @@ import { Transaction } from '../../interfaces/electrs.interface';
 import { MiningStats } from '../../services/mining.service';
 import { StorageService } from '../../services/storage.service';
 
+export type PaymentMethod = 'balance' | 'bitcoin' | 'cashapp';
+
 export type AccelerationEstimate = {
   hasAccess: boolean;
   txSummary: TxSummary;
@@ -19,7 +21,8 @@ export type AccelerationEstimate = {
   cost: number;
   mempoolBaseFee: number;
   vsizeFee: number;
-  pools: number[]
+  pools: number[];
+  availablePaymentMethods: PaymentMethod[];
 }
 export type TxSummary = {
   txid: string; // txid of the current transaction

From ea04ea00489f8c8f320cf8b4456550d55c4cbc2d Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Fri, 28 Jun 2024 11:28:41 +0900
Subject: [PATCH 33/77] Docs root network support

---
 frontend/src/app/docs/api-docs/api-docs.component.ts        | 6 +++++-
 .../src/app/docs/code-template/code-template.component.ts   | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/docs/api-docs/api-docs.component.ts b/frontend/src/app/docs/api-docs/api-docs.component.ts
index 76d9de8d0..b655b3969 100644
--- a/frontend/src/app/docs/api-docs/api-docs.component.ts
+++ b/frontend/src/app/docs/api-docs/api-docs.component.ts
@@ -72,7 +72,7 @@ export class ApiDocsComponent implements OnInit, AfterViewInit {
     this.auditEnabled = this.env.AUDIT;
     this.network$ = merge(of(''), this.stateService.networkChanged$).pipe(
       tap((network: string) => {
-        if (this.env.BASE_MODULE === 'mempool' && network !== '') {
+        if (this.env.BASE_MODULE === 'mempool' && network !== '' && this.env.ROOT_NETWORK === '') {
           this.baseNetworkUrl = `/${network}`;
         } else if (this.env.BASE_MODULE === 'liquid') {
           if (!['', 'liquid'].includes(network)) {
@@ -195,6 +195,10 @@ export class ApiDocsComponent implements OnInit, AfterViewInit {
       }
     }
 
+    if (network === this.env.ROOT_NETWORK) {
+      curlNetwork = '';
+    }
+
     let text = code.codeTemplate.curl;
     for (let index = 0; index < curlResponse.length; index++) {
       const curlText = curlResponse[index];
diff --git a/frontend/src/app/docs/code-template/code-template.component.ts b/frontend/src/app/docs/code-template/code-template.component.ts
index bd03f5b16..b31def01c 100644
--- a/frontend/src/app/docs/code-template/code-template.component.ts
+++ b/frontend/src/app/docs/code-template/code-template.component.ts
@@ -284,7 +284,7 @@ yarn add @mempool/liquid.js`;
     const headersString = code.headers ? ` -H "${code.headers}"` : ``;
     
     if (this.env.BASE_MODULE === 'mempool') {
-      if (this.network === 'main' || this.network === '') {
+      if (this.network === 'main' || this.network === '' || this.network === this.env.ROOT_NETWORK) {
         if (this.method === 'POST') {
           return `curl${headersString} -X POST -sSLd "${text}"`;
         }
@@ -296,7 +296,7 @@ yarn add @mempool/liquid.js`;
       return `curl${headersString} -sSL "${this.hostname}/${this.network}${text}"`;
     } else if (this.env.BASE_MODULE === 'liquid') {
       if (this.method === 'POST') {
-        if (this.network !== 'liquid') {
+        if (this.network !== 'liquid' || this.network === this.env.ROOT_NETWORK) {
           text = text.replace('/api', `/${this.network}/api`);
         }
         return `curl${headersString} -X POST -sSLd "${text}"`;

From 903ff1ea66a7f022dc87f73609b7337fd988ac10 Mon Sep 17 00:00:00 2001
From: hunicus <93150691+hunicus@users.noreply.github.com>
Date: Fri, 28 Jun 2024 13:38:35 +0900
Subject: [PATCH 34/77] Update foundry logo on about page

---
 .../app/components/about/about.component.html | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html
index 0acc07322..cc818050f 100644
--- a/frontend/src/app/components/about/about.component.html
+++ b/frontend/src/app/components/about/about.component.html
@@ -53,13 +53,26 @@
         <span>Spiral</span>
       </a>
       <a href="https://foundrydigital.com/" target="_blank" title="Foundry">
-        <svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="-10 -10 100 100" class="image">
-          <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-            <g transform="translate(-186.000000, -2316.000000)">
-              <g transform="translate(186.000000, 2316.000000)">
-                <rect id="" fill="#023D32" x="-10" y="-10" width="100" height="100" rx="8"></rect>
-                <path d="M61.6666667,9.16666667 L61.6666667,17.0041667 L46.2625,17.0041667 C46.2625,17.0041667 44.1666667,16.6666667 44.1666667,18.3333333 L44.1666667,25.8025 L61.6666667,25.8025 L61.6666667,34.7391667 L44.1666667,34.7391667 L44.1666667,70.5575 L31.7825,70.5575 L31.7825,35 L19.1666667,35 L19.1666667,25.595 L31.6666667,25.595 L31.6666667,17.5 C31.6666667,17.5 32.5,9.16666667 40.4166667,9.16666667 L61.6666667,9.16666667 Z" id="Fill-1" fill="#86E2A0"></path>
-              </g>
+        <svg xmlns="http://www.w3.org/2000/svg" id="b" data-name="Layer 2" style="zoom: 1;" width="32" height="76" viewBox="0 0 32 76">
+          <defs>
+            <style>
+              .d {
+                fill: #fff;
+              }
+
+              .e {
+                fill: #ff8200;
+              }
+            </style>
+          </defs>
+          <g id="c" data-name="b">
+            <circle class="e" cx="24" cy="32" r="8" />
+            <circle class="e" cx="24" cy="56" r="8" />
+            <circle class="e" cx="8" cy="68" r="8" />
+            <g>
+              <circle class="d" cx="24" cy="8" r="8" />
+              <circle class="d" cx="8" cy="20" r="8" />
+              <circle class="d" cx="8" cy="44" r="8" />
             </g>
           </g>
         </svg>

From 95c4da51ede69b1731ca82501015fe67450bc0a3 Mon Sep 17 00:00:00 2001
From: hunicus <93150691+hunicus@users.noreply.github.com>
Date: Thu, 27 Jun 2024 18:36:09 +0900
Subject: [PATCH 35/77] Juggle community integration listings

Also add back bitcoin-s and remove mercury.

Signed-off-by: hunicus <93150691+hunicus@users.noreply.github.com>
---
 .../app/components/about/about.component.html | 68 +++++++++----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html
index 0acc07322..0c5d04a57 100644
--- a/frontend/src/app/components/about/about.component.html
+++ b/frontend/src/app/components/about/about.component.html
@@ -259,22 +259,10 @@
         <img class="image" src="/resources/profile/bisq_network.png" />
         <span>Bisq</span>
       </a>
-      <a href="https://github.com/BlueWallet/BlueWallet" target="_blank" title="BlueWallet">
-        <img class="image" src="/resources/profile/bluewallet.png" />
-        <span>BlueWallet</span>
-      </a>
-      <a href="https://github.com/muun/apollo" target="_blank" title="Muun Wallet">
-        <img class="image" src="/resources/profile/muun.png" />
-        <span>Muun</span>
-      </a>
       <a href="https://github.com/spesmilo/electrum" target="_blank" title="Electrum Wallet">
         <img class="image" src="/resources/profile/electrum.png" />
         <span>Electrum</span>
       </a>
-      <a href="https://github.com/cryptoadvance/specter-desktop" target="_blank" title="Specter Wallet">
-        <img class="image" src="/resources/profile/specter.png" />
-        <span>Specter</span>
-      </a>
       <a href="https://github.com/sparrowwallet/sparrow" target="_blank" title="Sparrow Wallet">
         <img class="image" src="/resources/profile/sparrow.png" />
         <span>Sparrow</span>
@@ -283,21 +271,37 @@
         <img class="image not-rounded" src="/resources/profile/phoenix.svg" />
         <span>Phoenix</span>
       </a>
-      <a href="https://github.com/lnbits/lnbits-legend" target="_blank" title="LNbits">
-        <img class="image" src="/resources/profile/lnbits.svg" />
-        <span>LNBits</span>
+      <a href="http://github.com/COLDCARD" target="_blank" title="COLDCARD">
+        <img class="image coldcard" src="/resources/profile/coldcard.png" />
+        <span>COLDCARD</span>
       </a>
-      <a href="https://github.com/layer2tech/mercury-wallet" target="_blank" title="Mercury Wallet">
-        <img class="image" src="/resources/profile/mercury.svg" />
-        <span>Mercury</span>
+      <a href="https://github.com/ZeusLN/zeus" target="_blank" title="ZEUS">
+        <img class="image" src="/resources/profile/zeus.png" />
+        <span>ZEUS</span>
+      </a>
+      <a href="https://github.com/MutinyWallet" target="_blank" title="Mutiny">
+        <img class="image not-rounded" src="/resources/profile/mutiny.svg" />
+        <span>Mutiny</span>
       </a>
       <a href="https://github.com/hsjoberg/blixt-wallet" target="_blank" title="Blixt Wallet">
         <img class="image" src="/resources/profile/blixt.png" />
         <span>Blixt</span>
       </a>
-      <a href="https://github.com/ZeusLN/zeus" target="_blank" title="ZEUS">
-        <img class="image" src="/resources/profile/zeus.png" />
-        <span>ZEUS</span>
+      <a href="https://github.com/nunchuk-io" target="_blank" title="Nunchuck">
+        <img class="image" src="/resources/profile/nunchuk.svg" />
+        <span>Nunchuk</span>
+      </a>
+      <a href="https://github.com/BlueWallet/BlueWallet" target="_blank" title="BlueWallet">
+        <img class="image" src="/resources/profile/bluewallet.png" />
+        <span>BlueWallet</span>
+      </a>
+      <a href="https://github.com/BoltzExchange" target="_blank" title="Boltz">
+        <img class="image" src="/resources/profile/boltz.svg" />
+        <span>Boltz</span>
+      </a>
+      <a href="https://github.com/lnbits/lnbits-legend" target="_blank" title="LNbits">
+        <img class="image" src="/resources/profile/lnbits.svg" />
+        <span>LNBits</span>
       </a>
       <a href="https://github.com/vulpemventures/marina" target="_blank" title="Marina Wallet">
         <img class="image" src="/resources/profile/marina.svg" />
@@ -307,13 +311,9 @@
         <img class="image" src="/resources/profile/schildbach.svg" />
         <span>Schildbach</span>
       </a>
-      <a href="https://github.com/nunchuk-io" target="_blank" title="Nunchuck">
-        <img class="image" src="/resources/profile/nunchuk.svg" />
-        <span>Nunchuk</span>
-      </a>
-      <a href="http://github.com/COLDCARD" target="_blank" title="COLDCARD">
-        <img class="image coldcard" src="/resources/profile/coldcard.png" />
-        <span>COLDCARD</span>
+      <a href="https://github.com/cryptoadvance/specter-desktop" target="_blank" title="Specter Wallet">
+        <img class="image" src="/resources/profile/specter.png" />
+        <span>Specter</span>
       </a>
       <a href="https://github.com/EdgeApp" target="_blank" title="Edge">
         <img class="image not-rounded" src="/resources/profile/edge.svg" />
@@ -323,13 +323,13 @@
         <img class="image" src="/resources/profile/galoy.svg" />
         <span>Galoy</span>
       </a>
-      <a href="https://github.com/BoltzExchange" target="_blank" title="Boltz">
-        <img class="image" src="/resources/profile/boltz.svg" />
-        <span>Boltz</span>
+      <a href="https://github.com/muun/apollo" target="_blank" title="Muun Wallet">
+        <img class="image" src="/resources/profile/muun.png" />
+        <span>Muun</span>
       </a>
-      <a href="https://github.com/MutinyWallet" target="_blank" title="Mutiny">
-        <img class="image not-rounded" src="/resources/profile/mutiny.svg" />
-        <span>Mutiny</span>
+      <a href="https://github.com/bitcoin-s/bitcoin-s" target="_blank" title="bitcoin-s">
+        <img class="image" src="/resources/profile/bitcoin-s.svg" />
+        <span>bitcoin-s</span>
       </a>
     </div>
   </div>

From c75afe20cd391f552592af7a409034f6166cca45 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Fri, 28 Jun 2024 07:02:12 +0000
Subject: [PATCH 36/77] More acceleration checkout refactoring

---
 frontend/src/app/app-routing.module.ts        |   5 +-
 .../accelerate-checkout.component.html        | 691 +++++++++---------
 .../accelerate-checkout.component.scss        |  17 +
 .../accelerate-checkout.component.ts          |  87 ++-
 .../accelerate-fee-graph.component.html       |  21 -
 .../accelerate-fee-graph.component.scss       | 156 ----
 .../accelerate-fee-graph.component.ts         |  98 ---
 .../accelerate-preview.component.html         | 239 ------
 .../accelerate-preview.component.scss         | 132 ----
 .../accelerate-preview.component.ts           | 250 -------
 .../bitcoin-invoice.component.html            |  42 +-
 .../bitcoin-invoice.component.scss            |   1 +
 .../bitcoin-invoice.component.ts              |   1 +
 .../components/tracker/tracker.component.html |   2 +-
 .../app/components/tracker/tracker.module.ts  |  51 ++
 .../transaction/transaction.component.html    |   3 +-
 .../transaction/transaction.module.ts         |   9 +-
 .../src/app/services/services-api.service.ts  |   5 +-
 18 files changed, 532 insertions(+), 1278 deletions(-)
 delete mode 100644 frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.html
 delete mode 100644 frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.scss
 delete mode 100644 frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.ts
 delete mode 100644 frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
 delete mode 100644 frontend/src/app/components/accelerate-preview/accelerate-preview.component.scss
 delete mode 100644 frontend/src/app/components/accelerate-preview/accelerate-preview.component.ts
 create mode 100644 frontend/src/app/components/tracker/tracker.module.ts

diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
index 4fd1d2013..8e996953d 100644
--- a/frontend/src/app/app-routing.module.ts
+++ b/frontend/src/app/app-routing.module.ts
@@ -146,8 +146,9 @@ let routes: Routes = [
     data: { preload: true },
   },
   {
-    path: 'tracker/:id',
-    component: TrackerComponent,
+    path: 'tracker',
+    data: { networkSpecific: true },
+    loadChildren: () => import('./components/tracker/tracker.module').then(m => m.TrackerModule),
   },
   {
     path: 'wallet',
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 39e659971..b8b9a4283 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -6,327 +6,367 @@
     </div>
   } 
   @else if (step === 'quote') {
-    @if (!simpleMode) {
-      <span id="successAlert" class="m-0 p-0 d-block" style="height: 1px;"></span>
-      <div class="row" *ngIf="showSuccess">
-        <div class="col">
-          <div class="alert alert-success">
-            Transaction has now been <a class="alert-link" routerLink="/services/accelerator/history">submitted</a> to mining pools for acceleration.
+    <span id="successAlert" class="m-0 p-0 d-block" style="height: 1px;"></span>
+    <div class="row" *ngIf="showSuccess">
+      <div class="col">
+        <div class="alert alert-success">
+          Transaction has now been <a class="alert-link" routerLink="/services/accelerator/history">submitted</a> to mining pools for acceleration.
+        </div>
+      </div>
+    </div>
+
+    <span id="mempoolError" class="m-0 p-0 d-block" style="height: 1px;"></span>
+    <div class="row" *ngIf="error">
+      <div class="col">
+        <app-mempool-error [error]="error" [alertClass]="error === 'waitlisted' ? 'alert-mempool' : 'alert-danger'"></app-mempool-error>
+      </div>
+    </div>
+
+    <div class="accelerate-cols">
+      <ng-container *ngIf="!isMobile">
+        <app-accelerate-fee-graph
+          [tx]="tx"
+          [estimate]="estimate"
+          [showEstimate]="isLoggedIn()"
+          [maxRateOptions]="maxRateOptions"
+          [maxRateIndex]="selectFeeRateIndex"
+          (setUserBid)="setUserBid($event)"
+        ></app-accelerate-fee-graph>
+      </ng-container>
+
+      <ng-container *ngIf="estimate else loadingEstimate">
+        <div [class]="{estimateDisabled: error || showSuccess }">
+          <button class="btn btn-sm btn-outline-info float-right" (click)="showDetails = !showDetails">Details</button>
+
+          <div *ngIf="user && !estimate.hasAccess">
+            <div class="alert alert-mempool">You are currently on the waitlist</div>
           </div>
-        </div>
-      </div>
 
-      <span id="mempoolError" class="m-0 p-0 d-block" style="height: 1px;"></span>
-      <div class="row" *ngIf="error">
-        <div class="col">
-          <app-mempool-error [error]="error" [alertClass]="error === 'waitlisted' ? 'alert-mempool' : 'alert-danger'"></app-mempool-error>
-        </div>
-      </div>
-
-      <div class="accelerate-cols">
-        <ng-container *ngIf="!isMobile">
-          <app-accelerate-fee-graph
-            [tx]="tx"
-            [estimate]="estimate"
-            [showEstimate]="isLoggedIn()"
-            [maxRateOptions]="maxRateOptions"
-            [maxRateIndex]="selectFeeRateIndex"
-            (setUserBid)="setUserBid($event)"
-          ></app-accelerate-fee-graph>
-        </ng-container>
-
-        <ng-container *ngIf="estimate else loadingEstimate">
-          <div [class]="{estimateDisabled: error || showSuccess }">
-
-            <div *ngIf="user && !estimate.hasAccess">
-              <div class="alert alert-mempool">You are currently on the waitlist</div>
-            </div>
-
-            @if (showDetails) {
-              <h5 i18n="accelerator.your-transaction">Your transaction</h5>
-              <div class="row">
-                <div class="col">
-                  <small *ngIf="hasAncestors" class="form-text text-muted mb-2">
-                    <ng-container i18n="accelerator.plus-unconfirmed-ancestors">Plus {{ estimate.txSummary.ancestorCount - 1 }} unconfirmed ancestor(s)</ng-container>
-                  </small>
-                  <table class="table table-borderless table-border table-dark table-background table-accelerator">
-                    <tbody>
-                      <tr class="group-first">
-                        <td class="item" i18n="transaction.vsize|Transaction Virtual Size">Virtual size</td>
-                        <td style="text-align: end;" [innerHTML]="'&lrm;' + (estimate.txSummary.effectiveVsize | vbytes: 2)"></td>
-                      </tr>
-                      <tr class="info">
-                        <td class="info" colspan=3>
-                          <i><small i18n="accelerator.transaction-vbytes-size-description">Size in vbytes of this transaction (including unconfirmed ancestors)</small></i>
-                        </td>
-                      </tr>
-                      <tr>
-                        <td class="item" i18n="accelerator.in-band-fees">In-band fees</td>
-                        <td style="text-align: end;">
-                          {{ estimate.txSummary.effectiveFee | number : '1.0-0' }} <span class="symbol" i18n="shared.sats">sats</span>
-                        </td>
-                      </tr>
-                      <tr class="info group-last">
-                        <td class="info" colspan=3>
-                          <i><small i18n="accelerator.fees-already-paid-description">Fees already paid by this transaction (including unconfirmed ancestors)</small></i>
-                        </td>
-                      </tr>
-                    </tbody>
-                  </table>
-                </div>
-              </div>
-              <br>
-            }
-            <h5 *ngIf="estimate?.pools?.length" i18n="accelerator.how-much-faster">How much faster?</h5>
-            <div class="row">
-              <div class="col">
-                <ng-container *ngIf="(etaInfo$ | async) as etaInfo; else loadingEstimate">
-                  <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to <strong>{{ etaInfo.hashratePercentage | number : '1.1-1' }}%</strong> of miners.</small>
-                  <small class="form-text text-muted mb-2" i18n="accelerator.time-estimate-description">This will reduce your expected waiting time until the first confirmation to <strong><app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time></strong></small>
-                </ng-container>
-              </div>
-              <div class="col pie">
-                <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
-              </div>
-            </div>
-            <div class="row">
-              <div class="col">
-                <div class="form-group">
-                  <div class="fee-card">
-                    <div class="d-flex mb-0">
-                      <ng-container *ngFor="let option of maxRateOptions">
-                        <button type="button" class="btn btn-primary flex-grow-1 btn-border btn-sm feerate" [class]="{active: selectFeeRateIndex === option.index}" (click)="setUserBid(option)">
-                          <span class="fee">{{ option.fee + estimate.mempoolBaseFee + estimate.vsizeFee | number }} <span class="symbol" i18n="shared.sats">sats</span></span>
-                          <span class="rate">~<app-fee-rate [fee]="option.rate" rounding="1.0-0"></app-fee-rate></span>
-                        </button>
-                      </ng-container>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-        
-            <h5>Summary</h5>
+          @if (showDetails) {
+            <h5 class="mb-4" i18n="accelerator.your-transaction">Your transaction</h5>
             <div class="row">
               <div class="col">
+                <small *ngIf="hasAncestors" class="form-text text-muted mb-2">
+                  <ng-container i18n="accelerator.plus-unconfirmed-ancestors">Plus {{ estimate.txSummary.ancestorCount - 1 }} unconfirmed ancestor(s)</ng-container>
+                </small>
                 <table class="table table-borderless table-border table-dark table-background table-accelerator">
                   <tbody>
-                    <!-- ESTIMATED FEE -->
-                    <ng-container *ngIf="showDetails">
-                      <tr class="group-first">
-                        <td class="item" i18n="accelerator.next-block-rate">Next block market rate</td>
-                        <td class="amt" style="font-size: 16px">
-                          {{ estimate.targetFeeRate | number : '1.0-0' }}
-                        </td>
-                        <td class="units"><span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></td>
-                      </tr>
-                      <tr class="info">
-                        <td class="info">
-                          <i><small i18n="accelerator.estimated-extra-fee-required">Estimated extra fee required</small></i>
-                        </td>
-                        <td class="amt">
-                          {{ math.max(0, estimate.nextBlockFee - estimate.txSummary.effectiveFee) | number }}
-                        </td>
-                        <td class="units">
-                          <span class="symbol" i18n="shared.sats">sats</span>
-                          <span class="fiat ml-1"><app-fiat [value]="math.max(0, estimate.nextBlockFee - estimate.txSummary.effectiveFee)"></app-fiat></span>
-                        </td>
-                      </tr>
-        
-                      <!-- MEMPOOL BASE FEE -->
-                      <tr>
-                        <td class="item" i18n="accelerator.mempool-accelerator-fees">Mempool Accelerator™ fees</td>
-                      </tr>
-                      <tr class="info" [class.group-last]="!estimate.vsizeFee" [class.dashed-bottom]="!estimate.vsizeFee">
-                        <td class="info">
-                          <i><small i18n="accelerator.service-fee">Accelerator Service Fee</small></i>
-                        </td>
-                        <td class="amt">
-                          +{{ estimate.mempoolBaseFee | number }}
-                        </td>
-                        <td class="units">
-                          <span class="symbol" i18n="shared.sats">sats</span>
-                          <span class="fiat ml-1"><app-fiat [value]="estimate.mempoolBaseFee"></app-fiat></span>
-                        </td>
-                      </tr>
-                      <tr class="info group-last dashed-bottom" *ngIf="estimate.vsizeFee">
-                        <td class="info">
-                          <i><small i18n="accelerator.tx-size-surcharge">Transaction Size Surcharge</small></i>
-                        </td>
-                        <td class="amt">
-                          +{{ estimate.vsizeFee | number }}
-                        </td>
-                        <td class="units">
-                          <span class="symbol" i18n="shared.sats">sats</span>
-                          <span class="fiat ml-1"><app-fiat [value]="estimate.vsizeFee"></app-fiat></span>
-                        </td>
-                      </tr>
-                    </ng-container>
-
-                    
-                    <!-- NEXT BLOCK ESTIMATE -->
-                    <ng-container *ngIf="isLoggedIn()">
-                      <tr class="group-first">
-                        <td class="item">
-                          <b style="background-color: #5E35B1" class="p-1 pl-0" i18n="accelerator.estimated-cost">Estimated acceleration cost</b> ~{{ estimate.targetFeeRate | number : '1.0-0' }} sat/vB
-                        </td>
-                        <td class="amt">
-                          <span style="background-color: #5E35B1" class="p-1 pl-0">
-                            {{ estimate.cost + estimate.mempoolBaseFee + estimate.vsizeFee | number }}
-                          </span>
-                        </td>
-                        <td class="units">
-                          <span class="symbol" i18n="shared.sats">sats</span>
-                          <span class="fiat ml-1"><app-fiat [value]="estimate.cost + estimate.mempoolBaseFee + estimate.vsizeFee"></app-fiat></span>
-                        </td>
-                      </tr>
-                    </ng-container>
-
-                    <!-- MAX COST -->
-                    <ng-container>
-                      <tr class="group-first" [class.group-last]="!isLoggedIn() || estimate.userBalance >= cost">
-                        <td class="item">
-                          @if (isLoggedIn()) {
-                            <b style="background-color: var(--primary);" class="p-1 pl-0" i18n="accelerator.maximum-cost">Maximum acceleration cost</b>
-                          } @else {
-                            <b style="background-color: var(--primary);" class="p-1 pl-0" i18n="accelerator.cost">Acceleration cost</b>
-                          }
-                        </td>
-                        <td class="amt">
-                          <span style="background-color: var(--primary)" class="p-1 pl-0">
-                            {{ cost | number }}
-                          </span>
-                        </td>
-                        <td class="units">
-                          <span class="symbol" i18n="shared.sats">sats</span>
-                          <span class="fiat ml-1">
-                            <app-fiat [value]="cost" [colorClass]="isLoggedIn() && estimate.userBalance < cost ? 'red-color' : 'green-color'"></app-fiat>
-                          </span>
-                        </td>
-                      </tr>
-                    </ng-container>
-        
-                    <!-- USER BALANCE -->
-                    <ng-container *ngIf="isLoggedIn() && estimate.userBalance < cost">
-                      <tr class="group-first group-last dashed-top">
-                        <td class="item" i18n="accelerator.available-balance">Available balance</td>
-                        <td class="amt">
-                          {{ estimate.userBalance | number }}
-                        </td>
-                        <td class="units">
-                          <span class="symbol" i18n="shared.sats">sats</span>
-                          <span class="fiat ml-1">
-                            <app-fiat [value]="estimate.userBalance" [colorClass]="estimate.userBalance < cost ? 'red-color' : 'green-color'"></app-fiat>
-                          </span>
-                        </td>
-                      </tr>
-                    </ng-container>
-
-                    <tr class="group-first group-last" style="border-top: 1px dashed grey">
-                      <td class="item"></td>
-                      <td colspan="2">
-                        <div class="d-flex">
-                          <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" style="width: 200px" (click)="accelerate()">
-                            <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
-                            <span>Accelerate</span>
-                          </button>
-                        </div>
+                    <tr class="group-first">
+                      <td class="item" i18n="transaction.vsize|Transaction Virtual Size">Virtual size</td>
+                      <td style="text-align: end;" [innerHTML]="'&lrm;' + (estimate.txSummary.effectiveVsize | vbytes: 2)"></td>
+                    </tr>
+                    <tr class="info">
+                      <td class="info" colspan=3>
+                        <i><small i18n="accelerator.transaction-vbytes-size-description">Size in vbytes of this transaction (including unconfirmed ancestors)</small></i>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td class="item" i18n="accelerator.in-band-fees">In-band fees</td>
+                      <td style="text-align: end;">
+                        {{ estimate.txSummary.effectiveFee | number : '1.0-0' }} <span class="symbol" i18n="shared.sats">sats</span>
+                      </td>
+                    </tr>
+                    <tr class="info group-last">
+                      <td class="info" colspan=3>
+                        <i><small i18n="accelerator.fees-already-paid-description">Fees already paid by this transaction (including unconfirmed ancestors)</small></i>
                       </td>
                     </tr>
                   </tbody>
                 </table>
               </div>
             </div>
-          </div>
-        </ng-container>
-      </div>
-
-      <ng-template #loadingEstimate>
-        <div class="skeleton-loader"></div>
-        <br>
-      </ng-template>
-    }
-    @else {
-      <!-- Show A/B CTAs -->
-      <div class="row mb-1">
-        <div class="col-sm">
-          <h1 style="font-size: larger;"><ng-content select="[slot='cta-title']"></ng-content><span class="default-slot">Accelerate your Bitcoin transaction?</span></h1>
-        </div>
-      </div>
-
-      <form>
-        <div class="row">
-          <div class="col-md">
-            <div class="form-group form-check mb-2">
-              <input type="radio" [checked]="choosenOption === 'wait'"  class="form-check-input" id="wait" name="accel" (change)="selectedOptionChanged($event)">
-              <label class="form-check-label d-flex flex-column" for="wait">
-                <span class="font-weight-bold">Wait</span>
-                @if (eta.blocks < 7) {
-                  <span style="color: rgb(186, 186, 186); font-size: 14px;">Confirmation expected <app-time kind="within" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time></span>
-                } @else {
-                  <span style="color: rgb(186, 186, 186); font-size: 14px;">
-                    <span>Confirmation expected within several hours</span>
-                  </span>
-                }
-              </label>
+            <br>
+          }
+          <h5 *ngIf="estimate?.pools?.length" i18n="accelerator.how-much-faster">How much faster?</h5>
+          <div class="row">
+            <div class="col">
+              <ng-container *ngIf="(etaInfo$ | async) as etaInfo; else loadingEstimate">
+                <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to <strong>{{ etaInfo.hashratePercentage | number : '1.1-1' }}%</strong> of miners.</small>
+                <small class="form-text text-muted mb-2" i18n="accelerator.time-estimate-description">This will reduce your expected waiting time until the first confirmation to <strong><app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time></strong></small>
+              </ng-container>
+            </div>
+            <div class="col pie">
+              <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
             </div>
           </div>
-          <div class="col-md">
-            <div class="form-group form-check mb-2">
-              <input type="radio" [checked]="choosenOption === 'accel'" class="form-check-input" id="accel" name="accel" (change)="selectedOptionChanged($event)">
-              <label class="form-check-label d-flex flex-column" for="accel">
-                <span class="font-weight-bold">Accelerate</span>
-                <span style="color: rgb(186, 186, 186); font-size: 14px;" *ngIf="(etaInfo$ | async) as etaInfo">Confirmation expected <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time><br>
-                  @if (!calculating) {
-                    <app-fiat [value]="cost"></app-fiat>fee (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
-                  } @else {
-                    <span class="estimating">Calculating cost...</span>
-                  }
+          <div class="row">
+            <div class="col">
+              <div class="form-group">
+                <div class="fee-card">
+                  <div class="d-flex mb-0">
+                    <ng-container *ngFor="let option of maxRateOptions">
+                      <button type="button" class="btn btn-primary flex-grow-1 btn-border btn-sm feerate" [class]="{active: selectFeeRateIndex === option.index}" (click)="setUserBid(option)">
+                        <span class="fee">{{ option.fee + estimate.mempoolBaseFee + estimate.vsizeFee | number }} <span class="symbol" i18n="shared.sats">sats</span></span>
+                        <span class="rate">~<app-fee-rate [fee]="option.rate" rounding="1.0-0"></app-fee-rate></span>
+                      </button>
+                    </ng-container>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <h5>Summary</h5>
+          <div class="row">
+            <div class="col">
+              <table class="table table-borderless table-border table-dark table-background table-accelerator">
+                <tbody>
+                  <!-- ESTIMATED FEE -->
+                  <ng-container *ngIf="showDetails">
+                    <tr class="group-first">
+                      <td class="item" i18n="accelerator.next-block-rate">Next block market rate</td>
+                      <td class="amt" style="font-size: 16px">
+                        {{ estimate.targetFeeRate | number : '1.0-0' }}
+                      </td>
+                      <td class="units"><span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></td>
+                    </tr>
+                    <tr class="info">
+                      <td class="info">
+                        <i><small i18n="accelerator.estimated-extra-fee-required">Estimated extra fee required</small></i>
+                      </td>
+                      <td class="amt">
+                        {{ math.max(0, estimate.nextBlockFee - estimate.txSummary.effectiveFee) | number }}
+                      </td>
+                      <td class="units">
+                        <span class="symbol" i18n="shared.sats">sats</span>
+                        <span class="fiat ml-1"><app-fiat [value]="math.max(0, estimate.nextBlockFee - estimate.txSummary.effectiveFee)"></app-fiat></span>
+                      </td>
+                    </tr>
+
+                    <!-- MEMPOOL BASE FEE -->
+                    <tr>
+                      <td class="item" i18n="accelerator.mempool-accelerator-fees">Mempool Accelerator™ fees</td>
+                    </tr>
+                    <tr class="info" [class.group-last]="!estimate.vsizeFee" [class.dashed-bottom]="!estimate.vsizeFee">
+                      <td class="info">
+                        <i><small i18n="accelerator.service-fee">Accelerator Service Fee</small></i>
+                      </td>
+                      <td class="amt">
+                        +{{ estimate.mempoolBaseFee | number }}
+                      </td>
+                      <td class="units">
+                        <span class="symbol" i18n="shared.sats">sats</span>
+                        <span class="fiat ml-1"><app-fiat [value]="estimate.mempoolBaseFee"></app-fiat></span>
+                      </td>
+                    </tr>
+                    <tr class="info group-last dashed-bottom" *ngIf="estimate.vsizeFee">
+                      <td class="info">
+                        <i><small i18n="accelerator.tx-size-surcharge">Transaction Size Surcharge</small></i>
+                      </td>
+                      <td class="amt">
+                        +{{ estimate.vsizeFee | number }}
+                      </td>
+                      <td class="units">
+                        <span class="symbol" i18n="shared.sats">sats</span>
+                        <span class="fiat ml-1"><app-fiat [value]="estimate.vsizeFee"></app-fiat></span>
+                      </td>
+                    </tr>
+                  </ng-container>
+
+                  <!-- NEXT BLOCK ESTIMATE -->
+                  <ng-container *ngIf="isLoggedIn()">
+                    <tr class="group-first">
+                      <td class="item">
+                        <b style="background-color: #5E35B1" class="p-1 pl-0" i18n="accelerator.estimated-cost">Estimated acceleration cost</b> ~{{ estimate.targetFeeRate | number : '1.0-0' }} sat/vB
+                      </td>
+                      <td class="amt">
+                        <span style="background-color: #5E35B1" class="p-1 pl-0">
+                          {{ estimate.cost + estimate.mempoolBaseFee + estimate.vsizeFee | number }}
+                        </span>
+                      </td>
+                      <td class="units">
+                        <span class="symbol" i18n="shared.sats">sats</span>
+                        <span class="fiat ml-1"><app-fiat [value]="estimate.cost + estimate.mempoolBaseFee + estimate.vsizeFee"></app-fiat></span>
+                      </td>
+                    </tr>
+                  </ng-container>
+
+                  <!-- MAX COST -->
+                  <ng-container>
+                    <tr class="group-first" [class.group-last]="!isLoggedIn() || estimate.userBalance >= cost">
+                      <td class="item">
+                        @if (isLoggedIn()) {
+                          <b style="background-color: var(--primary);" class="p-1 pl-0" i18n="accelerator.maximum-cost">Maximum acceleration cost</b>
+                        } @else {
+                          <b style="background-color: var(--primary);" class="p-1 pl-0" i18n="accelerator.cost">Acceleration cost</b>
+                        }
+                      </td>
+                      <td class="amt">
+                        <span style="background-color: var(--primary)" class="p-1 pl-0">
+                          {{ cost | number }}
+                        </span>
+                      </td>
+                      <td class="units">
+                        <span class="symbol" i18n="shared.sats">sats</span>
+                        <span class="fiat ml-1">
+                          <app-fiat [value]="cost" [colorClass]="isLoggedIn() && estimate.userBalance < cost ? 'red-color' : 'green-color'"></app-fiat>
+                        </span>
+                      </td>
+                    </tr>
+                  </ng-container>
+
+                  <!-- USER BALANCE -->
+                  <ng-container *ngIf="isLoggedIn() && estimate.userBalance < cost">
+                    <tr class="group-first group-last dashed-top">
+                      <td class="item" i18n="accelerator.available-balance">Available balance</td>
+                      <td class="amt">
+                        {{ estimate.userBalance | number }}
+                      </td>
+                      <td class="units">
+                        <span class="symbol" i18n="shared.sats">sats</span>
+                        <span class="fiat ml-1">
+                          <app-fiat [value]="estimate.userBalance" [colorClass]="estimate.userBalance < cost ? 'red-color' : 'green-color'"></app-fiat>
+                        </span>
+                      </td>
+                    </tr>
+                  </ng-container>
+
+                  <tr class="group-first group-last" style="border-top: 1px dashed grey">
+                    <td class="item"></td>
+                    <td colspan="2">
+                      <div class="d-flex">
+                        <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" style="width: 200px" (click)="accelerate()">
+                          <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
+                          <span>Accelerate</span>
+                        </button>
+                      </div>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </div>
+      </ng-container>
+    </div>
+
+    <ng-template #loadingEstimate>
+      <div class="skeleton-loader"></div>
+      <br>
+    </ng-template>
+  }
+  @else if (step === 'summary') {
+    <!-- Show A/B CTAs -->
+    <div class="row mb-1">
+      <div class="col-sm">
+        <h1 style="font-size: larger;"><ng-content select="[slot='cta-title']"></ng-content><span class="default-slot">Accelerate your Bitcoin transaction?</span></h1>
+      </div>
+    </div>
+
+    <form>
+      <div class="row">
+        <div class="col-md">
+          <div class="form-group form-check mb-2">
+            <input type="radio" [checked]="choosenOption === 'wait'"  class="form-check-input" id="wait" name="accel" (change)="selectedOptionChanged($event)">
+            <label class="form-check-label d-flex flex-column" for="wait">
+              <span class="font-weight-bold">Wait</span>
+              @if (eta.blocks < 7) {
+                <span class="checkout-text">Confirmation expected <app-time kind="within" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time></span>
+              } @else {
+                <span class="checkout-text">
+                  <span>Confirmation expected within several hours</span>
                 </span>
-              </label>
-            </div>
-          </div>
-          <div class="col-md pie d-none d-lg-flex" *ngIf="estimate && !forceMobile">
-            <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description" *ngIf="(etaInfo$ | async) as etaInfo">Your transaction will be prioritized by up to {{ etaInfo.hashratePercentage | number : '1.1-1' }}% of miners.</small>
-            <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
+              }
+            </label>
           </div>
         </div>
-        <div class="row mt-2 mb-2" [style]="(choosenOption !== 'accel' || calculating) ? 'opacity: 0.25; pointer-events: none' : ''">
-          <div class="col-sm d-flex flex-row justify-content-center">
-            <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" style="width: 200px" (click)="enableCheckoutPage()">
-              <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
-              <span>Accelerate</span>
-            </button>
+        <div class="col-md">
+          <div class="form-group form-check mb-2" *ngIf="estimate">
+            <input type="radio" [checked]="choosenOption === 'accel'" class="form-check-input" id="accel" name="accel" (change)="selectedOptionChanged($event)">
+            <label class="form-check-label d-flex flex-column" for="accel">
+              <span><b>Accelerate</b> to ~{{ ((userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB <button *ngIf="advancedEnabled && isLoggedIn()" class="btn btn-sm btn-accelerate btn-small-height ml-3" i18n="accelerator.customize" (click)="moveToStep('quote')">customize</button></span>
+              <span class="checkout-text" *ngIf="(etaInfo$ | async) as etaInfo">Confirmation expected <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time><br>
+                @if (!calculating) {
+                  <app-fiat [value]="cost"></app-fiat>fee (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
+                } @else {
+                  <span class="estimating">Calculating cost...</span>
+                }
+              </span>
+            </label>
           </div>
         </div>
-      </form>
-    }
-  } @else if (step === 'paymentMethod') {
-    <div class="row text-center">
-      <div class="col-sm">
-        <h1 class="mb-2" style="font-size: larger;"><ng-content select="[slot='payment-title']"></ng-content><span class="default-slot">Select your payment method</span></h1>
+        <div class="col-md pie d-none d-lg-flex" *ngIf="estimate && !forceMobile">
+          <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description" *ngIf="(etaInfo$ | async) as etaInfo">Your transaction will be prioritized by up to {{ etaInfo.hashratePercentage | number : '1.1-1' }}% of miners.</small>
+          <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
+        </div>
       </div>
-    </div>
-    <div class="row text-center">
-      <div class="col-sm">
-        <app-fiat [value]="cost"></app-fiat> (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
+      <div class="row mt-2 mb-2" [style]="(choosenOption !== 'accel' || calculating) ? 'opacity: 0.25; pointer-events: none' : ''">
+        <div class="col-sm d-flex flex-row justify-content-center">
+          <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" style="width: 200px" (click)="accelerate()">
+            <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
+            <span>Accelerate</span>
+          </button>
+        </div>
       </div>
-    </div>
-    <div class="pt-2 d-flex justify-content-center position-relative">
-      @if (cashappEnabled) {
-        <img class="paymentMethod mx-2" src="/resources/cash-app.svg" height=55 (click)="selectPaymentMethod('cashapp')">
-      }
-      <img class="paymentMethod mx-2" src="/resources/btcpay.svg" height=55 (click)="selectPaymentMethod('btcpay')">
-    </div>
-
-    <hr>
-    <div class="row mt-2 mb-2 text-center">
-      <div class="col-sm d-flex flex-column">
-        <button type="button" class="mt-1 btn btn-secondary btn-sm rounded-pill align-self-center" style="width: 200px" (click)="step = 'quote'">Go Back</button>
-      </div>
-    </div>
-
+    </form>
   } @else if (step === 'checkout') {
+    <div class="row">
+      <div class="col-md">
+        <div class="d-flex flex-column" *ngIf="estimate">
+          <span><b>Accelerate</b> to ~{{ ((userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB <button *ngIf="advancedEnabled && isLoggedIn()" class="btn btn-sm btn-accelerate btn-small-height ml-3" i18n="accelerator.customize" (click)="moveToStep('quote')">customize</button></span>
+          <span class="checkout-text">
+            @if (!calculating) {
+              For an additional <app-fiat [value]="cost"></app-fiat> (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
+            } @else {
+              <span class="estimating">Calculating cost...</span>
+            }
+          </span>
+          <span class="checkout-text" *ngIf="(etaInfo$ | async) as etaInfo">
+            Reducing expected confirmation time to <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time>
+          </span>
+        </div>
+      </div>
+      <div class="col-md pie d-none d-md-flex" *ngIf="estimate && !forceMobile">
+        <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description" *ngIf="(etaInfo$ | async) as etaInfo">Your transaction will be prioritized by up to {{ etaInfo.hashratePercentage | number : '1.1-1' }}% of miners.</small>
+        <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
+      </div>
+    </div>
+    @if (canPayWithBalance || !(canPayWithBitcoin || canPayWithCashapp)) {
+      <div class="d-flex justify-content-center">
+        <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" [class.estimateDisabled]="!canPayWithBalance" style="width: 200px" (click)="accelerate()">
+          <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
+          <span>Accelerate</span>
+        </button>
+      </div>
+    } @else {
+      <div class="payment-area mt-2 p-2">
+        <div class="row text-center justify-content-center mx-2" style="font-size: 14px;">
+          <p>Payment to mempool.space for acceleration of txid <a [routerLink]="'/tx/' + tx.txid" target="_blank"> {{ tx.txid.substr(0, 10) }}..{{ tx.txid.substr(-10) }}</a></p>
+        </div>
+        <div class="row">
+          @if (canPayWithBitcoin) {
+            <div class="col-sm text-center d-flex flex-column justify-content-center align-items-center">
+              @if (invoice) {
+                <p>Pay <span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span></p>
+                <app-bitcoin-invoice style="width: 100%;" [invoiceId]="invoice.btcpayInvoiceId" [minimal]="true" (completed)="closeModal(2000)"></app-bitcoin-invoice>
+              } @else {
+                <span>Loading invoice...</span>
+                <div class="ml-2 spinner-border text-light" style="width: 25px; height: 25px"></div>
+              }
+            </div>
+            @if (canPayWithCashapp) {
+              <div class="col-sm text-center flex-grow-0  d-flex flex-column justify-content-center align-items-center">
+                <p class="text-nowrap">&mdash;<span i18n="or">OR</span>&mdash;</p>
+              </div>
+            }
+          }
+          @if (cashappEnabled) {
+            <div class="col-sm text-center d-flex flex-column justify-content-center align-items-center">
+              <p>Pay <app-fiat [value]="cost"></app-fiat> with</p>
+              <img class="paymentMethod mx-2" src="/resources/cash-app.svg" height=55 (click)="moveToStep('cashapp')">
+            </div>
+          }
+        </div>
+      </div>
+    }
+    @if (showSummary) {
+      <div class="row mt-2 mb-2 text-center">
+        <div class="col-sm d-flex flex-column">
+          <button type="button" class="mt-1 btn btn-secondary btn-sm rounded-pill align-self-center" style="width: 200px" (click)="moveToStep('summary')">Go Back</button>
+        </div>
+      </div>
+    }
+  } @else if (step === 'cashapp') {
     <!-- Show checkout page -->
     <div class="row mb-md-1 text-center">
       <div class="col-sm" id="confirm-payment-title">
@@ -342,44 +382,40 @@
       </div>
     </div>
 
-    @if (paymentMethod === 'cashapp') {
-      @if (!loadingCashapp) {
-        <div class="row text-center mt-1">
-          <div class="col-sm">
-            <div class="form-group w-100">
-              <span><u><strong>Total additional cost</strong></u><br>
-                <span style="font-size: 16px" class="d-block mt-2">
-                  Pay
-                  <strong><app-fiat [value]="cost"></app-fiat></strong>
-                  with
-                </span>
-              </span>
-            </div>
-          </div>
-        </div>
-      }
-
+    @if (!loadingCashapp) {
       <div class="row text-center mt-1">
         <div class="col-sm">
           <div class="form-group w-100">
-            <div id="cash-app-pay" class="d-inline-block" [style]="loadingCashapp ? 'opacity: 0; width: 0px; height: 0px; pointer-events: none;' : ''"></div>
-            @if (loadingCashapp) {
-            <div display="d-flex flex-row justify-content-center">
-              <span>Loading payment method...</span>
-              <div class="ml-2 spinner-border text-light" style="width: 25px; height: 25px"></div>
-            </div>
-            }
+            <span><u><strong>Total additional cost</strong></u><br>
+              <span style="font-size: 16px" class="d-block mt-2">
+                Pay
+                <strong><app-fiat [value]="cost"></app-fiat></strong>
+                with
+              </span>
+            </span>
           </div>
         </div>
       </div>
-    } @else if (paymentMethod === 'btcpay' && invoice?.btcpayInvoiceId) {
-      <app-bitcoin-invoice [invoiceId]="invoice.btcpayInvoiceId" (completed)="closeModal(2000)"></app-bitcoin-invoice>
     }
 
+    <div class="row text-center mt-1">
+      <div class="col-sm">
+        <div class="form-group w-100">
+          <div id="cash-app-pay" class="d-inline-block" [style]="loadingCashapp ? 'opacity: 0; width: 0px; height: 0px; pointer-events: none;' : ''"></div>
+          @if (loadingCashapp) {
+          <div display="d-flex flex-row justify-content-center">
+            <span>Loading payment method...</span>
+            <div class="ml-2 spinner-border text-light" style="width: 25px; height: 25px"></div>
+          </div>
+          }
+        </div>
+      </div>
+    </div>
+
     <hr>
     <div class="row mt-2 mb-2 text-center">
       <div class="col-sm d-flex flex-column">
-        <button type="button" class="mt-1 btn btn-secondary btn-sm rounded-pill align-self-center" style="width: 200px" (click)="step = 'paymentMethod'">Go Back</button>
+        <button type="button" class="mt-1 btn btn-secondary btn-sm rounded-pill align-self-center" style="width: 200px" (click)="moveToStep('checkout')">Go Back</button>
       </div>
     </div>
   }
@@ -404,5 +440,4 @@
       </div>
     </div>
   }
-  
-</div>
+</div>
\ No newline at end of file
diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
index e03f223ca..1fdb51086 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
@@ -141,6 +141,10 @@
   margin-top: 1em;
 }
 
+.payment-area {
+  background: var(--bg);
+}
+
 .col.pie {
   flex-grow: 0;
   padding: 0 1em;
@@ -154,4 +158,17 @@
 
 .table-background {
   background-color: var(--bg);
+}
+
+.checkout-text {
+  color: rgb(186, 186, 186);
+  font-size: 14px;
+}
+
+.btn-accelerate {
+  background-color: var(--tertiary);
+}
+
+.btn-small-height {
+	line-height: 1;
 }
\ 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 2a7f0d067..ee4e84518 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -41,6 +41,8 @@ export const MIN_BID_RATIO = 1;
 export const DEFAULT_BID_RATIO = 2;
 export const MAX_BID_RATIO = 4;
 
+type CheckoutStep = 'quote' | 'summary' | 'checkout' | 'cashapp' | 'processing';
+
 @Component({
   selector: 'app-accelerate-checkout',
   templateUrl: './accelerate-checkout.component.html',
@@ -51,9 +53,9 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   @Input() miningStats: MiningStats;
   @Input() eta: ETA;
   @Input() scrollEvent: boolean;
-  @Input() cashappEnabled: boolean;
-  @Input() showDetails: boolean;
+  @Input() cashappEnabled: boolean = true;
   @Input() advancedEnabled: boolean = false;
+  @Input() forceSummary: boolean = false;
   @Input() forceMobile: boolean = false;
   @Output() changeMode = new EventEmitter<boolean>();
   @Output() close = new EventEmitter<null>();
@@ -64,8 +66,9 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   math = Math;
   isMobile: boolean = window.innerWidth <= 767.98;
 
-  step: 'quote' | 'paymentMethod' | 'checkout' | 'processing' = 'quote';
+  private _step: CheckoutStep = 'summary';
   simpleMode: boolean = true;
+  showDetails: boolean = false;
   paymentMethod: 'cashapp' | 'btcpay';
 
   user: any = undefined;
@@ -117,9 +120,13 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
     this.user = this.storageService.getAuth()?.user ?? null;
     const urlParams = new URLSearchParams(window.location.search);
     if (urlParams.get('cash_request_id')) { // Redirected from cashapp
+      this.moveToStep('processing');
       this.insertSquare();
       this.setupSquare();
-      this.step = 'processing';
+    } else if (this.isLoggedIn() || this.forceSummary) {
+      this.moveToStep('summary');
+    } else {
+      this.moveToStep('checkout');
     }
 
     this.servicesApiService.setupSquare$().subscribe(ids => {
@@ -127,9 +134,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
         appId: ids.squareAppId,
         locationId: ids.squareLocationId
       };
-      if (this.step === 'quote') {
-        this.fetchEstimate();
-      }
     });
   }
 
@@ -145,6 +149,21 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
     }
   }
 
+  moveToStep(step: CheckoutStep) {
+    this._step = step;
+    if (!this.estimate && ['quote', 'summary', 'checkout'].includes(this.step)) {
+      this.fetchEstimate();
+    }
+    if (this._step === 'checkout' && this.canPayWithBitcoin) {
+      this.loadingBtcpayInvoice = true;
+      this.requestBTCPayInvoice();
+    } else if (this._step === 'cashapp' && this.cashappEnabled) {
+      this.loadingCashapp = true;
+      this.insertSquare();
+      this.setupSquare();
+    }
+  }
+
   /**
   * Scroll to element id with or without setTimeout
   */
@@ -214,6 +233,11 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
           }
           this.cost = this.userBid + this.estimate.mempoolBaseFee + this.estimate.vsizeFee;
 
+          if (this.canPayWithBitcoin && !this.loadingBtcpayInvoice) {
+            this.loadingBtcpayInvoice = true;
+            this.requestBTCPayInvoice();
+          }
+
           this.calculating = false;
           this.cd.markForCheck();
         }
@@ -244,9 +268,13 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
    */
   accelerate(): void {
     if (this.isLoggedIn()) {
-      this.accelerateWithMempoolAccount();
+      if (this.step !== 'summary') {
+        this.moveToStep('summary');
+      } else {
+        this.accelerateWithMempoolAccount();
+      }
     } else {
-      this.step = 'paymentMethod';
+      this.moveToStep('checkout');
     }
   }
 
@@ -356,7 +384,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
           button: { shape: 'semiround', size: 'small', theme: 'light'}
         });
 
-        if (this.step === 'checkout') {
+        if (this.step === 'cashapp') {
           await this.cashAppPay.attach(`#cash-app-pay`, { theme: 'light', size: 'small', shape: 'semiround' })
         }
         this.loadingCashapp = false;
@@ -410,7 +438,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
    * BTCPay
    */
   async requestBTCPayInvoice() {
-    this.servicesApiService.generateBTCPayAcceleratorInvoice$(this.tx.txid).subscribe({
+    this.servicesApiService.generateBTCPayAcceleratorInvoice$(this.tx.txid, this.userBid).subscribe({
       next: (response) => {
         this.invoice = response;
         this.cd.markForCheck();
@@ -425,27 +453,12 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   /**
    * UI events
    */
-  enableCheckoutPage() {
-    this.step = 'paymentMethod';
-  }
-  selectPaymentMethod(paymentMethod: 'cashapp' | 'btcpay') {
-    this.step = 'checkout';
-    this.paymentMethod = paymentMethod;
-    if (paymentMethod === 'cashapp') {
-      this.loadingCashapp = true;
-      this.insertSquare();
-      this.setupSquare();
-    } else if (paymentMethod === 'btcpay') {
-      this.loadingBtcpayInvoice = true;
-      this.requestBTCPayInvoice();
-    }
-  }
   selectedOptionChanged(event) {
     this.choosenOption = event.target.id;
   }
   closeModal(timeout: number = 0): void {
     setTimeout(() => {
-      this.step = 'processing';
+      this._step = 'processing';
       this.cd.markForCheck();
       this.close.emit();
     }, timeout);
@@ -456,6 +469,26 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
     return auth !== null;
   }
 
+  get step() {
+    return this._step;
+  }
+
+  get canPayWithBitcoin() {
+    return this.estimate?.availablePaymentMethods?.includes('bitcoin');
+  }
+
+  get canPayWithCashapp() {
+    return this.cashappEnabled && this.estimate?.availablePaymentMethods?.includes('bitcoin');
+  }
+
+  get canPayWithBalance() {
+    return this.isLoggedIn() && this.estimate?.availablePaymentMethods?.includes('balance');
+  }
+
+  get showSummary() {
+    return this.canPayWithBalance || this.forceSummary;
+  }
+
   @HostListener('window:resize', ['$event'])
   onResize(): void {
     this.isMobile = window.innerWidth <= 767.98;
diff --git a/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.html b/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.html
deleted file mode 100644
index fe0718ecc..000000000
--- a/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="fee-graph" *ngIf="tx && estimate">
-  <div class="column">
-    <ng-container *ngFor="let bar of bars">
-      <div class="bar {{ bar.class }}" [class.active]="bar.active" [style]="bar.style" (click)="onClick($event, bar);">
-        <div class="fill"></div>
-        <div class="line">
-          <p class="fee-rate">
-            <span class="label">{{ bar.label }}</span>
-            <span class="rate">
-              <app-fee-rate [fee]="bar.rate"></app-fee-rate>
-            </span>
-          </p>
-        </div>
-        <div class="spacer"></div>
-        <span class="fee">{{ bar.class === 'tx' ? '' : '+' }} {{ bar.fee | number }} <span class="symbol" i18n="shared.sat|sat">sat</span></span>
-        <div class="spacer"></div>
-        <div class="spacer"></div>
-      </div>
-    </ng-container>
-  </div>
-</div>
diff --git a/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.scss b/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.scss
deleted file mode 100644
index 919fdec4a..000000000
--- a/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.scss
+++ /dev/null
@@ -1,156 +0,0 @@
-.fee-graph {
-  height: 100%;
-  min-width: 120px;
-  width: 120px;
-  margin-left: 4em;
-  margin-right: 1.5em;
-
-  .column {
-    width: 100%;
-    height: 100%;
-    position: relative;
-    background: var(--stat-box-bg);
-
-    .bar {
-      position: absolute;
-      bottom: 0;
-      left: 0;
-      right: 0;
-      min-height: 30px;
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
-
-      .fill {
-        position: absolute;
-        left: 0;
-        right: 0;
-        top: 0;
-        bottom: 0;
-        opacity: 0.75;
-        pointer-events: none;
-      }
-
-      .fee {
-        font-size: 0.9em;
-        opacity: 0;
-        pointer-events: none;
-      }
-
-      .spacer {
-        width: 100%;
-        height: 1px;
-        flex-grow: 1;
-        pointer-events: none;
-      }
-
-      .line {
-        position: absolute;
-        right: 0;
-        top: 0;
-        left: -4.5em;
-        border-top: dashed white 1.5px;
-
-        .fee-rate {
-          width: 100%;
-          position: absolute;
-          left: 0;
-          right: 0.2em;
-          font-size: 0.8em;
-          display: flex;
-          flex-direction: row-reverse;
-          justify-content: space-between;
-          margin: 0;
-
-          .label {
-            margin-right: .2em;
-          }
-
-          .rate .symbol {
-            color: white;
-          }
-        }
-      }
-
-      &.tx {
-        .fill {
-          background: var(--green);
-        }
-        .line {
-          .fee-rate {
-            top: 0;
-          }
-        }
-        .fee {
-          position: absolute;
-          opacity: 1;
-          z-index: 11;
-        }
-      }
-
-      &.target {
-        .fill {
-          background: var(--tertiary);
-        }
-        .fee {
-          position: absolute;
-          opacity: 1;
-          z-index: 11;
-        }
-        .line .fee-rate {
-          bottom: 2px;
-        }
-      }
-
-      &.max {
-        cursor: pointer;
-        .line .fee-rate {
-          .label {
-            opacity: 0;
-          }
-          bottom: 2px;
-        }
-        &.active, &:hover {
-          .fill {
-            background: var(--primary);
-          }
-          .line {
-            .fee-rate .label {
-              opacity: 1;
-            }
-          }
-        }
-      }
-
-      &:hover {
-        .fill {
-          z-index: 10;
-        }
-        .line {
-          z-index: 11;
-        }
-        .fee {
-          opacity: 1;
-          z-index: 12;
-        }
-      }
-    }
-
-    &:hover > .bar:not(:hover) {
-      &.target, &.max {
-        .fee {
-          opacity: 0;
-        }
-        .line .fee-rate .label {
-          opacity: 0;
-        }
-      }
-      &.max {
-        .fill {
-          background: none;
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.ts b/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.ts
deleted file mode 100644
index ebfa019a1..000000000
--- a/frontend/src/app/components/accelerate-preview/accelerate-fee-graph.component.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import { Component, OnInit, Input, Output, OnChanges, EventEmitter, HostListener, Inject, LOCALE_ID } from '@angular/core';
-import { StateService } from '../../services/state.service';
-import { Outspend, Transaction, Vin, Vout } from '../../interfaces/electrs.interface';
-import { Router } from '@angular/router';
-import { ReplaySubject, merge, Subscription, of } from 'rxjs';
-import { tap, switchMap } from 'rxjs/operators';
-import { ApiService } from '../../services/api.service';
-import { AccelerationEstimate, RateOption } from './accelerate-preview.component';
-
-interface GraphBar {
-  rate: number;
-  style: any;
-  class: 'tx' | 'target' | 'max';
-  label: string;
-  active?: boolean;
-  rateIndex?: number;
-  fee?: number;
-}
-
-@Component({
-  selector: 'app-accelerate-fee-graph',
-  templateUrl: './accelerate-fee-graph.component.html',
-  styleUrls: ['./accelerate-fee-graph.component.scss'],
-})
-export class AccelerateFeeGraphComponent implements OnInit, OnChanges {
-  @Input() tx: Transaction;
-  @Input() estimate: AccelerationEstimate;
-  @Input() maxRateOptions: RateOption[] = [];
-  @Input() maxRateIndex: number = 0;
-  @Output() setUserBid = new EventEmitter<{ fee: number, index: number }>();
-
-  bars: GraphBar[] = [];
-  tooltipPosition = { x: 0, y: 0 };
-
-  ngOnInit(): void {
-    this.initGraph();
-  }
-
-  ngOnChanges(): void {
-    this.initGraph();
-  }
-
-  initGraph(): void {
-    if (!this.tx || !this.estimate) {
-      return;
-    }
-    const maxRate = Math.max(...this.maxRateOptions.map(option => option.rate));
-    const baseRate = this.estimate.txSummary.effectiveFee / this.estimate.txSummary.effectiveVsize;
-    const baseHeight = baseRate / maxRate;
-    const bars: GraphBar[] = this.maxRateOptions.slice().reverse().map(option => {
-      return {
-        rate: option.rate,
-        style: this.getStyle(option.rate, maxRate, baseHeight),
-        class: 'max',
-        label: $localize`maximum`,
-        active: option.index === this.maxRateIndex,
-        rateIndex: option.index,
-        fee: option.fee,
-      }
-    });
-    if (this.estimate.nextBlockFee > this.estimate.txSummary.effectiveFee) {
-      bars.push({
-        rate: this.estimate.targetFeeRate,
-        style: this.getStyle(this.estimate.targetFeeRate, maxRate, baseHeight),
-        class: 'target',
-        label: $localize`:@@bdf0e930eb22431140a2eaeacd809cc5f8ebd38c:Next Block`.toLowerCase(),
-        fee: this.estimate.nextBlockFee - this.estimate.txSummary.effectiveFee
-      });
-    }
-    bars.push({
-      rate: baseRate,
-      style: this.getStyle(baseRate, maxRate, 0),
-      class: 'tx',
-      label: '',
-      fee: this.estimate.txSummary.effectiveFee,
-    });
-    this.bars = bars;
-  }
-
-  getStyle(rate, maxRate, base) {
-    const top = (rate / maxRate);
-    return {
-      height: `${(top - base) * 100}%`,
-      bottom: base ? `${base * 100}%` : '0',
-    }
-  }
-
-  onClick(event, bar): void {
-    if (bar.rateIndex != null) {
-      this.setUserBid.emit({ fee: bar.fee, index: bar.rateIndex });
-    }
-  }
-
-  @HostListener('pointermove', ['$event'])
-  onPointerMove(event) {
-    this.tooltipPosition = { x: event.offsetX, y: event.offsetY };
-  }
-}
diff --git a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
deleted file mode 100644
index 92dc8d0f8..000000000
--- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html
+++ /dev/null
@@ -1,239 +0,0 @@
-<span id="successAlert" class="m-0 p-0 d-block" style="height: 1px;"></span>
-<div class="row" *ngIf="showSuccess">
-  <div class="col">
-    <div class="alert alert-success">
-      Transaction has now been <a class="alert-link" routerLink="/services/accelerator/history">submitted</a> to mining pools for acceleration.
-    </div>
-  </div>
-</div>
-
-<span id="mempoolError" class="m-0 p-0 d-block" style="height: 1px;"></span>
-<div class="row" *ngIf="error">
-  <div class="col">
-    <app-mempool-error [error]="error" [alertClass]="error === 'waitlisted' ? 'alert-mempool' : 'alert-danger'"></app-mempool-error>
-  </div>
-</div>
-
-<div class="accelerate-cols">
-  <ng-container *ngIf="!isMobile">
-    <app-accelerate-fee-graph
-      [tx]="tx"
-      [estimate]="estimate"
-      [maxRateOptions]="maxRateOptions"
-      [maxRateIndex]="selectFeeRateIndex"
-      (setUserBid)="setUserBid($event)"
-    ></app-accelerate-fee-graph>
-  </ng-container>
-
-  <ng-container *ngIf="estimate else loadingEstimate">
-    <div [class]="{estimateDisabled: error || showSuccess }">
-
-      <div *ngIf="user && !estimate.hasAccess">
-        <div class="alert alert-mempool">You are currently on the waitlist</div>
-      </div>
-
-      <ng-template [ngIf]="showDetails">
-        <h5 i18n="accelerator.your-transaction">Your transaction</h5>
-        <div class="row">
-          <div class="col">
-            <small *ngIf="hasAncestors" class="form-text text-muted mb-2">
-              <ng-container i18n="accelerator.plus-unconfirmed-ancestors">Plus {{ estimate.txSummary.ancestorCount - 1 }} unconfirmed ancestor(s)</ng-container>
-            </small>
-            <table class="table table-borderless table-border table-dark table-background table-accelerator">
-              <tbody>
-                <tr class="group-first">
-                  <td class="item" i18n="transaction.vsize|Transaction Virtual Size">Virtual size</td>
-                  <td style="text-align: end;" [innerHTML]="'&lrm;' + (estimate.txSummary.effectiveVsize | vbytes: 2)"></td>
-                </tr>
-                <tr class="info">
-                  <td class="info" colspan=3>
-                    <i><small i18n="accelerator.transaction-vbytes-size-description">Size in vbytes of this transaction (including unconfirmed ancestors)</small></i>
-                  </td>
-                </tr>
-                <tr>
-                  <td class="item" i18n="accelerator.in-band-fees">In-band fees</td>
-                  <td style="text-align: end;">
-                    {{ estimate.txSummary.effectiveFee | number : '1.0-0' }} <span class="symbol" i18n="shared.sats">sats</span>
-                  </td>
-                </tr>
-                <tr class="info group-last">
-                  <td class="info" colspan=3>
-                    <i><small i18n="accelerator.fees-already-paid-description">Fees already paid by this transaction (including unconfirmed ancestors)</small></i>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </div>
-        <br>
-      </ng-template>
-      <h5 *ngIf="estimate?.pools?.length" i18n="accelerator.how-much-faster">How much faster?</h5>
-      <div class="row">
-        <div class="col">
-          <ng-container *ngIf="(etaInfo$ | async) as etaInfo; else loadingEstimate">
-            <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to <strong>{{ etaInfo.hashratePercentage | number : '1.1-1' }}%</strong> of miners.</small>
-            <small class="form-text text-muted mb-2" i18n="accelerator.time-estimate-description">This will reduce your expected waiting time until the first confirmation to <strong><app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time></strong></small>
-          </ng-container>
-        </div>
-        <div class="col pie">
-          <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="col">
-          <div class="form-group">
-            <div class="fee-card">
-              <div class="d-flex mb-0">
-                <ng-container *ngFor="let option of maxRateOptions">
-                  <button type="button" class="btn btn-primary flex-grow-1 btn-border btn-sm feerate" [class]="{active: selectFeeRateIndex === option.index}" (click)="setUserBid(option)">
-                    <span class="fee">{{ option.fee + estimate.mempoolBaseFee + estimate.vsizeFee | number }} <span class="symbol" i18n="shared.sats">sats</span></span>
-                    <span class="rate">~<app-fee-rate [fee]="option.rate" rounding="1.0-0"></app-fee-rate></span>
-                  </button>
-                </ng-container>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-  
-      <h5>Summary</h5>
-      <div class="row">
-        <div class="col">
-          <table class="table table-borderless table-border table-dark table-background table-accelerator">
-            <tbody>
-              <!-- ESTIMATED FEE -->
-              <ng-template [ngIf]="showDetails">
-                <tr class="group-first">
-                  <td class="item" i18n="accelerator.next-block-rate">Next block market rate</td>
-                  <td class="amt" style="font-size: 16px">
-                    {{ estimate.targetFeeRate | number : '1.0-0' }}
-                  </td>
-                  <td class="units"><span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></td>
-                </tr>
-                <tr class="info">
-                  <td class="info">
-                    <i><small i18n="accelerator.estimated-extra-fee-required">Estimated extra fee required</small></i>
-                  </td>
-                  <td class="amt">
-                    {{ math.max(0, estimate.nextBlockFee - estimate.txSummary.effectiveFee) | number }}
-                  </td>
-                  <td class="units">
-                    <span class="symbol" i18n="shared.sats">sats</span>
-                    <span class="fiat ml-1"><app-fiat [value]="math.max(0, estimate.nextBlockFee - estimate.txSummary.effectiveFee)"></app-fiat></span>
-                  </td>
-                </tr>
-                
-                <!-- MEMPOOL BASE FEE -->
-                <tr>
-                  <td class="item" i18n="accelerator.mempool-accelerator-fees">Mempool Accelerator™ fees</td>
-                </tr>
-                <tr class="info" [class.group-last]="!estimate.vsizeFee" [class.dashed-bottom]="!estimate.vsizeFee">
-                  <td class="info">
-                    <i><small i18n="accelerator.service-fee">Accelerator Service Fee</small></i>
-                  </td>
-                  <td class="amt">
-                    +{{ estimate.mempoolBaseFee | number }}
-                  </td>
-                  <td class="units">
-                    <span class="symbol" i18n="shared.sats">sats</span>
-                    <span class="fiat ml-1"><app-fiat [value]="estimate.mempoolBaseFee"></app-fiat></span>
-                  </td>
-                </tr>
-              <tr class="info group-last dashed-bottom" *ngIf="estimate.vsizeFee">
-                <td class="info">
-                  <i><small i18n="accelerator.tx-size-surcharge">Transaction Size Surcharge</small></i>
-                </td>
-                <td class="amt">
-                  +{{ estimate.vsizeFee | number }}
-                </td>
-                <td class="units">
-                  <span class="symbol" i18n="shared.sats">sats</span>
-                  <span class="fiat ml-1"><app-fiat [value]="estimate.vsizeFee"></app-fiat></span>
-                </td>
-              </tr>
-            </ng-template>
-              
-              <!-- NEXT BLOCK ESTIMATE -->
-              <ng-container>
-                <tr class="group-first">
-                  <td class="item">
-                    <b style="background-color: #5E35B1" class="p-1 pl-0" i18n="accelerator.estimated-cost">Estimated acceleration cost</b> ~{{ estimate.targetFeeRate | number : '1.0-0' }} sat/vB
-                  </td>
-                  <td class="amt">
-                    <span style="background-color: #5E35B1" class="p-1 pl-0">
-                      {{ estimate.cost + estimate.mempoolBaseFee + estimate.vsizeFee | number }}
-                    </span>
-                  </td>
-                  <td class="units">
-                    <span class="symbol" i18n="shared.sats">sats</span>
-                    <span class="fiat ml-1"><app-fiat [value]="estimate.cost + estimate.mempoolBaseFee + estimate.vsizeFee"></app-fiat></span>
-                  </td>
-                </tr>
-              </ng-container>
-
-              <!-- MAX COST -->
-              <ng-container>
-                <tr class="group-first" [class.group-last]="!isLoggedIn() || estimate.userBalance >= maxCost">
-                  <td class="item">
-                    <b style="background-color: var(--primary);" class="p-1 pl-0" i18n="accelerator.maximum-cost">Maximum acceleration cost</b> 
-                  </td>
-                  <td class="amt">
-                    <span style="background-color: var(--primary)" class="p-1 pl-0">
-                      {{ maxCost | number }}
-                    </span>
-                  </td>
-                  <td class="units">
-                    <span class="symbol" i18n="shared.sats">sats</span>
-                    <span class="fiat ml-1">
-                      <app-fiat [value]="maxCost" [colorClass]="isLoggedIn() && estimate.userBalance < maxCost ? 'red-color' : 'green-color'"></app-fiat>
-                    </span>
-                  </td>
-                </tr>
-              </ng-container>
-  
-              <!-- USER BALANCE -->
-              <ng-container *ngIf="isLoggedIn() && estimate.userBalance < maxCost">
-                <tr class="group-first group-last dashed-top">
-                  <td class="item" i18n="accelerator.available-balance">Available balance</td>
-                  <td class="amt">
-                    {{ estimate.userBalance | number }}
-                  </td>
-                  <td class="units">
-                    <span class="symbol" i18n="shared.sats">sats</span>
-                    <span class="fiat ml-1">
-                      <app-fiat [value]="estimate.userBalance" [colorClass]="estimate.userBalance < maxCost ? 'red-color' : 'green-color'"></app-fiat>
-                    </span>
-                  </td>
-                </tr>
-              </ng-container>
-              <ng-container *ngIf="user && estimate?.hasAccess || !isLoggedIn()">
-                <tr class="group-first group-last" style="border-top: 1px dashed grey">
-                  <td class="item"></td>
-                  <td colspan="2">
-                    <div class="d-flex">
-                      @if (isLoggedIn()) {
-                        @if (user && estimate.hasAccess) {
-                          <button class="btn btn-sm btn-primary btn-success flex-grow-1" style="width: 150px" (click)="accelerate()" i18n="transaction.accelerate|Accelerate button label">Accelerate</button>
-                        }
-                      } @else if (stateService.isMempoolSpaceBuild) {
-                        <a [routerLink]="['/login']" [queryParams]="{redirectTo: '/tx/' + tx.txid + '#accelerate'}" class="btn btn-purple flex-grow-1" i18n="shared.sign-in">Sign In</a>
-                      } @else {
-                        <a [href]="'https://mempool.space/tx/' + tx.txid + '#accelerate'" class="btn btn-purple flex-grow-1" i18n="accelerator.accelerate-on-mempoolspace">Accelerate on mempool.space</a>
-                      }
-                    </div>
-                  </td>
-                </tr>
-              </ng-container>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </ng-container>
-</div>
-
-<ng-template #loadingEstimate>
-  <div class="skeleton-loader"></div>
-  <br>
-</ng-template>
\ No newline at end of file
diff --git a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.scss b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.scss
deleted file mode 100644
index 7194a4782..000000000
--- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.scss
+++ /dev/null
@@ -1,132 +0,0 @@
-.fee-card {
-  padding: 15px;
-  background-color: var(--bg);
-
-  .feerate {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-
-    .rate {
-      font-size: 0.9em;
-      .symbol {
-        color: white;
-      }
-    }
-  }
-}
-
-.btn-border {
-  border: solid 1px black;
-  background-color: #0c4a87;
-}
-
-.feerate.active {
-  background-color: var(--primary) !important;
-  opacity: 1;
-  border: 1px solid #007fff !important;
-}
-.feerate:focus {
-  box-shadow: none !important;
-}
-
-.estimateDisabled {
-  opacity: 0.5;
-  pointer-events: none;
-}
-
-.table-toggle {
-  width: 100%;
-  margin-top: 0.5em;
-}
-
-.tab {
-  &:first-child {
-    margin-right: 1px;
-  }
-  border: solid 1px black;
-  border-bottom: none;
-  background-color: #323655;
-  border-top-left-radius: 10px !important;
-  border-top-right-radius: 10px !important;
-}
-.tab.active {
-  background-color: #5d659d !important;
-  opacity: 1;
-}
-.tab:focus {
-  box-shadow: none !important;
-}
-
-.table-accelerator {
-  tr {
-    td {
-      padding-top: 0;
-      padding-bottom: 0;
-      vertical-align: baseline;
-    }
-
-    &.group-first {
-      td {
-        padding-top: 0.75rem;
-      }
-    }
-    &.group-last, &:last-child {
-      td {
-        padding-bottom: 0.75rem;
-      }
-    }
-    &.dashed-top {
-      border-top: 1px dashed grey;
-    }
-    &.dashed-bottom {
-      border-bottom: 1px dashed grey
-    }
-  }
-  td {
-    &:first-child {
-      width: 100vw;
-    }
-    &.info {
-      color: #6c757d;
-      white-space: initial;
-    }
-    &.amt {
-      text-align: right;
-      padding-right: 0.2em;
-    }
-    &.units {
-      padding-left: 0.2em;
-      white-space: nowrap;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-    }
-  }
-}
-
-.accelerate-cols {
-  display: flex;
-  flex-direction: row;
-  align-items: stretch;
-  margin-top: 1em;
-}
-
-.col.pie {
-  flex-grow: 0;
-  padding: 0 1em;
-}
-
-.item {
-  white-space: initial;
-}
-
-.table-background {
-  background-color: var(--bg);
-}
-
-.col.pie {
-  position: relative;
-  top: -15px;
-}
\ No newline at end of file
diff --git a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.ts b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.ts
deleted file mode 100644
index 8ec675041..000000000
--- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.ts
+++ /dev/null
@@ -1,250 +0,0 @@
-import { Component, OnInit, Input, OnDestroy, OnChanges, SimpleChanges, HostListener, ChangeDetectorRef } from '@angular/core';
-import { Observable, Subscription, catchError, of, tap } from 'rxjs';
-import { StorageService } from '../../services/storage.service';
-import { Transaction } from '../../interfaces/electrs.interface';
-import { nextRoundNumber } from '../../shared/common.utils';
-import { ServicesApiServices } from '../../services/services-api.service';
-import { AudioService } from '../../services/audio.service';
-import { StateService } from '../../services/state.service';
-import { MiningStats } from '../../services/mining.service';
-import { EtaService } from '../../services/eta.service';
-
-export type AccelerationEstimate = {
-  txSummary: TxSummary;
-  nextBlockFee: number;
-  targetFeeRate: number;
-  userBalance: number;
-  enoughBalance: boolean;
-  cost: number;
-  mempoolBaseFee: number;
-  vsizeFee: number;
-  pools: number[]
-}
-export type TxSummary = {
-  txid: string; // txid of the current transaction
-  effectiveVsize: number; // Total vsize of the dependency tree
-  effectiveFee: number;  // Total fee of the dependency tree in sats
-  ancestorCount: number; // Number of ancestors
-}
-
-export interface RateOption {
-  fee: number;
-  rate: number;
-  index: number;
-}
-
-export const MIN_BID_RATIO = 1;
-export const DEFAULT_BID_RATIO = 2;
-export const MAX_BID_RATIO = 4;
-
-@Component({
-  selector: 'app-accelerate-preview',
-  templateUrl: 'accelerate-preview.component.html',
-  styleUrls: ['accelerate-preview.component.scss']
-})
-export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges {
-  @Input() tx: Transaction;
-  @Input() miningStats: MiningStats;
-  @Input() scrollEvent: boolean;
-  @Input() showDetails: boolean;
-
-  math = Math;
-  error = '';
-  showSuccess = false;
-  estimateSubscription: Subscription;
-  accelerationSubscription: Subscription;
-  difficultySubscription: Subscription;
-  estimate: any;
-  etaInfo$: Observable<{ hashratePercentage: number, ETA: number, acceleratedETA: number }>;
-  hasAncestors: boolean = false;
-  minExtraCost = 0;
-  minBidAllowed = 0;
-  maxBidAllowed = 0;
-  defaultBid = 0;
-  maxCost = 0;
-  userBid = 0;
-  accelerationUUID: string;
-  selectFeeRateIndex = 1;
-  isMobile: boolean = window.innerWidth <= 767.98;
-  user: any = undefined;
-
-  maxRateOptions: RateOption[] = [];
-
-  constructor(
-    public stateService: StateService,
-    private servicesApiService: ServicesApiServices,
-    private storageService: StorageService,
-    private etaService: EtaService,
-    private audioService: AudioService,
-    private cd: ChangeDetectorRef
-  ) {
-  }
-
-  ngOnDestroy(): void {
-    if (this.estimateSubscription) {
-      this.estimateSubscription.unsubscribe();
-    }
-  }
-
-  ngOnInit(): void {
-    this.accelerationUUID = window.crypto.randomUUID();
-  }
-
-  ngOnChanges(changes: SimpleChanges): void {
-    if (changes.scrollEvent) {
-      this.scrollToPreview('acceleratePreviewAnchor', 'start');
-    }
-  }
-
-  ngAfterViewInit(): void {
-    this.user = this.storageService.getAuth()?.user ?? null;
-
-    this.estimateSubscription = this.servicesApiService.estimate$(this.tx.txid).pipe(
-      tap((response) => {
-        if (response.status === 204) {
-          this.estimate = undefined;
-          this.error = `cannot_accelerate_tx`;
-          this.scrollToPreviewWithTimeout('mempoolError', 'center');
-          this.estimateSubscription.unsubscribe();
-        } else {
-          this.estimate = response.body;
-          if (!this.estimate) {
-            this.error = `cannot_accelerate_tx`;
-            this.scrollToPreviewWithTimeout('mempoolError', 'center');
-            this.estimateSubscription.unsubscribe();
-          }
-
-          if (this.estimate.hasAccess === true && this.estimate.userBalance <= 0) {
-            if (this.isLoggedIn()) {
-              this.error = `not_enough_balance`;
-              this.scrollToPreviewWithTimeout('mempoolError', 'center');
-            }
-          }
-
-          this.etaInfo$ = this.etaService.getProjectedEtaObservable(this.estimate, this.miningStats);
-
-          this.hasAncestors = this.estimate.txSummary.ancestorCount > 1;
-          
-          // Make min extra fee at least 50% of the current tx fee
-          this.minExtraCost = nextRoundNumber(Math.max(this.estimate.cost * 2, this.estimate.txSummary.effectiveFee));
-
-          this.maxRateOptions = [1, 2, 4].map((multiplier, index) => {
-            return {
-              fee: this.minExtraCost * multiplier,
-              rate: (this.estimate.txSummary.effectiveFee + (this.minExtraCost * multiplier)) / this.estimate.txSummary.effectiveVsize,
-              index,
-            };
-          });
-
-          this.minBidAllowed = this.minExtraCost * MIN_BID_RATIO;
-          this.defaultBid = this.minExtraCost * DEFAULT_BID_RATIO;
-          this.maxBidAllowed = this.minExtraCost * MAX_BID_RATIO;
-
-          this.userBid = this.defaultBid;
-          if (this.userBid < this.minBidAllowed) {
-            this.userBid = this.minBidAllowed;
-          } else if (this.userBid > this.maxBidAllowed) {
-            this.userBid = this.maxBidAllowed;
-          }            
-          this.maxCost = this.userBid + this.estimate.mempoolBaseFee + this.estimate.vsizeFee;
-
-          if (!this.error) {
-            this.scrollToPreview('acceleratePreviewAnchor', 'start');
-
-            setTimeout(() => {
-              this.onScroll();
-            }, 100);
-          }
-        }
-      }),
-      catchError((response) => {
-        this.estimate = undefined;
-        this.error = response.error;
-        this.scrollToPreviewWithTimeout('mempoolError', 'center');
-        this.estimateSubscription.unsubscribe();
-        return of(null);
-      })
-    ).subscribe();
-  }
-
-  /**
-   * User changed his bid
-   */
-  setUserBid({ fee, index }: { fee: number, index: number}): void {
-    if (this.estimate) {
-      this.selectFeeRateIndex = index;
-      this.userBid = Math.max(0, fee);
-      this.maxCost = this.userBid + this.estimate.mempoolBaseFee + this.estimate.vsizeFee;
-    }
-  }
-
-  /**
-   * Scroll to element id with or without setTimeout
-   */
-  scrollToPreviewWithTimeout(id: string, position: ScrollLogicalPosition): void {
-    setTimeout(() => {
-      this.scrollToPreview(id, position);
-    }, 100);
-  }
-  scrollToPreview(id: string, position: ScrollLogicalPosition): void {
-    const acceleratePreviewAnchor = document.getElementById(id);
-    if (acceleratePreviewAnchor) {
-      this.cd.markForCheck();
-      acceleratePreviewAnchor.scrollIntoView({
-        behavior: 'smooth',
-        inline: position,
-        block: position,
-      });
-    }
-  }
-
-  /**
-   * Send acceleration request
-   */
-  accelerate(): void {
-    if (this.accelerationSubscription) {
-      this.accelerationSubscription.unsubscribe();
-    }
-    this.accelerationSubscription = this.servicesApiService.accelerate$(
-      this.tx.txid,
-      this.userBid,
-      this.accelerationUUID
-    ).subscribe({
-      next: () => {
-        this.audioService.playSound('ascend-chime-cartoon');
-        this.showSuccess = true;
-        this.scrollToPreviewWithTimeout('successAlert', 'center');
-        this.estimateSubscription.unsubscribe();
-      },
-      error: (response) => {
-        if (response.status === 403 && response.error === 'not_available') {
-          this.error = 'waitlisted';
-        } else {
-          this.error = response.error;
-        }
-        this.scrollToPreviewWithTimeout('mempoolError', 'center');
-      }
-    });
-  }
-
-  isLoggedIn(): boolean {
-    const auth = this.storageService.getAuth();
-    return auth !== null;
-  }
-
-  @HostListener('window:resize', ['$event'])
-  onResize(): void {
-    this.isMobile = window.innerWidth <= 767.98;
-  }
-
-
-  @HostListener('window:scroll', ['$event']) // for window scroll events
-  onScroll(): void {
-    if (this.estimate) {
-      setTimeout(() => {
-        this.onScroll();
-      }, 200);
-      return;
-    }
-  }
-}
diff --git a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
index 22205973b..1731a0e43 100644
--- a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
+++ b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
@@ -1,12 +1,14 @@
 <div class="wrapper">
 
-  <span *ngIf="paymentStatus === 3" class="valid-feedback d-block mt-5">
-    Payment successful. You can close this page.
-  </span>
-  
-  <span *ngIf="paymentStatus === 4" class="valid-feedback d-block mt-5">
-    A transaction <a [href]="'/tx/' + invoice.cryptoInfo[0].payments[0].id.split('-')[0]">has been detected in the mempool</a> fully paying for this invoice. Waiting for on-chain confirmation.
-  </span>
+  @if (!minimal) {
+    <span *ngIf="paymentStatus === 3" class="valid-feedback d-block mt-5">
+      Payment successful. You can close this page.
+    </span>
+
+    <span *ngIf="paymentStatus === 4" class="valid-feedback d-block mt-5">
+      A transaction <a [href]="'/tx/' + invoice.cryptoInfo[0].payments[0].id.split('-')[0]">has been detected in the mempool</a> fully paying for this invoice. Waiting for on-chain confirmation.
+    </span>
+  }
 
   <div *ngIf="paymentStatus === 2">
     
@@ -30,25 +32,27 @@
 
     <ng-template [ngIf]="paymentForm.get('method')?.value === 'chain' && invoice">
 
-        <div class="qr-wrapper">
+        <div class="qr-wrapper" [class.mt-0]="minimal">
           <a [href]="bypassSecurityTrustUrl('bitcoin:' + invoice.addresses.BTC + '?amount=' + invoice.amount)" target="_blank">
               <app-qrcode imageUrl="/resources/bitcoin-logo.png" [size]="200" [data]="'bitcoin:' + invoice.addresses.BTC + '?amount=' + invoice.amount"></app-qrcode>
           </a>
         </div>
-        
+
         <div class="input-group input-group-sm info-group">
           <input type="text" class="form-control input-dark" readonly [value]="invoice.addresses.BTC">
           <div class="input-group-append">
               <button class="btn btn-outline-secondary" type="button" ><app-clipboard [text]="invoice.addresses.BTC"></app-clipboard></button>
           </div>
         </div>
-        <p>{{ invoice.amount }} <span class="symbol">BTC</span></p>
+        @if (!minimal) {
+          <p>{{ invoice.amount }} <span class="symbol">BTC</span></p>
+        }
 
     </ng-template>
 
     <ng-template [ngIf]="paymentForm.get('method')?.value === 'lightning' && invoice && invoice.addresses.BTC_LightningLike">
 
-        <div class="qr-wrapper">
+        <div class="qr-wrapper" [class.mt-0]="minimal">
           <a [href]="bypassSecurityTrustUrl('lightning:' + invoice.addresses.BTC_LightningLike)" target="_blank">
               <app-qrcode imageUrl="/resources/bitcoin-logo.png" [size]="200" [data]="invoice.addresses.BTC_LightningLike.toUpperCase()"></app-qrcode>
           </a>
@@ -61,13 +65,15 @@
           </div>
         </div>
 
-        <p>{{ invoice.amount * 100_000_000 }} <span class="symbol">sats</span></p>
+        @if (!minimal) {
+          <p>{{ invoice.amount * 100_000_000 }} <span class="symbol">sats</span></p>
+        }
 
     </ng-template>
 
     <ng-template [ngIf]="invoice && (paymentForm.get('method')?.value === 'lbtc' || paymentForm.get('method')?.value === 'tlbtc')">
 
-        <div class="qr-wrapper">
+        <div class="qr-wrapper" [class.mt-0]="minimal">
           <a [href]="bypassSecurityTrustUrl('liquidnetwork:' + invoice.addresses.LBTC + '?amount=' + invoice.amount + '&assetid=6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d')" target="_blank">
               <app-qrcode imageUrl="/resources/liquid-bitcoin.png" [size]="200" [data]="'liquidnetwork:' + invoice.addresses.LBTC + '?amount=' + invoice.amount + '&assetid=6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d'"></app-qrcode>
           </a>
@@ -79,11 +85,15 @@
               <button class="btn btn-outline-secondary" type="button" ><app-clipboard [text]="invoice.addresses.LBTC"></app-clipboard></button>
           </div>
         </div>
-        <p>{{ invoice.amount }} <span class="symbol">BTC</span></p>
+        @if (!minimal) {
+          <p>{{ invoice.amount }} <span class="symbol">BTC</span></p>
+        }
 
     </ng-template>
 
-    <p>Waiting for transaction... </p>
-    <div class="spinner-border text-light"></div>
+    @if (!minimal) {
+      <p>Waiting for transaction... </p>
+      <div class="spinner-border text-light"></div>
+    }
   </div>
 </div>
\ No newline at end of file
diff --git a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.scss b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.scss
index 7582b70f0..b88a2ef74 100644
--- a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.scss
+++ b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.scss
@@ -140,6 +140,7 @@
 
 .wrapper {
   text-align: center;
+  width: 100%;
 }
 
 .input-dark {
diff --git a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts
index 2e12f54ba..6f2d4b36c 100644
--- a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts
+++ b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts
@@ -14,6 +14,7 @@ import { ServicesApiServices } from '../../services/services-api.service';
 export class BitcoinInvoiceComponent implements OnInit, OnDestroy {
   @Input() invoiceId: string;
   @Input() redirect = true;
+  @Input() minimal = false;
   @Output() completed = new EventEmitter();
 
   paymentForm: FormGroup;
diff --git a/frontend/src/app/components/tracker/tracker.component.html b/frontend/src/app/components/tracker/tracker.component.html
index faa2db793..03375c44d 100644
--- a/frontend/src/app/components/tracker/tracker.component.html
+++ b/frontend/src/app/components/tracker/tracker.component.html
@@ -117,7 +117,7 @@
     <div class="bottom-panel">
       @if (showAccelerationSummary && !accelerationFlowCompleted) {
         <ng-container *ngIf="(ETA$ | async) as eta;">
-          <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [tx]="tx" [miningStats]="miningStats" [eta]="eta" [forceMobile]="true" (close)="accelerationFlowCompleted = true" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100"></app-accelerate-checkout>
+          <app-accelerate-checkout *ngIf="(da$ | async) as da;" [forceSummary]="true" [cashappEnabled]="accelerationEligible" [advancedEnabled]="false" [forceMobile]="true" [tx]="tx" [miningStats]="miningStats" [eta]="eta" (close)="accelerationFlowCompleted = true" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100"></app-accelerate-checkout>
         </ng-container>
       } @else {
         @if (tx?.acceleration && !tx.status?.confirmed) {
diff --git a/frontend/src/app/components/tracker/tracker.module.ts b/frontend/src/app/components/tracker/tracker.module.ts
new file mode 100644
index 000000000..799b8cd65
--- /dev/null
+++ b/frontend/src/app/components/tracker/tracker.module.ts
@@ -0,0 +1,51 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { Routes, RouterModule } from '@angular/router';
+import { SharedModule } from '../../shared/shared.module';
+import { TxBowtieModule } from '../tx-bowtie-graph/tx-bowtie.module';
+import { GraphsModule } from '../../graphs/graphs.module';
+import { TrackerComponent } from '../tracker/tracker.component';
+import { TrackerBarComponent } from '../tracker/tracker-bar.component';
+import { TransactionModule } from '../transaction/transaction.module';
+
+const routes: Routes = [
+  {
+    path: ':id',
+    component: TrackerComponent,
+    data: {
+      ogImage: true
+    }
+  }
+];
+
+@NgModule({
+  imports: [
+    RouterModule.forChild(routes)
+  ],
+  exports: [
+    RouterModule
+  ]
+})
+export class TrackerRoutingModule { }
+
+@NgModule({
+  imports: [
+    CommonModule,
+    TrackerRoutingModule,
+    TransactionModule,
+    SharedModule,
+    GraphsModule,
+    TxBowtieModule,
+  ],
+  declarations: [
+    TrackerComponent,
+    TrackerBarComponent,
+  ]
+})
+export class TrackerModule { }
+
+
+
+
+
+
diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index 87477c5d7..7cba84784 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -80,12 +80,11 @@
       <div class="title float-left">
         <h2 i18n="transaction.accelerate|Accelerate button label">Accelerate</h2>
       </div>
-      <button type="button" class="btn btn-outline-info flow-toggle btn-sm float-right" (click)="showAccelerationDetails = !showAccelerationDetails" i18n="transaction.details|Transaction Details">Details</button>
 
       <div class="clearfix"></div>
 
       <ng-container *ngIf="(ETA$ | async) as eta;">
-        <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [tx]="tx" [eta]="eta" [miningStats]="miningStats" (close)="showAccelerationSummary = false" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100">
+        <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [advancedEnabled]="true" [tx]="tx" [eta]="eta" [miningStats]="miningStats" (close)="showAccelerationSummary = false" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100">
           <span slot="cta-title">Urgent transaction? Get it confirmed faster.</span>
         </app-accelerate-checkout>
       </ng-container>
diff --git a/frontend/src/app/components/transaction/transaction.module.ts b/frontend/src/app/components/transaction/transaction.module.ts
index b536b3045..5429a22cc 100644
--- a/frontend/src/app/components/transaction/transaction.module.ts
+++ b/frontend/src/app/components/transaction/transaction.module.ts
@@ -7,8 +7,6 @@ import { TxBowtieModule } from '../tx-bowtie-graph/tx-bowtie.module';
 import { GraphsModule } from '../../graphs/graphs.module';
 import { AccelerateCheckout } from '../accelerate-checkout/accelerate-checkout.component';
 import { AccelerateFeeGraphComponent } from '../accelerate-checkout/accelerate-fee-graph.component';
-import { TrackerComponent } from '../tracker/tracker.component';
-import { TrackerBarComponent } from '../tracker/tracker-bar.component';
 
 const routes: Routes = [
   {
@@ -40,8 +38,11 @@ export class TransactionRoutingModule { }
   ],
   declarations: [
     TransactionComponent,
-    TrackerComponent,
-    TrackerBarComponent,
+    AccelerateCheckout,
+    AccelerateFeeGraphComponent,
+  ],
+  exports: [
+    TransactionComponent,
     AccelerateCheckout,
     AccelerateFeeGraphComponent,
   ]
diff --git a/frontend/src/app/services/services-api.service.ts b/frontend/src/app/services/services-api.service.ts
index 534f45b4e..0dc58b957 100644
--- a/frontend/src/app/services/services-api.service.ts
+++ b/frontend/src/app/services/services-api.service.ts
@@ -168,9 +168,10 @@ export class ServicesApiServices {
     return this.httpClient.get<{txid: string}>(`${SERVICES_API_PREFIX}/testnet4/faucet/request?address=${address}&sats=${sats}`, { responseType: 'json' });
   }
 
-  generateBTCPayAcceleratorInvoice$(txid: string): Observable<any> {
+  generateBTCPayAcceleratorInvoice$(txid: string, sats: number): Observable<any> {
     const params = {
-      product: txid
+      product: txid,
+      amount: sats,
     };
     return this.httpClient.post<any>(`${SERVICES_API_PREFIX}/payments/bitcoin`, params);
   }

From 254d9625586c755f6a17196b54496b1d19411863 Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Thu, 27 Jun 2024 18:49:37 +0900
Subject: [PATCH 37/77] [accelerator] add new error message

---
 .../shared/components/mempool-error/mempool-error.component.ts   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/app/shared/components/mempool-error/mempool-error.component.ts b/frontend/src/app/shared/components/mempool-error/mempool-error.component.ts
index e60c7c524..1706be24d 100644
--- a/frontend/src/app/shared/components/mempool-error/mempool-error.component.ts
+++ b/frontend/src/app/shared/components/mempool-error/mempool-error.component.ts
@@ -29,6 +29,7 @@ const MempoolErrors = {
   'faucet_address_not_allowed': `You cannot use this address`,
   'faucet_below_minimum': `Requested amount is too small`,
   'faucet_above_maximum': `Requested amount is too high`,
+  'payment_method_not_allowed': `You are not allowed to use this payment method`,
 } as { [error: string]: string };
 
 export function isMempoolError(error: string) {

From e158c1068850680860348dc890398242b338e43a Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Fri, 28 Jun 2024 13:29:44 +0000
Subject: [PATCH 38/77] [accelerator] fix duplicate invoice request

---
 .../accelerate-checkout/accelerate-checkout.component.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ee4e84518..1a7039c92 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -233,7 +233,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
           }
           this.cost = this.userBid + this.estimate.mempoolBaseFee + this.estimate.vsizeFee;
 
-          if (this.canPayWithBitcoin && !this.loadingBtcpayInvoice) {
+          if (this.step === 'checkout' && this.canPayWithBitcoin && !this.loadingBtcpayInvoice) {
             this.loadingBtcpayInvoice = true;
             this.requestBTCPayInvoice();
           }

From 5872b2c46b9be5fcc8671329d329d941db570788 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Fri, 28 Jun 2024 13:35:34 +0000
Subject: [PATCH 39/77] [accelerator] fix success/failure messages

---
 .../accelerate-checkout.component.html        | 24 +++++++------------
 .../accelerate-checkout.component.ts          |  1 +
 2 files changed, 10 insertions(+), 15 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 b8b9a4283..7a7dab8cf 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -1,27 +1,21 @@
 <div class="box card w-100" style="background: var(--box-bg)" id=acceleratePreviewAnchor>
 
-  @if (error) {
-    <div class="mt-2">
-      <app-mempool-error [error]="error"></app-mempool-error>
-    </div>
-  } 
-  @else if (step === 'quote') {
-    <span id="successAlert" class="m-0 p-0 d-block" style="height: 1px;"></span>
-    <div class="row" *ngIf="showSuccess">
-      <div class="col">
-        <div class="alert alert-success">
-          Transaction has now been <a class="alert-link" routerLink="/services/accelerator/history">submitted</a> to mining pools for acceleration.
-        </div>
+  <div class="row mt-2" *ngIf="showSuccess">
+    <div class="col">
+      <div class="alert alert-success">
+        Transaction has now been <a class="alert-link" routerLink="/services/accelerator/history">submitted</a> to mining pools for acceleration.
       </div>
     </div>
+  </div>
 
-    <span id="mempoolError" class="m-0 p-0 d-block" style="height: 1px;"></span>
-    <div class="row" *ngIf="error">
+  @if (error) {
+    <div class="row mt-2">
       <div class="col">
         <app-mempool-error [error]="error" [alertClass]="error === 'waitlisted' ? 'alert-mempool' : 'alert-danger'"></app-mempool-error>
       </div>
     </div>
-
+  }
+  @else if (step === 'quote') {
     <div class="accelerate-cols">
       <ng-container *ngIf="!isMobile">
         <app-accelerate-fee-graph
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 1a7039c92..6af453706 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -294,6 +294,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
         this.audioService.playSound('ascend-chime-cartoon');
         this.showSuccess = true;
         this.estimateSubscription.unsubscribe();
+        this.closeModal(2000);
       },
       error: (response) => {
         if (response.status === 403 && response.error === 'not_available') {

From 193c41cb81f760cab5c649ee1c4c10bcc8493dda Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sat, 29 Jun 2024 04:10:47 +0000
Subject: [PATCH 40/77] Fix pizza tracker loading state

---
 .../accelerate-checkout.component.html         |  2 +-
 .../components/tracker/tracker.component.html  |  7 ++++++-
 .../components/tracker/tracker.component.ts    | 18 ++++++++++--------
 3 files changed, 17 insertions(+), 10 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 7a7dab8cf..5a57b492b 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -335,7 +335,7 @@
                 <app-bitcoin-invoice style="width: 100%;" [invoiceId]="invoice.btcpayInvoiceId" [minimal]="true" (completed)="closeModal(2000)"></app-bitcoin-invoice>
               } @else {
                 <span>Loading invoice...</span>
-                <div class="ml-2 spinner-border text-light" style="width: 25px; height: 25px"></div>
+                <div class="m-4 spinner-border text-light" style="width: 25px; height: 25px"></div>
               }
             </div>
             @if (canPayWithCashapp) {
diff --git a/frontend/src/app/components/tracker/tracker.component.html b/frontend/src/app/components/tracker/tracker.component.html
index 03375c44d..64277e3e0 100644
--- a/frontend/src/app/components/tracker/tracker.component.html
+++ b/frontend/src/app/components/tracker/tracker.component.html
@@ -115,7 +115,12 @@
     </div>
 
     <div class="bottom-panel">
-      @if (showAccelerationSummary && !accelerationFlowCompleted) {
+      @if (isLoading) {
+        <div class="progress-icon">
+          <div class="spinner-border text-light" style="width: 1em; height: 1em"></div>
+        </div>
+        <span class="explainer">&nbsp;</span>
+      } @else if (showAccelerationSummary && !accelerationFlowCompleted) {
         <ng-container *ngIf="(ETA$ | async) as eta;">
           <app-accelerate-checkout *ngIf="(da$ | async) as da;" [forceSummary]="true" [cashappEnabled]="accelerationEligible" [advancedEnabled]="false" [forceMobile]="true" [tx]="tx" [miningStats]="miningStats" [eta]="eta" (close)="accelerationFlowCompleted = true" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100"></app-accelerate-checkout>
         </ng-container>
diff --git a/frontend/src/app/components/tracker/tracker.component.ts b/frontend/src/app/components/tracker/tracker.component.ts
index 508c8db19..234d89adc 100644
--- a/frontend/src/app/components/tracker/tracker.component.ts
+++ b/frontend/src/app/components/tracker/tracker.component.ts
@@ -63,8 +63,9 @@ export class TrackerComponent implements OnInit, OnDestroy {
   mempoolPosition: MempoolPosition;
   accelerationPositions: AccelerationPosition[];
   isLoadingTx = true;
-  error: any = undefined;
   loadingCachedTx = false;
+  loadingPosition = true;
+  error: any = undefined;
   waitingForTransaction = false;
   latestBlock: BlockExtended;
   transactionTime = -1;
@@ -148,13 +149,6 @@ export class TrackerComponent implements OnInit, OnDestroy {
   ngOnInit() {
     this.onResize();
 
-    window['setStage'] = ((stage: TrackerStage) => {
-      this.zone.run(() => {
-        this.trackerStage = stage;
-        this.cd.markForCheck();
-      });
-    }).bind(this);
-
     this.acceleratorAvailable = this.stateService.env.OFFICIAL_MEMPOOL_SPACE && this.stateService.env.ACCELERATOR && this.stateService.network === '';
 
     const urlParams = new URLSearchParams(window.location.search);
@@ -361,6 +355,7 @@ export class TrackerComponent implements OnInit, OnDestroy {
     this.mempoolPositionSubscription = this.stateService.mempoolTxPosition$.subscribe(txPosition => {
       this.now = Date.now();
       if (txPosition && txPosition.txid === this.txId && txPosition.position) {
+        this.loadingPosition = false;
         this.mempoolPosition = txPosition.position;
         this.accelerationPositions = txPosition.accelerationPositions;
         if (this.tx && !this.tx.status.confirmed) {
@@ -443,6 +438,7 @@ export class TrackerComponent implements OnInit, OnDestroy {
       ))
       .subscribe((tx: Transaction) => {
           if (!tx) {
+            this.loadingPosition = false;
             this.fetchCachedTx$.next(this.txId);
             this.seoService.logSoft404();
             return;
@@ -475,6 +471,7 @@ export class TrackerComponent implements OnInit, OnDestroy {
             }
           } else {
             this.trackerStage = 'confirmed';
+            this.loadingPosition = false;
             this.fetchAcceleration$.next(tx.status.block_hash);
             this.fetchMiningInfo$.next({ hash: tx.status.block_hash, height: tx.status.block_height, txid: tx.txid });
             this.transactionTime = 0;
@@ -735,12 +732,17 @@ export class TrackerComponent implements OnInit, OnDestroy {
     return false;
   }
 
+  get isLoading(): boolean {
+    return this.isLoadingTx || this.loadingCachedTx || this.loadingPosition;
+  }
+
   resetTransaction() {
     this.error = undefined;
     this.tx = null;
     this.txChanged$.next(true);
     this.waitingForTransaction = false;
     this.isLoadingTx = true;
+    this.loadingPosition = true;
     this.rbfTransaction = undefined;
     this.replaced = false;
     this.latestReplacement = '';

From 48bdae4e781f0223e9b63e5e36e8a269ba3ffd7f Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sat, 29 Jun 2024 04:11:02 +0000
Subject: [PATCH 41/77] [accelerator] hide pizza tracker CTA when irrelevant

---
 frontend/src/app/components/tracker/tracker.component.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/components/tracker/tracker.component.ts b/frontend/src/app/components/tracker/tracker.component.ts
index 234d89adc..00051350b 100644
--- a/frontend/src/app/components/tracker/tracker.component.ts
+++ b/frontend/src/app/components/tracker/tracker.component.ts
@@ -381,9 +381,11 @@ export class TrackerComponent implements OnInit, OnDestroy {
             this.trackerStage = 'replaced';
           }
 
-          this.showAccelerationSummary = true;
-          if (txPosition.position?.block > 0 && this.tx.weight < 4000) {
-            this.accelerationEligible = true;
+          if (!this.mempoolPosition.accelerated) {
+            this.showAccelerationSummary = true;
+            if (txPosition.position?.block > 0 && this.tx.weight < 4000) {
+              this.accelerationEligible = true;
+            }
           }
         }
       } else {

From d62300ccff98b6f8ddd4184ba809cee88ffe75eb Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sat, 29 Jun 2024 06:06:11 +0000
Subject: [PATCH 42/77] [accelerator] add acceleration paid screen, fix end
 state

---
 .../accelerate-checkout.component.html        | 221 ++++++++++--------
 .../accelerate-checkout.component.ts          |  14 +-
 .../components/tracker/tracker.component.html |   2 +-
 .../components/tracker/tracker.component.ts   |   4 +
 .../transaction/transaction.component.html    |   2 +-
 .../transaction/transaction.component.ts      |  10 +-
 6 files changed, 146 insertions(+), 107 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 5a57b492b..a77347cdf 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -240,119 +240,141 @@
     </ng-template>
   }
   @else if (step === 'summary') {
-    <!-- Show A/B CTAs -->
-    <div class="row mb-1">
-      <div class="col-sm">
-        <h1 style="font-size: larger;"><ng-content select="[slot='cta-title']"></ng-content><span class="default-slot">Accelerate your Bitcoin transaction?</span></h1>
+    <ng-container *ngIf="estimate && (etaInfo$ | async) as etaInfo; else loadingSummary">
+      <!-- Show A/B CTAs -->
+      <div class="row mb-1">
+        <div class="col-sm">
+          <h1 style="font-size: larger;"><ng-content select="[slot='cta-title']"></ng-content><span class="default-slot">Accelerate your Bitcoin transaction?</span></h1>
+        </div>
       </div>
-    </div>
 
-    <form>
+      <form>
+        <div class="row">
+          <div class="col-md">
+            <div class="form-group form-check mb-2">
+              <input type="radio" [checked]="choosenOption === 'wait'"  class="form-check-input" id="wait" name="accel" (change)="selectedOptionChanged($event)">
+              <label class="form-check-label d-flex flex-column" for="wait">
+                <span class="font-weight-bold">Wait</span>
+                @if (eta.blocks < 7) {
+                  <span class="checkout-text">Confirmation expected <app-time kind="within" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time></span>
+                } @else {
+                  <span class="checkout-text">
+                    <span>Confirmation expected within several hours</span>
+                  </span>
+                }
+              </label>
+            </div>
+          </div>
+          <div class="col-md">
+            <div class="form-group form-check mb-2">
+              <input type="radio" [checked]="choosenOption === 'accel'" class="form-check-input" id="accel" name="accel" (change)="selectedOptionChanged($event)">
+              <label class="form-check-label d-flex flex-column" for="accel">
+                <span><b>Accelerate</b> to ~{{ ((userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB <button *ngIf="advancedEnabled && isLoggedIn()" class="btn btn-sm btn-accelerate btn-small-height ml-3" i18n="accelerator.customize" (click)="moveToStep('quote')">customize</button></span>
+                <span class="checkout-text">Confirmation expected <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time><br>
+                  @if (!calculating) {
+                    <app-fiat [value]="cost"></app-fiat>fee (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
+                  } @else {
+                    <span class="estimating">Calculating cost...</span>
+                  }
+                </span>
+              </label>
+            </div>
+          </div>
+          <div class="col-md pie d-none d-lg-flex" *ngIf="!forceMobile">
+            <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to {{ etaInfo.hashratePercentage | number : '1.1-1' }}% of miners.</small>
+            <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
+          </div>
+        </div>
+        <div class="row mt-2 mb-2" [style]="(choosenOption !== 'accel' || calculating) ? 'opacity: 0.25; pointer-events: none' : ''">
+          <div class="col-sm d-flex flex-row justify-content-center">
+            <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" style="width: 200px" (click)="accelerate()">
+              <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
+              <span>Accelerate</span>
+            </button>
+          </div>
+        </div>
+      </form>
+    </ng-container>
+    <ng-template #loadingSummary>
       <div class="row">
         <div class="col-md">
-          <div class="form-group form-check mb-2">
-            <input type="radio" [checked]="choosenOption === 'wait'"  class="form-check-input" id="wait" name="accel" (change)="selectedOptionChanged($event)">
-            <label class="form-check-label d-flex flex-column" for="wait">
-              <span class="font-weight-bold">Wait</span>
-              @if (eta.blocks < 7) {
-                <span class="checkout-text">Confirmation expected <app-time kind="within" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time></span>
-              } @else {
-                <span class="checkout-text">
-                  <span>Confirmation expected within several hours</span>
-                </span>
-              }
-            </label>
+          <div class="d-flex flex-row justify-content-center align-items-center">
+            <div class="m-4 spinner-border text-light" style="width: 25px; height: 25px"></div>
           </div>
         </div>
+      </div>
+    </ng-template>
+  } @else if (step === 'checkout') {
+    <ng-container *ngIf="estimate && (etaInfo$ | async) as etaInfo; else loadingCheckout">
+      <div class="row">
         <div class="col-md">
-          <div class="form-group form-check mb-2" *ngIf="estimate">
-            <input type="radio" [checked]="choosenOption === 'accel'" class="form-check-input" id="accel" name="accel" (change)="selectedOptionChanged($event)">
-            <label class="form-check-label d-flex flex-column" for="accel">
-              <span><b>Accelerate</b> to ~{{ ((userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB <button *ngIf="advancedEnabled && isLoggedIn()" class="btn btn-sm btn-accelerate btn-small-height ml-3" i18n="accelerator.customize" (click)="moveToStep('quote')">customize</button></span>
-              <span class="checkout-text" *ngIf="(etaInfo$ | async) as etaInfo">Confirmation expected <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time><br>
-                @if (!calculating) {
-                  <app-fiat [value]="cost"></app-fiat>fee (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
-                } @else {
-                  <span class="estimating">Calculating cost...</span>
-                }
-              </span>
-            </label>
+          <div class="d-flex flex-column">
+            <span><b>Accelerate</b> to ~{{ ((userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB <button *ngIf="advancedEnabled && isLoggedIn()" class="btn btn-sm btn-accelerate btn-small-height ml-3" i18n="accelerator.customize" (click)="moveToStep('quote')">customize</button></span>
+            <span class="checkout-text">
+              @if (!calculating) {
+                For an additional <app-fiat [value]="cost"></app-fiat> (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
+              } @else {
+                <span class="estimating">Calculating cost...</span>
+              }
+            </span>
+            <span class="checkout-text" *ngIf="(etaInfo$ | async) as etaInfo">
+              Reducing expected confirmation time to <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time>
+            </span>
           </div>
         </div>
-        <div class="col-md pie d-none d-lg-flex" *ngIf="estimate && !forceMobile">
+        <div class="col-md pie d-none d-md-flex" *ngIf="!forceMobile">
           <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description" *ngIf="(etaInfo$ | async) as etaInfo">Your transaction will be prioritized by up to {{ etaInfo.hashratePercentage | number : '1.1-1' }}% of miners.</small>
           <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
         </div>
       </div>
-      <div class="row mt-2 mb-2" [style]="(choosenOption !== 'accel' || calculating) ? 'opacity: 0.25; pointer-events: none' : ''">
-        <div class="col-sm d-flex flex-row justify-content-center">
-          <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" style="width: 200px" (click)="accelerate()">
+      @if (canPayWithBalance || !(canPayWithBitcoin || canPayWithCashapp)) {
+        <div class="d-flex justify-content-center">
+          <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" [class.estimateDisabled]="!canPayWithBalance" style="width: 200px" (click)="accelerate()">
             <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
             <span>Accelerate</span>
           </button>
         </div>
-      </div>
-    </form>
-  } @else if (step === 'checkout') {
-    <div class="row">
-      <div class="col-md">
-        <div class="d-flex flex-column" *ngIf="estimate">
-          <span><b>Accelerate</b> to ~{{ ((userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB <button *ngIf="advancedEnabled && isLoggedIn()" class="btn btn-sm btn-accelerate btn-small-height ml-3" i18n="accelerator.customize" (click)="moveToStep('quote')">customize</button></span>
-          <span class="checkout-text">
-            @if (!calculating) {
-              For an additional <app-fiat [value]="cost"></app-fiat> (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
-            } @else {
-              <span class="estimating">Calculating cost...</span>
-            }
-          </span>
-          <span class="checkout-text" *ngIf="(etaInfo$ | async) as etaInfo">
-            Reducing expected confirmation time to <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time>
-          </span>
-        </div>
-      </div>
-      <div class="col-md pie d-none d-md-flex" *ngIf="estimate && !forceMobile">
-        <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description" *ngIf="(etaInfo$ | async) as etaInfo">Your transaction will be prioritized by up to {{ etaInfo.hashratePercentage | number : '1.1-1' }}% of miners.</small>
-        <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
-      </div>
-    </div>
-    @if (canPayWithBalance || !(canPayWithBitcoin || canPayWithCashapp)) {
-      <div class="d-flex justify-content-center">
-        <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" [class.estimateDisabled]="!canPayWithBalance" style="width: 200px" (click)="accelerate()">
-          <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
-          <span>Accelerate</span>
-        </button>
-      </div>
-    } @else {
-      <div class="payment-area mt-2 p-2">
-        <div class="row text-center justify-content-center mx-2" style="font-size: 14px;">
-          <p>Payment to mempool.space for acceleration of txid <a [routerLink]="'/tx/' + tx.txid" target="_blank"> {{ tx.txid.substr(0, 10) }}..{{ tx.txid.substr(-10) }}</a></p>
-        </div>
-        <div class="row">
-          @if (canPayWithBitcoin) {
-            <div class="col-sm text-center d-flex flex-column justify-content-center align-items-center">
-              @if (invoice) {
-                <p>Pay <span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span></p>
-                <app-bitcoin-invoice style="width: 100%;" [invoiceId]="invoice.btcpayInvoiceId" [minimal]="true" (completed)="closeModal(2000)"></app-bitcoin-invoice>
-              } @else {
-                <span>Loading invoice...</span>
-                <div class="m-4 spinner-border text-light" style="width: 25px; height: 25px"></div>
+      } @else {
+        <div class="payment-area mt-2 p-2">
+          <div class="row text-center justify-content-center mx-2" style="font-size: 14px;">
+            <p>Payment to mempool.space for acceleration of txid <a [routerLink]="'/tx/' + tx.txid" target="_blank"> {{ tx.txid.substr(0, 10) }}..{{ tx.txid.substr(-10) }}</a></p>
+          </div>
+          <div class="row">
+            @if (canPayWithBitcoin) {
+              <div class="col-sm text-center d-flex flex-column justify-content-center align-items-center">
+                @if (invoice) {
+                  <p>Pay <span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span></p>
+                  <app-bitcoin-invoice style="width: 100%;" [invoiceId]="invoice.btcpayInvoiceId" [minimal]="true" (completed)="moveToStep('paid')"></app-bitcoin-invoice>
+                } @else {
+                  <span>Loading invoice...</span>
+                  <div class="m-4 spinner-border text-light" style="width: 25px; height: 25px"></div>
+                }
+              </div>
+              @if (canPayWithCashapp) {
+                <div class="col-sm text-center flex-grow-0  d-flex flex-column justify-content-center align-items-center">
+                  <p class="text-nowrap">&mdash;<span i18n="or">OR</span>&mdash;</p>
+                </div>
               }
-            </div>
-            @if (canPayWithCashapp) {
-              <div class="col-sm text-center flex-grow-0  d-flex flex-column justify-content-center align-items-center">
-                <p class="text-nowrap">&mdash;<span i18n="or">OR</span>&mdash;</p>
+            }
+            @if (cashappEnabled) {
+              <div class="col-sm text-center d-flex flex-column justify-content-center align-items-center">
+                <p>Pay <app-fiat [value]="cost"></app-fiat> with</p>
+                <img class="paymentMethod mx-2" src="/resources/cash-app.svg" height=55 (click)="moveToStep('cashapp')">
               </div>
             }
-          }
-          @if (cashappEnabled) {
-            <div class="col-sm text-center d-flex flex-column justify-content-center align-items-center">
-              <p>Pay <app-fiat [value]="cost"></app-fiat> with</p>
-              <img class="paymentMethod mx-2" src="/resources/cash-app.svg" height=55 (click)="moveToStep('cashapp')">
-            </div>
-          }
+          </div>
+        </div>
+      }
+    </ng-container>
+    <ng-template #loadingCheckout>
+      <div class="row">
+        <div class="col-md">
+          <div class="d-flex flex-row justify-content-center align-items-center">
+            <div class="m-4 spinner-border text-light" style="width: 25px; height: 25px"></div>
+          </div>
         </div>
       </div>
-    }
+    </ng-template>
     @if (showSummary) {
       <div class="row mt-2 mb-2 text-center">
         <div class="col-sm d-flex flex-column">
@@ -413,7 +435,6 @@
       </div>
     </div>
   }
-
   @else if (step === 'processing') {
     <div class="row mb-1 text-center">
       <div class="col-sm">
@@ -434,4 +455,20 @@
       </div>
     </div>
   }
+  @else if (step === 'paid') {
+    <div class="row mb-1 text-center">
+      <div class="col-sm">
+        <h1 style="font-size: larger;"><ng-content select="[slot='accelerating-title']"></ng-content><span class="default-slot">Accelerating your transaction</span></h1>
+      </div>
+    </div>
+
+    <div class="row text-center mt-1">
+      <div class="col-sm">
+        <div class="d-flex flex-row justify-content-center align-items-center">
+          <p>Confirming your acceleration with our mining pool partners...</p>
+          <div class="ml-2 spinner-border text-light" style="width: 25px; height: 25px"></div>
+        </div>
+      </div>
+    </div>
+  }
 </div>
\ 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 6af453706..a580360a5 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -41,7 +41,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' | 'processing';
+type CheckoutStep = 'quote' | 'summary' | 'checkout' | 'cashapp' | 'processing' | 'paid';
 
 @Component({
   selector: 'app-accelerate-checkout',
@@ -58,7 +58,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   @Input() forceSummary: boolean = false;
   @Input() forceMobile: boolean = false;
   @Output() changeMode = new EventEmitter<boolean>();
-  @Output() close = new EventEmitter<null>();
 
   calculating = true;
   choosenOption: 'wait' | 'accel';
@@ -294,7 +293,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
         this.audioService.playSound('ascend-chime-cartoon');
         this.showSuccess = true;
         this.estimateSubscription.unsubscribe();
-        this.closeModal(2000);
+        this.moveToStep('paid')
       },
       error: (response) => {
         if (response.status === 403 && response.error === 'not_available') {
@@ -409,7 +408,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
                   that.cashAppPay.destroy();
                 }
                 setTimeout(() => {
-                  that.closeModal();
+                  this.moveToStep('paid');
                   if (window.history.replaceState) {
                     const urlParams = new URLSearchParams(window.location.search);
                     window.history.replaceState(null, null, window.location.toString().replace(`?cash_request_id=${urlParams.get('cash_request_id')}`, ''));
@@ -457,13 +456,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   selectedOptionChanged(event) {
     this.choosenOption = event.target.id;
   }
-  closeModal(timeout: number = 0): void {
-    setTimeout(() => {
-      this._step = 'processing';
-      this.cd.markForCheck();
-      this.close.emit();
-    }, timeout);
-  }
 
   isLoggedIn(): boolean {
     const auth = this.storageService.getAuth();
diff --git a/frontend/src/app/components/tracker/tracker.component.html b/frontend/src/app/components/tracker/tracker.component.html
index 64277e3e0..f65e1a204 100644
--- a/frontend/src/app/components/tracker/tracker.component.html
+++ b/frontend/src/app/components/tracker/tracker.component.html
@@ -122,7 +122,7 @@
         <span class="explainer">&nbsp;</span>
       } @else if (showAccelerationSummary && !accelerationFlowCompleted) {
         <ng-container *ngIf="(ETA$ | async) as eta;">
-          <app-accelerate-checkout *ngIf="(da$ | async) as da;" [forceSummary]="true" [cashappEnabled]="accelerationEligible" [advancedEnabled]="false" [forceMobile]="true" [tx]="tx" [miningStats]="miningStats" [eta]="eta" (close)="accelerationFlowCompleted = true" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100"></app-accelerate-checkout>
+          <app-accelerate-checkout *ngIf="(da$ | async) as da;" [forceSummary]="true" [cashappEnabled]="accelerationEligible" [advancedEnabled]="false" [forceMobile]="true" [tx]="tx" [miningStats]="miningStats" [eta]="eta" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100"></app-accelerate-checkout>
         </ng-container>
       } @else {
         @if (tx?.acceleration && !tx.status?.confirmed) {
diff --git a/frontend/src/app/components/tracker/tracker.component.ts b/frontend/src/app/components/tracker/tracker.component.ts
index 00051350b..b9c2b5ae7 100644
--- a/frontend/src/app/components/tracker/tracker.component.ts
+++ b/frontend/src/app/components/tracker/tracker.component.ts
@@ -386,6 +386,10 @@ export class TrackerComponent implements OnInit, OnDestroy {
             if (txPosition.position?.block > 0 && this.tx.weight < 4000) {
               this.accelerationEligible = true;
             }
+          } else if (this.showAccelerationSummary) {
+            setTimeout(() => {
+              this.accelerationFlowCompleted = true;
+            }, 2000);
           }
         }
       } else {
diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index cb20abe1e..0e67887dc 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -84,7 +84,7 @@
       <div class="clearfix"></div>
 
       <ng-container *ngIf="(ETA$ | async) as eta;">
-        <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [advancedEnabled]="true" [tx]="tx" [eta]="eta" [miningStats]="miningStats" (close)="showAccelerationSummary = false" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100">
+        <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [advancedEnabled]="true" [tx]="tx" [eta]="eta" [miningStats]="miningStats" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100">
           <span slot="cta-title">Urgent transaction? Get it confirmed faster.</span>
         </app-accelerate-checkout>
       </ng-container>
diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts
index c4b4a6af1..1e37ca3fc 100644
--- a/frontend/src/app/components/transaction/transaction.component.ts
+++ b/frontend/src/app/components/transaction/transaction.component.ts
@@ -767,8 +767,14 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
 
   setIsAccelerated(initialState: boolean = false) {
     this.isAcceleration = (this.tx.acceleration || (this.accelerationInfo && this.pool && this.accelerationInfo.pools.some(pool => (pool === this.pool.id))));
-    if (this.isAcceleration && initialState) {
-      this.showAccelerationSummary = false;
+    if (this.isAcceleration) {
+      if (initialState) {
+        this.showAccelerationSummary = false;
+      } else if (this.showAccelerationSummary) {
+        setTimeout(() => {
+          this.showAccelerationSummary = false;
+        }, 2000);
+      }
     }
     if (this.isAcceleration) {
       // this immediately returns cached stats if we fetched them recently

From 84d4eaa93267ccd5ebc55f1dafd951bee89f5f5a Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sat, 29 Jun 2024 06:08:58 +0000
Subject: [PATCH 43/77] remove stray console.log

---
 .../accelerate-checkout/accelerate-fee-graph.component.ts        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.ts b/frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.ts
index c41cb2f87..d85d2ee46 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-fee-graph.component.ts
@@ -48,7 +48,6 @@ export class AccelerateFeeGraphComponent implements OnInit, OnChanges {
     const maxRate = Math.max(...this.maxRateOptions.map(option => option.rate));
     const baseRate = this.estimate.txSummary.effectiveFee / this.estimate.txSummary.effectiveVsize;
     const baseHeight = baseRate / maxRate;
-    console.log(maxRate, baseRate, baseHeight);
     const bars: GraphBar[] = this.maxRateOptions.slice().reverse().map(option => {
       return {
         rate: option.rate,

From 3720d67666979977338cd73f7c108685d136ae16 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sat, 29 Jun 2024 07:04:08 +0000
Subject: [PATCH 44/77] [accelerator] waitlisted & preview-only screens

---
 .../accelerate-checkout.component.html        | 29 ++++++++++++-------
 .../accelerate-checkout.component.ts          | 26 ++++++++++++-----
 2 files changed, 36 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 a77347cdf..f23b808de 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -32,8 +32,8 @@
         <div [class]="{estimateDisabled: error || showSuccess }">
           <button class="btn btn-sm btn-outline-info float-right" (click)="showDetails = !showDetails">Details</button>
 
-          <div *ngIf="user && !estimate.hasAccess">
-            <div class="alert alert-mempool">You are currently on the waitlist</div>
+          <div *ngIf="user && !estimate.hasAccess" style="margin-right: 5em;">
+            <div class="alert alert-mempool mr-6">You are currently on the waitlist</div>
           </div>
 
           @if (showDetails) {
@@ -177,7 +177,7 @@
 
                   <!-- MAX COST -->
                   <ng-container>
-                    <tr class="group-first" [class.group-last]="!isLoggedIn() || estimate.userBalance >= cost">
+                    <tr class="group-first group-last">
                       <td class="item">
                         @if (isLoggedIn()) {
                           <b style="background-color: var(--primary);" class="p-1 pl-0" i18n="accelerator.maximum-cost">Maximum acceleration cost</b>
@@ -219,10 +219,17 @@
                     <td class="item"></td>
                     <td colspan="2">
                       <div class="d-flex">
-                        <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" style="width: 200px" (click)="accelerate()">
-                          <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
-                          <span>Accelerate</span>
-                        </button>
+                        @if (isLoggedIn()) {
+                          <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" [class.estimateDisabled]="!canPay" style="width: 200px" (click)="accelerate()">
+                            <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
+                            <span>Accelerate</span>
+                          </button>
+                        } @else {
+                          <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center estimateDisabled" style="width: 200px">
+                            <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
+                            <span>Coming soon</span>
+                          </button>
+                        }
                       </div>
                     </td>
                   </tr>
@@ -248,7 +255,7 @@
         </div>
       </div>
 
-      <form>
+      <form [class]="{estimateDisabled: error || showSuccess }">
         <div class="row">
           <div class="col-md">
             <div class="form-group form-check mb-2">
@@ -328,14 +335,14 @@
         </div>
       </div>
       @if (canPayWithBalance || !(canPayWithBitcoin || canPayWithCashapp)) {
-        <div class="d-flex justify-content-center">
-          <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" [class.estimateDisabled]="!canPayWithBalance" style="width: 200px" (click)="accelerate()">
+        <div class="d-flex justify-content-center" [class]="{estimateDisabled: !canPayWithBalance || error || showSuccess }">
+          <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" style="width: 200px" (click)="accelerate()">
             <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
             <span>Accelerate</span>
           </button>
         </div>
       } @else {
-        <div class="payment-area mt-2 p-2">
+        <div class="payment-area mt-2 p-2"[class]="{estimateDisabled: error || showSuccess }">
           <div class="row text-center justify-content-center mx-2" style="font-size: 14px;">
             <p>Payment to mempool.space for acceleration of txid <a [routerLink]="'/tx/' + tx.txid" target="_blank"> {{ tx.txid.substr(0, 10) }}..{{ tx.txid.substr(-10) }}</a></p>
           </div>
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 a580360a5..7de6a4a04 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -232,6 +232,10 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
           }
           this.cost = this.userBid + this.estimate.mempoolBaseFee + this.estimate.vsizeFee;
 
+          if (!this.canPay && this.advancedEnabled && this.step !== 'quote') {
+            this.moveToStep('quote');
+          }
+
           if (this.step === 'checkout' && this.canPayWithBitcoin && !this.loadingBtcpayInvoice) {
             this.loadingBtcpayInvoice = true;
             this.requestBTCPayInvoice();
@@ -266,14 +270,16 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
    * Advanced mode acceleration button clicked
    */
   accelerate(): void {
-    if (this.isLoggedIn()) {
-      if (this.step !== 'summary') {
-        this.moveToStep('summary');
+    if (this.canPay) {
+      if (this.isLoggedIn()) {
+        if (this.step !== 'summary') {
+          this.moveToStep('summary');
+        } else {
+          this.accelerateWithMempoolAccount();
+        }
       } else {
-        this.accelerateWithMempoolAccount();
+        this.moveToStep('checkout');
       }
-    } else {
-      this.moveToStep('checkout');
     }
   }
 
@@ -471,11 +477,15 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   }
 
   get canPayWithCashapp() {
-    return this.cashappEnabled && this.estimate?.availablePaymentMethods?.includes('bitcoin');
+    return this.cashappEnabled && this.estimate?.availablePaymentMethods?.includes('cashapp');
   }
 
   get canPayWithBalance() {
-    return this.isLoggedIn() && this.estimate?.availablePaymentMethods?.includes('balance');
+    return this.isLoggedIn() && this.estimate?.availablePaymentMethods?.includes('balance') && this.estimate?.hasAccess;
+  }
+
+  get canPay() {
+    return this.canPayWithBalance || this.canPayWithBitcoin || this.canPayWithCashapp;
   }
 
   get showSummary() {

From c249da790152e65c12b97ffb9ccbeafeeb86f77f Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sat, 29 Jun 2024 07:13:43 +0000
Subject: [PATCH 45/77] [accelerator] pizza tracker waitlisted & preview-only
 screens

---
 .../accelerate-checkout.component.html        | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 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 f23b808de..85e62b783 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -32,7 +32,7 @@
         <div [class]="{estimateDisabled: error || showSuccess }">
           <button class="btn btn-sm btn-outline-info float-right" (click)="showDetails = !showDetails">Details</button>
 
-          <div *ngIf="user && !estimate.hasAccess" style="margin-right: 5em;">
+          <div *ngIf="isLoggedIn() && !estimate.hasAccess" style="margin-right: 5em;">
             <div class="alert alert-mempool mr-6">You are currently on the waitlist</div>
           </div>
 
@@ -224,7 +224,7 @@
                             <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
                             <span>Accelerate</span>
                           </button>
-                        } @else {
+                        } @else if (!canPayWithBitcoin && !canPayWithCashapp) {
                           <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center estimateDisabled" style="width: 200px">
                             <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
                             <span>Coming soon</span>
@@ -255,6 +255,10 @@
         </div>
       </div>
 
+      <div *ngIf="isLoggedIn() && !estimate.hasAccess">
+        <div class="alert alert-mempool mr-6">You are currently on the waitlist for Mempool Accelerator&trade;</div>
+      </div>
+
       <form [class]="{estimateDisabled: error || showSuccess }">
         <div class="row">
           <div class="col-md">
@@ -292,12 +296,19 @@
             <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
           </div>
         </div>
-        <div class="row mt-2 mb-2" [style]="(choosenOption !== 'accel' || calculating) ? 'opacity: 0.25; pointer-events: none' : ''">
+        <div class="row mt-2 mb-2">
           <div class="col-sm d-flex flex-row justify-content-center">
-            <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" style="width: 200px" (click)="accelerate()">
-              <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
-              <span>Accelerate</span>
-            </button>
+            @if (isLoggedIn()) {
+              <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" [class.estimateDisabled]="!canPay || choosenOption !== 'accel' || calculating" style="width: 200px" (click)="accelerate()">
+                <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
+                <span>Accelerate</span>
+              </button>
+            } @else if (!canPayWithBitcoin && !canPayWithCashapp) {
+              <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center estimateDisabled" style="width: 200px">
+                <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
+                <span>Coming soon</span>
+              </button>
+            }
           </div>
         </div>
       </form>

From 277f8f7bfdd9c79b91bca6685d828567a6dba3f2 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sat, 29 Jun 2024 07:45:10 +0000
Subject: [PATCH 46/77] [accelerator] restore missing sparkles button

---
 .../accelerate-checkout/accelerate-checkout.component.html    | 4 ++--
 1 file changed, 2 insertions(+), 2 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 85e62b783..6dccfc060 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -298,12 +298,12 @@
         </div>
         <div class="row mt-2 mb-2">
           <div class="col-sm d-flex flex-row justify-content-center">
-            @if (isLoggedIn()) {
+            @if (isLoggedIn() || canPayWithBitcoin || canPayWithCashapp) {
               <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" [class.estimateDisabled]="!canPay || choosenOption !== 'accel' || calculating" style="width: 200px" (click)="accelerate()">
                 <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
                 <span>Accelerate</span>
               </button>
-            } @else if (!canPayWithBitcoin && !canPayWithCashapp) {
+            } @else {
               <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center estimateDisabled" style="width: 200px">
                 <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
                 <span>Coming soon</span>

From 6cf753ddafec0cc9349c9bbe0e7f82e7c786681c Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sat, 29 Jun 2024 07:46:24 +0000
Subject: [PATCH 47/77] [accelerator] fix other missing button

---
 .../accelerate-checkout/accelerate-checkout.component.html    | 4 ++--
 1 file changed, 2 insertions(+), 2 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 6dccfc060..0cd278f25 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -219,12 +219,12 @@
                     <td class="item"></td>
                     <td colspan="2">
                       <div class="d-flex">
-                        @if (isLoggedIn()) {
+                        @if (isLoggedIn() || canPayWithBitcoin || canPayWithCashapp) {
                           <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" [class.estimateDisabled]="!canPay" style="width: 200px" (click)="accelerate()">
                             <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
                             <span>Accelerate</span>
                           </button>
-                        } @else if (!canPayWithBitcoin && !canPayWithCashapp) {
+                        } @else {
                           <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center estimateDisabled" style="width: 200px">
                             <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
                             <span>Coming soon</span>

From 10671311203c4a1597204e438c4b4e783e082961 Mon Sep 17 00:00:00 2001
From: nymkappa <1612910616@pm.me>
Date: Sat, 29 Jun 2024 16:47:38 +0900
Subject: [PATCH 48/77] [btcpay] fix displayed amount

---
 .../bitcoin-invoice/bitcoin-invoice.component.html | 14 +++++++-------
 .../bitcoin-invoice/bitcoin-invoice.component.ts   |  4 +---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
index 1731a0e43..4e158e3e4 100644
--- a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
+++ b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
@@ -33,8 +33,8 @@
     <ng-template [ngIf]="paymentForm.get('method')?.value === 'chain' && invoice">
 
         <div class="qr-wrapper" [class.mt-0]="minimal">
-          <a [href]="bypassSecurityTrustUrl('bitcoin:' + invoice.addresses.BTC + '?amount=' + invoice.amount)" target="_blank">
-              <app-qrcode imageUrl="/resources/bitcoin-logo.png" [size]="200" [data]="'bitcoin:' + invoice.addresses.BTC + '?amount=' + invoice.amount"></app-qrcode>
+          <a [href]="bypassSecurityTrustUrl('bitcoin:' + invoice.addresses.BTC + '?amount=' + invoice.btcDue)" target="_blank">
+              <app-qrcode imageUrl="/resources/bitcoin-logo.png" [size]="200" [data]="'bitcoin:' + invoice.addresses.BTC + '?amount=' + invoice.btcDue"></app-qrcode>
           </a>
         </div>
 
@@ -45,7 +45,7 @@
           </div>
         </div>
         @if (!minimal) {
-          <p>{{ invoice.amount }} <span class="symbol">BTC</span></p>
+          <p>{{ invoice.btcDue | number: '1.0-8' }} <span class="symbol">BTC</span></p>
         }
 
     </ng-template>
@@ -66,7 +66,7 @@
         </div>
 
         @if (!minimal) {
-          <p>{{ invoice.amount * 100_000_000 }} <span class="symbol">sats</span></p>
+          <p>{{ invoice.btcDue * 100_000_000 | number: '1.0-0' }} <span class="symbol">sats</span></p>
         }
 
     </ng-template>
@@ -74,8 +74,8 @@
     <ng-template [ngIf]="invoice && (paymentForm.get('method')?.value === 'lbtc' || paymentForm.get('method')?.value === 'tlbtc')">
 
         <div class="qr-wrapper" [class.mt-0]="minimal">
-          <a [href]="bypassSecurityTrustUrl('liquidnetwork:' + invoice.addresses.LBTC + '?amount=' + invoice.amount + '&assetid=6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d')" target="_blank">
-              <app-qrcode imageUrl="/resources/liquid-bitcoin.png" [size]="200" [data]="'liquidnetwork:' + invoice.addresses.LBTC + '?amount=' + invoice.amount + '&assetid=6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d'"></app-qrcode>
+          <a [href]="bypassSecurityTrustUrl('liquidnetwork:' + invoice.addresses.LBTC + '?amount=' + invoice.btcDue + '&assetid=6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d')" target="_blank">
+              <app-qrcode imageUrl="/resources/liquid-bitcoin.png" [size]="200" [data]="'liquidnetwork:' + invoice.addresses.LBTC + '?amount=' + invoice.btcDue + '&assetid=6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d'"></app-qrcode>
           </a>
         </div>
         <br>
@@ -86,7 +86,7 @@
           </div>
         </div>
         @if (!minimal) {
-          <p>{{ invoice.amount }} <span class="symbol">BTC</span></p>
+          <p>{{ invoice.btcDue | number: '1.0-8' }} <span class="symbol">BTC</span></p>
         }
 
     </ng-template>
diff --git a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts
index 6f2d4b36c..395e1e41d 100644
--- a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts
+++ b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts
@@ -65,9 +65,7 @@ export class BitcoinInvoiceComponent implements OnInit, OnDestroy {
             this.paymentStatusSubscription = this.apiService.retreiveInvoice$(invoiceId).pipe(
               tap((invoice: any) => {
                 this.invoice = invoice;
-                this.invoice.amount = invoice.btcDue ?? (invoice.cryptoInfo.length ? parseFloat(invoice.cryptoInfo[0].totalDue) : 0) ?? 0;
-
-                if (this.invoice.amount > 0) {
+                if (this.invoice.btcDue > 0) {
                   this.paymentStatus = 2;
                 } else {
                   this.paymentStatus = 4;

From 776404dbdea891a65b69a7296e06898e838052ec Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sat, 29 Jun 2024 09:17:08 +0000
Subject: [PATCH 49/77] [accelerator] Pro for everyone

---
 .../accelerate-checkout.component.html        | 89 +++++++++++--------
 .../accelerate-checkout.component.ts          | 19 +---
 .../components/tracker/tracker.component.html |  2 +-
 .../components/tracker/tracker.component.ts   | 11 ++-
 .../transaction/transaction.component.html    |  5 +-
 .../transaction/transaction.component.ts      | 30 +++++--
 6 files changed, 91 insertions(+), 65 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 0cd278f25..11ecd2b7e 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -107,25 +107,49 @@
                 <tbody>
                   <!-- ESTIMATED FEE -->
                   <ng-container *ngIf="showDetails">
-                    <tr class="group-first">
-                      <td class="item" i18n="accelerator.next-block-rate">Next block market rate</td>
-                      <td class="amt" style="font-size: 16px">
-                        {{ estimate.targetFeeRate | number : '1.0-0' }}
-                      </td>
-                      <td class="units"><span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></td>
-                    </tr>
-                    <tr class="info">
-                      <td class="info">
-                        <i><small i18n="accelerator.estimated-extra-fee-required">Estimated extra fee required</small></i>
-                      </td>
-                      <td class="amt">
-                        {{ math.max(0, estimate.nextBlockFee - estimate.txSummary.effectiveFee) | number }}
-                      </td>
-                      <td class="units">
-                        <span class="symbol" i18n="shared.sats">sats</span>
-                        <span class="fiat ml-1"><app-fiat [value]="math.max(0, estimate.nextBlockFee - estimate.txSummary.effectiveFee)"></app-fiat></span>
-                      </td>
-                    </tr>
+                    @if (isLoggedIn()) {
+                      <tr class="group-first">
+                        <td class="item" i18n="accelerator.next-block-rate">Next block market rate</td>
+                        <td class="amt" style="font-size: 16px">
+                          {{ estimate.targetFeeRate | number : '1.0-0' }}
+                        </td>
+                        <td class="units"><span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></td>
+                      </tr>
+                      <tr class="info">
+                        <td class="info">
+                          <i><small i18n="accelerator.estimated-extra-fee-required">Estimated extra fee required</small></i>
+                        </td>
+                        <td class="amt">
+                          {{ math.max(0, estimate.nextBlockFee - estimate.txSummary.effectiveFee) | number }}
+                        </td>
+                        <td class="units">
+                          <span class="symbol" i18n="shared.sats">sats</span>
+                          <span class="fiat ml-1"><app-fiat [value]="math.max(0, estimate.nextBlockFee - estimate.txSummary.effectiveFee)"></app-fiat></span>
+                        </td>
+                      </tr>
+                    }
+                    @else {
+                      <!-- TARGET FEE -->
+                      <tr class="group-first">
+                        <td class="item" i18n="accelerator.target-rate">Target rate</td>
+                        <td class="amt" style="font-size: 16px">
+                          {{ maxRateOptions[selectFeeRateIndex].rate | number : '1.0-0' }}
+                        </td>
+                        <td class="units"><span class="symbol" i18n="shared.sat-vbyte|sat/vB">sat/vB</span></td>
+                      </tr>
+                      <tr class="info">
+                        <td class="info">
+                          <i><small i18n="accelerator.extra-fee-required">Extra fee required</small></i>
+                        </td>
+                        <td class="amt">
+                          {{ maxRateOptions[selectFeeRateIndex].fee | number }}
+                        </td>
+                        <td class="units">
+                          <span class="symbol" i18n="shared.sats">sats</span>
+                          <span class="fiat ml-1"><app-fiat [value]="maxRateOptions[selectFeeRateIndex].fee"></app-fiat></span>
+                        </td>
+                      </tr>
+                    }
 
                     <!-- MEMPOOL BASE FEE -->
                     <tr>
@@ -219,17 +243,10 @@
                     <td class="item"></td>
                     <td colspan="2">
                       <div class="d-flex">
-                        @if (isLoggedIn() || canPayWithBitcoin || canPayWithCashapp) {
-                          <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" [class.estimateDisabled]="!canPay" style="width: 200px" (click)="accelerate()">
-                            <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
-                            <span>Accelerate</span>
-                          </button>
-                        } @else {
-                          <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center estimateDisabled" style="width: 200px">
-                            <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
-                            <span>Coming soon</span>
-                          </button>
-                        }
+                        <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" style="width: 200px" (click)="moveToStep('summary')">
+                          <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
+                          <span>Continue</span>
+                        </button>
                       </div>
                     </td>
                   </tr>
@@ -280,7 +297,7 @@
             <div class="form-group form-check mb-2">
               <input type="radio" [checked]="choosenOption === 'accel'" class="form-check-input" id="accel" name="accel" (change)="selectedOptionChanged($event)">
               <label class="form-check-label d-flex flex-column" for="accel">
-                <span><b>Accelerate</b> to ~{{ ((userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB <button *ngIf="advancedEnabled && isLoggedIn()" class="btn btn-sm btn-accelerate btn-small-height ml-3" i18n="accelerator.customize" (click)="moveToStep('quote')">customize</button></span>
+                <span><b>Accelerate</b> to ~{{ ((userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB <button class="btn btn-sm btn-accelerate btn-small-height ml-3" i18n="accelerator.customize" (click)="moveToStep('quote')">customize</button></span>
                 <span class="checkout-text">Confirmation expected <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time><br>
                   @if (!calculating) {
                     <app-fiat [value]="cost"></app-fiat>fee (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
@@ -393,13 +410,11 @@
         </div>
       </div>
     </ng-template>
-    @if (showSummary) {
-      <div class="row mt-2 mb-2 text-center">
-        <div class="col-sm d-flex flex-column">
-          <button type="button" class="mt-1 btn btn-secondary btn-sm rounded-pill align-self-center" style="width: 200px" (click)="moveToStep('summary')">Go Back</button>
-        </div>
+    <div class="row mt-2 mb-2 text-center">
+      <div class="col-sm d-flex flex-column">
+        <button type="button" class="mt-1 btn btn-secondary btn-sm rounded-pill align-self-center" style="width: 200px" (click)="moveToStep('summary')">Go Back</button>
       </div>
-    }
+    </div>
   } @else if (step === 'cashapp') {
     <!-- Show checkout page -->
     <div class="row mb-md-1 text-center">
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 7de6a4a04..6c37663d0 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -55,7 +55,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   @Input() scrollEvent: boolean;
   @Input() cashappEnabled: boolean = true;
   @Input() advancedEnabled: boolean = false;
-  @Input() forceSummary: boolean = false;
   @Input() forceMobile: boolean = false;
   @Output() changeMode = new EventEmitter<boolean>();
 
@@ -122,10 +121,8 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
       this.moveToStep('processing');
       this.insertSquare();
       this.setupSquare();
-    } else if (this.isLoggedIn() || this.forceSummary) {
-      this.moveToStep('summary');
     } else {
-      this.moveToStep('checkout');
+      this.moveToStep('summary');
     }
 
     this.servicesApiService.setupSquare$().subscribe(ids => {
@@ -232,10 +229,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
           }
           this.cost = this.userBid + this.estimate.mempoolBaseFee + this.estimate.vsizeFee;
 
-          if (!this.canPay && this.advancedEnabled && this.step !== 'quote') {
-            this.moveToStep('quote');
-          }
-
           if (this.step === 'checkout' && this.canPayWithBitcoin && !this.loadingBtcpayInvoice) {
             this.loadingBtcpayInvoice = true;
             this.requestBTCPayInvoice();
@@ -272,11 +265,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   accelerate(): void {
     if (this.canPay) {
       if (this.isLoggedIn()) {
-        if (this.step !== 'summary') {
-          this.moveToStep('summary');
-        } else {
-          this.accelerateWithMempoolAccount();
-        }
+        this.accelerateWithMempoolAccount();
       } else {
         this.moveToStep('checkout');
       }
@@ -488,10 +477,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
     return this.canPayWithBalance || this.canPayWithBitcoin || this.canPayWithCashapp;
   }
 
-  get showSummary() {
-    return this.canPayWithBalance || this.forceSummary;
-  }
-
   @HostListener('window:resize', ['$event'])
   onResize(): void {
     this.isMobile = window.innerWidth <= 767.98;
diff --git a/frontend/src/app/components/tracker/tracker.component.html b/frontend/src/app/components/tracker/tracker.component.html
index f65e1a204..5199897fc 100644
--- a/frontend/src/app/components/tracker/tracker.component.html
+++ b/frontend/src/app/components/tracker/tracker.component.html
@@ -122,7 +122,7 @@
         <span class="explainer">&nbsp;</span>
       } @else if (showAccelerationSummary && !accelerationFlowCompleted) {
         <ng-container *ngIf="(ETA$ | async) as eta;">
-          <app-accelerate-checkout *ngIf="(da$ | async) as da;" [forceSummary]="true" [cashappEnabled]="accelerationEligible" [advancedEnabled]="false" [forceMobile]="true" [tx]="tx" [miningStats]="miningStats" [eta]="eta" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100"></app-accelerate-checkout>
+          <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [advancedEnabled]="false" [forceMobile]="true" [tx]="tx" [miningStats]="miningStats" [eta]="eta" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100"></app-accelerate-checkout>
         </ng-container>
       } @else {
         @if (tx?.acceleration && !tx.status?.confirmed) {
diff --git a/frontend/src/app/components/tracker/tracker.component.ts b/frontend/src/app/components/tracker/tracker.component.ts
index b9c2b5ae7..88a929bd7 100644
--- a/frontend/src/app/components/tracker/tracker.component.ts
+++ b/frontend/src/app/components/tracker/tracker.component.ts
@@ -151,6 +151,10 @@ export class TrackerComponent implements OnInit, OnDestroy {
 
     this.acceleratorAvailable = this.stateService.env.OFFICIAL_MEMPOOL_SPACE && this.stateService.env.ACCELERATOR && this.stateService.network === '';
 
+    this.miningService.getMiningStats('1w').subscribe(stats => {
+      this.miningStats = stats;
+    });
+
     const urlParams = new URLSearchParams(window.location.search);
     if (urlParams.get('cash_request_id')) {
       this.showAccelerationSummary = true;
@@ -382,7 +386,12 @@ export class TrackerComponent implements OnInit, OnDestroy {
           }
 
           if (!this.mempoolPosition.accelerated) {
-            this.showAccelerationSummary = true;
+            if (!this.showAccelerationSummary) {
+              this.showAccelerationSummary = true;
+              this.miningService.getMiningStats('1w').subscribe(stats => {
+                this.miningStats = stats;
+              });
+            }
             if (txPosition.position?.block > 0 && this.tx.weight < 4000) {
               this.accelerationEligible = true;
             }
diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index 0e67887dc..58322a72d 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -547,11 +547,8 @@
             } @else if (network === 'liquid' || network === 'liquidtestnet') {
               <app-time kind="until" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time>
             } @else {
-              <span class="eta justify-content-end" [class]="(acceleratorAvailable && accelerateCtaType === 'button') ? 'd-flex align-items-center' : ''">
+              <span class="eta justify-content-end">
                 <app-time kind="until" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time>
-                @if (!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button') {
-                  <a class="btn btn-sm accelerate btn-small-height" i18n="transaction.accelerate|Accelerate button label" (click)="onAccelerateClicked()">Accelerate</a>
-                }
               </span>
             }
           </ng-container>
diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts
index 1e37ca3fc..7b12b3c7b 100644
--- a/frontend/src/app/components/transaction/transaction.component.ts
+++ b/frontend/src/app/components/transaction/transaction.component.ts
@@ -170,6 +170,15 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
   ngOnInit() {
     this.enterpriseService.page();
 
+    const urlParams = new URLSearchParams(window.location.search);
+    if (urlParams.get('cash_request_id')) {
+      this.showAccelerationSummary = true;
+    }
+
+    this.miningService.getMiningStats('1w').subscribe(stats => {
+      this.miningStats = stats;
+    });
+
     this.websocketService.want(['blocks', 'mempool-blocks']);
     this.stateService.networkChanged$.subscribe(
       (network) => {
@@ -398,7 +407,22 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
           } else if ((this.tx?.acceleration && txPosition.position.acceleratedBy)) {
             this.tx.acceleratedBy = txPosition.position.acceleratedBy;
           }
-          this.accelerationEligible = txPosition?.position?.block > 0 && this.tx?.weight < 4000;
+
+          if (!this.mempoolPosition.accelerated) {
+            if (!this.showAccelerationSummary) {
+              this.showAccelerationSummary = true;
+              this.miningService.getMiningStats('1w').subscribe(stats => {
+                this.miningStats = stats;
+              });
+            }
+            if (txPosition.position?.block > 0 && this.tx.weight < 4000) {
+              this.accelerationEligible = true;
+            }
+          } else if (this.showAccelerationSummary) {
+            setTimeout(() => {
+              this.showAccelerationSummary = false;
+            }, 2000);
+          }
         }
       } else {
         this.mempoolPosition = null;
@@ -683,10 +707,6 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
       return;
     }
 
-    this.miningService.getMiningStats('1w').subscribe(stats => {
-      this.miningStats = stats;
-    });
-
     document.location.hash = '#accelerate';
     this.enterpriseService.goal(8);
     this.showAccelerationSummary = true && this.acceleratorAvailable;

From c5fc47683470d6b194df22e1d44a00ab6f46bd2f Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sat, 29 Jun 2024 09:21:39 +0000
Subject: [PATCH 50/77] [accelerator] no autoscroll to checkout

---
 .../accelerate-checkout.component.ts          | 28 -------------------
 .../components/tracker/tracker.component.html |  2 +-
 .../transaction/transaction.component.html    |  2 +-
 3 files changed, 2 insertions(+), 30 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 6c37663d0..30ce7a606 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -52,7 +52,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   @Input() tx: Transaction;
   @Input() miningStats: MiningStats;
   @Input() eta: ETA;
-  @Input() scrollEvent: boolean;
   @Input() cashappEnabled: boolean = true;
   @Input() advancedEnabled: boolean = false;
   @Input() forceMobile: boolean = false;
@@ -139,12 +138,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
     }
   }
 
-  ngOnChanges(changes: SimpleChanges): void {
-    if (changes.scrollEvent) {
-      this.scrollToElement('acceleratePreviewAnchor', 'start');
-    }
-  }
-
   moveToStep(step: CheckoutStep) {
     this._step = step;
     if (!this.estimate && ['quote', 'summary', 'checkout'].includes(this.step)) {
@@ -160,26 +153,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
     }
   }
 
-  /**
-  * Scroll to element id with or without setTimeout
-  */
-  scrollToElementWithTimeout(id: string, position: ScrollLogicalPosition, timeout: number = 1000): void {
-    setTimeout(() => {
-      this.scrollToElement(id, position);
-    }, timeout);
-  }
-  scrollToElement(id: string, position: ScrollLogicalPosition) {
-    const acceleratePreviewAnchor = document.getElementById(id);
-    if (acceleratePreviewAnchor) {
-      this.cd.markForCheck();
-      acceleratePreviewAnchor.scrollIntoView({
-        behavior: 'smooth',
-        inline: position,
-        block: position,
-      });
-    }
-  }
-
   /**
    * Accelerator
    */
@@ -437,7 +410,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
       next: (response) => {
         this.invoice = response;
         this.cd.markForCheck();
-        this.scrollToElementWithTimeout('acceleratePreviewAnchor', 'start', 500);
       },
       error: (response) => {
         console.log(response);
diff --git a/frontend/src/app/components/tracker/tracker.component.html b/frontend/src/app/components/tracker/tracker.component.html
index 5199897fc..417038539 100644
--- a/frontend/src/app/components/tracker/tracker.component.html
+++ b/frontend/src/app/components/tracker/tracker.component.html
@@ -122,7 +122,7 @@
         <span class="explainer">&nbsp;</span>
       } @else if (showAccelerationSummary && !accelerationFlowCompleted) {
         <ng-container *ngIf="(ETA$ | async) as eta;">
-          <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [advancedEnabled]="false" [forceMobile]="true" [tx]="tx" [miningStats]="miningStats" [eta]="eta" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100"></app-accelerate-checkout>
+          <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [advancedEnabled]="false" [forceMobile]="true" [tx]="tx" [miningStats]="miningStats" [eta]="eta" class="h-100 w-100"></app-accelerate-checkout>
         </ng-container>
       } @else {
         @if (tx?.acceleration && !tx.status?.confirmed) {
diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index 58322a72d..1c83bba40 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -84,7 +84,7 @@
       <div class="clearfix"></div>
 
       <ng-container *ngIf="(ETA$ | async) as eta;">
-        <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [advancedEnabled]="true" [tx]="tx" [eta]="eta" [miningStats]="miningStats" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100">
+        <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [advancedEnabled]="true" [tx]="tx" [eta]="eta" [miningStats]="miningStats" class="h-100 w-100">
           <span slot="cta-title">Urgent transaction? Get it confirmed faster.</span>
         </app-accelerate-checkout>
       </ng-container>

From f68c8cc621cafa4e474e2e3ed0d990a48e093625 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 01:46:11 +0000
Subject: [PATCH 51/77] [accelerator] restore scroll events, remove eta button

---
 .../accelerate-checkout.component.ts          | 28 +++++++++++++++++++
 .../components/tracker/tracker.component.html |  6 ++--
 .../components/tracker/tracker.component.ts   |  2 +-
 .../transaction/transaction.component.html    |  6 ++--
 .../transaction/transaction.component.ts      |  2 +-
 5 files changed, 36 insertions(+), 8 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 30ce7a606..6a20f6ff7 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -52,6 +52,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   @Input() tx: Transaction;
   @Input() miningStats: MiningStats;
   @Input() eta: ETA;
+  @Input() scrollEvent: boolean;
   @Input() cashappEnabled: boolean = true;
   @Input() advancedEnabled: boolean = false;
   @Input() forceMobile: boolean = false;
@@ -138,6 +139,12 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
     }
   }
 
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes.scrollEvent && this.scrollEvent) {
+      this.scrollToElement('acceleratePreviewAnchor', 'start');
+    }
+  }
+
   moveToStep(step: CheckoutStep) {
     this._step = step;
     if (!this.estimate && ['quote', 'summary', 'checkout'].includes(this.step)) {
@@ -153,6 +160,26 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
     }
   }
 
+  /**
+  * Scroll to element id with or without setTimeout
+  */
+  scrollToElementWithTimeout(id: string, position: ScrollLogicalPosition, timeout: number = 1000): void {
+    setTimeout(() => {
+      this.scrollToElement(id, position);
+    }, timeout);
+  }
+  scrollToElement(id: string, position: ScrollLogicalPosition) {
+    const acceleratePreviewAnchor = document.getElementById(id);
+    if (acceleratePreviewAnchor) {
+      this.cd.markForCheck();
+      acceleratePreviewAnchor.scrollIntoView({
+        behavior: 'smooth',
+        inline: position,
+        block: position,
+      });
+    }
+  }
+
   /**
    * Accelerator
    */
@@ -410,6 +437,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
       next: (response) => {
         this.invoice = response;
         this.cd.markForCheck();
+        this.scrollToElementWithTimeout('acceleratePreviewAnchor', 'start', 500);
       },
       error: (response) => {
         console.log(response);
diff --git a/frontend/src/app/components/tracker/tracker.component.html b/frontend/src/app/components/tracker/tracker.component.html
index 417038539..6bb0950b5 100644
--- a/frontend/src/app/components/tracker/tracker.component.html
+++ b/frontend/src/app/components/tracker/tracker.component.html
@@ -75,9 +75,9 @@
                   } @else {
                     <app-time kind="until" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time>
                   }
-                  @if (!showAccelerationSummary && isMobile && !tx.acceleration && acceleratorAvailable && accelerateCtaType === 'button' && !tx?.acceleration) {
+                  <!-- @if (!showAccelerationSummary && isMobile && !tx.acceleration && acceleratorAvailable && accelerateCtaType === 'button' && !tx?.acceleration) {
                     <a class="btn btn-sm accelerate btn-small-height" i18n="transaction.accelerate|Accelerate button label" (click)="onAccelerateClicked()">Accelerate</a>
-                  }
+                  } -->
                 </span>
               </ng-container>
               <ng-template #etaSkeleton>
@@ -122,7 +122,7 @@
         <span class="explainer">&nbsp;</span>
       } @else if (showAccelerationSummary && !accelerationFlowCompleted) {
         <ng-container *ngIf="(ETA$ | async) as eta;">
-          <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [advancedEnabled]="false" [forceMobile]="true" [tx]="tx" [miningStats]="miningStats" [eta]="eta" class="h-100 w-100"></app-accelerate-checkout>
+          <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [advancedEnabled]="false" [forceMobile]="true" [tx]="tx" [miningStats]="miningStats" [eta]="eta" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100"></app-accelerate-checkout>
         </ng-container>
       } @else {
         @if (tx?.acceleration && !tx.status?.confirmed) {
diff --git a/frontend/src/app/components/tracker/tracker.component.ts b/frontend/src/app/components/tracker/tracker.component.ts
index 88a929bd7..397f98805 100644
--- a/frontend/src/app/components/tracker/tracker.component.ts
+++ b/frontend/src/app/components/tracker/tracker.component.ts
@@ -743,7 +743,7 @@ export class TrackerComponent implements OnInit, OnDestroy {
     }
     this.enterpriseService.goal(8);
     this.showAccelerationSummary = true && this.acceleratorAvailable;
-    this.scrollIntoAccelPreview = !this.scrollIntoAccelPreview;
+    this.scrollIntoAccelPreview = true;
     return false;
   }
 
diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index 1c83bba40..5a2c1510a 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -84,7 +84,7 @@
       <div class="clearfix"></div>
 
       <ng-container *ngIf="(ETA$ | async) as eta;">
-        <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [advancedEnabled]="true" [tx]="tx" [eta]="eta" [miningStats]="miningStats" class="h-100 w-100">
+        <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [advancedEnabled]="true" [tx]="tx" [eta]="eta" [miningStats]="miningStats" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100">
           <span slot="cta-title">Urgent transaction? Get it confirmed faster.</span>
         </app-accelerate-checkout>
       </ng-container>
@@ -540,9 +540,9 @@
             @if (eta.blocks >= 7) {
               <span [class]="(!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button') ? 'etaDeepMempool d-flex justify-content-end align-items-center' : ''">
                 <span i18n="transaction.eta.in-several-hours|Transaction ETA in several hours or more">In several hours (or more)</span>
-                @if (!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button') {
+                <!-- @if (!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button') {
                   <a class="btn btn-sm accelerateDeepMempool btn-small-height" i18n="transaction.accelerate|Accelerate button label" (click)="onAccelerateClicked()">Accelerate</a>
-                }
+                } -->
               </span>
             } @else if (network === 'liquid' || network === 'liquidtestnet') {
               <app-time kind="until" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time>
diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts
index 7b12b3c7b..74f49c69b 100644
--- a/frontend/src/app/components/transaction/transaction.component.ts
+++ b/frontend/src/app/components/transaction/transaction.component.ts
@@ -710,7 +710,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
     document.location.hash = '#accelerate';
     this.enterpriseService.goal(8);
     this.showAccelerationSummary = true && this.acceleratorAvailable;
-    this.scrollIntoAccelPreview = !this.scrollIntoAccelPreview;
+    this.scrollIntoAccelPreview = true;
     return false;
   }
 

From 425edb9b9f3b45762118fdd6d979bd2811875238 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 02:06:50 +0000
Subject: [PATCH 52/77] Fix dust limit for undefined witness program outputs

---
 backend/src/api/common.ts                    | 2 +-
 frontend/src/app/shared/transaction.utils.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/api/common.ts b/backend/src/api/common.ts
index 04f380418..c1c998fb8 100644
--- a/backend/src/api/common.ts
+++ b/backend/src/api/common.ts
@@ -292,7 +292,7 @@ export class Common {
         dustSize += getVarIntLength(dustSize);
         // add value size
         dustSize += 8;
-        if (['v0_p2wpkh', 'v0_p2wsh', 'v1_p2tr'].includes(vout.scriptpubkey_type)) {
+        if (Common.isWitnessProgram(vout.scriptpubkey)) {
           dustSize += 67;
         } else {
           dustSize += 148;
diff --git a/frontend/src/app/shared/transaction.utils.ts b/frontend/src/app/shared/transaction.utils.ts
index 7bc986330..6803ef489 100644
--- a/frontend/src/app/shared/transaction.utils.ts
+++ b/frontend/src/app/shared/transaction.utils.ts
@@ -181,7 +181,7 @@ export function isNonStandard(tx: Transaction): boolean {
       dustSize += getVarIntLength(dustSize);
       // add value size
       dustSize += 8;
-      if (['v0_p2wpkh', 'v0_p2wsh', 'v1_p2tr'].includes(vout.scriptpubkey_type)) {
+      if (isWitnessProgram(vout.scriptpubkey)) {
         dustSize += 67;
       } else {
         dustSize += 148;

From 2798b43913e1cf056a3b1bd7cfa581bc786ab127 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 02:40:58 +0000
Subject: [PATCH 53/77] [accelerator] adjust h1 labels

---
 .../src/app/components/transaction/transaction.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index 5a2c1510a..4a56f2c99 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -78,14 +78,14 @@
     <ng-container *ngIf="!tx?.status?.confirmed && showAccelerationSummary">
       <br>
       <div class="title float-left">
-        <h2 i18n="transaction.accelerate|Accelerate button label">Accelerate</h2>
+        <h2 i18n="transaction.accelerate|Accelerate button label">Transaction stuck?</h2>
       </div>
 
       <div class="clearfix"></div>
 
       <ng-container *ngIf="(ETA$ | async) as eta;">
         <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [advancedEnabled]="true" [tx]="tx" [eta]="eta" [miningStats]="miningStats" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100">
-          <span slot="cta-title">Urgent transaction? Get it confirmed faster.</span>
+          <span slot="cta-title">Mempool Accelerator&trade; fixes this.</span>
         </app-accelerate-checkout>
       </ng-container>
     </ng-container>

From bf37affe47be152cb6de536e700a9e5a3bd48a3d Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 03:20:33 +0000
Subject: [PATCH 54/77] [accelerator] fiat limits

---
 .../accelerate-checkout.component.html                   | 2 +-
 .../accelerate-checkout/accelerate-checkout.component.ts | 2 +-
 .../src/app/components/tracker/tracker.component.html    | 2 +-
 frontend/src/app/components/tracker/tracker.component.ts | 7 +++++--
 .../components/transaction/transaction.component.html    | 4 ++--
 .../app/components/transaction/transaction.component.ts  | 9 ++++++++-
 6 files changed, 18 insertions(+), 8 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 11ecd2b7e..2ffb94294 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -391,7 +391,7 @@
                 </div>
               }
             }
-            @if (cashappEnabled) {
+            @if (canPayWithCashapp) {
               <div class="col-sm text-center d-flex flex-column justify-content-center align-items-center">
                 <p>Pay <app-fiat [value]="cost"></app-fiat> with</p>
                 <img class="paymentMethod mx-2" src="/resources/cash-app.svg" height=55 (click)="moveToStep('cashapp')">
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 6a20f6ff7..c69da8524 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -466,7 +466,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   }
 
   get canPayWithCashapp() {
-    return this.cashappEnabled && this.estimate?.availablePaymentMethods?.includes('cashapp');
+    return this.cashappEnabled && this.estimate?.availablePaymentMethods?.includes('cashapp') && this.cost < 400000;
   }
 
   get canPayWithBalance() {
diff --git a/frontend/src/app/components/tracker/tracker.component.html b/frontend/src/app/components/tracker/tracker.component.html
index 6bb0950b5..a0f242d46 100644
--- a/frontend/src/app/components/tracker/tracker.component.html
+++ b/frontend/src/app/components/tracker/tracker.component.html
@@ -120,7 +120,7 @@
           <div class="spinner-border text-light" style="width: 1em; height: 1em"></div>
         </div>
         <span class="explainer">&nbsp;</span>
-      } @else if (showAccelerationSummary && !accelerationFlowCompleted) {
+      } @else if (showAccelerationSummary) {
         <ng-container *ngIf="(ETA$ | async) as eta;">
           <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [advancedEnabled]="false" [forceMobile]="true" [tx]="tx" [miningStats]="miningStats" [eta]="eta" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100"></app-accelerate-checkout>
         </ng-container>
diff --git a/frontend/src/app/components/tracker/tracker.component.ts b/frontend/src/app/components/tracker/tracker.component.ts
index 397f98805..57eecee16 100644
--- a/frontend/src/app/components/tracker/tracker.component.ts
+++ b/frontend/src/app/components/tracker/tracker.component.ts
@@ -386,18 +386,19 @@ export class TrackerComponent implements OnInit, OnDestroy {
           }
 
           if (!this.mempoolPosition.accelerated) {
-            if (!this.showAccelerationSummary) {
+            if (!this.accelerationFlowCompleted && !this.showAccelerationSummary && this.mempoolPosition.block > 0) {
               this.showAccelerationSummary = true;
               this.miningService.getMiningStats('1w').subscribe(stats => {
                 this.miningStats = stats;
               });
             }
-            if (txPosition.position?.block > 0 && this.tx.weight < 4000) {
+            if (txPosition.position?.block > 0) {
               this.accelerationEligible = true;
             }
           } else if (this.showAccelerationSummary) {
             setTimeout(() => {
               this.accelerationFlowCompleted = true;
+              this.showAccelerationSummary = false;
             }, 2000);
           }
         }
@@ -742,6 +743,7 @@ export class TrackerComponent implements OnInit, OnDestroy {
       return;
     }
     this.enterpriseService.goal(8);
+    this.accelerationFlowCompleted = false;
     this.showAccelerationSummary = true && this.acceleratorAvailable;
     this.scrollIntoAccelPreview = true;
     return false;
@@ -777,6 +779,7 @@ export class TrackerComponent implements OnInit, OnDestroy {
     this.auditStatus = null;
     this.accelerationPositions = null;
     this.accelerationEligible = false;
+    this.accelerationFlowCompleted = false;
     this.trackerStage = 'waiting';
     document.body.scrollTo(0, 0);
     this.leaveTransaction();
diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index 4a56f2c99..eecae86f7 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -540,9 +540,9 @@
             @if (eta.blocks >= 7) {
               <span [class]="(!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button') ? 'etaDeepMempool d-flex justify-content-end align-items-center' : ''">
                 <span i18n="transaction.eta.in-several-hours|Transaction ETA in several hours or more">In several hours (or more)</span>
-                <!-- @if (!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button') {
+                @if (!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button' && !showAccelerationSummary) {
                   <a class="btn btn-sm accelerateDeepMempool btn-small-height" i18n="transaction.accelerate|Accelerate button label" (click)="onAccelerateClicked()">Accelerate</a>
-                } -->
+                }
               </span>
             } @else if (network === 'liquid' || network === 'liquidtestnet') {
               <app-time kind="until" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time>
diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts
index 74f49c69b..0f86701ff 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;
+  accelerationFlowCompleted = false;
   scrollIntoAccelPreview = false;
   accelerationEligible = false;
   auditEnabled: boolean = this.stateService.env.AUDIT && this.stateService.env.BASE_MODULE === 'mempool' && this.stateService.env.MINING_DASHBOARD === true;
@@ -409,7 +410,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
           }
 
           if (!this.mempoolPosition.accelerated) {
-            if (!this.showAccelerationSummary) {
+            if (!this.accelerationFlowCompleted && !this.showAccelerationSummary) {
               this.showAccelerationSummary = true;
               this.miningService.getMiningStats('1w').subscribe(stats => {
                 this.miningStats = stats;
@@ -420,6 +421,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
             }
           } else if (this.showAccelerationSummary) {
             setTimeout(() => {
+              this.accelerationFlowCompleted = true;
               this.showAccelerationSummary = false;
             }, 2000);
           }
@@ -709,6 +711,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
 
     document.location.hash = '#accelerate';
     this.enterpriseService.goal(8);
+    this.accelerationFlowCompleted = false;
     this.showAccelerationSummary = true && this.acceleratorAvailable;
     this.scrollIntoAccelPreview = true;
     return false;
@@ -789,9 +792,11 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
     this.isAcceleration = (this.tx.acceleration || (this.accelerationInfo && this.pool && this.accelerationInfo.pools.some(pool => (pool === this.pool.id))));
     if (this.isAcceleration) {
       if (initialState) {
+        this.accelerationFlowCompleted = true;
         this.showAccelerationSummary = false;
       } else if (this.showAccelerationSummary) {
         setTimeout(() => {
+          this.accelerationFlowCompleted = true;
           this.showAccelerationSummary = false;
         }, 2000);
       }
@@ -864,6 +869,8 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
     this.filters = [];
     this.showCpfpDetails = false;
     this.accelerationInfo = null;
+    this.accelerationEligible = false;
+    this.accelerationFlowCompleted = false;
     this.txInBlockIndex = null;
     this.mempoolPosition = null;
     this.pool = null;

From d059c5ca27c23f0d892fe798d281ccb4c7aed845 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 03:43:28 +0000
Subject: [PATCH 55/77] [accelerator] slim summary screen

---
 .../accelerate-checkout.component.html        | 59 +++++++------------
 .../accelerate-checkout.component.scss        | 13 ++++
 .../accelerate-checkout.component.ts          | 10 +---
 .../transaction/transaction.component.html    | 14 ++++-
 4 files changed, 47 insertions(+), 49 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 2ffb94294..73b209593 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -266,36 +266,23 @@
   @else if (step === 'summary') {
     <ng-container *ngIf="estimate && (etaInfo$ | async) as etaInfo; else loadingSummary">
       <!-- Show A/B CTAs -->
-      <div class="row mb-1">
-        <div class="col-sm">
-          <h1 style="font-size: larger;"><ng-content select="[slot='cta-title']"></ng-content><span class="default-slot">Accelerate your Bitcoin transaction?</span></h1>
+      @if (!noCTA) {
+        <div class="row mb-1">
+          <div class="col-sm">
+            <h1 style="font-size: larger;"><ng-content select="[slot='cta-title']"></ng-content><span class="default-slot">Accelerate your Bitcoin transaction?</span></h1>
+          </div>
         </div>
-      </div>
+      }
 
       <div *ngIf="isLoggedIn() && !estimate.hasAccess">
         <div class="alert alert-mempool mr-6">You are currently on the waitlist for Mempool Accelerator&trade;</div>
       </div>
 
       <form [class]="{estimateDisabled: error || showSuccess }">
-        <div class="row">
-          <div class="col-md">
+        <div class="row summary-row">
+          <div>
             <div class="form-group form-check mb-2">
-              <input type="radio" [checked]="choosenOption === 'wait'"  class="form-check-input" id="wait" name="accel" (change)="selectedOptionChanged($event)">
-              <label class="form-check-label d-flex flex-column" for="wait">
-                <span class="font-weight-bold">Wait</span>
-                @if (eta.blocks < 7) {
-                  <span class="checkout-text">Confirmation expected <app-time kind="within" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time></span>
-                } @else {
-                  <span class="checkout-text">
-                    <span>Confirmation expected within several hours</span>
-                  </span>
-                }
-              </label>
-            </div>
-          </div>
-          <div class="col-md">
-            <div class="form-group form-check mb-2">
-              <input type="radio" [checked]="choosenOption === 'accel'" class="form-check-input" id="accel" name="accel" (change)="selectedOptionChanged($event)">
+              <input type="checkbox" [checked]="armed" class="form-check-input" id="accel" name="accel" (change)="armed = !armed">
               <label class="form-check-label d-flex flex-column" for="accel">
                 <span><b>Accelerate</b> to ~{{ ((userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB <button class="btn btn-sm btn-accelerate btn-small-height ml-3" i18n="accelerator.customize" (click)="moveToStep('quote')">customize</button></span>
                 <span class="checkout-text">Confirmation expected <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time><br>
@@ -308,25 +295,21 @@
               </label>
             </div>
           </div>
-          <div class="col-md pie d-none d-lg-flex" *ngIf="!forceMobile">
+          <div class="pie d-none d-lg-flex" *ngIf="!forceMobile">
             <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to {{ etaInfo.hashratePercentage | number : '1.1-1' }}% of miners.</small>
             <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
           </div>
-        </div>
-        <div class="row mt-2 mb-2">
-          <div class="col-sm d-flex flex-row justify-content-center">
-            @if (isLoggedIn() || canPayWithBitcoin || canPayWithCashapp) {
-              <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" [class.estimateDisabled]="!canPay || choosenOption !== 'accel' || calculating" style="width: 200px" (click)="accelerate()">
-                <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
-                <span>Accelerate</span>
-              </button>
-            } @else {
-              <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center estimateDisabled" style="width: 200px">
-                <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
-                <span>Coming soon</span>
-              </button>
-            }
-          </div>
+          @if (isLoggedIn() || canPayWithBitcoin || canPayWithCashapp) {
+            <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" [class.estimateDisabled]="!canPay || !armed || calculating" style="width: 200px" (click)="accelerate()">
+              <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
+              <span>Accelerate</span>
+            </button>
+          } @else {
+            <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center estimateDisabled" style="width: 200px">
+              <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
+              <span>Coming soon</span>
+            </button>
+          }
         </div>
       </form>
     </ng-container>
diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
index 1fdb51086..da4dc8079 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
@@ -171,4 +171,17 @@
 
 .btn-small-height {
 	line-height: 1;
+}
+
+.summary-row {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 2em;
+  flex-wrap: wrap;
+
+  @media (max-width: 640px) {
+    flex-direction: column;
+  }
 }
\ 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 c69da8524..4f8c5b163 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -56,10 +56,11 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   @Input() cashappEnabled: boolean = true;
   @Input() advancedEnabled: boolean = false;
   @Input() forceMobile: boolean = false;
+  @Input() noCTA: boolean = false;
   @Output() changeMode = new EventEmitter<boolean>();
 
   calculating = true;
-  choosenOption: 'wait' | 'accel';
+  armed = false;
   error = '';
   math = Math;
   isMobile: boolean = window.innerWidth <= 767.98;
@@ -445,13 +446,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
     });
   }
 
-  /**
-   * UI events
-   */
-  selectedOptionChanged(event) {
-    this.choosenOption = event.target.id;
-  }
-
   isLoggedIn(): boolean {
     const auth = this.storageService.getAuth();
     return auth !== null;
diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index eecae86f7..29ef8bfba 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -84,9 +84,17 @@
       <div class="clearfix"></div>
 
       <ng-container *ngIf="(ETA$ | async) as eta;">
-        <app-accelerate-checkout *ngIf="(da$ | async) as da;" [cashappEnabled]="accelerationEligible" [advancedEnabled]="true" [tx]="tx" [eta]="eta" [miningStats]="miningStats" [scrollEvent]="scrollIntoAccelPreview" class="h-100 w-100">
-          <span slot="cta-title">Mempool Accelerator&trade; fixes this.</span>
-        </app-accelerate-checkout>
+        <app-accelerate-checkout
+          *ngIf="(da$ | async) as da;"
+          [cashappEnabled]="accelerationEligible"
+          [advancedEnabled]="true"
+          [tx]="tx"
+          [eta]="eta"
+          [miningStats]="miningStats"
+          [scrollEvent]="scrollIntoAccelPreview"
+          [noCTA]="true"
+          class="h-100 w-100"
+        ></app-accelerate-checkout>
       </ng-container>
     </ng-container>
 

From 110b7a934cfe07db89edc677b4ac79417698edaf Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 04:57:00 +0000
Subject: [PATCH 56/77] [accelerator] buttons

---
 .../accelerate-checkout.component.html             |  6 +++---
 .../app/components/tracker/tracker.component.ts    |  1 -
 .../transaction/transaction.component.html         | 11 +++++++++--
 .../transaction/transaction.component.ts           | 14 ++++++++------
 4 files changed, 20 insertions(+), 12 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 73b209593..d96c8af36 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -269,7 +269,7 @@
       @if (!noCTA) {
         <div class="row mb-1">
           <div class="col-sm">
-            <h1 style="font-size: larger;"><ng-content select="[slot='cta-title']"></ng-content><span class="default-slot">Accelerate your Bitcoin transaction?</span></h1>
+            <h1 style="font-size: larger;"><ng-content select="[slot='cta-title']"></ng-content><span class="default-slot">Transaction stuck?</span></h1>
           </div>
         </div>
       }
@@ -284,7 +284,7 @@
             <div class="form-group form-check mb-2">
               <input type="checkbox" [checked]="armed" class="form-check-input" id="accel" name="accel" (change)="armed = !armed">
               <label class="form-check-label d-flex flex-column" for="accel">
-                <span><b>Accelerate</b> to ~{{ ((userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB <button class="btn btn-sm btn-accelerate btn-small-height ml-3" i18n="accelerator.customize" (click)="moveToStep('quote')">customize</button></span>
+                <span><b>Accelerate</b> to ~{{ ((userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB <button *ngIf="advancedEnabled" class="btn btn-sm btn-outline-info btn-small-height ml-3" i18n="accelerator.customize" (click)="moveToStep('quote')">customize</button></span>
                 <span class="checkout-text">Confirmation expected <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time><br>
                   @if (!calculating) {
                     <app-fiat [value]="cost"></app-fiat>fee (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
@@ -327,7 +327,7 @@
       <div class="row">
         <div class="col-md">
           <div class="d-flex flex-column">
-            <span><b>Accelerate</b> to ~{{ ((userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB <button *ngIf="advancedEnabled && isLoggedIn()" class="btn btn-sm btn-accelerate btn-small-height ml-3" i18n="accelerator.customize" (click)="moveToStep('quote')">customize</button></span>
+            <span><b>Accelerate</b> to ~{{ ((userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB <button *ngIf="advancedEnabled" class="btn btn-sm btn-outline-info btn-small-height ml-3" i18n="accelerator.customize" (click)="moveToStep('quote')">customize</button></span>
             <span class="checkout-text">
               @if (!calculating) {
                 For an additional <app-fiat [value]="cost"></app-fiat> (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
diff --git a/frontend/src/app/components/tracker/tracker.component.ts b/frontend/src/app/components/tracker/tracker.component.ts
index 57eecee16..349e8d43b 100644
--- a/frontend/src/app/components/tracker/tracker.component.ts
+++ b/frontend/src/app/components/tracker/tracker.component.ts
@@ -779,7 +779,6 @@ export class TrackerComponent implements OnInit, OnDestroy {
     this.auditStatus = null;
     this.accelerationPositions = null;
     this.accelerationEligible = false;
-    this.accelerationFlowCompleted = false;
     this.trackerStage = 'waiting';
     document.body.scrollTo(0, 0);
     this.leaveTransaction();
diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index 29ef8bfba..7876f4f4c 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -81,6 +81,8 @@
         <h2 i18n="transaction.accelerate|Accelerate button label">Transaction stuck?</h2>
       </div>
 
+      <button type="button" class="btn btn-outline-info flow-toggle btn-sm float-right" (click)="closeAccelerator()" i18n="hide-diagram">Hide accelerator</button>
+
       <div class="clearfix"></div>
 
       <ng-container *ngIf="(ETA$ | async) as eta;">
@@ -546,7 +548,7 @@
         <td>
           <ng-container *ngIf="(ETA$ | async) as eta; else etaSkeleton">
             @if (eta.blocks >= 7) {
-              <span [class]="(!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button') ? 'etaDeepMempool d-flex justify-content-end align-items-center' : ''">
+              <span [class]="(!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button' && !showAccelerationSummary) ? 'etaDeepMempool d-flex justify-content-end align-items-center' : ''">
                 <span i18n="transaction.eta.in-several-hours|Transaction ETA in several hours or more">In several hours (or more)</span>
                 @if (!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button' && !showAccelerationSummary) {
                   <a class="btn btn-sm accelerateDeepMempool btn-small-height" i18n="transaction.accelerate|Accelerate button label" (click)="onAccelerateClicked()">Accelerate</a>
@@ -555,8 +557,13 @@
             } @else if (network === 'liquid' || network === 'liquidtestnet') {
               <app-time kind="until" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time>
             } @else {
-              <span class="eta justify-content-end">
+              <span [class]="(!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button' && !showAccelerationSummary) ? 'etaDeepMempool d-flex justify-content-end align-items-center' : ''">
                 <app-time kind="until" [time]="eta.time" [fastRender]="false" [fixedRender]="true"></app-time>
+                @if (!tx?.acceleration && acceleratorAvailable && accelerateCtaType === 'button' && !showAccelerationSummary) {
+                  <a class="btn btn-sm accelerateDeepMempool btn-small-height" i18n="transaction.accelerate|Accelerate button label" (click)="onAccelerateClicked()">Accelerate</a>
+                }
+              </span>
+              <span class="eta justify-content-end">
               </span>
             }
           </ng-container>
diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts
index 0f86701ff..fb3f8cb1a 100644
--- a/frontend/src/app/components/transaction/transaction.component.ts
+++ b/frontend/src/app/components/transaction/transaction.component.ts
@@ -421,8 +421,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
             }
           } else if (this.showAccelerationSummary) {
             setTimeout(() => {
-              this.accelerationFlowCompleted = true;
-              this.showAccelerationSummary = false;
+              this.closeAccelerator();
             }, 2000);
           }
         }
@@ -712,7 +711,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
     document.location.hash = '#accelerate';
     this.enterpriseService.goal(8);
     this.accelerationFlowCompleted = false;
-    this.showAccelerationSummary = true && this.acceleratorAvailable;
+    this.showAccelerationSummary = this.acceleratorAvailable;
     this.scrollIntoAccelPreview = true;
     return false;
   }
@@ -796,8 +795,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
         this.showAccelerationSummary = false;
       } else if (this.showAccelerationSummary) {
         setTimeout(() => {
-          this.accelerationFlowCompleted = true;
-          this.showAccelerationSummary = false;
+          this.closeAccelerator();
         }, 2000);
       }
     }
@@ -870,7 +868,6 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
     this.showCpfpDetails = false;
     this.accelerationInfo = null;
     this.accelerationEligible = false;
-    this.accelerationFlowCompleted = false;
     this.txInBlockIndex = null;
     this.mempoolPosition = null;
     this.pool = null;
@@ -887,6 +884,11 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
     this.stateService.markBlock$.next({});
   }
 
+  closeAccelerator(): void {
+    this.accelerationFlowCompleted = true;
+    this.showAccelerationSummary = false;
+  }
+
   roundToOneDecimal(cpfpTx: any): number {
     return +(cpfpTx.fee / (cpfpTx.weight / 4)).toFixed(1);
   }

From cfe5da227625e96267bf9c1dbeb59da00a81d209 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 05:37:51 +0000
Subject: [PATCH 57/77] [accelerator] streamline flow

---
 .../accelerate-checkout.component.html        | 53 ++++++++++++-------
 .../accelerate-checkout.component.ts          |  4 +-
 .../transaction/transaction.component.html    |  3 ++
 .../transaction/transaction.component.ts      |  6 +++
 4 files changed, 45 insertions(+), 21 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 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 @@
 
       <ng-container *ngIf="estimate else loadingEstimate">
         <div [class]="{estimateDisabled: error || showSuccess }">
-          <button class="btn btn-sm btn-outline-info float-right" (click)="showDetails = !showDetails">Details</button>
-
           <div *ngIf="isLoggedIn() && !estimate.hasAccess" style="margin-right: 5em;">
             <div class="alert alert-mempool mr-6">You are currently on the waitlist</div>
           </div>
@@ -243,10 +241,7 @@
                     <td class="item"></td>
                     <td colspan="2">
                       <div class="d-flex">
-                        <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" style="width: 200px" (click)="moveToStep('summary')">
-                          <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
-                          <span>Continue</span>
-                        </button>
+                        <ng-container *ngTemplateOutlet="accelerateButton"></ng-container>
                       </div>
                     </td>
                   </tr>
@@ -258,6 +253,13 @@
       </ng-container>
     </div>
 
+    <hr>
+    <div class="row mt-2 mb-2 text-center">
+      <div class="col-sm d-flex flex-column">
+        <button type="button" class="mt-1 btn btn-secondary btn-sm rounded-pill align-self-center" style="width: 200px" (click)="moveToStep('summary')">Go Back</button>
+      </div>
+    </div>
+
     <ng-template #loadingEstimate>
       <div class="skeleton-loader"></div>
       <br>
@@ -282,9 +284,10 @@
         <div class="row summary-row">
           <div>
             <div class="form-group form-check mb-2">
+              <div class="float-right"><ng-container *ngTemplateOutlet="customizeButton"></ng-container></div>
               <input type="checkbox" [checked]="armed" class="form-check-input" id="accel" name="accel" (change)="armed = !armed">
               <label class="form-check-label d-flex flex-column" for="accel">
-                <span><b>Accelerate</b> to ~{{ ((userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB <button *ngIf="advancedEnabled" class="btn btn-sm btn-outline-info btn-small-height ml-3" i18n="accelerator.customize" (click)="moveToStep('quote')">customize</button></span>
+                <span><b>Accelerate</b> to ~{{ ((userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB</span>
                 <span class="checkout-text">Confirmation expected <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time><br>
                   @if (!calculating) {
                     <app-fiat [value]="cost"></app-fiat>fee (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
@@ -299,17 +302,7 @@
             <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to {{ etaInfo.hashratePercentage | number : '1.1-1' }}% of miners.</small>
             <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
           </div>
-          @if (isLoggedIn() || canPayWithBitcoin || canPayWithCashapp) {
-            <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" [class.estimateDisabled]="!canPay || !armed || calculating" style="width: 200px" (click)="accelerate()">
-              <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
-              <span>Accelerate</span>
-            </button>
-          } @else {
-            <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center estimateDisabled" style="width: 200px">
-              <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
-              <span>Coming soon</span>
-            </button>
-          }
+          <ng-container *ngTemplateOutlet="accelerateButton"></ng-container>
         </div>
       </form>
     </ng-container>
@@ -327,7 +320,7 @@
       <div class="row">
         <div class="col-md">
           <div class="d-flex flex-column">
-            <span><b>Accelerate</b> to ~{{ ((userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB <button *ngIf="advancedEnabled" class="btn btn-sm btn-outline-info btn-small-height ml-3" i18n="accelerator.customize" (click)="moveToStep('quote')">customize</button></span>
+            <span><b>Accelerate</b> to ~{{ ((userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB</span>
             <span class="checkout-text">
               @if (!calculating) {
                 For an additional <app-fiat [value]="cost"></app-fiat> (<span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span>)
@@ -393,6 +386,8 @@
         </div>
       </div>
     </ng-template>
+
+    <hr>
     <div class="row mt-2 mb-2 text-center">
       <div class="col-sm d-flex flex-column">
         <button type="button" class="mt-1 btn btn-secondary btn-sm rounded-pill align-self-center" style="width: 200px" (click)="moveToStep('summary')">Go Back</button>
@@ -487,4 +482,22 @@
       </div>
     </div>
   }
-</div>
\ No newline at end of file
+</div>
+
+<ng-template #customizeButton>
+  <button type="button" *ngIf="advancedEnabled" class="btn btn-sm btn-outline-info btn-small-height ml-3" (click)="moveToStep('quote')" i18n="accelerator.customize">customize</button>
+</ng-template>
+
+<ng-template #accelerateButton>
+  @if (isLoggedIn() || canPayWithBitcoin || canPayWithCashapp) {
+    <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" [class.estimateDisabled]="!canPay || (!armed && step === 'summary') || calculating" style="width: 200px" (click)="accelerate()">
+      <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
+      <span>Accelerate</span>
+    </button>
+  } @else {
+    <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center estimateDisabled" style="width: 200px">
+      <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
+      <span>Coming soon</span>
+    </button>
+  }
+</ng-template>
\ 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<boolean>();
   @Output() changeMode = new EventEmitter<boolean>();
 
   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 @@
       </div>
 
       <button type="button" class="btn btn-outline-info flow-toggle btn-sm float-right" (click)="closeAccelerator()" i18n="hide-diagram">Hide accelerator</button>
+      <button *ngIf="hasAccelerationDetails" class="btn btn-sm btn-outline-info float-right ml-2" (click)="showAccelerationDetails = !showAccelerationDetails">Details</button>
 
       <div class="clearfix"></div>
 
@@ -94,7 +95,9 @@
           [eta]="eta"
           [miningStats]="miningStats"
           [scrollEvent]="scrollIntoAccelPreview"
+          [showDetails]="showAccelerationDetails"
           [noCTA]="true"
+          (hasDetails)="setHasAccelerationDetails($event)"
           class="h-100 w-100"
         ></app-accelerate-checkout>
       </ng-container>
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;

From 3b4ac3b6b7f8fb498dbbc0d3ce03b19ad07f1700 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 05:42:32 +0000
Subject: [PATCH 58/77] [accelerator] less muted text

---
 .../accelerate-checkout.component.html                    | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 92041eaca..dff691c95 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -73,8 +73,8 @@
           <div class="row">
             <div class="col">
               <ng-container *ngIf="(etaInfo$ | async) as etaInfo; else loadingEstimate">
-                <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to <strong>{{ etaInfo.hashratePercentage | number : '1.1-1' }}%</strong> of miners.</small>
-                <small class="form-text text-muted mb-2" i18n="accelerator.time-estimate-description">This will reduce your expected waiting time until the first confirmation to <strong><app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time></strong></small>
+                <small class="form-text checkout-text mb-2" i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to <strong>{{ etaInfo.hashratePercentage | number : '1.1-1' }}%</strong> of miners.</small>
+                <small class="form-text checkout-text mb-2" i18n="accelerator.time-estimate-description">This will reduce your expected waiting time until the first confirmation to <strong><app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time></strong></small>
               </ng-container>
             </div>
             <div class="col pie">
@@ -299,7 +299,7 @@
             </div>
           </div>
           <div class="pie d-none d-lg-flex" *ngIf="!forceMobile">
-            <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to {{ etaInfo.hashratePercentage | number : '1.1-1' }}% of miners.</small>
+            <small class="form-text checkout-text mb-2" i18n="accelerator.hashrate-percentage-description">Your transaction will be prioritized by up to {{ etaInfo.hashratePercentage | number : '1.1-1' }}% of miners.</small>
             <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
           </div>
           <ng-container *ngTemplateOutlet="accelerateButton"></ng-container>
@@ -334,7 +334,7 @@
           </div>
         </div>
         <div class="col-md pie d-none d-md-flex" *ngIf="!forceMobile">
-          <small class="form-text text-muted mb-2" i18n="accelerator.hashrate-percentage-description" *ngIf="(etaInfo$ | async) as etaInfo">Your transaction will be prioritized by up to {{ etaInfo.hashratePercentage | number : '1.1-1' }}% of miners.</small>
+          <small class="form-text checkout-text mb-2" i18n="accelerator.hashrate-percentage-description" *ngIf="(etaInfo$ | async) as etaInfo">Your transaction will be prioritized by up to {{ etaInfo.hashratePercentage | number : '1.1-1' }}% of miners.</small>
           <app-active-acceleration-box [miningStats]="miningStats" [pools]="estimate.pools" [chartOnly]="true"></app-active-acceleration-box>
         </div>
       </div>

From 84e1ac31c27dbbf4963d3c07940c7391d5af5a61 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 05:51:13 +0000
Subject: [PATCH 59/77] [accelerator] fix stray margin

---
 .../accelerate-checkout/accelerate-checkout.component.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 dff691c95..86f008a61 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -35,7 +35,7 @@
           </div>
 
           @if (showDetails) {
-            <h5 class="mb-4" i18n="accelerator.your-transaction">Your transaction</h5>
+            <h5 i18n="accelerator.your-transaction">Your transaction</h5>
             <div class="row">
               <div class="col">
                 <small *ngIf="hasAncestors" class="form-text text-muted mb-2">

From caf7011df527e7d6cdf08aa9ee4b5403b71c8a39 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 06:51:01 +0000
Subject: [PATCH 60/77] [accelerator] checkbox error hint

---
 .../accelerate-checkout.component.html        | 14 +++++------
 .../accelerate-checkout.component.scss        | 25 ++++++++++++++++++-
 .../accelerate-checkout.component.ts          | 15 ++++++++---
 3 files changed, 42 insertions(+), 12 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 86f008a61..301303c89 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -29,7 +29,7 @@
       </ng-container>
 
       <ng-container *ngIf="estimate else loadingEstimate">
-        <div [class]="{estimateDisabled: error || showSuccess }">
+        <div [class.disabled]="error || showSuccess">
           <div *ngIf="isLoggedIn() && !estimate.hasAccess" style="margin-right: 5em;">
             <div class="alert alert-mempool mr-6">You are currently on the waitlist</div>
           </div>
@@ -280,12 +280,12 @@
         <div class="alert alert-mempool mr-6">You are currently on the waitlist for Mempool Accelerator&trade;</div>
       </div>
 
-      <form [class]="{estimateDisabled: error || showSuccess }">
+      <form [class.disabled]="error || showSuccess">
         <div class="row summary-row">
           <div>
             <div class="form-group form-check mb-2">
               <div class="float-right"><ng-container *ngTemplateOutlet="customizeButton"></ng-container></div>
-              <input type="checkbox" [checked]="armed" class="form-check-input" id="accel" name="accel" (change)="armed = !armed">
+              <input type="checkbox" [checked]="armed" class="form-check-input" [class.error-shake]="misfire" id="accel" name="accel" (change)="armed = !armed; misfire = false">
               <label class="form-check-label d-flex flex-column" for="accel">
                 <span><b>Accelerate</b> to ~{{ ((userBid + estimate.txSummary.effectiveFee) / estimate.txSummary.effectiveVsize) | number : '1.0-0' }} sat/vB</span>
                 <span class="checkout-text">Confirmation expected <app-time kind="within" [time]="etaInfo.acceleratedETA" [fastRender]="false" [fixedRender]="true"></app-time><br>
@@ -339,14 +339,14 @@
         </div>
       </div>
       @if (canPayWithBalance || !(canPayWithBitcoin || canPayWithCashapp)) {
-        <div class="d-flex justify-content-center" [class]="{estimateDisabled: !canPayWithBalance || error || showSuccess }">
+        <div class="d-flex justify-content-center" [class.grayOut]="!canPayWithBalance || error || showSuccess">
           <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" style="width: 200px" (click)="accelerate()">
             <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
             <span>Accelerate</span>
           </button>
         </div>
       } @else {
-        <div class="payment-area mt-2 p-2"[class]="{estimateDisabled: error || showSuccess }">
+        <div class="payment-area mt-2 p-2" [class.disabled]="error || showSuccess">
           <div class="row text-center justify-content-center mx-2" style="font-size: 14px;">
             <p>Payment to mempool.space for acceleration of txid <a [routerLink]="'/tx/' + tx.txid" target="_blank"> {{ tx.txid.substr(0, 10) }}..{{ tx.txid.substr(-10) }}</a></p>
           </div>
@@ -490,12 +490,12 @@
 
 <ng-template #accelerateButton>
   @if (isLoggedIn() || canPayWithBitcoin || canPayWithCashapp) {
-    <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" [class.estimateDisabled]="!canPay || (!armed && step === 'summary') || calculating" style="width: 200px" (click)="accelerate()">
+    <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center" [class.grayOut]="!canPay || (!armed && step === 'summary') || calculating" style="width: 200px" (click)="accelerate()">
       <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
       <span>Accelerate</span>
     </button>
   } @else {
-    <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center estimateDisabled" style="width: 200px">
+    <button type="button" class="mt-1 btn btn-purple rounded-pill align-self-center d-flex flex-row justify-content-center align-items-center disabled" style="width: 200px">
       <img src="/resources/mempool-accelerator-sparkles-light.svg" height="20" class="mr-2" style="margin-left: -10px">
       <span>Coming soon</span>
     </button>
diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
index da4dc8079..5cfd153bd 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.scss
@@ -59,7 +59,11 @@
   box-shadow: none !important;
 }
 
-.estimateDisabled {
+.grayOut {
+  opacity: 0.5;
+}
+
+.disabled {
   opacity: 0.5;
   pointer-events: none;
 }
@@ -184,4 +188,23 @@
   @media (max-width: 640px) {
     flex-direction: column;
   }
+}
+
+@keyframes box-shake {
+  0% { transform: rotate(0deg); }
+  10% { transform: rotate(-8deg); }
+  20% { transform: rotate(8deg); }
+  30% { transform: rotate(-8deg); }
+  40% { transform: rotate(8deg); }
+  50% { transform: rotate(-8deg); }
+  60% { transform: rotate(8deg); }
+  70% { transform: rotate(-8deg); }
+  80% { transform: rotate(8deg); }
+  90% { transform: rotate(-8deg); }
+  100% { transform: rotate(0deg); }
+}
+
+.error-shake {
+  box-shadow: 0 0 10px 2px var(--danger);
+  animation: box-shake 1.5s ease-in-out;
 }
\ 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 49eb990fa..791dc1ebc 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -63,6 +63,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
 
   calculating = true;
   armed = false;
+  misfire = false;
   error = '';
   math = Math;
   isMobile: boolean = window.innerWidth <= 767.98;
@@ -149,6 +150,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
 
   moveToStep(step: CheckoutStep) {
     this._step = step;
+    this.misfire = false;
     if (!this.estimate && ['quote', 'summary', 'checkout'].includes(this.step)) {
       this.fetchEstimate();
     }
@@ -266,11 +268,16 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
    * Advanced mode acceleration button clicked
    */
   accelerate(): void {
-    if (this.canPay) {
-      if (this.isLoggedIn()) {
-        this.accelerateWithMempoolAccount();
+    if (this.canPay && !this.calculating) {
+      if ((!this.armed && this.step === 'summary')) {
+        this.misfire = true;
       } else {
-        this.moveToStep('checkout');
+        if (this.isLoggedIn()) {
+          this.accelerateWithMempoolAccount();
+        } else {
+          this.armed = true;
+          this.moveToStep('checkout');
+        }
       }
     }
   }

From e3abdf4b4f666b132bc2588ec962e18282a78b22 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 06:53:56 +0000
Subject: [PATCH 61/77] [accelerator] revert titles

---
 .../accelerate-checkout/accelerate-checkout.component.html      | 2 +-
 .../src/app/components/transaction/transaction.component.html   | 2 +-
 2 files changed, 2 insertions(+), 2 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 301303c89..d4db46258 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -271,7 +271,7 @@
       @if (!noCTA) {
         <div class="row mb-1">
           <div class="col-sm">
-            <h1 style="font-size: larger;"><ng-content select="[slot='cta-title']"></ng-content><span class="default-slot">Transaction stuck?</span></h1>
+            <h1 style="font-size: larger;"><ng-content select="[slot='cta-title']"></ng-content><span class="default-slot">Accelerate your Bitcoin transaction?</span></h1>
           </div>
         </div>
       }
diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html
index 47c368dfc..da8763fa6 100644
--- a/frontend/src/app/components/transaction/transaction.component.html
+++ b/frontend/src/app/components/transaction/transaction.component.html
@@ -78,7 +78,7 @@
     <ng-container *ngIf="!tx?.status?.confirmed && showAccelerationSummary">
       <br>
       <div class="title float-left">
-        <h2 i18n="transaction.accelerate|Accelerate button label">Transaction stuck?</h2>
+        <h2 i18n="transaction.accelerate|Accelerate button label">Accelerate</h2>
       </div>
 
       <button type="button" class="btn btn-outline-info flow-toggle btn-sm float-right" (click)="closeAccelerator()" i18n="hide-diagram">Hide accelerator</button>

From 1e820a0fc8dc3e0d1b5d9519a3eb995a7ea37eae Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 06:55:32 +0000
Subject: [PATCH 62/77] [accelerator] soft enforce referrer

---
 .../accelerate-checkout/accelerate-checkout.component.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 791dc1ebc..61b03d553 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -469,7 +469,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
   }
 
   get canPayWithCashapp() {
-    return this.cashappEnabled && this.estimate?.availablePaymentMethods?.includes('cashapp') && this.cost < 400000;
+    return this.cashappEnabled && this.estimate?.availablePaymentMethods?.includes('cashapp') && this.cost < 400000 && this.stateService.referrer === 'https://cash.app/';
   }
 
   get canPayWithBalance() {

From 3ecc8ae8cfcec38543fd29ac2a30efeba2afc2ab Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 07:17:15 +0000
Subject: [PATCH 63/77] [accelerator] ln qr

---
 .../components/bitcoin-invoice/bitcoin-invoice.component.html | 4 ++--
 .../components/bitcoin-invoice/bitcoin-invoice.component.ts   | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
index 4e158e3e4..790f046f7 100644
--- a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
+++ b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
@@ -14,7 +14,7 @@
     
     <form [formGroup]="paymentForm">
 
-      <div class="form-group">
+      <div *ngIf="availableMethods.length > 1" class="form-group">
         <div class="btn-group btn-group-toggle" data-toggle="buttons">
           <!-- <label *ngIf="invoice.addresses.BTC" class="btn btn-primary" [ngClass]="{'active': paymentForm.get('method')?.value === 'chain'}">
             <input type="radio" value="chain" formControlName="method"> <fa-icon [icon]="['fas', 'link']" [fixedWidth]="true" title="Onchain"></fa-icon>
@@ -54,7 +54,7 @@
 
         <div class="qr-wrapper" [class.mt-0]="minimal">
           <a [href]="bypassSecurityTrustUrl('lightning:' + invoice.addresses.BTC_LightningLike)" target="_blank">
-              <app-qrcode imageUrl="/resources/bitcoin-logo.png" [size]="200" [data]="invoice.addresses.BTC_LightningLike.toUpperCase()"></app-qrcode>
+              <app-qrcode imageUrl="/resources/lightning-logo.png" [size]="200" [data]="invoice.addresses.BTC_LightningLike.toUpperCase()"></app-qrcode>
           </a>
         </div>
 
diff --git a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts
index 395e1e41d..e4ad1af20 100644
--- a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts
+++ b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts
@@ -87,6 +87,10 @@ export class BitcoinInvoiceComponent implements OnInit, OnDestroy {
       ).subscribe();
   }
 
+  get availableMethods(): string[] {
+    return Object.keys(this.invoice?.addresses || {}).filter(k => k === 'BTC_LightningLike');
+  }
+
   bypassSecurityTrustUrl(text: string): SafeUrl {
     return this.sanitizer.bypassSecurityTrustUrl(text);
   }

From ce31d0512c05e90c4e4b6699bccc6985dbd58f6d Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 07:32:04 +0000
Subject: [PATCH 64/77] [accelerator] improve btcpay QR codes

---
 .../app/components/qrcode/qrcode.component.scss |   9 +++++----
 .../app/components/qrcode/qrcode.component.ts   |   2 +-
 frontend/src/resources/bitcoin-logo.png         | Bin 0 -> 59285 bytes
 frontend/src/resources/lightning-logo.png       | Bin 0 -> 67289 bytes
 4 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 frontend/src/resources/bitcoin-logo.png
 create mode 100644 frontend/src/resources/lightning-logo.png

diff --git a/frontend/src/app/components/qrcode/qrcode.component.scss b/frontend/src/app/components/qrcode/qrcode.component.scss
index d4de43026..9c2aafe23 100644
--- a/frontend/src/app/components/qrcode/qrcode.component.scss
+++ b/frontend/src/app/components/qrcode/qrcode.component.scss
@@ -1,9 +1,10 @@
 img {
   position: absolute;
-  top: 67px;
-  left: 67px;
-  width: 65px;
-  height: 65px;
+  top: 50%;
+  left: 50%;
+  width: 42px;
+  height: 42px;
+  transform: translate(-50%, -50%);
 }
 
 .holder {
diff --git a/frontend/src/app/components/qrcode/qrcode.component.ts b/frontend/src/app/components/qrcode/qrcode.component.ts
index dad7522c6..f377895c0 100644
--- a/frontend/src/app/components/qrcode/qrcode.component.ts
+++ b/frontend/src/app/components/qrcode/qrcode.component.ts
@@ -37,7 +37,7 @@ export class QrcodeComponent implements AfterViewInit {
       return;
     }
     const opts: QRCode.QRCodeRenderersOptions = {
-      errorCorrectionLevel: 'L',
+      errorCorrectionLevel: 'M',
       margin: 0,
       color: {
         dark: '#000',
diff --git a/frontend/src/resources/bitcoin-logo.png b/frontend/src/resources/bitcoin-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d7962d2a0e65f1b9a3ec7d605ea54bd472c90ff
GIT binary patch
literal 59285
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

literal 0
HcmV?d00001

diff --git a/frontend/src/resources/lightning-logo.png b/frontend/src/resources/lightning-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..4507ae9ad8c5ffc2be0293fb279c50b5fa3d3524
GIT binary patch
literal 67289
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

literal 0
HcmV?d00001


From c4942074697c020537848ae66e561a31db69f332 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 07:38:25 +0000
Subject: [PATCH 65/77] [accelerator] match loading height to actual QR

---
 .../accelerate-checkout/accelerate-checkout.component.html  | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 d4db46258..decd95d3c 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -357,8 +357,10 @@
                   <p>Pay <span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span></p>
                   <app-bitcoin-invoice style="width: 100%;" [invoiceId]="invoice.btcpayInvoiceId" [minimal]="true" (completed)="moveToStep('paid')"></app-bitcoin-invoice>
                 } @else {
-                  <span>Loading invoice...</span>
-                  <div class="m-4 spinner-border text-light" style="width: 25px; height: 25px"></div>
+                  <p>Loading invoice...</p>
+                  <div class="d-flex align-items-center justify-content-center" style="width: 100%; height: 292px;">
+                    <div class="m-4 spinner-border text-light" style="width: 25px; height: 25px"></div>
+                  </div>
                 }
               </div>
               @if (canPayWithCashapp) {

From 0b663c1a77b1fbd922d630184c3274a2a9c67546 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 07:41:25 +0000
Subject: [PATCH 66/77] [accelerator] fix loading spinner alignment

---
 .../accelerate-checkout/accelerate-checkout.component.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 decd95d3c..db9ac6811 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -478,7 +478,7 @@
     <div class="row text-center mt-1">
       <div class="col-sm">
         <div class="d-flex flex-row justify-content-center align-items-center">
-          <p>Confirming your acceleration with our mining pool partners...</p>
+          <span>Confirming your acceleration with our mining pool partners...</span>
           <div class="ml-2 spinner-border text-light" style="width: 25px; height: 25px"></div>
         </div>
       </div>

From f114a8ca75bb8a5fbbb382d8e241b2d62eb45903 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 08:15:20 +0000
Subject: [PATCH 67/77] [accelerator] refactor bitcoin-payment component

---
 .../accelerate-checkout.component.html        |  2 +-
 .../bitcoin-invoice.component.html            | 44 ++++++------
 .../bitcoin-invoice.component.ts              | 69 +++++++++++--------
 3 files changed, 64 insertions(+), 51 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 db9ac6811..a6863eb36 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -355,7 +355,7 @@
               <div class="col-sm text-center d-flex flex-column justify-content-center align-items-center">
                 @if (invoice) {
                   <p>Pay <span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span></p>
-                  <app-bitcoin-invoice style="width: 100%;" [invoiceId]="invoice.btcpayInvoiceId" [minimal]="true" (completed)="moveToStep('paid')"></app-bitcoin-invoice>
+                  <app-bitcoin-invoice style="width: 100%;" [invoice]="invoice" [invoiceId]="invoice.btcpayInvoiceId" [minimal]="true" (completed)="moveToStep('paid')"></app-bitcoin-invoice>
                 } @else {
                   <p>Loading invoice...</p>
                   <div class="d-flex align-items-center justify-content-center" style="width: 100%; height: 292px;">
diff --git a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
index 790f046f7..5fd4f6701 100644
--- a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
+++ b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.html
@@ -6,7 +6,7 @@
     </span>
 
     <span *ngIf="paymentStatus === 4" class="valid-feedback d-block mt-5">
-      A transaction <a [href]="'/tx/' + invoice.cryptoInfo[0].payments[0].id.split('-')[0]">has been detected in the mempool</a> fully paying for this invoice. Waiting for on-chain confirmation.
+      A transaction <a [href]="'/tx/' + loadedInvoice.cryptoInfo[0].payments[0].id.split('-')[0]">has been detected in the mempool</a> fully paying for this invoice. Waiting for on-chain confirmation.
     </span>
   }
 
@@ -16,13 +16,13 @@
 
       <div *ngIf="availableMethods.length > 1" class="form-group">
         <div class="btn-group btn-group-toggle" data-toggle="buttons">
-          <!-- <label *ngIf="invoice.addresses.BTC" class="btn btn-primary" [ngClass]="{'active': paymentForm.get('method')?.value === 'chain'}">
+          <!-- <label *ngIf="loadedInvoice.addresses.BTC" class="btn btn-primary" [ngClass]="{'active': paymentForm.get('method')?.value === 'chain'}">
             <input type="radio" value="chain" formControlName="method"> <fa-icon [icon]="['fas', 'link']" [fixedWidth]="true" title="Onchain"></fa-icon>
           </label> -->
-          <label *ngIf="invoice.addresses.BTC_LightningLike" class="btn btn-primary" [ngClass]="{'active': paymentForm.get('method')?.value === 'lightning'}">
+          <label *ngIf="loadedInvoice.addresses.BTC_LightningLike" class="btn btn-primary" [ngClass]="{'active': paymentForm.get('method')?.value === 'lightning'}">
             <input type="radio" value="lightning" formControlName="method"> <fa-icon [icon]="['fas', 'bolt']" [fixedWidth]="true" title="Lightning"></fa-icon>
           </label>
-          <!-- <label *ngIf="invoice.addresses.LBTC" class="btn btn-primary" [ngClass]="{'active': paymentForm.get('method')?.value === 'lbtc'}">
+          <!-- <label *ngIf="loadedInvoice.addresses.LBTC" class="btn btn-primary" [ngClass]="{'active': paymentForm.get('method')?.value === 'lbtc'}">
             <input type="radio" value="lbtc" formControlName="method"> <fa-icon [icon]="['fas', 'tint']" [fixedWidth]="true" title="Liquid Bitcoin"></fa-icon>
           </label> -->
         </div>
@@ -30,63 +30,63 @@
 
     </form>
 
-    <ng-template [ngIf]="paymentForm.get('method')?.value === 'chain' && invoice">
+    <ng-template [ngIf]="paymentForm.get('method')?.value === 'chain' && loadedInvoice">
 
         <div class="qr-wrapper" [class.mt-0]="minimal">
-          <a [href]="bypassSecurityTrustUrl('bitcoin:' + invoice.addresses.BTC + '?amount=' + invoice.btcDue)" target="_blank">
-              <app-qrcode imageUrl="/resources/bitcoin-logo.png" [size]="200" [data]="'bitcoin:' + invoice.addresses.BTC + '?amount=' + invoice.btcDue"></app-qrcode>
+          <a [href]="bypassSecurityTrustUrl('bitcoin:' + loadedInvoice.addresses.BTC + '?amount=' + loadedInvoice.btcDue)" target="_blank">
+              <app-qrcode imageUrl="/resources/bitcoin-logo.png" [size]="200" [data]="'bitcoin:' + loadedInvoice.addresses.BTC + '?amount=' + loadedInvoice.btcDue"></app-qrcode>
           </a>
         </div>
 
         <div class="input-group input-group-sm info-group">
-          <input type="text" class="form-control input-dark" readonly [value]="invoice.addresses.BTC">
+          <input type="text" class="form-control input-dark" readonly [value]="loadedInvoice.addresses.BTC">
           <div class="input-group-append">
-              <button class="btn btn-outline-secondary" type="button" ><app-clipboard [text]="invoice.addresses.BTC"></app-clipboard></button>
+              <button class="btn btn-outline-secondary" type="button" ><app-clipboard [text]="loadedInvoice.addresses.BTC"></app-clipboard></button>
           </div>
         </div>
         @if (!minimal) {
-          <p>{{ invoice.btcDue | number: '1.0-8' }} <span class="symbol">BTC</span></p>
+          <p>{{ loadedInvoice.btcDue | number: '1.0-8' }} <span class="symbol">BTC</span></p>
         }
 
     </ng-template>
 
-    <ng-template [ngIf]="paymentForm.get('method')?.value === 'lightning' && invoice && invoice.addresses.BTC_LightningLike">
+    <ng-template [ngIf]="paymentForm.get('method')?.value === 'lightning' && loadedInvoice && loadedInvoice.addresses.BTC_LightningLike">
 
         <div class="qr-wrapper" [class.mt-0]="minimal">
-          <a [href]="bypassSecurityTrustUrl('lightning:' + invoice.addresses.BTC_LightningLike)" target="_blank">
-              <app-qrcode imageUrl="/resources/lightning-logo.png" [size]="200" [data]="invoice.addresses.BTC_LightningLike.toUpperCase()"></app-qrcode>
+          <a [href]="bypassSecurityTrustUrl('lightning:' + loadedInvoice.addresses.BTC_LightningLike)" target="_blank">
+              <app-qrcode imageUrl="/resources/lightning-logo.png" [size]="200" [data]="loadedInvoice.addresses.BTC_LightningLike.toUpperCase()"></app-qrcode>
           </a>
         </div>
 
         <div class="input-group input-group-sm info-group">
-          <input type="text" class="form-control input-dark" readonly [value]="invoice.addresses.BTC_LightningLike">
+          <input type="text" class="form-control input-dark" readonly [value]="loadedInvoice.addresses.BTC_LightningLike">
           <div class="input-group-append">
-              <button class="btn btn-outline-secondary" type="button"><app-clipboard [text]="invoice.addresses.BTC_LightningLike"></app-clipboard></button>
+              <button class="btn btn-outline-secondary" type="button"><app-clipboard [text]="loadedInvoice.addresses.BTC_LightningLike"></app-clipboard></button>
           </div>
         </div>
 
         @if (!minimal) {
-          <p>{{ invoice.btcDue * 100_000_000 | number: '1.0-0' }} <span class="symbol">sats</span></p>
+          <p>{{ loadedInvoice.btcDue * 100_000_000 | number: '1.0-0' }} <span class="symbol">sats</span></p>
         }
 
     </ng-template>
 
-    <ng-template [ngIf]="invoice && (paymentForm.get('method')?.value === 'lbtc' || paymentForm.get('method')?.value === 'tlbtc')">
+    <ng-template [ngIf]="loadedInvoice && (paymentForm.get('method')?.value === 'lbtc' || paymentForm.get('method')?.value === 'tlbtc')">
 
         <div class="qr-wrapper" [class.mt-0]="minimal">
-          <a [href]="bypassSecurityTrustUrl('liquidnetwork:' + invoice.addresses.LBTC + '?amount=' + invoice.btcDue + '&assetid=6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d')" target="_blank">
-              <app-qrcode imageUrl="/resources/liquid-bitcoin.png" [size]="200" [data]="'liquidnetwork:' + invoice.addresses.LBTC + '?amount=' + invoice.btcDue + '&assetid=6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d'"></app-qrcode>
+          <a [href]="bypassSecurityTrustUrl('liquidnetwork:' + loadedInvoice.addresses.LBTC + '?amount=' + loadedInvoice.btcDue + '&assetid=6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d')" target="_blank">
+              <app-qrcode imageUrl="/resources/liquid-bitcoin.png" [size]="200" [data]="'liquidnetwork:' + loadedInvoice.addresses.LBTC + '?amount=' + loadedInvoice.btcDue + '&assetid=6f0279e9ed041c3d710a9f57d0c02928416460c4b722ae3457a11eec381c526d'"></app-qrcode>
           </a>
         </div>
         <br>
         <div class="input-group input-group-sm info-group">
-          <input type="text" class="form-control input-dark" readonly [value]="invoice.addresses.LBTC" />
+          <input type="text" class="form-control input-dark" readonly [value]="loadedInvoice.addresses.LBTC" />
           <div class="input-group-append">
-              <button class="btn btn-outline-secondary" type="button" ><app-clipboard [text]="invoice.addresses.LBTC"></app-clipboard></button>
+              <button class="btn btn-outline-secondary" type="button" ><app-clipboard [text]="loadedInvoice.addresses.LBTC"></app-clipboard></button>
           </div>
         </div>
         @if (!minimal) {
-          <p>{{ invoice.btcDue | number: '1.0-8' }} <span class="symbol">BTC</span></p>
+          <p>{{ loadedInvoice.btcDue | number: '1.0-8' }} <span class="symbol">BTC</span></p>
         }
 
     </ng-template>
diff --git a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts
index e4ad1af20..b220a63b1 100644
--- a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts
+++ b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts
@@ -1,8 +1,8 @@
-import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core';
 import { FormBuilder, FormGroup } from '@angular/forms';
 import { DomSanitizer, SafeUrl } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';
-import { Subscription, timer } from 'rxjs';
+import { Subscription, of, timer } from 'rxjs';
 import { retry, switchMap, tap } from 'rxjs/operators';
 import { ServicesApiServices } from '../../services/services-api.service';
 
@@ -11,7 +11,8 @@ import { ServicesApiServices } from '../../services/services-api.service';
   templateUrl: './bitcoin-invoice.component.html',
   styleUrls: ['./bitcoin-invoice.component.scss']
 })
-export class BitcoinInvoiceComponent implements OnInit, OnDestroy {
+export class BitcoinInvoiceComponent implements OnInit, OnChanges, OnDestroy {
+  @Input() invoice;
   @Input() invoiceId: string;
   @Input() redirect = true;
   @Input() minimal = false;
@@ -20,7 +21,7 @@ export class BitcoinInvoiceComponent implements OnInit, OnDestroy {
   paymentForm: FormGroup;
   requestSubscription: Subscription | undefined;
   paymentStatusSubscription: Subscription | undefined;
-  invoice: any;
+  loadedInvoice: any;
   paymentStatus = 1; // 1 - Waiting for invoice | 2 - Pending payment | 3 - Payment completed
   paramMapSubscription: Subscription | undefined;
   invoiceSubscription: Subscription | undefined;
@@ -60,35 +61,47 @@ export class BitcoinInvoiceComponent implements OnInit, OnDestroy {
     this.paramMapSubscription = this.activatedRoute.paramMap
       .pipe(
         tap((paramMap) => {
-          const invoiceId = paramMap.get('invoiceId') ?? this.invoiceId;
-          if (invoiceId) {
-            this.paymentStatusSubscription = this.apiService.retreiveInvoice$(invoiceId).pipe(
-              tap((invoice: any) => {
-                this.invoice = invoice;
-                if (this.invoice.btcDue > 0) {
-                  this.paymentStatus = 2;
-                } else {
-                  this.paymentStatus = 4;
-                }
-              }),
-              switchMap(() => this.apiService.getPaymentStatus$(this.invoice.id)
-                .pipe(
-                  retry({ delay: () => timer(2000)})
-                )
-              ),
-            ).subscribe({
-              next: ((result) => {
-                this.paymentStatus = 3;
-                this.completed.emit();
-              }),
-            });
-          }
+          this.fetchInvoice(paramMap.get('invoiceId') ?? this.invoiceId);
         })
       ).subscribe();
   }
 
+  ngOnChanges(changes: SimpleChanges): void {
+    if ((changes.invoice || changes.invoiceId) && this.invoiceId) {
+      this.fetchInvoice(this.invoiceId);
+    }
+  }
+
+  fetchInvoice(invoiceId: string): void {
+    if (invoiceId) {
+      if (this.paymentStatusSubscription) {
+        this.paymentStatusSubscription.unsubscribe();
+      }
+      this.paymentStatusSubscription = ((this.invoice && (this.invoice.btcpayInvoiceId || this.invoice.id) === invoiceId) ? of(this.invoice) : this.apiService.retreiveInvoice$(invoiceId)).pipe(
+        tap((invoice: any) => {
+          this.loadedInvoice = invoice;
+          if (this.loadedInvoice.btcDue > 0) {
+            this.paymentStatus = 2;
+          } else {
+            this.paymentStatus = 4;
+          }
+        }),
+        switchMap(() => this.apiService.getPaymentStatus$(this.loadedInvoice.id)
+          .pipe(
+            retry({ delay: () => timer(2000)})
+          )
+        ),
+      ).subscribe({
+        next: ((result) => {
+          this.paymentStatus = 3;
+          this.completed.emit();
+        }),
+      });
+    }
+  }
+
   get availableMethods(): string[] {
-    return Object.keys(this.invoice?.addresses || {}).filter(k => k === 'BTC_LightningLike');
+    return Object.keys(this.loadedInvoice?.addresses || {}).filter(k => k === 'BTC_LightningLike');
   }
 
   bypassSecurityTrustUrl(text: string): SafeUrl {

From 35d0e7fae700013c8aee62c9814267368e540ca8 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 08:39:32 +0000
Subject: [PATCH 68/77] [accelerator] rerefactor bitcoin-payment component

---
 .../accelerate-checkout.component.html        |  2 +-
 .../accelerate-checkout.component.ts          | 23 +++++++++++--------
 .../bitcoin-invoice.component.ts              |  2 +-
 3 files changed, 16 insertions(+), 11 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 a6863eb36..1a1977f57 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -355,7 +355,7 @@
               <div class="col-sm text-center d-flex flex-column justify-content-center align-items-center">
                 @if (invoice) {
                   <p>Pay <span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span></p>
-                  <app-bitcoin-invoice style="width: 100%;" [invoice]="invoice" [invoiceId]="invoice.btcpayInvoiceId" [minimal]="true" (completed)="moveToStep('paid')"></app-bitcoin-invoice>
+                  <app-bitcoin-invoice style="width: 100%;" [invoice]="invoice" [invoiceId]="invoice.id" [minimal]="true" (completed)="moveToStep('paid')"></app-bitcoin-invoice>
                 } @else {
                   <p>Loading invoice...</p>
                   <div class="d-flex align-items-center justify-content-center" style="width: 100%; height: 292px;">
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 61b03d553..661b78c11 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, OnDestroy, Output, EventEmitter, Input, ChangeDetectorRef, SimpleChanges, HostListener } from '@angular/core';
-import { Subscription, tap, of, catchError, Observable } from 'rxjs';
+import { Subscription, tap, of, catchError, Observable, switchMap } from 'rxjs';
 import { ServicesApiServices } from '../../services/services-api.service';
 import { nextRoundNumber } from '../../shared/common.utils';
 import { StateService } from '../../services/state.service';
@@ -443,15 +443,20 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
    * BTCPay
    */
   async requestBTCPayInvoice() {
-    this.servicesApiService.generateBTCPayAcceleratorInvoice$(this.tx.txid, this.userBid).subscribe({
-      next: (response) => {
-        this.invoice = response;
+    this.servicesApiService.generateBTCPayAcceleratorInvoice$(this.tx.txid, this.userBid).pipe(
+      switchMap(response => {
+        return this.servicesApiService.retreiveInvoice$(response.btcpayInvoiceId);
+      }),
+      catchError(error => {
+        console.log(error);
+        return of(null);
+      })
+    ).subscribe((invoice) => {
+        this.invoice = invoice;
         this.cd.markForCheck();
-        this.scrollToElementWithTimeout('acceleratePreviewAnchor', 'start', 500);
-      },
-      error: (response) => {
-        console.log(response);
-      }
+        if (invoice) {
+          this.scrollToElementWithTimeout('acceleratePreviewAnchor', 'start', 500);
+        }
     });
   }
 
diff --git a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts
index b220a63b1..cb7e78ebd 100644
--- a/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts
+++ b/frontend/src/app/components/bitcoin-invoice/bitcoin-invoice.component.ts
@@ -77,7 +77,7 @@ export class BitcoinInvoiceComponent implements OnInit, OnChanges, OnDestroy {
       if (this.paymentStatusSubscription) {
         this.paymentStatusSubscription.unsubscribe();
       }
-      this.paymentStatusSubscription = ((this.invoice && (this.invoice.btcpayInvoiceId || this.invoice.id) === invoiceId) ? of(this.invoice) : this.apiService.retreiveInvoice$(invoiceId)).pipe(
+      this.paymentStatusSubscription = ((this.invoice && this.invoice.id === invoiceId) ? of(this.invoice) : this.apiService.retreiveInvoice$(invoiceId)).pipe(
         tap((invoice: any) => {
           this.loadedInvoice = invoice;
           if (this.loadedInvoice.btcDue > 0) {

From 9140bcb408f851236150b1f584bed14eb1a64e28 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 08:58:39 +0000
Subject: [PATCH 69/77] [accelerator] fix liquid

---
 .../transaction/transaction.component.ts      | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts
index 7ad683cce..3bc40ea93 100644
--- a/frontend/src/app/components/transaction/transaction.component.ts
+++ b/frontend/src/app/components/transaction/transaction.component.ts
@@ -177,9 +177,11 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
       this.showAccelerationSummary = true;
     }
 
-    this.miningService.getMiningStats('1w').subscribe(stats => {
-      this.miningStats = stats;
-    });
+    if (!this.stateService.isLiquid) {
+      this.miningService.getMiningStats('1w').subscribe(stats => {
+        this.miningStats = stats;
+      });
+    }
 
     this.websocketService.want(['blocks', 'mempool-blocks']);
     this.stateService.networkChanged$.subscribe(
@@ -410,20 +412,22 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy {
             this.tx.acceleratedBy = txPosition.position.acceleratedBy;
           }
 
-          if (!this.mempoolPosition.accelerated) {
-            if (!this.accelerationFlowCompleted && !this.showAccelerationSummary) {
-              this.showAccelerationSummary = true;
-              this.miningService.getMiningStats('1w').subscribe(stats => {
-                this.miningStats = stats;
-              });
+          if (this.stateService.network === '') {
+            if (!this.mempoolPosition.accelerated) {
+              if (!this.accelerationFlowCompleted && !this.showAccelerationSummary) {
+                this.showAccelerationSummary = true;
+                this.miningService.getMiningStats('1w').subscribe(stats => {
+                  this.miningStats = stats;
+                });
+              }
+              if (txPosition.position?.block > 0 && this.tx.weight < 4000) {
+                this.accelerationEligible = true;
+              }
+            } else if (this.showAccelerationSummary) {
+              setTimeout(() => {
+                this.closeAccelerator();
+              }, 2000);
             }
-            if (txPosition.position?.block > 0 && this.tx.weight < 4000) {
-              this.accelerationEligible = true;
-            }
-          } else if (this.showAccelerationSummary) {
-            setTimeout(() => {
-              this.closeAccelerator();
-            }, 2000);
           }
         }
       } else {

From eb3c248acdca2c4003b6f226807f8b7d39d52a9b Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Sun, 30 Jun 2024 18:34:22 +0900
Subject: [PATCH 70/77] Add test transaction

---
 .../api/test-data/transactions-random.json    | 265 ++++++++++++++++++
 1 file changed, 265 insertions(+)

diff --git a/backend/src/__tests__/api/test-data/transactions-random.json b/backend/src/__tests__/api/test-data/transactions-random.json
index ceab6e3c6..4bc0b731c 100644
--- a/backend/src/__tests__/api/test-data/transactions-random.json
+++ b/backend/src/__tests__/api/test-data/transactions-random.json
@@ -331,5 +331,270 @@
             "block_hash": "00000000000000000002c69c7a3010fcd596c0c7451c23e7cd1f5e19ebf8ee6d",
             "block_time": 1718517071
         }
+    },
+    {
+        "txid": "b10c0000004da5a9d1d9b4ae32e09f0b3e62d21a5cce5428d4ad714fb444eb5d",
+        "version": 1,
+        "locktime": 1231006505,
+        "vin": [
+            {
+                "txid": "d46a24962c1d7bd6e87d80570c6a53413eaf30d7fde7f52347f13645ae53969b",
+                "vout": 0,
+                "prevout": {
+                    "scriptpubkey": "41049434a2dd7c5b82df88f578f8d7fd14e8d36513aaa9c003eb5bd6cb56065e44b7e0227139e8a8e68e7de0a4ed32b8c90edc9673b8a7ea541b52f2a22196f7b8cfac",
+                    "scriptpubkey_asm": "OP_PUSHBYTES_65 049434a2dd7c5b82df88f578f8d7fd14e8d36513aaa9c003eb5bd6cb56065e44b7e0227139e8a8e68e7de0a4ed32b8c90edc9673b8a7ea541b52f2a22196f7b8cf OP_CHECKSIG",
+                    "scriptpubkey_type": "p2pk",
+                    "value": 6102
+                },
+                "scriptsig": "473044022004f027ae0b19bb7a7aa8fcdf135f1da769d087342020359ef4099a9f0f0ba4ec02206a83a9b78df3fed89a3b6052e69963e1fb08d8f6d17d945e43b51b5214aa41e601",
+                "scriptsig_asm": "OP_PUSHBYTES_71 3044022004f027ae0b19bb7a7aa8fcdf135f1da769d087342020359ef4099a9f0f0ba4ec02206a83a9b78df3fed89a3b6052e69963e1fb08d8f6d17d945e43b51b5214aa41e601",
+                "is_coinbase": false,
+                "sequence": 20090103
+            },
+            {
+                "txid": "cb9b47ac04023b29fb633a8ef04af351ac9fd74c57c9a2163f683516274767e3",
+                "vout": 0,
+                "prevout": {
+                    "scriptpubkey": "76a914bbb1f7d0f7e15ac088af9bafe25aaac1a59832d088ac",
+                    "scriptpubkey_asm": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 bbb1f7d0f7e15ac088af9bafe25aaac1a59832d0 OP_EQUALVERIFY OP_CHECKSIG",
+                    "scriptpubkey_type": "p2pkh",
+                    "scriptpubkey_address": "1J7SZJry7CX4zWdH3P8E8UJjZrhcLEjJ39",
+                    "value": 1913
+                },
+                "scriptsig": "46304302204dc2939be89ab6626457fff40aec2cc4e6213e64bcb4d2c43bf6b49358ff638c021f33d2f8fdf6d54a2c82bb7cddc62becc2cbbaca6fd7f3ec927ea975f29ad8510221028b98707adfd6f468d56c1a6067a6f0c7fef43afbacad45384017f8be93a18d40",
+                "scriptsig_asm": "OP_PUSHBYTES_70 304302204dc2939be89ab6626457fff40aec2cc4e6213e64bcb4d2c43bf6b49358ff638c021f33d2f8fdf6d54a2c82bb7cddc62becc2cbbaca6fd7f3ec927ea975f29ad85102 OP_PUSHBYTES_33 028b98707adfd6f468d56c1a6067a6f0c7fef43afbacad45384017f8be93a18d40",
+                "is_coinbase": false,
+                "sequence": 20081031
+            },
+            {
+                "txid": "cb9b47ac04023b29fb633a8ef04af351ac9fd74c57c9a2163f683516274767e3",
+                "vout": 1,
+                "prevout": {
+                    "scriptpubkey": "52210304e708d258a632ffb128a62ecf5eebd1904e505497d031619513afc8bca7858f2102b9dc03f1133e7cbc7eb311631acc2dbda908fb0f0fae095da2f4dd427f51308a4104678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f53ae",
+                    "scriptpubkey_asm": "OP_PUSHNUM_2 OP_PUSHBYTES_33 0304e708d258a632ffb128a62ecf5eebd1904e505497d031619513afc8bca7858f OP_PUSHBYTES_33 02b9dc03f1133e7cbc7eb311631acc2dbda908fb0f0fae095da2f4dd427f51308a OP_PUSHBYTES_65 04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f OP_PUSHNUM_3 OP_CHECKMULTISIG",
+                    "scriptpubkey_type": "multisig",
+                    "value": 1971
+                },
+                "scriptsig": "00453042021e4f6ff73d7b304a5cbf3bb7738abb5f81a4af6335962134ce27a1cc45fec702201b95e3acb7db93257b20651cdcb79af66bf0bb86a8ae5b4e0a5df4e3f86787e2033b303802153b78ce563f89a0ed9414f5aa28ad0d96d6795f9c63021f34793e2878497561e7616291ebdda3024b681cdacc8b863b5b0804cd30c2a481",
+                "scriptsig_asm": "OP_0 OP_PUSHBYTES_69 3042021e4f6ff73d7b304a5cbf3bb7738abb5f81a4af6335962134ce27a1cc45fec702201b95e3acb7db93257b20651cdcb79af66bf0bb86a8ae5b4e0a5df4e3f86787e203 OP_PUSHBYTES_59 303802153b78ce563f89a0ed9414f5aa28ad0d96d6795f9c63021f34793e2878497561e7616291ebdda3024b681cdacc8b863b5b0804cd30c2a481",
+                "is_coinbase": false,
+                "sequence": 19750504
+            },
+            {
+                "txid": "45e1cb33599acb071810ccc801b71bd7610865f5b899492946ab1bfbcb61cad6",
+                "vout": 0,
+                "prevout": {
+                    "scriptpubkey": "a91419f0b86f61606c6eb51b217698ca7e8bff1e398b87",
+                    "scriptpubkey_asm": "OP_HASH160 OP_PUSHBYTES_20 19f0b86f61606c6eb51b217698ca7e8bff1e398b OP_EQUAL",
+                    "scriptpubkey_type": "p2sh",
+                    "scriptpubkey_address": "344BBtYkhaCXgA7oYSXASUfh4bFieiponG",
+                    "value": 2140
+                },
+                "scriptsig": "00443041021d1313459a48bd1d0628eec635495f793e970729684394f9b814d2b24012022050be6d9918444e283da0136884f8311ec465d0fed2f8d24b75a8485ebdc13aea013a303702153b78ce563f89a0ed9414f5aa28ad0d96d6795f9c63021e78644ba72eab69fefb5fe50700671bfb91dda699f72ffbb325edc6a3c4ef8239303602153b78ce563f89a0ed9414f5aa28ad0d96d6795f9c63021d2c2db104e70720c39af43b6ba3edd930c26e0818aa59ff9c886281d8ba834ced532103e0a220d36f6f7ed5f3f58c279d055707c454135baf18fd00d798fec3cb52dfbc2103cf689db9313b9f7fc0b984dd9cac750be76041b392919b06f6bf94813da34cd421027f8af2eb6e904deddaa60d5af393d430575eb35e4dfd942a8a5882734b078906410411db93e1dcdb8a016b49840f8c53bc1eb68a382e97b1482ecad7b148a6909a5cb2e0eaddfb84ccf9744464f82e160bfa9b8b64f9d4c03f999b8643f656b412a34104ae1a62fe09c5f51b13905f07f06b99a2f7159b2225f374cd378d71302fa28414e7aab37397f554a7df5f142c21c1b7303b8a0626f1baded5c72a704f7e6cd84c55ae",
+                "scriptsig_asm": "OP_0 OP_PUSHBYTES_68 3041021d1313459a48bd1d0628eec635495f793e970729684394f9b814d2b24012022050be6d9918444e283da0136884f8311ec465d0fed2f8d24b75a8485ebdc13aea01 OP_PUSHBYTES_58 303702153b78ce563f89a0ed9414f5aa28ad0d96d6795f9c63021e78644ba72eab69fefb5fe50700671bfb91dda699f72ffbb325edc6a3c4ef82 OP_PUSHBYTES_57 303602153b78ce563f89a0ed9414f5aa28ad0d96d6795f9c63021d2c2db104e70720c39af43b6ba3edd930c26e0818aa59ff9c886281d8ba83 OP_PUSHDATA1 532103e0a220d36f6f7ed5f3f58c279d055707c454135baf18fd00d798fec3cb52dfbc2103cf689db9313b9f7fc0b984dd9cac750be76041b392919b06f6bf94813da34cd421027f8af2eb6e904deddaa60d5af393d430575eb35e4dfd942a8a5882734b078906410411db93e1dcdb8a016b49840f8c53bc1eb68a382e97b1482ecad7b148a6909a5cb2e0eaddfb84ccf9744464f82e160bfa9b8b64f9d4c03f999b8643f656b412a34104ae1a62fe09c5f51b13905f07f06b99a2f7159b2225f374cd378d71302fa28414e7aab37397f554a7df5f142c21c1b7303b8a0626f1baded5c72a704f7e6cd84c55ae",
+                "is_coinbase": false,
+                "sequence": 16,
+                "inner_redeemscript_asm": "OP_PUSHNUM_3 OP_PUSHBYTES_33 03e0a220d36f6f7ed5f3f58c279d055707c454135baf18fd00d798fec3cb52dfbc OP_PUSHBYTES_33 03cf689db9313b9f7fc0b984dd9cac750be76041b392919b06f6bf94813da34cd4 OP_PUSHBYTES_33 027f8af2eb6e904deddaa60d5af393d430575eb35e4dfd942a8a5882734b078906 OP_PUSHBYTES_65 0411db93e1dcdb8a016b49840f8c53bc1eb68a382e97b1482ecad7b148a6909a5cb2e0eaddfb84ccf9744464f82e160bfa9b8b64f9d4c03f999b8643f656b412a3 OP_PUSHBYTES_65 04ae1a62fe09c5f51b13905f07f06b99a2f7159b2225f374cd378d71302fa28414e7aab37397f554a7df5f142c21c1b7303b8a0626f1baded5c72a704f7e6cd84c OP_PUSHNUM_5 OP_CHECKMULTISIG"
+            },
+            {
+                "txid": "cb9b47ac04023b29fb633a8ef04af351ac9fd74c57c9a2163f683516274767e3",
+                "vout": 2,
+                "prevout": {
+                    "scriptpubkey": "a9143b13a1f71c20c799d86bb624b3898c826d6c82da87",
+                    "scriptpubkey_asm": "OP_HASH160 OP_PUSHBYTES_20 3b13a1f71c20c799d86bb624b3898c826d6c82da OP_EQUAL",
+                    "scriptpubkey_type": "p2sh",
+                    "scriptpubkey_address": "375PJxsKRtAq4WoS6u82jvgZW94R8Wx3iH",
+                    "value": 5139
+                },
+                "scriptsig": "1600149b27f072e4b972927c445d1946162a550b0914d8",
+                "scriptsig_asm": "OP_PUSHBYTES_22 00149b27f072e4b972927c445d1946162a550b0914d8",
+                "witness": [
+                    "3040021c23902a01d4c5cff2c33c8bdb778a5aadea78a9a0d6d4db60aaa0fba1022069237d9dbf2db8cff9c260ba71250493682d01a746f4a45c5c7ea386e56d2bc902",
+                    "0240187acd3e2fd3d8e1acffefa85907b6550730c24f78dfd3301c829fc4daf3cc"
+                ],
+                "is_coinbase": false,
+                "sequence": 141,
+                "inner_redeemscript_asm": "OP_0 OP_PUSHBYTES_20 9b27f072e4b972927c445d1946162a550b0914d8"
+            },
+            {
+                "txid": "cb9b47ac04023b29fb633a8ef04af351ac9fd74c57c9a2163f683516274767e3",
+                "vout": 3,
+                "prevout": {
+                    "scriptpubkey": "a914a3c0698f2300c7b2e8107d4c9c988e642110039087",
+                    "scriptpubkey_asm": "OP_HASH160 OP_PUSHBYTES_20 a3c0698f2300c7b2e8107d4c9c988e6421100390 OP_EQUAL",
+                    "scriptpubkey_type": "p2sh",
+                    "scriptpubkey_address": "3GcrZrbUuvE4UtUdSbKTXcRnTqmfMdyMAC",
+                    "value": 3220
+                },
+                "scriptsig": "220020a18160de7291554f349c7d5cbee4ab97fb542e94cf302ce8d7e9747e4188ca75",
+                "scriptsig_asm": "OP_PUSHBYTES_34 0020a18160de7291554f349c7d5cbee4ab97fb542e94cf302ce8d7e9747e4188ca75",
+                "witness": [
+                    "303f021c65aee6696e80be6e14545cfd64b44f17b0514c150eefdb090c0f0bd9021f3fef4aa95c252a225622aba99e4d5af5a6fe40d177acd593e64cf2f8557ccc03",
+                    "03b55c6f0749e0f3e2caeca05f68e3699f1b3c62a550730f704985a6a9aae437a1",
+                    "76a914db865fd920959506111079995f1e4017b489bfe38763ac6721024d560f7f5d28aae5e1a8aa2b7ba615d7fc48e4ea27e5d27336e6a8f5fa0f5c8c7c820120876475527c2103443e8834fa7d79d7b5e95e0e9d0847f6b03ac3ea977979858b4104947fca87ca52ae67a91446c3747322b220fdb925c9802f0e949c1feab99988ac6868"
+                ],
+                "is_coinbase": false,
+                "sequence": 3735928559,
+                "inner_redeemscript_asm": "OP_0 OP_PUSHBYTES_32 a18160de7291554f349c7d5cbee4ab97fb542e94cf302ce8d7e9747e4188ca75",
+                "inner_witnessscript_asm": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 db865fd920959506111079995f1e4017b489bfe3 OP_EQUAL OP_IF OP_CHECKSIG OP_ELSE OP_PUSHBYTES_33 024d560f7f5d28aae5e1a8aa2b7ba615d7fc48e4ea27e5d27336e6a8f5fa0f5c8c OP_SWAP OP_SIZE OP_PUSHBYTES_1 20 OP_EQUAL OP_NOTIF OP_DROP OP_PUSHNUM_2 OP_SWAP OP_PUSHBYTES_33 03443e8834fa7d79d7b5e95e0e9d0847f6b03ac3ea977979858b4104947fca87ca OP_PUSHNUM_2 OP_CHECKMULTISIG OP_ELSE OP_HASH160 OP_PUSHBYTES_20 46c3747322b220fdb925c9802f0e949c1feab999 OP_EQUALVERIFY OP_CHECKSIG OP_ENDIF OP_ENDIF"
+            },
+            {
+                "txid": "cb9b47ac04023b29fb633a8ef04af351ac9fd74c57c9a2163f683516274767e3",
+                "vout": 4,
+                "prevout": {
+                    "scriptpubkey": "0014c0ca6e754e65d3ba59112d7abc33e500c00ecfa7",
+                    "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 c0ca6e754e65d3ba59112d7abc33e500c00ecfa7",
+                    "scriptpubkey_type": "v0_p2wpkh",
+                    "scriptpubkey_address": "bc1qcr9xua2wvhfm5kg394atcvl9qrqqana8rrmy8h",
+                    "value": 17144
+                },
+                "scriptsig": "",
+                "scriptsig_asm": "",
+                "witness": [
+                    "303e021c11f60486afd0f5d6573603fb2076ef2f676455b92ada257d2f25558a021e317719c946f951d49bf4df4285a618629cd9e554fcbf787c319a0c4dd22601",
+                    "032467f24cc31664f0cf34ff8d5cbb590888ddc1dcfec724a32ae3dd5338b8508e"
+                ],
+                "is_coinbase": false,
+                "sequence": 21000000
+            },
+            {
+                "txid": "637db3928a8fb1b22b81f92dc738ee7637e5b172d650363d0b327429578bd001",
+                "vout": 0,
+                "prevout": {
+                    "scriptpubkey": "0020a9530a167fcada672c142ee636dcd171796e69ef8e37aa1f77f35c58edd7a357",
+                    "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_32 a9530a167fcada672c142ee636dcd171796e69ef8e37aa1f77f35c58edd7a357",
+                    "scriptpubkey_type": "v0_p2wsh",
+                    "scriptpubkey_address": "bc1q49fs59nletdxwtq59mnrdhx3w9uku6003cm658mh7dw93mwh5dts2w2kht",
+                    "value": 8149
+                },
+                "scriptsig": "",
+                "scriptsig_asm": "",
+                "witness": [
+                    "303d021c32f9454db85cb1a4ca63a9883d4347c5e13f3654e884ae44e9efa3c8021d62f07fe452c06b084bc3e09afd3aac4039136549a465533bc1ca66967902",
+                    "01",
+                    "632102fd6db4de50399b2aa086edb23f8e140bbc823d6651e024a0eb871288068789cd67012ab27521034134a2bb35c3f83dab2489d96160741888b8b5589bb694dea6e7bc24486e9c6f68ac"
+                ],
+                "is_coinbase": false,
+                "sequence": 4190024921,
+                "inner_witnessscript_asm": "OP_IF OP_PUSHBYTES_33 02fd6db4de50399b2aa086edb23f8e140bbc823d6651e024a0eb871288068789cd OP_ELSE OP_PUSHBYTES_1 2a OP_CSV OP_DROP OP_PUSHBYTES_33 034134a2bb35c3f83dab2489d96160741888b8b5589bb694dea6e7bc24486e9c6f OP_ENDIF OP_CHECKSIG"
+            },
+            {
+                "txid": "0020db02df125062ebae5bacd189ebff22577b2817c1872be79a0d3ba3982c41",
+                "vout": 0,
+                "prevout": {
+                    "scriptpubkey": "512071212ded0ff4c9b1b0c505d8012772e2dbe98a3cae7168377b950fb6b866a849",
+                    "scriptpubkey_asm": "OP_PUSHNUM_1 OP_PUSHBYTES_32 71212ded0ff4c9b1b0c505d8012772e2dbe98a3cae7168377b950fb6b866a849",
+                    "scriptpubkey_type": "v1_p2tr",
+                    "scriptpubkey_address": "bc1pwysjmmg07nymrvx9qhvqzfmjutd7nz3u4ecksdmmj58mdwrx4pysq6m68g",
+                    "value": 9001
+                },
+                "scriptsig": "",
+                "scriptsig_asm": "",
+                "witness": [
+                    "d822f203827852998cad370232e8c57294540a5da51107fa26cf466bdd2b8b0b3d161999cc80aed8de7386a2bd5d5313aea159a231cc26fa53aaa702b7fa21ed"
+                ],
+                "is_coinbase": false,
+                "sequence": 341
+            },
+            {
+                "txid": "795741ecf9c431b14b1c8d2dd017d3978fd4f6452e91edf416f31ef9971206b4",
+                "vout": 0,
+                "prevout": {
+                    "scriptpubkey": "512089ac120a490eee88db5588112f95f88093284c814f07c3ad943a7faefba2271a",
+                    "scriptpubkey_asm": "OP_PUSHNUM_1 OP_PUSHBYTES_32 89ac120a490eee88db5588112f95f88093284c814f07c3ad943a7faefba2271a",
+                    "scriptpubkey_type": "v1_p2tr",
+                    "scriptpubkey_address": "bc1p3xkpyzjfpmhg3k643qgjl90cszfjsnypfuru8tv58fl6a7azyudqkcu66k",
+                    "value": 19953
+                },
+                "scriptsig": "",
+                "scriptsig_asm": "",
+                "witness": [
+                    "fe6eb715dceffefc067fdc787d250a9a9116682d216f6356ea38fc1f112bd74995faa90315e81981d2c2260b7eaca3c41a16b280362980f0d8faf4c05ebb82c5",
+                    "e34ad0ad33885a473831f8ba8d9339123cb19d0e642e156d8e0d6e2ab2691aedb30e55a35637a806927225e1aa72223d41e59f92c6579b819e7d331a7ada9d2e01",
+                    "2a4861fb4cb951c791bf6c93859ef65abccd90034f91b9b77abb918e13b6fce75d5fa3e2d2f6eeeae105315178c2cb9db2ef238fe89b282f691c06db43bc71ca02",
+                    "fc97bb2be673c3bf388aaf58178ef14d354caf83c92aca8ef1831d619b8511e928f4f5fdea3962067b11e7cecfe094cd0f66a4ea9af9ec836d70d18f2b37df0281",
+                    "a5781a0adaa80ab7f7f164172dd1a1cb127e523daa0d6949aba074a15c589f12dfb8183182afec9230cb7947b7422a4abc1bb78173550d66274ea19f6c9dd92c82",
+                    "",
+                    "",
+                    "205f4237bd7dae576b34abc8a9c6fa4f0e4787c04234ca963e9e96c8f9b67b56d1ac205f4237bd7f93c69403a30c6b641f27ccf5201090152fcf1596474221307831c3ba205ac8ff25ce63564963d1148b84627f614af1f3c77d7caa23adc61264fa5e4996ba20b210c83e6f5b3f866837112d023d9ae8da2a6412168d54968ab87860ab970690ba20d3ee3b7a8b8149122b3c886330b3241538ba4b935c4040f4a73ddab917241bc5ba20cdfabb9d0e5c8f09a83f19e36e100d8f5e882f1b60aa60dacd9e6d072c117bc0ba20aab038c238e95fb54cdd0a6705dc1b1f8d135a9e9b20ab9c7ff96eef0e9bf545ba559c",
+                    "c0b1674191a88ec5cdd733e4240a81803105dc412d6c6708d53ab94fc248f4f5534a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33bf4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e166f7cf9580f1c2dfb3c4d5d043cdbb128c640e3f20161245aa7372e9666168516a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48dd5d27987d2a3dfc724e359870c6644b40e497bdc0589a033220fe15429d88599e3bf3d07d4b0375638d5f1db5255fe07ba2c4cb067cd81b84ee974b6585fb46829a3efd3ef04f9153d47a990bd7b048a4b2d213daaa5fb8ed670fb85f13bdbcf54e48e5f5c656b26c3bca14a8c95aa583d07ebe84dde3b7dd4a78f4e4186e713d29c9c0e8e4d2a9790922af73f0b8d51f0bd4bb19940d9cf910ead8fbe85bc9bbb41a757f405890fb0f5856228e23b715702d714d59bf2b1feb70d8b2b4e3e089fdbcf0ef9d8d00f66e47917f67cc5d78aec1ac786e2abb8d2facb4e4790aad6cc455ae816e6cdafdb58d54e35d4f46d860047458eacf1c7405dc634631c570d8d31992805518fd62daa3bdd2a5c4fd2cd3054c9b3dca1d78055e9528cff6adc8f907925d2ebe48765103e6845c06f1f2bb77c6adc1cc002865865eb5cfd5c1cb10c007c60e14f9d087e0291d4d0c7869697c6681d979c6639dbd960792b4d4133e794d097969002ee05d336686fc03c9e15a597c1b9827669460fac9879903637777defed8717c581b4c0509329550e344bdc14ac38f71fc050096887e535c8fd456524104a6674693c29946543f8a0befccce5a352bda55ec8559fc630f5f37393096d97bfee8660f4100ffd61874d62f9a65de9fb6acf740c4c386990ef7373be398c4bdc43709db7398106609eea2a7841aaf3a4fa2000dc18184faa2a7eb5a2af5845a8d3796308ff9840e567b14cf6bb158ff26c999e6f9a1f5448f9aa"
+                ],
+                "is_coinbase": false,
+                "sequence": 342,
+                "inner_witnessscript_asm": "OP_PUSHBYTES_32 5f4237bd7dae576b34abc8a9c6fa4f0e4787c04234ca963e9e96c8f9b67b56d1 OP_CHECKSIG OP_PUSHBYTES_32 5f4237bd7f93c69403a30c6b641f27ccf5201090152fcf1596474221307831c3 OP_CHECKSIGADD OP_PUSHBYTES_32 5ac8ff25ce63564963d1148b84627f614af1f3c77d7caa23adc61264fa5e4996 OP_CHECKSIGADD OP_PUSHBYTES_32 b210c83e6f5b3f866837112d023d9ae8da2a6412168d54968ab87860ab970690 OP_CHECKSIGADD OP_PUSHBYTES_32 d3ee3b7a8b8149122b3c886330b3241538ba4b935c4040f4a73ddab917241bc5 OP_CHECKSIGADD OP_PUSHBYTES_32 cdfabb9d0e5c8f09a83f19e36e100d8f5e882f1b60aa60dacd9e6d072c117bc0 OP_CHECKSIGADD OP_PUSHBYTES_32 aab038c238e95fb54cdd0a6705dc1b1f8d135a9e9b20ab9c7ff96eef0e9bf545 OP_CHECKSIGADD OP_PUSHNUM_5 OP_NUMEQUAL"
+            }
+        ],
+        "vout": [
+            {
+                "scriptpubkey": "210261542eb020b36c1da48e2e607b90a8c1f2ccdbd06eaf5fb4bb0d7cc34293d32aac",
+                "scriptpubkey_asm": "OP_PUSHBYTES_33 0261542eb020b36c1da48e2e607b90a8c1f2ccdbd06eaf5fb4bb0d7cc34293d32a OP_CHECKSIG",
+                "scriptpubkey_type": "p2pk",
+                "value": 576
+            },
+            {
+                "scriptpubkey": "76a9140240539af6c68431e4ce9cc5ef464f12c1741b3c88ac",
+                "scriptpubkey_asm": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 0240539af6c68431e4ce9cc5ef464f12c1741b3c OP_EQUALVERIFY OP_CHECKSIG",
+                "scriptpubkey_type": "p2pkh",
+                "scriptpubkey_address": "1CuQsdrcgcmPvugo3NqEwh1kDcpeEnuFC",
+                "value": 546
+            },
+            {
+                "scriptpubkey": "5121028b45a50f795be0413680036665d17a3eca099648ea80637bc3a70a7d2b52ae2851ae",
+                "scriptpubkey_asm": "OP_PUSHNUM_1 OP_PUSHBYTES_33 028b45a50f795be0413680036665d17a3eca099648ea80637bc3a70a7d2b52ae28 OP_PUSHNUM_1 OP_CHECKMULTISIG",
+                "scriptpubkey_type": "multisig",
+                "value": 582
+            },
+            {
+                "scriptpubkey": "a91449ed2c96e33b6134408af8484508bcc3248c8dbd87",
+                "scriptpubkey_asm": "OP_HASH160 OP_PUSHBYTES_20 49ed2c96e33b6134408af8484508bcc3248c8dbd OP_EQUAL",
+                "scriptpubkey_type": "p2sh",
+                "scriptpubkey_address": "38RuNhSiZiftB6WVnStu5aUz6jXtCDXQZk",
+                "value": 540
+            },
+            {
+                "scriptpubkey": "0014c8e51cf6891c0a2101aecea8cd5ce9bbbfaf7bba",
+                "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_20 c8e51cf6891c0a2101aecea8cd5ce9bbbfaf7bba",
+                "scriptpubkey_type": "v0_p2wpkh",
+                "scriptpubkey_address": "bc1qerj3ea5frs9zzqdwe65v6h8fhwl677a6s0hxhf",
+                "value": 294
+            },
+            {
+                "scriptpubkey": "0020c485bbb80c4be276e77eac3a983a391cc8b1a1b5f160995a36c3dff18296385a",
+                "scriptpubkey_asm": "OP_0 OP_PUSHBYTES_32 c485bbb80c4be276e77eac3a983a391cc8b1a1b5f160995a36c3dff18296385a",
+                "scriptpubkey_type": "v0_p2wsh",
+                "scriptpubkey_address": "bc1qcjzmhwqvf038dem74safsw3ernytrgd479sfjk3kc00lrq5k8pdqczl83q",
+                "value": 330
+            },
+            {
+                "scriptpubkey": "5120a7a42b268957a06c9de4d7260f1df392ce4d6e7b743f5adc27415ce2afceb3b9",
+                "scriptpubkey_asm": "OP_PUSHNUM_1 OP_PUSHBYTES_32 a7a42b268957a06c9de4d7260f1df392ce4d6e7b743f5adc27415ce2afceb3b9",
+                "scriptpubkey_type": "v1_p2tr",
+                "scriptpubkey_address": "bc1p57jzkf5f27sxe80y6unq780njt8y6mnmwsl44hp8g9ww9t7wkwusv7av76",
+                "value": 330
+            },
+            {
+                "scriptpubkey": "51024e73",
+                "scriptpubkey_asm": "OP_PUSHNUM_1 OP_PUSHBYTES_2 4e73",
+                "scriptpubkey_type": "unknown",
+                "scriptpubkey_address": "bc1pfeessrawgf",
+                "value": 240
+            },
+            {
+                "scriptpubkey": "6a224e6f7420796f757220696e707574732c206e6f7420796f7572206f7574707574732e005152535455565758595a5b5c5d5e5f60",
+                "scriptpubkey_asm": "OP_RETURN OP_PUSHBYTES_34 4e6f7420796f757220696e707574732c206e6f7420796f7572206f7574707574732e OP_0 OP_PUSHNUM_1 OP_PUSHNUM_2 OP_PUSHNUM_3 OP_PUSHNUM_4 OP_PUSHNUM_5 OP_PUSHNUM_6 OP_PUSHNUM_7 OP_PUSHNUM_8 OP_PUSHNUM_9 OP_PUSHNUM_10 OP_PUSHNUM_11 OP_PUSHNUM_12 OP_PUSHNUM_13 OP_PUSHNUM_14 OP_PUSHNUM_15 OP_PUSHNUM_16",
+                "scriptpubkey_type": "op_return",
+                "value": 0
+            }
+        ],
+        "size": 3500,
+        "weight": 8186,
+        "sigops": 115,
+        "fee": 71294,
+        "status": {
+            "confirmed": true,
+            "block_height": 850000,
+            "block_hash": "00000000000000000002a0b5db2a7f8d9087464c2586b546be7bce8eb53b8187",
+            "block_time": 1719689674
+        }
     }
 ]
\ No newline at end of file

From a80372f3352cb1e461f2ee3c44b8a53294cbc688 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 10:04:24 +0000
Subject: [PATCH 71/77] [accelerator] play sound on invoice paid

---
 .../accelerate-checkout/accelerate-checkout.component.html  | 2 +-
 .../accelerate-checkout/accelerate-checkout.component.ts    | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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 1a1977f57..0f8f81165 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -355,7 +355,7 @@
               <div class="col-sm text-center d-flex flex-column justify-content-center align-items-center">
                 @if (invoice) {
                   <p>Pay <span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span></p>
-                  <app-bitcoin-invoice style="width: 100%;" [invoice]="invoice" [invoiceId]="invoice.id" [minimal]="true" (completed)="moveToStep('paid')"></app-bitcoin-invoice>
+                  <app-bitcoin-invoice style="width: 100%;" [invoice]="invoice" [invoiceId]="invoice.id" [minimal]="true" (completed)="bitcoinPaymentCompleted()"></app-bitcoin-invoice>
                 } @else {
                   <p>Loading invoice...</p>
                   <div class="d-flex align-items-center justify-content-center" style="width: 100%; height: 292px;">
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 661b78c11..a4fa5c5a0 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -460,6 +460,12 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
     });
   }
 
+  bitcoinPaymentCompleted(): void {
+    this.audioService.playSound('ascend-chime-cartoon');
+    this.estimateSubscription.unsubscribe();
+    this.moveToStep('paid')
+  }
+
   isLoggedIn(): boolean {
     const auth = this.storageService.getAuth();
     return auth !== null;

From d76490df0c5797e8c423d6d11cdf092aa05b62b7 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 10:08:49 +0000
Subject: [PATCH 72/77] [accelerator] fresh invoice after changing bid

---
 .../accelerate-checkout/accelerate-checkout.component.ts         | 1 +
 1 file changed, 1 insertion(+)

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 a4fa5c5a0..51c8d1153 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -156,6 +156,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
     }
     if (this._step === 'checkout' && this.canPayWithBitcoin) {
       this.loadingBtcpayInvoice = true;
+      this.invoice = null;
       this.requestBTCPayInvoice();
     } else if (this._step === 'cashapp' && this.cashappEnabled) {
       this.loadingCashapp = true;

From ce879152fdfb6bff249ec6d3cd596c817d93eb61 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 10:09:45 +0000
Subject: [PATCH 73/77] [accelerator] don't scroll to btcpay invoice

---
 .../accelerate-checkout/accelerate-checkout.component.ts       | 3 ---
 1 file changed, 3 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 51c8d1153..8c0d35dd9 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts
@@ -455,9 +455,6 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
     ).subscribe((invoice) => {
         this.invoice = invoice;
         this.cd.markForCheck();
-        if (invoice) {
-          this.scrollToElementWithTimeout('acceleratePreviewAnchor', 'start', 500);
-        }
     });
   }
 

From da1e5c515edcdf95c3163cbf629b170a4baa844a Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Sun, 30 Jun 2024 10:14:14 +0000
Subject: [PATCH 74/77] [accelerator] use invoice amount

---
 .../accelerate-checkout/accelerate-checkout.component.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0f8f81165..a0f84e226 100644
--- a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
+++ b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html
@@ -354,7 +354,7 @@
             @if (canPayWithBitcoin) {
               <div class="col-sm text-center d-flex flex-column justify-content-center align-items-center">
                 @if (invoice) {
-                  <p>Pay <span><small style="font-family: monospace;">{{ cost | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span></p>
+                  <p>Pay <span><small style="font-family: monospace;">{{ ((invoice.btcDue * 100_000_000) || cost) | number }}</small>&nbsp;<span class="symbol" i18n="shared.sats">sats</span></span></p>
                   <app-bitcoin-invoice style="width: 100%;" [invoice]="invoice" [invoiceId]="invoice.id" [minimal]="true" (completed)="bitcoinPaymentCompleted()"></app-bitcoin-invoice>
                 } @else {
                   <p>Loading invoice...</p>

From de95dd9c77b32ace408002ae63669956fbbd6949 Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Sun, 30 Jun 2024 22:20:44 +0900
Subject: [PATCH 75/77] removing margin causing table jump

---
 .../src/app/components/transaction/transaction.component.scss    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/app/components/transaction/transaction.component.scss b/frontend/src/app/components/transaction/transaction.component.scss
index 80caa6003..b43c63c2c 100644
--- a/frontend/src/app/components/transaction/transaction.component.scss
+++ b/frontend/src/app/components/transaction/transaction.component.scss
@@ -300,7 +300,6 @@
 
 .accelerateDeepMempool {
   align-self: auto;
-  margin-top: 3px;
   margin-left: auto;
   background-color: var(--tertiary);
   @media (max-width: 995px) {

From 7432e6e29bf26d31d8680f802be36841378602d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vojt=C4=9Bch=20Strnad?=
 <43024885+vostrnad@users.noreply.github.com>
Date: Mon, 1 Jul 2024 02:02:53 +0200
Subject: [PATCH 76/77] Fix errors caused by P2TR inputs without witness data

---
 frontend/src/app/bitcoin.utils.ts            | 31 ++++++++++++--------
 frontend/src/app/shared/transaction.utils.ts | 26 ++++++++--------
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/frontend/src/app/bitcoin.utils.ts b/frontend/src/app/bitcoin.utils.ts
index 9d9091842..92d3de7f3 100644
--- a/frontend/src/app/bitcoin.utils.ts
+++ b/frontend/src/app/bitcoin.utils.ts
@@ -71,19 +71,24 @@ export function calcSegwitFeeGains(tx: Transaction) {
     }
 
     if (isP2tr) {
-      if (vin.witness.length === 1) {
-        // key path spend
-        // we don't know if this was a multisig or single sig (the goal of taproot :)),
-        // so calculate fee savings by comparing to the cheapest single sig input type: P2WPKH and say "saved at least ...%"
-        // the witness size of P2WPKH is 1 (stack size) + 1 (size) + 72 (low s signature) + 1 (size) + 33 (pubkey) = 108 WU
-        // the witness size of key path P2TR is 1 (stack size) + 1 (size) + 64 (signature) = 66 WU
-        realizedTaprootGains += 42;
-      } else {
-        // script path spend
-        // complex scripts with multiple spending paths can often be made around 2x to 3x smaller with the Taproot script tree
-        // because only the hash of the alternative spending path has the be in the witness data, not the entire script,
-        // but only assumptions can be made because the scripts themselves are unknown (again, the goal of taproot :))
-        // TODO maybe add some complex scripts that are specified somewhere, so that size is known, such as lightning scripts
+      // every valid taproot input has at least one witness item, however transactions
+      // created before taproot activation don't need to have any witness data
+      // (see https://mempool.space/tx/b10c007c60e14f9d087e0291d4d0c7869697c6681d979c6639dbd960792b4d41)
+      if (vin.witness?.length) {
+        if (vin.witness.length === 1) {
+          // key path spend
+          // we don't know if this was a multisig or single sig (the goal of taproot :)),
+          // so calculate fee savings by comparing to the cheapest single sig input type: P2WPKH and say "saved at least ...%"
+          // the witness size of P2WPKH is 1 (stack size) + 1 (size) + 72 (low s signature) + 1 (size) + 33 (pubkey) = 108 WU
+          // the witness size of key path P2TR is 1 (stack size) + 1 (size) + 64 (signature) = 66 WU
+          realizedTaprootGains += 42;
+        } else {
+          // script path spend
+          // complex scripts with multiple spending paths can often be made around 2x to 3x smaller with the Taproot script tree
+          // because only the hash of the alternative spending path has the be in the witness data, not the entire script,
+          // but only assumptions can be made because the scripts themselves are unknown (again, the goal of taproot :))
+          // TODO maybe add some complex scripts that are specified somewhere, so that size is known, such as lightning scripts
+        }
       }
     } else {
       const script = isP2shP2Wsh || isP2wsh ? vin.inner_witnessscript_asm : vin.inner_redeemscript_asm;
diff --git a/frontend/src/app/shared/transaction.utils.ts b/frontend/src/app/shared/transaction.utils.ts
index 7bc986330..0e3922140 100644
--- a/frontend/src/app/shared/transaction.utils.ts
+++ b/frontend/src/app/shared/transaction.utils.ts
@@ -335,19 +335,21 @@ export function getTransactionFlags(tx: Transaction, cpfpInfo?: CpfpInfo, replac
       case 'v0_p2wpkh': flags |= TransactionFlags.p2wpkh; break;
       case 'v0_p2wsh': flags |= TransactionFlags.p2wsh; break;
       case 'v1_p2tr': {
-        if (!vin.witness?.length) {
-          throw new Error('Taproot input missing witness data');
-        }
         flags |= TransactionFlags.p2tr;
-        // in taproot, if the last witness item begins with 0x50, it's an annex
-        const hasAnnex = vin.witness?.[vin.witness.length - 1].startsWith('50');
-        // script spends have more than one witness item, not counting the annex (if present)
-        if (vin.witness.length > (hasAnnex ? 2 : 1)) {
-          // the script itself is the second-to-last witness item, not counting the annex
-          const asm = vin.inner_witnessscript_asm;
-          // inscriptions smuggle data within an 'OP_0 OP_IF ... OP_ENDIF' envelope
-          if (asm?.includes('OP_0 OP_IF')) {
-            flags |= TransactionFlags.inscription;
+        // every valid taproot input has at least one witness item, however transactions
+        // created before taproot activation don't need to have any witness data
+        // (see https://mempool.space/tx/b10c007c60e14f9d087e0291d4d0c7869697c6681d979c6639dbd960792b4d41)
+        if (vin.witness?.length) {
+          // in taproot, if the last witness item begins with 0x50, it's an annex
+          const hasAnnex = vin.witness?.[vin.witness.length - 1].startsWith('50');
+          // script spends have more than one witness item, not counting the annex (if present)
+          if (vin.witness.length > (hasAnnex ? 2 : 1)) {
+            // the script itself is the second-to-last witness item, not counting the annex
+            const asm = vin.inner_witnessscript_asm;
+            // inscriptions smuggle data within an 'OP_0 OP_IF ... OP_ENDIF' envelope
+            if (asm?.includes('OP_0 OP_IF')) {
+              flags |= TransactionFlags.inscription;
+            }
           }
         }
       } break;

From 27c70bd9196bd79b51350810445eba8e46e61bd1 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Mon, 1 Jul 2024 01:22:10 +0000
Subject: [PATCH 77/77] Also fix backend errors caused by P2TR inputs without
 witness data

---
 backend/src/api/common.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/backend/src/api/common.ts b/backend/src/api/common.ts
index 04f380418..07fc4830d 100644
--- a/backend/src/api/common.ts
+++ b/backend/src/api/common.ts
@@ -460,11 +460,10 @@ export class Common {
           case 'v0_p2wpkh': flags |= TransactionFlags.p2wpkh; break;
           case 'v0_p2wsh': flags |= TransactionFlags.p2wsh; break;
           case 'v1_p2tr': {
-            if (!vin.witness?.length) {
-              throw new Error('Taproot input missing witness data');
-            }
             flags |= TransactionFlags.p2tr;
-            flags = Common.isInscription(vin, flags);
+            if (vin.witness?.length) {
+              flags = Common.isInscription(vin, flags);
+            }
           } break;
         }
       } else {