GlcoinCore/mempool
1
0
Fork 0
mirror of https://github.com/mempool/mempool.git synced 2026-08-13 12:33:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into dependabot/npm_and_yarn/frontend/cypress-15.7.0

Browse source
This commit is contained in:
Felipe Knorr Kuhn 2025-11-27 13:56:47 -03:00 • committed by GitHub
commit f18b89d129
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/custom-meta-config.json
View file

@ -25,7 +25,7 @@
"component": "twitter",
"mobileOrder": 5,
"props": {
"handle": "Metaplanet_JP"
"handle": "Metaplanet"
}
},
{

4
frontend/src/app/components/transaction/cpfp-info.component.html
View file

@ -16,7 +16,7 @@
</thead>
<tbody>
<ng-template [ngIf]="cpfpInfo?.descendants?.length">
<tr *ngFor="let cpfpTx of cpfpInfo.descendants">
<tr *ngFor="let cpfpTx of cpfpInfo.descendants; trackBy: trackByIndex">
<td><span class="badge badge-primary" i18n="transaction.descendant|Descendant">Descendant</span></td>
<td>
<app-truncate [text]="cpfpTx.txid" [link]="['/tx' | relativeUrl, cpfpTx.txid]"></app-truncate>
@ -40,7 +40,7 @@
</tr>
</ng-template>
<ng-template [ngIf]="cpfpInfo?.ancestors?.length">
<tr *ngFor="let cpfpTx of cpfpInfo.ancestors">
<tr *ngFor="let cpfpTx of cpfpInfo.ancestors; trackBy: trackByIndex">
<td><span class="badge badge-primary" i18n="transaction.ancestor|Transaction Ancestor">Ancestor</span></td>
<td class="txids">
<app-truncate [text]="cpfpTx.txid" [link]="['/tx' | relativeUrl, cpfpTx.txid]"></app-truncate>

4
frontend/src/app/components/transaction/cpfp-info.component.ts
View file

@ -20,4 +20,8 @@ export class CpfpInfoComponent implements OnInit {
roundToOneDecimal(cpfpTx: any): number {
return +(cpfpTx.fee / (cpfpTx.weight / 4)).toFixed(1);
}
trackByIndex(index: number): number {
return index;
}
}

2
frontend/src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.html
View file

@ -56,7 +56,7 @@
</ng-container>
</span>
<span *ngSwitchCase="'output'">
<ng-container *ngIf="line.blockHeight && line?.spent">
<ng-container *ngIf="(stateService.backend$ | async) === 'esplora' && line.blockHeight && line?.spent">
<ng-container *ngIf="line?.status?.block_height; else noBlockHeight">
<ng-container *ngTemplateOutlet="nBlocksLater; context:{n: line?.status?.block_height - line.blockHeight, connector: false}"></ng-container>
</ng-container>

2
frontend/src/app/components/tx-bowtie-graph-tooltip/tx-bowtie-graph-tooltip.component.ts
View file

@ -54,7 +54,7 @@ export class TxBowtieGraphTooltipComponent implements OnChanges {
constructor(
private priceService: PriceService,
private stateService: StateService,
public stateService: StateService,
private apiService: ApiService,
) {}