fix exec formatting

gobitfly · Nov 6, 2023 · 6b86c66 · 6b86c66
1 parent 94d50bc
commit 6b86c66
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/app/components/dashboard/dashboard.component.html b/src/app/components/dashboard/dashboard.component.html
@@ -225,6 +225,7 @@
 			<div class="grid">
 				<app-performance-item
 					*ngIf="rewardTab === 'combined'"
+					[targetCurrency]="unit.pref.Cons"
 					[performanceData]="data.combinedPerformance"
 					[currency]="'GWEI'"
 					[unit]="unit"
@@ -240,6 +241,7 @@
 
 				<app-performance-item
 					*ngIf="rewardTab === 'cons'"
+					[targetCurrency]="unit.pref.Cons"
 					[performanceData]="data.consensusPerformance"
 					[currency]="'GWEI'"
 					[unit]="unit"
@@ -249,12 +251,11 @@
 					[last7DaysTooltip]=""
 					[last31DaysTooltip]=""
 					[totalTooltip]="'Total (Contains your consensus rewards)'"
-					[aprTooltip]="
-						'APR (Estimated yearly returns on both consensus layer (staking) and execution layer (transaction fees))'
-					"></app-performance-item>
+					[aprTooltip]="'APR (Estimated yearly returns on consensus layer (staking))'"></app-performance-item>
 
 				<app-performance-item
 					*ngIf="rewardTab === 'exec'"
+					[targetCurrency]="unit.pref.Exec"
 					[performanceData]="data.executionPerformance"
 					[currency]="'GWEI'"
 					[unit]="unit"
@@ -264,9 +265,7 @@
 					[last7DaysTooltip]=""
 					[last31DaysTooltip]=""
 					[totalTooltip]="'Total (Contains execution rewards without any claimed or unclaimed smoothing pool rewards.)'"
-					[aprTooltip]="
-						'APR (Estimated yearly returns on both consensus layer (staking) and execution layer (transaction fees))'
-					"></app-performance-item>
+					[aprTooltip]="'APR (Estimated yearly returns on execution layer (transaction fees))'"></app-performance-item>
 			</div>
 		</ion-item>
 	</ion-list>

diff --git a/src/app/components/dashboard/performance-item.component.html b/src/app/components/dashboard/performance-item.component.html
@@ -21,7 +21,7 @@
 	<div class="grid-cell left" (click)="unit.switchCurrencyPipe()">
 		<div class="grid">
 			<ion-label class="value left" [class]="performanceData.performance1d | valuestyle : 0">
-				{{ performanceData.performance1d | mcurrency : currency : unit.pref.Cons }}
+				{{ performanceData.performance1d | mcurrency : currency : targetCurrency }}
 			</ion-label>
 		</div>
 		<div class="grid">
@@ -35,7 +35,7 @@
 	<div class="grid-cell" (click)="unit.switchCurrencyPipe()">
 		<div>
 			<ion-label class="value right" [class]="performanceData.performance7d | valuestyle : 0">
-				{{ performanceData.performance7d | mcurrency : currency : unit.pref.Cons }}
+				{{ performanceData.performance7d | mcurrency : currency : targetCurrency }}
 			</ion-label>
 		</div>
 		<div>
@@ -49,7 +49,7 @@
 	<div class="grid-cell left" (click)="unit.switchCurrencyPipe()">
 		<div>
 			<ion-label class="value left" [class]="performanceData.performance31d | valuestyle : 0">
-				{{ performanceData.performance31d | mcurrency : currency : unit.pref.Cons }}
+				{{ performanceData.performance31d | mcurrency : currency : targetCurrency }}
 			</ion-label>
 		</div>
 		<div>
@@ -63,7 +63,7 @@
 	<div class="grid-cell" (click)="unit.switchCurrencyPipe()">
 		<div>
 			<ion-label class="value right" [class]="performanceData.total | valuestyle : 0">
-				{{ performanceData.total | mcurrency : currency : unit.pref.Cons }}
+				{{ performanceData.total | mcurrency : currency : targetCurrency }}
 			</ion-label>
 		</div>
 		<div>

diff --git a/src/app/components/dashboard/performance-item.component.ts b/src/app/components/dashboard/performance-item.component.ts
@@ -19,7 +19,7 @@
 
 import { Component, Input } from '@angular/core'
 import { Performance } from 'src/app/controllers/OverviewController'
-import { UnitconvService } from 'src/app/services/unitconv.service'
+import { Currency, UnitconvService } from 'src/app/services/unitconv.service'
 
 @Component({
 	selector: 'app-performance-item',
@@ -29,6 +29,7 @@ import { UnitconvService } from 'src/app/services/unitconv.service'
 export class PerformanceItemComponent {
 	@Input() performanceData: Performance
 	@Input() unit: UnitconvService
+	@Input() targetCurrency: Currency
 	@Input() currency: string
 	@Input() todayTooltip: string
 	@Input() last7DaysTooltip: string