diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index 48ee85c62..c3f516fc7 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -32,7 +32,7 @@ - +

Sponsor the project

Community @@ -193,7 +193,7 @@ - + @@ -205,7 +205,7 @@
- +
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 795d11df6..8d36387f3 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 @@ -2,7 +2,6 @@ height: 100%; min-width: 120px; width: 120px; - max-height: 90vh; margin-left: 4em; margin-right: 1.5em; padding-bottom: 63px; 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 9bb66eda1..7f4d88688 100644 --- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html +++ b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.html @@ -1,7 +1,7 @@
- Transaction has now been submitted to mining pools for acceleration. You can track the progress here. + Transaction has now been submitted to mining pools for acceleration.
@@ -75,7 +75,7 @@
@@ -88,12 +88,12 @@
-
+
-
+ +
+
@@ -228,7 +228,7 @@ - + + + + + + + + + +
Available balance @@ -244,6 +244,17 @@
+ Login +
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 433c05520..814b37e7a 100644 --- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.scss +++ b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.scss @@ -28,7 +28,10 @@ .feerate.active { background-color: #105fb0 !important; opacity: 1; - border: 1px solid white !important; + border: 1px solid #007fff !important; +} +.feerate:focus { + box-shadow: none !important; } .estimateDisabled { @@ -41,6 +44,24 @@ 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 { text-wrap: wrap; 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 1c356a80b..933ee6149 100644 --- a/frontend/src/app/components/accelerate-preview/accelerate-preview.component.ts +++ b/frontend/src/app/components/accelerate-preview/accelerate-preview.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit, Input, OnDestroy, OnChanges, SimpleChanges, HostListener } from '@angular/core'; +import { Router } from '@angular/router'; import { ApiService } from '../../services/api.service'; import { Subscription, catchError, of, tap } from 'rxjs'; import { StorageService } from '../../services/storage.service'; @@ -62,7 +63,8 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges constructor( private apiService: ApiService, - private storageService: StorageService + private storageService: StorageService, + private router: Router, ) { } ngOnDestroy(): void { @@ -73,7 +75,7 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges ngOnChanges(changes: SimpleChanges): void { if (changes.scrollEvent) { - this.scrollToPreview('acceleratePreviewAnchor', 'center'); + this.scrollToPreview('acceleratePreviewAnchor', 'start'); } } @@ -126,7 +128,7 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges this.maxCost = this.userBid + this.estimate.mempoolBaseFee + this.estimate.vsizeFee; if (!this.error) { - this.scrollToPreview('acceleratePreviewAnchor', 'center'); + this.scrollToPreview('acceleratePreviewAnchor', 'start'); } } }), @@ -187,7 +189,11 @@ export class AcceleratePreviewComponent implements OnInit, OnDestroy, OnChanges this.estimateSubscription.unsubscribe(); }, error: (response) => { - this.error = response.error; + if (response.status === 403 && response.error === 'not_available') { + this.error = 'waitlisted'; + } else { + this.error = response.error; + } this.scrollToPreviewWithTimeout('mempoolError', 'center'); } }); diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html index 8863b335f..dc1cc2c30 100644 --- a/frontend/src/app/components/master-page/master-page.component.html +++ b/frontend/src/app/components/master-page/master-page.component.html @@ -5,7 +5,7 @@
- +
@@ -18,7 +18,7 @@
- +
@@ -71,13 +71,14 @@ - +
+
diff --git a/frontend/src/app/components/master-page/master-page.component.scss b/frontend/src/app/components/master-page/master-page.component.scss index b82d973de..ad95d162f 100644 --- a/frontend/src/app/components/master-page/master-page.component.scss +++ b/frontend/src/app/components/master-page/master-page.component.scss @@ -238,4 +238,18 @@ nav { main { transition: 0.2s; transition-property: max-width; -} \ No newline at end of file +} + +// empty sidenav +.sidenav { + z-index: 1; + background-color: transparent; + width: 225px; + height: calc(100vh - 65px); + position: sticky; + top: 65px; + transition: 0.25s; + margin-left: -250px; + box-shadow: 5px 0px 30px 0px #000; + padding-bottom: 20px; +} diff --git a/frontend/src/app/components/menu/menu.component.html b/frontend/src/app/components/menu/menu.component.html index e89ace64a..1c247a94b 100644 --- a/frontend/src/app/components/menu/menu.component.html +++ b/frontend/src/app/components/menu/menu.component.html @@ -3,7 +3,7 @@