Remove checkbox for expired UTXOs and add new tab

This commit is contained in:
natsoni 2024-03-03 18:31:39 +01:00
parent 84e91b2c90
commit dc9bddc6b2
No known key found for this signature in database
GPG Key ID: C65917583181743B
7 changed files with 20 additions and 24 deletions

View File

@ -1,10 +1,8 @@
<div class="fee-estimation-container">
<div class="item">
<a class="title-link" [routerLink]="['/audit/wallet/utxos' | relativeUrl]" [fragment]="'expired'">
<h5 class="card-title" i18n="liquid.non-dust-expired">Non-Dust Expired</h5>
</a>
<h5 class="card-title" i18n="liquid.non-dust-expired">Non-Dust Expired</h5>
<div *ngIf="(stats$ | async) as expiredStats; else loadingData" class="card-text">
<div class="fee-text">{{ (+expiredStats.nonDust.total) / 100000000 | number: '1.5-5' }} <span style="color: #b86d12;">BTC</span></div>
<div class="fee-text" i18n-ngbTooltip="liquid.expired-utxos-non-dust" ngbTooltip="Total amount of BTC held in non-dust Federation UTXOs that have expired timelocks" placement="top">{{ (+expiredStats.nonDust.total) / 100000000 | number: '1.5-5' }} <span style="color: #b86d12;">BTC</span></div>
<div class="fiat">{{ expiredStats.nonDust.count }} <span i18n="shared.utxos">UTXOs</span></div>
</div>
</div>
@ -14,7 +12,7 @@
<h5 class="card-title"><ng-container i18n="liquid.total-expired">Total Expired</ng-container>&nbsp;<fa-icon [icon]="['fas', 'external-link-alt']" [fixedWidth]="true" style="font-size: 13px; color: #4a68b9"></fa-icon></h5>
</a>
<div *ngIf="(stats$ | async) as expiredStats; else loadingData" class="card-text">
<div class="fee-text">{{ (+expiredStats.all.total) / 100000000 | number: '1.5-5' }} <span style="color: #b86d12;">BTC</span></div>
<div class="fee-text" i18n-ngbTooltip="liquid.expired-utxos" ngbTooltip="Total amount of BTC held Federation UTXOs that have expired timelocks" placement="top">{{ (+expiredStats.all.total) / 100000000 | number: '1.5-5' }} <span style="color: #b86d12;">BTC</span></div>
<div class="fiat">{{ expiredStats.all.count }} <span i18n="shared.utxos">UTXOs</span></div>
</div>
</div>

View File

@ -1,14 +1,5 @@
<div [ngClass]="{'widget': widget}">
<div *ngIf="!widget" class="form-check">
<div style="padding-left: 0.75rem;">
<input style="margin-top: 6px" class="form-check-input" type="checkbox" [checked]="showExpiredUtxosToggle$ | async" id="show-expired-utxos" (change)="onShowExpiredUtxosToggleChange($event)">
<label class="form-check-label" for="show-expired-utxos">
<small i18n="liquid.include-expired-utxos">Expired UTXOs</small>
</label>
</div>
</div>
<div class="clearfix"></div>
<div style="min-height: 295px">

View File

@ -120,12 +120,6 @@ export class FederationUtxosListComponent implements OnInit {
this.page = page;
}
onShowExpiredUtxosToggleChange(e): void {
const fragment = e.target.checked ? 'expired' : null;
this.router.navigate([], { fragment });
this.isLoading = true;
}
getGradientColor(value: number): string {
const distanceToGreen = Math.abs(4032 - value);
const green = '#7CB342';

View File

@ -6,8 +6,10 @@
<div class="nav-container">
<ul class="nav nav-pills">
<li class="nav-item">
<a class="nav-link" [routerLink]="['/audit/wallet/utxos' | relativeUrl]" routerLinkActive="active">UTXOs</a>
<a class="nav-link" [routerLink]="['/audit/wallet/utxos' | relativeUrl]" routerLinkActive="active" [routerLinkActiveOptions]="{matrixParams: 'ignored', queryParams: 'ignored', paths: 'exact', fragment: isExpiredFragment() ? 'exact' : 'ignored'}">UTXOs</a>
</li>
<li class="nav-item">
<a class="nav-link" [routerLink]="['/audit/wallet/utxos' | relativeUrl]" [fragment]="'expired'" routerLinkActive="active" [routerLinkActiveOptions]="{matrixParams: 'ignored', queryParams: 'ignored', paths: 'exact', fragment: 'exact'}"><ng-container i18n="liquid.timelock-expired-utxos">Timelock-Expired UTXOs</ng-container></a>
</li>
<li class="nav-item">
<a class="nav-link" [routerLink]="['/audit/wallet/addresses' | relativeUrl]" routerLinkActive="active"><ng-container i18n="mining.addresses">Addresses</ng-container></a>

View File

@ -10,4 +10,11 @@ ul {
justify-content: center;
margin: auto;
}
}
@media (max-width: 434px) {
.nav-link {
padding: 0.8rem 0.8rem;
font-size: 0.8rem;
}
}

View File

@ -17,4 +17,8 @@ export class FederationWalletComponent implements OnInit {
ngOnInit(): void {
}
isExpiredFragment(): boolean {
return location.hash === '#expired';
}
}

View File

@ -170,7 +170,7 @@
</div>
<div class="col card-wrapper liquid">
<div class="main-title" i18n="liquid.federation-expired-utxos">Federation Expired UTXOs</div>
<div class="main-title" i18n="liquid.federation-expired-utxos">Federation Timelock-Expired UTXOs</div>
<div class="card">
<div class="card-body liquid">
<app-expired-utxos-stats [expiredUtxos$]="expiredUtxos$"></app-expired-utxos-stats>
@ -310,7 +310,7 @@
</div>
<div class="col card-wrapper liquid">
<div class="main-title" i18n="liquid.federation-expired-utxos">Federation Expired UTXOs</div>
<div class="main-title" i18n="liquid.federation-expired-utxos">Federation Timelock-Expired UTXOs</div>
<div class="card">
<div class="card-body liquid">
<app-expired-utxos-stats></app-expired-utxos-stats>