diff --git a/frontend/src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html b/frontend/src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html index 6d21d9826..72f9fda50 100644 --- a/frontend/src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html +++ b/frontend/src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.html @@ -24,7 +24,7 @@ - + diff --git a/frontend/src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.ts b/frontend/src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.ts index f700a0664..479daf78f 100644 --- a/frontend/src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.ts +++ b/frontend/src/app/components/liquid-reserves-audit/federation-utxos-list/federation-utxos-list.component.ts @@ -22,6 +22,7 @@ export class FederationUtxosListComponent implements OnInit { pageSize = 15; maxSize = window.innerWidth <= 767.98 ? 3 : 5; skeletonLines: number[] = []; + changeAddress: string = "bc1qxvay4an52gcghxq5lavact7r6qe9l4laedsazz8fj2ee2cy47tlqff4aj4"; auditStatus$: Observable; auditUpdated$: Observable; showChangeUtxosToggleSubject: BehaviorSubject = new BehaviorSubject(false); @@ -45,7 +46,7 @@ export class FederationUtxosListComponent implements OnInit { ngOnInit(): void { this.isLoading = !this.widget; this.env = this.stateService.env; - this.skeletonLines = this.widget === true ? [...Array(5).keys()] : [...Array(15).keys()]; + this.skeletonLines = this.widget === true ? [...Array(6).keys()] : [...Array(15).keys()]; if (!this.widget) { this.websocketService.want(['blocks']); @@ -104,7 +105,7 @@ export class FederationUtxosListComponent implements OnInit { this.federationUtxos$, this.showChangeUtxosToggle$ ]).pipe( - switchMap(([federationUtxos, showChangeUtxosToggle]) => showChangeUtxosToggle ? of(federationUtxos) : of(federationUtxos.filter(utxo => utxo.pegtxid))), + switchMap(([federationUtxos, showChangeUtxosToggle]) => showChangeUtxosToggle ? of(federationUtxos) : of(federationUtxos.filter(utxo => utxo.bitcoinaddress !== this.changeAddress))), share() ); } diff --git a/frontend/src/app/components/liquid-reserves-audit/federation-utxos-stats/federation-utxos-stats.component.html b/frontend/src/app/components/liquid-reserves-audit/federation-utxos-stats/federation-utxos-stats.component.html index 401b3f6a1..7f84cfe4b 100644 --- a/frontend/src/app/components/liquid-reserves-audit/federation-utxos-stats/federation-utxos-stats.component.html +++ b/frontend/src/app/components/liquid-reserves-audit/federation-utxos-stats/federation-utxos-stats.component.html @@ -1,34 +1,7 @@ -
- -
-
- -
Liquid Federation UTXOs
-
-
-
{{ federationUtxos.length }} UTXOs
- - - -
-
-
-
- - -
- +
+ - - - -
-
+
diff --git a/frontend/src/app/components/liquid-reserves-audit/federation-utxos-stats/federation-utxos-stats.component.scss b/frontend/src/app/components/liquid-reserves-audit/federation-utxos-stats/federation-utxos-stats.component.scss index f7c2f104c..0534c9b5d 100644 --- a/frontend/src/app/components/liquid-reserves-audit/federation-utxos-stats/federation-utxos-stats.component.scss +++ b/frontend/src/app/components/liquid-reserves-audit/federation-utxos-stats/federation-utxos-stats.component.scss @@ -1,6 +1,7 @@ .fee-estimation-container { display: flex; justify-content: space-between; + padding-bottom: 1rem; @media (min-width: 376px) { flex-direction: row; } @@ -35,7 +36,6 @@ top: 0px; } .fee-text{ - border-bottom: 1px solid #ffffff1c; width: fit-content; margin: auto; line-height: 1.45; @@ -48,10 +48,6 @@ } } -.loading-container{ - min-height: 76px; -} - .card-text { .skeleton-loader { width: 100%; diff --git a/frontend/src/app/components/liquid-reserves-audit/federation-utxos-stats/federation-utxos-stats.component.ts b/frontend/src/app/components/liquid-reserves-audit/federation-utxos-stats/federation-utxos-stats.component.ts index 0064de89c..6c114ed32 100644 --- a/frontend/src/app/components/liquid-reserves-audit/federation-utxos-stats/federation-utxos-stats.component.ts +++ b/frontend/src/app/components/liquid-reserves-audit/federation-utxos-stats/federation-utxos-stats.component.ts @@ -1,7 +1,4 @@ -import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; -import { Observable } from 'rxjs'; -import { FederationUtxo } from '../../../interfaces/node-api.interface'; - +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; @Component({ selector: 'app-federation-utxos-stats', templateUrl: './federation-utxos-stats.component.html', @@ -9,12 +6,10 @@ import { FederationUtxo } from '../../../interfaces/node-api.interface'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class FederationUtxosStatsComponent implements OnInit { - @Input() federationUtxos$: Observable; - @Input() federationUtxosOneMonthAgo$: Observable; - constructor() { } ngOnInit(): void { + } } diff --git a/frontend/src/app/components/liquid-reserves-audit/reserves-audit-dashboard/reserves-audit-dashboard.component.html b/frontend/src/app/components/liquid-reserves-audit/reserves-audit-dashboard/reserves-audit-dashboard.component.html index d27bc1f48..d42300511 100644 --- a/frontend/src/app/components/liquid-reserves-audit/reserves-audit-dashboard/reserves-audit-dashboard.component.html +++ b/frontend/src/app/components/liquid-reserves-audit/reserves-audit-dashboard/reserves-audit-dashboard.component.html @@ -25,7 +25,7 @@
- +
diff --git a/frontend/src/app/components/liquid-reserves-audit/reserves-audit-dashboard/reserves-audit-dashboard.component.ts b/frontend/src/app/components/liquid-reserves-audit/reserves-audit-dashboard/reserves-audit-dashboard.component.ts index 3009edc46..86dda7ebc 100644 --- a/frontend/src/app/components/liquid-reserves-audit/reserves-audit-dashboard/reserves-audit-dashboard.component.ts +++ b/frontend/src/app/components/liquid-reserves-audit/reserves-audit-dashboard/reserves-audit-dashboard.component.ts @@ -18,7 +18,6 @@ export class ReservesAuditDashboardComponent implements OnInit { currentPeg$: Observable; currentReserves$: Observable; federationUtxos$: Observable; - federationUtxosOneMonthAgo$: Observable; federationAddresses$: Observable; federationAddressesOneMonthAgo$: Observable; liquidPegsMonth$: Observable; @@ -111,12 +110,6 @@ export class ReservesAuditDashboardComponent implements OnInit { share() ); - this.federationUtxosOneMonthAgo$ = interval(60 * 60 * 1000) - .pipe( - startWith(0), - switchMap(() => this.apiService.federationUtxosOneMonthAgo$()) - ); - this.federationAddressesOneMonthAgo$ = interval(60 * 60 * 1000) .pipe( startWith(0),