From 12546e10969d5b2982a61e251c6b176ad9e6067d Mon Sep 17 00:00:00 2001 From: softsimon Date: Wed, 25 Mar 2020 21:55:18 +0700 Subject: [PATCH] Liquid: Display BTC as L-BTC. --- frontend/src/app/components/address/address.component.html | 6 +++--- frontend/src/app/components/address/address.component.ts | 3 +++ frontend/src/app/components/amount/amount.component.html | 2 +- frontend/src/app/components/block/block.component.html | 4 ++-- frontend/src/app/components/block/block.component.ts | 6 ++++++ .../components/mempool-block/mempool-block.component.html | 2 +- .../app/components/mempool-block/mempool-block.component.ts | 2 ++ 7 files changed, 18 insertions(+), 7 deletions(-) diff --git a/frontend/src/app/components/address/address.component.html b/frontend/src/app/components/address/address.component.html index 74dd49eac..0350a122a 100644 --- a/frontend/src/app/components/address/address.component.html +++ b/frontend/src/app/components/address/address.component.html @@ -18,15 +18,15 @@ Total received - {{ receieved / 100000000 | number: '1.8-8' }} BTC + {{ receieved / 100000000 | number: '1.8-8' }} L-BTC Total sent - {{ sent / 100000000 | number: '1.8-8' }} BTC + {{ sent / 100000000 | number: '1.8-8' }} L-BTC Balance - {{ (receieved - sent) / 100000000 | number: '1.8-8' }} BTC () + {{ (receieved - sent) / 100000000 | number: '1.8-8' }} L-BTC () diff --git a/frontend/src/app/components/address/address.component.ts b/frontend/src/app/components/address/address.component.ts index 21d9b52ef..ab0b1ea26 100644 --- a/frontend/src/app/components/address/address.component.ts +++ b/frontend/src/app/components/address/address.component.ts @@ -9,6 +9,7 @@ import { AudioService } from 'src/app/services/audio.service'; import { ApiService } from 'src/app/services/api.service'; import { of, merge } from 'rxjs'; import { SeoService } from 'src/app/services/seo.service'; +import { environment } from 'src/environments/environment'; @Component({ selector: 'app-address', @@ -16,6 +17,8 @@ import { SeoService } from 'src/app/services/seo.service'; styleUrls: ['./address.component.scss'] }) export class AddressComponent implements OnInit, OnDestroy { + network = environment.network; + address: Address; addressString: string; isLoadingAddress = true; diff --git a/frontend/src/app/components/amount/amount.component.html b/frontend/src/app/components/amount/amount.component.html index 5b0877afd..e18508e1e 100644 --- a/frontend/src/app/components/amount/amount.component.html +++ b/frontend/src/app/components/amount/amount.component.html @@ -6,6 +6,6 @@ Confidential - {{ satoshis / 100000000 | number : '1.8-8' }} BTC + {{ satoshis / 100000000 | number : '1.8-8' }} L-BTC diff --git a/frontend/src/app/components/block/block.component.html b/frontend/src/app/components/block/block.component.html index a1085fa29..078b0bca5 100644 --- a/frontend/src/app/components/block/block.component.html +++ b/frontend/src/app/components/block/block.component.html @@ -49,12 +49,12 @@ Total fees - {{ fees | number: '1.2-2' }} BTC () + {{ fees | number: '1.2-2' }} L-BTC () Reward + fees: - {{ blockSubsidy + fees | number: '1.2-2' }} BTC () + {{ blockSubsidy + fees | number: '1.2-2' }} L-BTC () diff --git a/frontend/src/app/components/block/block.component.ts b/frontend/src/app/components/block/block.component.ts index df529724b..101103d99 100644 --- a/frontend/src/app/components/block/block.component.ts +++ b/frontend/src/app/components/block/block.component.ts @@ -6,6 +6,7 @@ import { Block, Transaction, Vout } from '../../interfaces/electrs.interface'; import { of } from 'rxjs'; import { StateService } from '../../services/state.service'; import { SeoService } from 'src/app/services/seo.service'; +import { environment } from 'src/environments/environment'; @Component({ selector: 'app-block', @@ -13,6 +14,7 @@ import { SeoService } from 'src/app/services/seo.service'; styleUrls: ['./block.component.scss'] }) export class BlockComponent implements OnInit, OnDestroy { + network = environment.network; block: Block; blockHeight: number; blockHash: string; @@ -97,6 +99,10 @@ export class BlockComponent implements OnInit, OnDestroy { } setBlockSubsidy() { + if (this.network === 'liquid') { + this.blockSubsidy = 0; + return; + } this.blockSubsidy = 50; let halvenings = Math.floor(this.block.height / 210000); while (halvenings > 0) { diff --git a/frontend/src/app/components/mempool-block/mempool-block.component.html b/frontend/src/app/components/mempool-block/mempool-block.component.html index 35b17ebd0..6d116102c 100644 --- a/frontend/src/app/components/mempool-block/mempool-block.component.html +++ b/frontend/src/app/components/mempool-block/mempool-block.component.html @@ -19,7 +19,7 @@ Total fees - {{ mempoolBlock.totalFees / 100000000 | number : '1.2-2' }} BTC () + {{ mempoolBlock.totalFees / 100000000 | number : '1.2-2' }} L-BTC () Transactions diff --git a/frontend/src/app/components/mempool-block/mempool-block.component.ts b/frontend/src/app/components/mempool-block/mempool-block.component.ts index 98f70aaf7..8613c10a6 100644 --- a/frontend/src/app/components/mempool-block/mempool-block.component.ts +++ b/frontend/src/app/components/mempool-block/mempool-block.component.ts @@ -5,6 +5,7 @@ import { switchMap, map, tap } from 'rxjs/operators'; import { MempoolBlock } from 'src/app/interfaces/websocket.interface'; import { Observable } from 'rxjs'; import { SeoService } from 'src/app/services/seo.service'; +import { environment } from 'src/environments/environment'; @Component({ selector: 'app-mempool-block', @@ -12,6 +13,7 @@ import { SeoService } from 'src/app/services/seo.service'; styleUrls: ['./mempool-block.component.scss'] }) export class MempoolBlockComponent implements OnInit, OnDestroy { + network = environment.network; mempoolBlockIndex: number; mempoolBlock$: Observable;