Merge pull request #5437 from mempool/simon/use-sats
only use sats, not sat
This commit is contained in:
		
						commit
						07a0850f99
					
				| @ -12,7 +12,7 @@ | |||||||
|           </p> |           </p> | ||||||
|         </div> |         </div> | ||||||
|         <div class="spacer"></div> |         <div class="spacer"></div> | ||||||
|         <span class="fee">{{ bar.class === 'tx' ? '' : '+' }}{{ bar.fee | number }} <span class="symbol" i18n="shared.sat|sat">sat</span></span> |         <span class="fee">{{ bar.class === 'tx' ? '' : '+' }}{{ bar.fee | number }} <span class="symbol" i18n="shared.sats">sats</span></span> | ||||||
|         <div class="spacer"></div> |         <div class="spacer"></div> | ||||||
|         <div class="spacer"></div> |         <div class="spacer"></div> | ||||||
|       </div> |       </div> | ||||||
|  | |||||||
| @ -21,14 +21,14 @@ | |||||||
|       </tr> |       </tr> | ||||||
|       <tr *ngIf="accelerationInfo.fee"> |       <tr *ngIf="accelerationInfo.fee"> | ||||||
|         <td class="label" i18n="transaction.fee|Transaction fee">Fee</td> |         <td class="label" i18n="transaction.fee|Transaction fee">Fee</td> | ||||||
|         <td class="value">{{ accelerationInfo.fee | number }} <span class="symbol" i18n="shared.sat|sat">sat</span></td> |         <td class="value">{{ accelerationInfo.fee | number }} <span class="symbol" i18n="shared.sats">sats</span></td> | ||||||
|       </tr> |       </tr> | ||||||
|       <tr *ngIf="accelerationInfo.bidBoost >= 0 || accelerationInfo.feeDelta"> |       <tr *ngIf="accelerationInfo.bidBoost >= 0 || accelerationInfo.feeDelta"> | ||||||
|         <td class="label" i18n="transaction.out-of-band-fees">Out-of-band fees</td> |         <td class="label" i18n="transaction.out-of-band-fees">Out-of-band fees</td> | ||||||
|         @if (accelerationInfo.status === 'accelerated') { |         @if (accelerationInfo.status === 'accelerated') { | ||||||
|           <td class="value oobFees">{{ accelerationInfo.feeDelta | number }} <span class="symbol" i18n="shared.sat|sat">sat</span></td> |           <td class="value oobFees">{{ accelerationInfo.feeDelta | number }} <span class="symbol" i18n="shared.sats">sats</span></td> | ||||||
|         } @else { |         } @else { | ||||||
|           <td class="value oobFees">{{ accelerationInfo.bidBoost | number }} <span class="symbol" i18n="shared.sat|sat">sat</span></td> |           <td class="value oobFees">{{ accelerationInfo.bidBoost | number }} <span class="symbol" i18n="shared.sats">sats</span></td> | ||||||
|         } |         } | ||||||
|       </tr> |       </tr> | ||||||
|       <tr *ngIf="accelerationInfo.fee && accelerationInfo.weight"> |       <tr *ngIf="accelerationInfo.fee && accelerationInfo.weight"> | ||||||
|  | |||||||
| @ -33,7 +33,7 @@ | |||||||
|               <app-fee-rate [fee]="acceleration.effectiveFee" [weight]="acceleration.effectiveVsize * 4"></app-fee-rate> |               <app-fee-rate [fee]="acceleration.effectiveFee" [weight]="acceleration.effectiveVsize * 4"></app-fee-rate> | ||||||
|             </td> |             </td> | ||||||
|             <td class="bid text-right"> |             <td class="bid text-right"> | ||||||
|               {{ (acceleration.feeDelta) | number }} <span class="symbol" i18n="shared.sat|sat">sat</span> |               {{ (acceleration.feeDelta) | number }} <span class="symbol" i18n="shared.sats">sats</span> | ||||||
|             </td> |             </td> | ||||||
|             <td class="time text-right"> |             <td class="time text-right"> | ||||||
|               <app-time kind="since" [time]="acceleration.added" [fastRender]="true" [showTooltip]="true"></app-time> |               <app-time kind="since" [time]="acceleration.added" [fastRender]="true" [showTooltip]="true"></app-time> | ||||||
| @ -41,7 +41,7 @@ | |||||||
|           </ng-container> |           </ng-container> | ||||||
|           <ng-container *ngIf="!pending"> |           <ng-container *ngIf="!pending"> | ||||||
|             <td *ngIf="acceleration.boost != null" class="fee text-right"> |             <td *ngIf="acceleration.boost != null" class="fee text-right"> | ||||||
|               {{ acceleration.boost | number }} <span class="symbol" i18n="shared.sat|sat">sat</span> |               {{ acceleration.boost | number }} <span class="symbol" i18n="shared.sats">sats</span> | ||||||
|             </td> |             </td> | ||||||
|             <td *ngIf="acceleration.boost == null" class="fee text-right"> |             <td *ngIf="acceleration.boost == null" class="fee text-right"> | ||||||
|               ~ |               ~ | ||||||
|  | |||||||
| @ -1,7 +1,7 @@ | |||||||
| <div [formGroup]="amountForm" class="text-small text-center"> | <div [formGroup]="amountForm" class="text-small text-center"> | ||||||
|     <select formControlName="mode" class="custom-select custom-select-sm form-control-secondary form-control mx-auto" style="width: 70px;" (change)="changeMode()"> |     <select formControlName="mode" class="custom-select custom-select-sm form-control-secondary form-control mx-auto" style="width: 70px;" (change)="changeMode()"> | ||||||
|         <option value="btc" i18n="shared.btc|BTC">BTC</option> |         <option value="btc" i18n="shared.btc|BTC">BTC</option> | ||||||
|         <option value="sats" i18n="shared.sat|sat">sat</option> |         <option value="sats" i18n="shared.sats">sats</option> | ||||||
|         <option value="fiat" i18n="shared.fiat|Fiat">Fiat</option> |         <option value="fiat" i18n="shared.fiat|Fiat">Fiat</option> | ||||||
|     </select> |     </select> | ||||||
| </div> | </div> | ||||||
|  | |||||||
| @ -40,7 +40,7 @@ | |||||||
|       </tr> |       </tr> | ||||||
|       <tr> |       <tr> | ||||||
|         <td class="label" i18n="transaction.fee|Transaction fee">Fee</td> |         <td class="label" i18n="transaction.fee|Transaction fee">Fee</td> | ||||||
|         <td class="value">{{ fee | number }} <span class="symbol" i18n="shared.sat|sat">sat</span>   <span class="fiat"><app-fiat [blockConversion]="blockConversion" [value]="fee"></app-fiat></span> |         <td class="value">{{ fee | number }} <span class="symbol" i18n="shared.sats">sats</span>   <span class="fiat"><app-fiat [blockConversion]="blockConversion" [value]="fee"></app-fiat></span> | ||||||
|       </tr> |       </tr> | ||||||
|       <tr> |       <tr> | ||||||
|         <td class="label" i18n="transaction.fee-rate|Transaction fee rate">Fee rate</td> |         <td class="label" i18n="transaction.fee-rate|Transaction fee rate">Fee rate</td> | ||||||
|  | |||||||
| @ -19,7 +19,7 @@ | |||||||
|       </tr> |       </tr> | ||||||
|       <tr> |       <tr> | ||||||
|         <td class="td-width" i18n="transaction.fee|Transaction fee">Fee</td> |         <td class="td-width" i18n="transaction.fee|Transaction fee">Fee</td> | ||||||
|         <td>{{ rbfInfo.tx.fee | number }} <span class="symbol" i18n="shared.sat|sat">sat</span></td> |         <td>{{ rbfInfo.tx.fee | number }} <span class="symbol" i18n="shared.sats">sats</span></td> | ||||||
|       </tr> |       </tr> | ||||||
|       <tr *only-vsize> |       <tr *only-vsize> | ||||||
|         <td class="td-width" i18n="transaction.vsize|Transaction Virtual Size">Virtual size</td> |         <td class="td-width" i18n="transaction.vsize|Transaction Virtual Size">Virtual size</td> | ||||||
|  | |||||||
| @ -21,7 +21,7 @@ | |||||||
|       </ng-template> |       </ng-template> | ||||||
|     </span> |     </span> | ||||||
|     <span class="field col-sm-4 text-center"><ng-container *ngIf="transactionTime > 0">‎{{ transactionTime * 1000 | date:'yyyy-MM-dd HH:mm' }}</ng-container></span> |     <span class="field col-sm-4 text-center"><ng-container *ngIf="transactionTime > 0">‎{{ 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.sats">sats</span></span> | ||||||
|   </div> |   </div> | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -606,9 +606,9 @@ | |||||||
|   @if (!isLoadingTx) { |   @if (!isLoadingTx) { | ||||||
|     <tr> |     <tr> | ||||||
|       <td class="td-width" i18n="transaction.fee|Transaction fee">Fee</td> |       <td class="td-width" i18n="transaction.fee|Transaction fee">Fee</td> | ||||||
|       <td class="text-wrap">{{ tx.fee | number }} <span class="symbol" i18n="shared.sat|sat">sat</span> |       <td class="text-wrap">{{ tx.fee | number }} <span class="symbol" i18n="shared.sats">sats</span> | ||||||
|         @if (accelerationInfo?.bidBoost ?? tx.feeDelta > 0) { |         @if (accelerationInfo?.bidBoost ?? tx.feeDelta > 0) { | ||||||
|           <span class="oobFees" i18n-ngbTooltip="Acceleration Fees" ngbTooltip="Acceleration fees paid out-of-band"> +{{ accelerationInfo?.bidBoost ?? tx.feeDelta | number }} </span><span class="symbol" i18n="shared.sat|sat">sat</span> |           <span class="oobFees" i18n-ngbTooltip="Acceleration Fees" ngbTooltip="Acceleration fees paid out-of-band"> +{{ accelerationInfo?.bidBoost ?? tx.feeDelta | number }} </span><span class="symbol" i18n="shared.sats">sats</span> | ||||||
|         } |         } | ||||||
|         <span class="fiat"><app-fiat [blockConversion]="tx.price" [value]="tx.fee + ((accelerationInfo?.bidBoost ?? tx.feeDelta) || 0)"></app-fiat></span> |         <span class="fiat"><app-fiat [blockConversion]="tx.price" [value]="tx.fee + ((accelerationInfo?.bidBoost ?? tx.feeDelta) || 0)"></app-fiat></span> | ||||||
|       </td> |       </td> | ||||||
|  | |||||||
| @ -321,7 +321,7 @@ | |||||||
|       <div class="float-left mt-2-5" *ngIf="!transactionPage && !tx.vin[0].is_coinbase && tx.fee !== -1"> |       <div class="float-left mt-2-5" *ngIf="!transactionPage && !tx.vin[0].is_coinbase && tx.fee !== -1"> | ||||||
|         <app-fee-rate [fee]="tx.fee" [weight]="tx.weight"></app-fee-rate> |         <app-fee-rate [fee]="tx.fee" [weight]="tx.weight"></app-fee-rate> | ||||||
|         <span class="d-none d-sm-inline-block"> – {{ tx.fee | number }} <span class="symbol" |         <span class="d-none d-sm-inline-block"> – {{ tx.fee | number }} <span class="symbol" | ||||||
|             i18n="shared.sat|sat">sat</span> <span class="fiat"><app-fiat [blockConversion]="tx.price" [value]="tx.fee"></app-fiat></span></span> |             i18n="shared.sats">sats</span> <span class="fiat"><app-fiat [blockConversion]="tx.price" [value]="tx.fee"></app-fiat></span></span> | ||||||
|       </div> |       </div> | ||||||
|       <div class="float-left mt-2-5 grey-info-text" *ngIf="tx.fee === -1" i18n="transactions-list.load-to-reveal-fee-info">Show more inputs to reveal fee data</div> |       <div class="float-left mt-2-5 grey-info-text" *ngIf="tx.fee === -1" i18n="transactions-list.load-to-reveal-fee-info">Show more inputs to reveal fee data</div> | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user