SSR: Fix more merge/version conflicts

This commit is contained in:
Mononaut
2024-03-20 09:57:05 +00:00
parent 50e656b259
commit 6e2f17b3d2
17 changed files with 41 additions and 40 deletions

View File

@@ -1,7 +1,7 @@
<div class="container-xl dashboard-container" *ngIf="(network$ | async) !== 'liquid'; else liquidDashboard">
<div class="row row-cols-1 row-cols-md-2" *ngIf="{ value: (mempoolInfoData$ | async) } as mempoolInfoData">
<ng-container *ngIf="(network$ | async) !== 'liquidtestnet'">
<ng-container>
<div class="col card-wrapper">
<div class="main-title" i18n="fees-box.transaction-fees">Transaction Fees</div>
<div class="card">
@@ -29,7 +29,7 @@
</label>
</div>
</div>
<div class="mempool-block-wrapper">
<div class="mempool-block-wrapper" *ngIf="webGlEnabled">
<app-mempool-block-overview
[index]="0"
[resolution]="goggleResolution"