From 64ba03360250daf8a30d78fe2cc82dd6ad76c4b1 Mon Sep 17 00:00:00 2001 From: nymkappa <1612910616@pm.me> Date: Tue, 16 Apr 2024 16:01:52 +0900 Subject: [PATCH] [accelerator] polish pizza accel --- .../accelerate-checkout.component.html | 28 +++++++++---------- .../components/tracker/tracker.component.html | 10 +++---- .../components/tracker/tracker.component.scss | 4 +++ .../components/tracker/tracker.component.ts | 2 +- .../transaction/transaction.component.ts | 7 +---- frontend/src/app/services/state.service.ts | 6 ++-- ...empool-accelerator-sparkles-compressed.svg | 1 - .../mempool-accelerator-sparkles-light.svg | 13 +++++++++ 8 files changed, 40 insertions(+), 31 deletions(-) delete mode 100644 frontend/src/resources/mempool-accelerator-sparkles-compressed.svg create mode 100644 frontend/src/resources/mempool-accelerator-sparkles-light.svg diff --git a/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html b/frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html index 8faa4e53e..cd19e2809 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 @@ -
+
@if (error) {
@@ -8,7 +8,7 @@ @else if (step === 'cta') { -
+

Accelerate your Bitcoin transaction?

@@ -17,11 +17,11 @@
-
+
-
+
-
+
-
@@ -56,7 +56,7 @@ @else if (step === 'checkout') { -
+

Confirm your payment

@@ -64,7 +64,7 @@
-
+
Payment to mempool.space for acceleration of txid {{ txid.substr(0, 10) }}..{{ txid.substr(-10) }}
@@ -104,13 +104,13 @@
Changed your mind? - +
} @else if (step === 'processing') { -
+

Confirm your payment

@@ -129,7 +129,5 @@
} - - ✖
diff --git a/frontend/src/app/components/tracker/tracker.component.html b/frontend/src/app/components/tracker/tracker.component.html index 01b32b5e0..73a1800db 100644 --- a/frontend/src/app/components/tracker/tracker.component.html +++ b/frontend/src/app/components/tracker/tracker.component.html @@ -29,7 +29,7 @@
@if (tx && !tx.status?.confirmed && mempoolPosition?.block != null) { -
+
First seen
@if (transactionTime > 0) { @@ -39,7 +39,7 @@ }
-
+
ETA
@@ -48,14 +48,14 @@ } @else { } - @if (isMobile && paymentType === 'cashapp' && accelerationEligible && !tx.acceleration && acceleratorAvailable && accelerateCtaType === 'button' && !tx?.acceleration) { + @if (!showAccelerationSummary && isMobile && paymentType === 'cashapp' && accelerationEligible && !tx.acceleration && acceleratorAvailable && accelerateCtaType === 'button' && !tx?.acceleration) { Accelerate }
} @else if (tx && tx.status?.confirmed) { -
+
Confirmed at
‎{{ tx.status.block_time * 1000 | date:'yyyy-MM-dd HH:mm' }} @@ -64,7 +64,7 @@
-
+
Block height
diff --git a/frontend/src/app/components/tracker/tracker.component.scss b/frontend/src/app/components/tracker/tracker.component.scss index 6d80c7521..90f4cbd4b 100644 --- a/frontend/src/app/components/tracker/tracker.component.scss +++ b/frontend/src/app/components/tracker/tracker.component.scss @@ -92,6 +92,10 @@ white-space: nowrap; text-align: end; } + &.narrower { + padding-top: 0.75em !important; + padding-bottom: 0.75em !important; + } } .tracker-bar { diff --git a/frontend/src/app/components/tracker/tracker.component.ts b/frontend/src/app/components/tracker/tracker.component.ts index d07c87510..05bb0d097 100644 --- a/frontend/src/app/components/tracker/tracker.component.ts +++ b/frontend/src/app/components/tracker/tracker.component.ts @@ -143,7 +143,7 @@ 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.ref === 'https://cash.app/') { + if (this.acceleratorAvailable && this.stateService.referrer === 'https://cash.app/') { this.paymentType = 'cashapp'; } const urlParams = new URLSearchParams(window.location.search); diff --git a/frontend/src/app/components/transaction/transaction.component.ts b/frontend/src/app/components/transaction/transaction.component.ts index 0be28f951..ed50b73d8 100644 --- a/frontend/src/app/components/transaction/transaction.component.ts +++ b/frontend/src/app/components/transaction/transaction.component.ts @@ -745,11 +745,7 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy { } resetTransaction() { - if (!this.firstLoad) { - this.stateService.ref = ''; - } else { - this.firstLoad = false; - } + this.firstLoad = false; this.error = undefined; this.tx = null; this.setFeatures(); @@ -845,7 +841,6 @@ export class TransactionComponent implements OnInit, AfterViewInit, OnDestroy { } ngOnDestroy() { - this.stateService.ref = ''; this.subscription.unsubscribe(); this.fetchCpfpSubscription.unsubscribe(); this.fetchRbfSubscription.unsubscribe(); diff --git a/frontend/src/app/services/state.service.ts b/frontend/src/app/services/state.service.ts index 9dfec85e6..970bfcac3 100644 --- a/frontend/src/app/services/state.service.ts +++ b/frontend/src/app/services/state.service.ts @@ -86,7 +86,7 @@ const defaultEnv: Env = { providedIn: 'root' }) export class StateService { - ref: string = ''; + referrer: string = ''; isBrowser: boolean = isPlatformBrowser(this.platformId); isMempoolSpaceBuild = window['isMempoolSpaceBuild'] ?? false; backend: 'esplora' | 'electrum' | 'none' = 'esplora'; @@ -164,7 +164,7 @@ export class StateService { private router: Router, private storageService: StorageService, ) { - this.ref = window.document.referrer; + this.referrer = window.document.referrer; const browserWindow = window || {}; // @ts-ignore @@ -192,7 +192,7 @@ export class StateService { } }); - if (this.ref === 'https://cash.app/' && window.innerWidth < 850 && window.location.pathname.startsWith('/tx/')) { + if (this.referrer === 'https://cash.app/' && window.innerWidth < 850 && window.location.pathname.startsWith('/tx/')) { this.router.navigate(['/tracker/' + window.location.pathname.slice(4)]); } diff --git a/frontend/src/resources/mempool-accelerator-sparkles-compressed.svg b/frontend/src/resources/mempool-accelerator-sparkles-compressed.svg deleted file mode 100644 index 4a5bac3cc..000000000 --- a/frontend/src/resources/mempool-accelerator-sparkles-compressed.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/frontend/src/resources/mempool-accelerator-sparkles-light.svg b/frontend/src/resources/mempool-accelerator-sparkles-light.svg new file mode 100644 index 000000000..8998e0c22 --- /dev/null +++ b/frontend/src/resources/mempool-accelerator-sparkles-light.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file