Merge branch 'master' into hunicus/footer-refinement-exp

This commit is contained in:
wiz
2023-08-10 15:51:07 +09:00
committed by GitHub
33 changed files with 526 additions and 247 deletions

View File

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { HttpClient, HttpParams, HttpResponse } from '@angular/common/http';
import { CpfpInfo, OptimizedMempoolStats, AddressInformation, LiquidPegs, ITranslators,
PoolStat, BlockExtended, TransactionStripped, RewardStats, AuditScore, BlockSizesAndWeights, RbfTree, BlockAudit } from '../interfaces/node-api.interface';
import { Observable } from 'rxjs';
import { Observable, of } from 'rxjs';
import { StateService } from './state.service';
import { WebsocketResponse } from '../interfaces/websocket.interface';
import { Outspend, Transaction } from '../interfaces/electrs.interface';
@@ -312,6 +312,19 @@ export class ApiService {
}
getHistoricalPrice$(timestamp: number | undefined): Observable<Conversion> {
if (this.stateService.isAnyTestnet()) {
return of({
prices: [],
exchangeRates: {
USDEUR: 0,
USDGBP: 0,
USDCAD: 0,
USDCHF: 0,
USDAUD: 0,
USDJPY: 0,
}
});
}
return this.httpClient.get<Conversion>(
this.apiBaseUrl + this.apiBasePath + '/api/v1/historical-price' +
(timestamp ? `?timestamp=${timestamp}` : '')

View File

@@ -339,6 +339,10 @@ export class StateService {
return this.network === 'liquid' || this.network === 'liquidtestnet';
}
isAnyTestnet(): boolean {
return ['testnet', 'signet', 'liquidtestnet'].includes(this.network);
}
resetChainTip() {
this.latestBlockHeight = -1;
this.chainTip$.next(-1);

View File

@@ -18,7 +18,7 @@ footer .row.main {
}
footer .row.main .branding > p {
margin-bottom: 25px;
margin-bottom: 45px;
}
footer .row.main .branding .btn {