Merge branch 'master' into simon/configurable-main-module

This commit is contained in:
softsimon
2021-08-03 18:41:43 +03:00
42 changed files with 2426 additions and 1760 deletions

View File

@@ -43,6 +43,10 @@
<img class="image" src="/resources/profile/exodus.svg" />
<span>Exodus</span>
</a>
<a href="https://foundrydigital.com/" target="_blank" title="Foundry">
<img class="image" src="/resources/profile/foundry.svg" />
<span>Foundry</span>
</a>
</div>
</div>

View File

@@ -92,14 +92,14 @@
<td class="td-width" i18n="transaction.version">Version</td>
<td>{{ block.version | decimal2hex }} <span *ngIf="displayTaprootStatus() && hasTaproot(block.version)" class="badge badge-success ml-1" >Taproot</span></td>
</tr>
<tr>
<td i18n="block.merkle-root">Merkle root</td>
<td><p class="break-all">{{ block.merkle_root }}</p></td>
</tr>
<tr *ngIf="network !== 'liquid'">
<td i18n="block.bits">Bits</td>
<td>{{ block.bits | decimal2hex }}</td>
</tr>
<tr>
<td i18n="block.merkle-root">Merkle root</td>
<td><p class="break-all">{{ block.merkle_root }}</p></td>
</tr>
</tbody>
</table>
</div>

View File

@@ -4,7 +4,7 @@
<div class="col d-none d-sm-block">
<span class="txPerSecond" i18n="footer.tx-vbytes-per-second">Tx vBytes per second:</span>
<span *ngIf="mempoolInfoData.vBytesPerSecond === 0; else inSync">
&nbsp;<span class="badge badge-pill badge-warning" i18n="footer.backend-is-synchronizing">Backend is synchronizing</span>
&nbsp;<span class="badge badge-pill badge-warning" i18n="dashboard.backend-is-synchronizing">Backend is synchronizing</span>
</span>
<ng-template #inSync>
<div class="progress sub-text">

View File

@@ -216,6 +216,10 @@
<td i18n="transaction.weight|Transaction Weight">Weight</td>
<td [innerHTML]="tx.weight | wuBytes: 2"></td>
</tr>
<tr>
<td i18n="transaction.hex">Transaction Hex</td>
<td><a target="_blank" href="/api/tx/{{ txId }}/hex"><fa-icon [icon]="['fas', 'external-link-alt']" [fixedWidth]="true"></fa-icon></a></td>
</tr>
</tbody>
</table>
</div>