Merge branch 'master' into save-flow-preference

This commit is contained in:
wiz
2022-10-16 08:11:03 +09:00
committed by GitHub
62 changed files with 2911 additions and 648 deletions

View File

@@ -24,7 +24,7 @@
</ng-template>
</span>
<span class="field col-sm-4 text-center"><ng-container *ngIf="transactionTime > 0">&lrm;{{ transactionTime * 1000 | date:'yyyy-MM-dd HH:mm' }}</ng-container></span>
<span class="field col-sm-4 text-right"><span class="label" i18n="transaction.fee|Transaction fee">Fee </span>{{ tx.fee | number }} <span class="symbol" i18n="shared.sat|sat">sat</span></span>
<span class="field col-sm-4 text-right"><span class="label" i18n="transaction.fee|Transaction fee">Fee</span> {{ tx.fee | number }} <span class="symbol" i18n="shared.sat|sat">sat</span></span>
</div>

View File

@@ -3,7 +3,7 @@
}
.container-buttons {
align-self: flex-start;
align-self: center;
}
.title-block {