fix fiat switching, fix validatorutils

gobitfly · Oct 19, 2023 · 7d58036 · 7d58036
1 parent f6d750c
commit 7d58036
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/src/app/services/unitconv.service.ts b/src/app/services/unitconv.service.ts
@@ -77,6 +77,15 @@ export class UnitconvService {
 		await this.init()
 	}
 
+	public async changeCurrency(value: string) {
+		this.pref.Cons = this.createCurrency(value, 'cons')
+		await this.updatePriceData()
+	}
+
+	public async getCurrentConsFiat() {
+		return this.createCurrency(this.getPref(await this.loadStored(STORAGE_KEY_CONS), this.getNetworkDefaultCurrency('cons')), 'cons').value
+	}
+
 	private async loadStored(key: string): Promise<StoredPref> {
 		const result = await this.storage.getObject(key)
 		if (!result) return null

diff --git a/src/app/tab-preferences/tab-preferences.page.html b/src/app/tab-preferences/tab-preferences.page.html
@@ -56,7 +56,7 @@
 			<ion-select
 				label="Display Currency"
 				[value]="unit.getNetworkDefaultCurrency(unit.pref.Cons)"
-				[(ngModel)]="unit.pref.Cons.value"
+				[(ngModel)]="currentFiatCurrency"
 				(ionChange)="changeCurrency()"
 				interface="popover"
 				*ngIf="overrideDisplayCurrency == null">

diff --git a/src/app/tab-preferences/tab-preferences.page.ts b/src/app/tab-preferences/tab-preferences.page.ts
@@ -81,6 +81,7 @@ export class Tab3Page {
 	premiumLabel = ''
 
 	protected package = ''
+	protected currentFiatCurrency
 
 	constructor(
 		protected api: ApiService,
@@ -103,6 +104,9 @@ export class Tab3Page {
 	) {}
 
 	ngOnInit() {
+		this.unit.getCurrentConsFiat().then((result) => {
+			this.currentFiatCurrency = result
+		})
 		this.theme.isDarkThemed().then((result) => (this.darkMode = result))
 
 		this.theme.getThemeColor().then((result) => (this.themeColor = result))
@@ -230,13 +234,13 @@ export class Tab3Page {
 
 	overrideDisplayCurrency = null
 	private changeCurrencyLocked = false
-	changeCurrency() {
+	async changeCurrency() {
 		if (this.changeCurrencyLocked) return
 		this.changeCurrencyLocked = true
 
 		this.overrideDisplayCurrency = this.unit.pref
 
-		this.unit.updatePriceData()
+		await this.unit.changeCurrency(this.currentFiatCurrency)
 		this.unit.save()
 
 		setTimeout(() => {

diff --git a/src/app/utils/ValidatorUtils.ts b/src/app/utils/ValidatorUtils.ts
@@ -371,16 +371,16 @@ export class ValidatorUtils extends CacheModule {
 
 		const result = request.parse(response)[0]
 		if (!result) {
-			console.warn('error getDashboardDataValidators', response)
+			console.warn('error getDashboardDataValidators', response, result)
 			return []
 		}
-		if (result.currentEpoch && result.currentEpoch.length > 1) {
+		if (result.currentEpoch && result.currentEpoch.length > 0) {
 			this.currentEpoch = result.currentEpoch[0]
 		}
-		if (result.olderEpoch && result.olderEpoch.length > 1) {
+		if (result.olderEpoch && result.olderEpoch.length > 0) {
 			this.olderEpoch = result.olderEpoch[0]
 		}
-		if (result.rocketpool_network_stats && result.rocketpool_network_stats.length > 1) {
+		if (result.rocketpool_network_stats && result.rocketpool_network_stats.length > 0) {
 			this.rocketpoolStats = result.rocketpool_network_stats[0]
 		}
 		const validatorEffectivenessResponse = result.effectiveness