Various bugfixes.

This commit is contained in:
softsimon
2020-09-28 16:32:48 +07:00
parent e9d3b44e97
commit b95efca29d
9 changed files with 23 additions and 12 deletions

View File

@@ -23,7 +23,7 @@ export class AboutComponent implements OnInit {
ngOnInit() {
this.gitCommit$ = this.stateService.gitCommit$;
this.seoService.setTitle('Contributors');
this.seoService.setTitle('About');
this.websocketService.want(['blocks']);
if (this.stateService.network === 'bisq') {
this.active = 2;

View File

@@ -2,7 +2,7 @@
<span>{{ conversions.USD * (satoshis / 100000000) | currency:'USD':'symbol':'1.2-2' }}</span>
</ng-container>
<ng-template #viewFiatVin>
<ng-template [ngIf]="network === 'liquid' && satoshis === undefined" [ngIfElse]="default">
<ng-template [ngIf]="network === 'liquid' && (satoshis === undefined || satoshis === null)" [ngIfElse]="default">
Confidential
</ng-template>
<ng-template #default>

View File

@@ -57,7 +57,7 @@
</tr>
<tr *ngIf="!isNativeAsset">
<td>Circulating amount</td>
<td>{{ (asset.chain_stats.issued_amount - asset.chain_stats.burned_amount) | number: '1.0-' + assetContract[3] }} {{ assetContract[1] }}</td>
<td>{{ (asset.chain_stats.issued_amount - asset.chain_stats.burned_amount) / 100000000 | number: '1.0-' + assetContract[3] }} {{ assetContract[1] }}</td>
</tr>
<tr *ngIf="isNativeAsset">
<td>Circulating amount</td>

View File

@@ -1,7 +1,7 @@
import { Component, OnInit, ChangeDetectionStrategy } from '@angular/core';
import { StateService } from 'src/app/services/state.service';
import { map, filter } from 'rxjs/operators';
import { Observable } from 'rxjs';
import { merge, Observable } from 'rxjs';
interface FeeEstimations {
fastestFee: number;
@@ -29,8 +29,14 @@ export class FeesBoxComponent implements OnInit {
this.isLoadingWebSocket$ = this.stateService.isLoadingWebSocket$;
this.feeEstimations$ = this.stateService.mempoolBlocks$
.pipe(
filter((blocks) => !!blocks.length),
map((pBlocks) => {
if (!pBlocks.length) {
return {
'fastestFee': defaultFee,
'halfHourFee': defaultFee,
'hourFee': defaultFee,
};
}
let firstMedianFee = Math.ceil(pBlocks[0].medianFee);
if (pBlocks.length === 1 && pBlocks[0].blockVSize <= 500000) {

View File

@@ -34,7 +34,7 @@ export class LatestBlocksComponent implements OnInit, OnDestroy {
) { }
ngOnInit() {
this.seoService.resetTitle();
this.seoService.setTitle('Blocks');
this.websocketService.want(['blocks']);
this.network$ = merge(of(''), this.stateService.networkChanged$);