machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Display asset circulating amount more nicely fixing overflow

Browse Source 
fixes #1264
This commit is contained in:
softsimon
2022-02-21 22:33:03 +04:00
parent dd42f39ef6
commit b61450995a
4 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/app/components/asset-circulation/asset-circulation.component.html
View File

@@ -1,3 +1,6 @@
<ng-container *ngIf="(circulatingAmount$ | async) as circulating">
{{ circulating.amount }} <span class="ticker">{{ circulating.ticker }}</span>
<ng-template [ngIf]="circulating.amount === -1" [ngIfElse]="default" i18n="shared.confidential">Confidential</ng-template>
<ng-template #default>
<span class="d-inline-block d-md-none">{{ circulating.amount | amountShortener }}</span>
<span class="d-none d-md-inline-block">{{ circulating.amount | number: '1.2-2' }}</span>&nbsp;<span class="ticker">{{ circulating.ticker }}</span></ng-template>
</ng-container>

10
frontend/src/app/components/asset-circulation/asset-circulation.component.ts
View File

@@ -16,7 +16,7 @@ import { environment } from 'src/environments/environment';
export class AssetCirculationComponent implements OnInit {
@Input() assetId: string;
circulatingAmount$: Observable<{ amount: string, ticker: string}>;
circulatingAmount$: Observable<{ amount: number, ticker: string}>;
constructor(
private electrsApiService: ElectrsApiService,
@@ -35,20 +35,18 @@ export class AssetCirculationComponent implements OnInit {
if (!asset.chain_stats.has_blinded_issuances) {
if (asset.asset_id === environment.nativeAssetId) {
return {
amount: formatNumber(this.formatAmount(asset.chain_stats.peg_in_amount - asset.chain_stats.burned_amount
- asset.chain_stats.peg_out_amount, assetData[3]), this.locale, '1.2-2'),
amount: this.formatAmount(asset.chain_stats.peg_in_amount - asset.chain_stats.burned_amount - asset.chain_stats.peg_out_amount, assetData[3]),
ticker: assetData[1]
};
} else {
return {
amount: formatNumber(this.formatAmount(asset.chain_stats.issued_amount
- asset.chain_stats.burned_amount, assetData[3]), this.locale, '1.2-2'),
amount: this.formatAmount(asset.chain_stats.issued_amount - asset.chain_stats.burned_amount, assetData[3]),
ticker: assetData[1]
};
}
} else {
return {
amount: $localize`:@@shared.confidential:Confidential`,
amount: -1,
ticker: '',
};
}