+
Nothing found
We couldn't find the validators you are looking for. Try searching by Index, Public Key or ETH address.
-
+
Add Validators
You can add your validators by searching for a public key, validator index or your ETH address.
@@ -122,4 +113,19 @@ Add Validators
+
+
+
+
diff --git a/src/app/tab-validators/tab-validators.page.scss b/src/app/tab-validators/tab-validators.page.scss
index 9b2faac5..f59a2834 100644
--- a/src/app/tab-validators/tab-validators.page.scss
+++ b/src/app/tab-validators/tab-validators.page.scss
@@ -68,11 +68,13 @@ ion-label {
margin-bottom: 0px !important;
}
-ion-virtual-scroll {
+cdk-virtual-scroll-viewport {
margin-left: 0px;
margin-right: 0px;
padding-left: 0px;
padding-right: 0px;
+ width: 100%;
+ height: 100%;
}
.center {
diff --git a/src/app/tab-validators/tab-validators.page.ts b/src/app/tab-validators/tab-validators.page.ts
index e2d3228b..38b9dd20 100644
--- a/src/app/tab-validators/tab-validators.page.ts
+++ b/src/app/tab-validators/tab-validators.page.ts
@@ -39,20 +39,18 @@ import ThemeUtils from '../utils/ThemeUtils'
import { Haptics } from '@capacitor/haptics'
import { UnitconvService } from '../services/unitconv.service'
-
+import { InfiniteScrollDataSource } from '../utils/InfiniteScrollDataSource'
+import { trigger, style, animate, transition } from '@angular/animations'
@Component({
selector: 'app-tab2',
templateUrl: 'tab-validators.page.html',
styleUrls: ['tab-validators.page.scss'],
+ animations: [trigger('fadeIn', [transition(':enter', [style({ opacity: 0 }), animate('300ms 100ms', style({ opacity: 1 }))])])],
})
export class Tab2Page {
- public classReference = UnitconvService
-
- fadeIn = 'invisible'
+ dataSource: InfiniteScrollDataSource
- static itemCount = 0
-
- items: Validator[] = []
+ public classReference = UnitconvService
searchResultMode = false
loading = false
@@ -88,6 +86,8 @@ export class Tab2Page {
this.merchant.getCurrentPlanMaxValidator().then((result) => {
this.currentPackageMaxValidators = result
})
+
+ this.dataSource = new InfiniteScrollDataSource(InfiniteScrollDataSource.ALL_ITEMS_AT_ONCE, this.getDefaultDataRetriever())
}
ngOnInit() {
@@ -97,14 +97,11 @@ export class Tab2Page {
private async refresh() {
this.reachedMaxValidators = false
this.storage.isLoggedIn().then((result) => (this.isLoggedIn = result))
- if (!this.searchResultMode) this.refreshMyValidators()
- if (this.fadeIn == 'invisible') {
- this.fadeIn = 'fade-in'
- setTimeout(() => {
- this.fadeIn = null
- }, 1500)
+ if (!this.searchResultMode) {
+ this.dataSource.setLoadFrom(this.getDefaultDataRetriever())
}
+ this.dataSource.reset()
}
async syncRemote() {
@@ -116,14 +113,18 @@ export class Tab2Page {
}, 2000)
}
- private async refreshMyValidators() {
+ private getDefaultDataRetriever() {
+ return () => {
+ return this.getValidatorData()
+ }
+ }
+
+ private async getValidatorData() {
this.searchResultMode = false
if (!(await this.validatorUtils.hasLocalValdiators())) {
- this.items = new Array()
- Tab2Page.itemCount = this.items.length
this.initialized = true
- return
+ return []
}
this.setLoading(true)
@@ -163,17 +164,15 @@ export class Tab2Page {
return -1
}
})
- this.items = temp
this.setLoading(false)
- Tab2Page.itemCount = this.items.length
+ return temp
}
private setLoading(loading: boolean) {
- console.log('set loading', loading)
if (loading) {
// Reasoning: Don't show loading indicator if it takes less than 400ms (already cached locally but storage is slow-ish so we adjust for that)
setTimeout(() => {
- if (!this.items || this.items.length <= 0) {
+ if (!this.dataSource || !this.dataSource.hasItems()) {
this.loading = true
}
}, 200)
@@ -203,7 +202,7 @@ export class Tab2Page {
}
private async showDialog(title, text, action: () => void) {
- const size = this.items.length
+ const size = this.dataSource.length()
const alert = await this.alertController.create({
header: title,
message: text.replace('{AMOUNT}', size + ''),
@@ -225,17 +224,17 @@ export class Tab2Page {
async confirmRemoveAll() {
this.validatorUtils.deleteAll()
- this.refreshMyValidators()
+ this.dataSource.reset()
}
async confirmAddAll() {
const responses: ValidatorResponse[] = []
- this.items.forEach(async (item) => {
+ this.dataSource.getItems().forEach(async (item) => {
responses.push(item.data)
})
this.validatorUtils.convertToValidatorModelsAndSaveLocal(false, responses)
- this.refreshMyValidators()
+ this.dataSource.reset()
}
searchEvent(event) {
@@ -250,34 +249,50 @@ export class Tab2Page {
this.searchResultMode = true
this.loading = true
-
const isETH1Address = searchString.startsWith('0x') && searchString.length == 42
- if (isETH1Address) this.searchETH1(searchString).then(() => (this.loading = false))
- else this.searchByPubKeyOrIndex(searchString).then(() => (this.loading = false))
+ if (isETH1Address) await this.searchETH1(searchString)
+ else await this.searchByPubKeyOrIndex(searchString)
+
+ // this.loading = false would be preferable here but somehow the first time it is called the promises resolve instantly without waiting
+ // but it works for any subsequent calls ¯\_(ツ)_/¯
+ // workaround for now is to set it in searchETH1 and searchByPubKeyOrIndex
}
- async searchByPubKeyOrIndex(target) {
- const temp = await this.validatorUtils.searchValidators(target).catch((error) => {
- console.warn('search error', error)
- return []
+ private async searchByPubKeyOrIndex(target) {
+ this.dataSource.setLoadFrom(() => {
+ return this.validatorUtils
+ .searchValidators(target)
+ .catch((error) => {
+ console.warn('search error', error)
+ return []
+ })
+ .then((result) => {
+ this.loading = false
+ return result
+ })
})
- this.items = temp
- Tab2Page.itemCount = this.items.length
+ return await this.dataSource.reset()
}
- async searchETH1(target) {
- const temp = await this.validatorUtils.searchValidatorsViaETH1(target).catch(async (error) => {
- if (error && error.message && error.message.indexOf('only a maximum of') > 0) {
- console.log('SET reachedMaxValidators to true')
- this.reachedMaxValidators = true
- return await this.validatorUtils.searchValidatorsViaETH1(target, this.currentPackageMaxValidators - 1)
- }
- return []
+ private async searchETH1(target) {
+ this.dataSource.setLoadFrom(() => {
+ return this.validatorUtils
+ .searchValidatorsViaETH1(target)
+ .catch(async (error) => {
+ if (error && error.message && error.message.indexOf('only a maximum of') > 0) {
+ console.log('SET reachedMaxValidators to true')
+ this.reachedMaxValidators = true
+ return this.validatorUtils.searchValidatorsViaETH1(target, this.currentPackageMaxValidators - 1)
+ }
+ return []
+ })
+ .then((result) => {
+ this.loading = false
+ return result
+ })
})
-
- this.items = temp // await this.applyAttestationEffectiveness(temp, target)
- Tab2Page.itemCount = this.items.length
+ return await this.dataSource.reset()
}
cancelSearch() {
@@ -307,14 +322,10 @@ export class Tab2Page {
}
ionViewDidLeave() {
+ this.validatorUtils.notifyListenersIfDeletedWithoutNotifying()
this.sync.mightSyncUpAndSyncDelete()
}
- itemHeightFn(item, index) {
- if (index == Tab2Page.itemCount - 1) return 210
- return 144
- }
-
async upgrade() {
const modal = await this.modalController.create({
component: SubscribePage,
@@ -375,7 +386,7 @@ export class Tab2Page {
getValidatorsByIndex(indexMap): Validator[] {
const result = []
indexMap.forEach((value, key) => {
- const temp = this.items.find((item) => {
+ const temp = this.dataSource.getItems().find((item) => {
return item.index == key
})
if (temp) {
diff --git a/src/app/utils/AdUtils.ts b/src/app/utils/AdUtils.ts
index e70fa91c..6e6286e0 100644
--- a/src/app/utils/AdUtils.ts
+++ b/src/app/utils/AdUtils.ts
@@ -58,7 +58,7 @@ export default class AdUtils {
async get(location: AdLocation): Promise {
const adFree = await this.merchantUtils.hasAdFree()
if (adFree) {
- console.warn(LOGTAG + 'user is premium member, disabling ads')
+ console.info(LOGTAG + 'user is premium member, disabling ads')
return null
}
diff --git a/src/app/utils/BlockUtils.ts b/src/app/utils/BlockUtils.ts
index 95bb8e16..e577e73d 100644
--- a/src/app/utils/BlockUtils.ts
+++ b/src/app/utils/BlockUtils.ts
@@ -79,14 +79,17 @@ export class BlockUtils extends CacheModule {
const request = new DashboardRequest(...valis.map((vali) => vali.index))
const response = await this.api.execute(request)
const result = request.parse(response)[0]
- const proposalLuckStats = result.proposal_luck_stats
- return {
- luckPercentage: proposalLuckStats.proposal_luck,
- timeFrameName: proposalLuckStats.time_frame_name,
- userValidators: valis.length,
- expectedBlocksPerMonth: MONTH / (proposalLuckStats.average_proposal_interval * 12),
- nextBlockEstimate: proposalLuckStats.next_proposal_estimate_ts * 1000,
- } as Luck
+ if (result) {
+ const proposalLuckStats = result.proposal_luck_stats
+ return {
+ luckPercentage: proposalLuckStats.proposal_luck,
+ timeFrameName: proposalLuckStats.time_frame_name,
+ userValidators: valis.length,
+ expectedBlocksPerMonth: MONTH / (proposalLuckStats.average_proposal_interval * 12),
+ nextBlockEstimate: proposalLuckStats.next_proposal_estimate_ts * 1000,
+ } as Luck
+ }
+ return null
}
}
diff --git a/src/app/utils/CacheModule.ts b/src/app/utils/CacheModule.ts
index 51f9ab10..cdc16266 100644
--- a/src/app/utils/CacheModule.ts
+++ b/src/app/utils/CacheModule.ts
@@ -63,8 +63,8 @@ export class CacheModule {
private getStoreForCacheKey(cacheKey: string): Map {
// rationale: don't store big data objects in hardStorage due to severe performance impacts
- const storeHotOnly = cacheKey.indexOf('user/stats/') >= 0
- return storeHotOnly ? this.hotOnly : this.cache
+ const storeHard = cacheKey.indexOf('app/dashboard') >= 0
+ return storeHard ? this.cache : this.hotOnly
}
protected putCache(key: string, data: unknown, staleTime = this.staleTime) {
@@ -77,17 +77,27 @@ export class CacheModule {
data: data,
})
- if (this.hardStorage) {
- this.hardStorage.setObject('cachemodule2_' + this.keyPrefix, this.cache)
+ try {
+ if (this.hardStorage) {
+ this.hardStorage.setObject('cachemodule2_' + this.keyPrefix, this.cache)
+ }
+ } catch (e) {
+ if (isQuotaExceededError(e)) {
+ this.clearHardCache()
+ }
}
}
clearCache() {
+ this.clearHardCache()
+ this.cache.clear()
+ this.hotOnly.clear()
+ }
+
+ clearHardCache() {
if (this.hardStorage) {
this.hardStorage.setObject('cachemodule2_' + this.keyPrefix, null)
}
- this.cache.clear()
- this.hotOnly.clear()
}
protected async getCache(key: string) {
@@ -153,3 +163,18 @@ export class CacheModule {
return this.keyPrefix + key
}
}
+
+function isQuotaExceededError(err: unknown): boolean {
+ return (
+ err instanceof DOMException &&
+ // everything except Firefox
+ (err.code === 22 ||
+ // Firefox
+ err.code === 1014 ||
+ // test name field too, because code might not be present
+ // everything except Firefox
+ err.name === 'QuotaExceededError' ||
+ // Firefox
+ err.name === 'NS_ERROR_DOM_QUOTA_REACHED')
+ )
+}
diff --git a/src/app/utils/ClientUpdateUtils.ts b/src/app/utils/ClientUpdateUtils.ts
index 408220b9..5edc25b8 100644
--- a/src/app/utils/ClientUpdateUtils.ts
+++ b/src/app/utils/ClientUpdateUtils.ts
@@ -118,6 +118,7 @@ const SETTINGS_UPDATECHANNEL = 'setting_client_updatechannel'
export default class ClientUpdateUtils {
private oldClientInfoConverted = false
updates: Release[] = null
+ lastTry = 0
constructor(private api: ApiService, private storage: StorageService) {}
@@ -135,6 +136,7 @@ export default class ClientUpdateUtils {
}
async checkAllUpdates() {
+ if (this.lastTry + 10 * 60 * 1000 > Date.now()) return
this.updates = null
for (let i = 0; i < Clients.length; i++) {
this.append(this.checkUpdateFor(await this.storage.getItem(Clients[i].storageKey)))
@@ -202,6 +204,7 @@ export default class ClientUpdateUtils {
}
const client = this.getClientInfo(clientKey)
if (client != null) {
+ this.lastTry = Date.now()
const update = await this.getReleases(client)
const lastClosed = await this.getLastClosedVersion(clientKey)
if (update && update.data && lastClosed) {
diff --git a/src/app/utils/FirebaseUtils.ts b/src/app/utils/FirebaseUtils.ts
index 406906d1..d5fa62f2 100644
--- a/src/app/utils/FirebaseUtils.ts
+++ b/src/app/utils/FirebaseUtils.ts
@@ -28,6 +28,7 @@ import { PushNotifications, PushNotificationSchema } from '@capacitor/push-notif
import { LocalNotifications } from '@capacitor/local-notifications'
import FlavorUtils from './FlavorUtils'
+import { Capacitor } from '@capacitor/core'
const LOGTAG = '[FirebaseUtils]'
@@ -68,6 +69,9 @@ export default class FirebaseUtils {
if (!this.platform.is('ios') && !this.platform.is('android')) {
return
}
+ if (!Capacitor.isNativePlatform()) {
+ return
+ }
const isNoGoogle = await this.flavor.isNoGoogleFlavor()
if (isNoGoogle) {
return
diff --git a/src/app/utils/FlavorUtils.ts b/src/app/utils/FlavorUtils.ts
index 02ab4b8a..8af76c36 100644
--- a/src/app/utils/FlavorUtils.ts
+++ b/src/app/utils/FlavorUtils.ts
@@ -1,17 +1,20 @@
import { Injectable } from '@angular/core'
import { App } from '@capacitor/app'
+import { Capacitor } from '@capacitor/core'
@Injectable({
providedIn: 'root',
})
export default class FlavorUtils {
async isBetaFlavor(): Promise {
+ if (!Capacitor.isNativePlatform()) return false
const info = await App.getInfo()
return info.id.indexOf('beta') > 0
}
async isNoGoogleFlavor(): Promise {
+ if (!Capacitor.isNativePlatform()) return false
const info = await App.getInfo()
return info.id.indexOf('nogoo') > 0
}
diff --git a/src/app/utils/HighchartOptions.ts b/src/app/utils/HighchartOptions.ts
index 4e7100df..d3a9cd65 100644
--- a/src/app/utils/HighchartOptions.ts
+++ b/src/app/utils/HighchartOptions.ts
@@ -142,6 +142,7 @@ export function highChartOptions(where) {
},
},
line: {
+ borderWidth: 0,
animation: false,
lineWidth: 2.5,
dashStyle: 'Solid',
diff --git a/src/app/utils/InfiniteScrollDataSource.ts b/src/app/utils/InfiniteScrollDataSource.ts
new file mode 100644
index 00000000..94e4c36a
--- /dev/null
+++ b/src/app/utils/InfiniteScrollDataSource.ts
@@ -0,0 +1,112 @@
+/*
+ * // Copyright (C) 2020 - 2021 Bitfly GmbH
+ * //
+ * // This file is part of Beaconchain Dashboard.
+ * //
+ * // Beaconchain Dashboard is free software: you can redistribute it and/or modify
+ * // it under the terms of the GNU General Public License as published by
+ * // the Free Software Foundation, either version 3 of the License, or
+ * // (at your option) any later version.
+ * //
+ * // Beaconchain Dashboard is distributed in the hope that it will be useful,
+ * // but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * // GNU General Public License for more details.
+ * //
+ * // You should have received a copy of the GNU General Public License
+ * // along with Beaconchain Dashboard. If not, see .
+ */
+
+import { BehaviorSubject, Observable, Subscription } from 'rxjs'
+import { CollectionViewer, DataSource } from '@angular/cdk/collections'
+
+export class InfiniteScrollDataSource extends DataSource {
+ public static ALL_ITEMS_AT_ONCE = 0
+
+ private pageSize = 100
+ private cachedData: T[] = []
+ private fetchedPages = new Set()
+ private dataStream = new BehaviorSubject(this.cachedData)
+ private subscription = new Subscription()
+
+ private loadMore: (offset: number) => Promise
+ private reachedMax = false
+
+ constructor(pageSize: number, loadMore: (offset: number) => Promise) {
+ super()
+ this.pageSize = pageSize
+ this.loadMore = loadMore
+ }
+
+ connect(collectionViewer: CollectionViewer): Observable {
+ this.subscription.add(
+ collectionViewer.viewChange.subscribe((range) => {
+ const startPage = this.getPageForIndex(range.start)
+ const endPage = this.getPageForIndex(range.end + 1)
+ for (let i = startPage; i <= endPage; i++) {
+ this.fetchPage(i)
+ }
+ })
+ )
+ return this.dataStream
+ }
+
+ disconnect(): void {
+ this.subscription.unsubscribe()
+ }
+
+ private getPageForIndex(index: number): number {
+ if (this.pageSize == InfiniteScrollDataSource.ALL_ITEMS_AT_ONCE) return 0
+ return Math.floor(index / this.pageSize)
+ }
+
+ private async fetchPage(page: number) {
+ if (this.fetchedPages.has(page) || this.reachedMax) {
+ return
+ }
+ this.fetchedPages.add(page)
+
+ const newEntries = await this.loadMore(page * this.pageSize)
+
+ let deleteAmount = this.pageSize
+ if (this.pageSize == InfiniteScrollDataSource.ALL_ITEMS_AT_ONCE) {
+ deleteAmount = this.cachedData.length
+ }
+
+ this.cachedData.splice(page * this.pageSize, deleteAmount, ...newEntries)
+ this.dataStream.next(this.cachedData)
+
+ if (newEntries.length < this.pageSize) {
+ this.reachedMax = true
+ }
+ return Promise.resolve()
+ }
+
+ public async reset() {
+ this.fetchedPages.clear()
+ this.cachedData = []
+ this.dataStream.next(this.cachedData)
+ this.reachedMax = false
+ return await this.fetchPage(0)
+ }
+
+ public hasItems(): boolean {
+ return this.length() > 0
+ }
+
+ public length(): number {
+ return this.cachedData.length
+ }
+
+ public getItems(): T[] {
+ return this.cachedData
+ }
+
+ public setLoadFrom(loadMore: (offset: number) => Promise) {
+ this.loadMore = loadMore
+ }
+}
+
+export function sleep(ms: number): Promise {
+ return new Promise((resolve) => setTimeout(resolve, ms))
+}
diff --git a/src/app/utils/MerchantUtils.ts b/src/app/utils/MerchantUtils.ts
index 83d489c5..bdd85860 100644
--- a/src/app/utils/MerchantUtils.ts
+++ b/src/app/utils/MerchantUtils.ts
@@ -19,7 +19,7 @@
*/
import { Injectable } from '@angular/core'
-import { IAPProduct, IAPProducts, InAppPurchase2 } from '@awesome-cordova-plugins/in-app-purchase-2/ngx'
+import 'cordova-plugin-purchase/www/store.d'
import { Platform } from '@ionic/angular'
import { PostMobileSubscription, SubscriptionData } from '../requests/requests'
import { AlertService, PURCHASEUTILS } from '../services/alert.service'
@@ -94,16 +94,9 @@ export class MerchantUtils {
},
]
- products: IAPProducts[] = []
currentPlan = PRODUCT_STANDARD // use getCurrentPlanConfirmed instead
- constructor(
- private store: InAppPurchase2,
- private alertService: AlertService,
- private api: ApiService,
- private platform: Platform,
- private storage: StorageService
- ) {
+ constructor(private alertService: AlertService, private api: ApiService, private platform: Platform, private storage: StorageService) {
if (!this.platform.is('ios') && !this.platform.is('android')) {
console.log('merchant is not supported on this platform')
return
@@ -114,17 +107,34 @@ export class MerchantUtils {
this.initCustomValidator()
this.setupListeners()
} catch (e) {
- console.warn('MerchantUtils cannot be initialized', e)
+ if (e.toString().includes('CdvPurchase is not defined')) {
+ console.info('Store purchases are not available on this platform')
+ } else {
+ console.warn('MerchantUtils cannot be initialized', e)
+ }
}
}
private initCustomValidator() {
- this.store.validator = async (product: IAPProduct, callback) => {
+ CdvPurchase.store.validator = async (
+ product: CdvPurchase.Validator.Request.Body,
+ callback: CdvPurchase.Callback
+ ) => {
if (this.restorePurchase && product.id != 'in.beaconcha.mobile') {
this.restorePurchase = false
await this.confirmPurchaseOnRemote(product)
}
- callback(true)
+ callback({
+ ok: true,
+ data: {
+ collection: [product] as CdvPurchase.VerifiedPurchase[],
+ ineligible_for_intro_price: null,
+ id: product.id,
+ latest_receipt: true,
+ transaction: product.transaction,
+ warning: null,
+ },
+ } as CdvPurchase.Validator.Response.SuccessPayload)
}
}
@@ -165,16 +175,21 @@ export class MerchantUtils {
}
private initProducts() {
+ let platform = CdvPurchase.Platform.GOOGLE_PLAY
+ if (this.platform.is('ios')) {
+ platform = CdvPurchase.Platform.APPLE_APPSTORE
+ }
for (let i = 0; i < this.PACKAGES.length; i++) {
if (this.PACKAGES[i].purchaseKey) {
- this.store.register({
+ CdvPurchase.store.register({
id: this.PACKAGES[i].purchaseKey,
- type: this.store.PAID_SUBSCRIPTION,
- })
+ platform: platform,
+ type: CdvPurchase.ProductType.PAID_SUBSCRIPTION,
+ } as CdvPurchase.IRegisterProduct)
}
}
- this.store.refresh()
+ CdvPurchase.store.initialize()
}
private updatePrice(id, price) {
@@ -187,22 +202,22 @@ export class MerchantUtils {
private setupListeners() {
// General query to all products
- this.store
- .when('product')
- .loaded((p: IAPProduct) => {
- this.updatePrice(p.id, p.price)
+ CdvPurchase.store
+ .when()
+ .productUpdated((p: CdvPurchase.Product) => {
+ this.updatePrice(p.id, p.pricing.price)
})
- .approved((p: IAPProduct) => {
+ .approved((p: CdvPurchase.Transaction) => {
// Handle the product deliverable
- this.currentPlan = p.id
+ this.currentPlan = p.products[0].id
//this.ref.detectChanges();
return p.verify()
})
- .verified((p: IAPProduct) => p.finish())
- .owned((p) => {
- console.log(`you now own ${p.alias}`)
- })
+ .verified((p: CdvPurchase.VerifiedReceipt) => p.finish())
+ // .receiptUpdated((p: CdvPurchase.Receipt) => {
+ // console.log(`you now own ${p.hasTransaction }`)
+ // })
}
sleep(ms) {
@@ -210,18 +225,19 @@ export class MerchantUtils {
}
manageSubscriptions() {
- this.store.manageSubscriptions()
+ CdvPurchase.store.manageSubscriptions()
}
async restore() {
this.restorePurchase = true
- this.store.refresh()
+ CdvPurchase.store.restorePurchases()
}
async purchase(product: string) {
+ const offer = CdvPurchase.store.get(product).getOffer()
const loading = await this.alertService.presentLoading('')
loading.present()
- this.store.order(product).then(
+ CdvPurchase.store.order(offer).then(
async () => {
this.restorePurchase = true
diff --git a/src/app/utils/NetworkData.ts b/src/app/utils/NetworkData.ts
index 659311f7..a671f291 100644
--- a/src/app/utils/NetworkData.ts
+++ b/src/app/utils/NetworkData.ts
@@ -55,15 +55,15 @@ export const MAP: ApiNetwork[] = [
genesisTs: 1655733600,
},
{
- key: 'zhejiang',
+ key: 'holesky',
protocol: 'https',
host: 'beaconcha.in',
- net: 'zhejiang.',
+ net: 'holesky.',
endpoint: '/api/',
version: 'v1',
onlyDebug: false,
active: true,
- genesisTs: 1675263600,
+ genesisTs: 1695902400,
},
{
key: 'local dev',
@@ -90,9 +90,12 @@ export const MAP: ApiNetwork[] = [
]
export function findConfigForKey(key: string): ApiNetwork {
- console.log('looking for config', key, MAP)
for (const entry of MAP) {
- if (entry.key == key) return entry
+ if (entry.key == key) {
+ console.log('found config', key, entry)
+ return entry
+ }
}
+ console.debug('config for ' + key + ' not found, using mainnet instead', key)
return MAP[0]
}
diff --git a/src/app/utils/OAuthUtils.ts b/src/app/utils/OAuthUtils.ts
index 514bff82..bb07859f 100644
--- a/src/app/utils/OAuthUtils.ts
+++ b/src/app/utils/OAuthUtils.ts
@@ -125,9 +125,9 @@ export class OAuthUtils {
const endpointUrl = await api.getResourceUrl('user/token')
const info = await Device.getId().catch(() => {
- return { uuid: 'iduno' }
+ return { identifier: 'iduno' }
})
- let clientID = this.hashCode(info.uuid)
+ let clientID = this.hashCode(info.identifier)
while (clientID.length <= 5) {
clientID += '0'
}
diff --git a/src/app/utils/ThemeUtils.ts b/src/app/utils/ThemeUtils.ts
index d660969f..160d5e2f 100644
--- a/src/app/utils/ThemeUtils.ts
+++ b/src/app/utils/ThemeUtils.ts
@@ -21,7 +21,7 @@
import { StorageService } from '../services/storage.service'
import { Injectable } from '@angular/core'
import { NavigationBarPlugin } from 'capacitor-navigationbarnx'
-import { Plugins } from '@capacitor/core'
+import { Capacitor, Plugins } from '@capacitor/core'
import { Platform } from '@ionic/angular'
import * as Snowflakes from 'magic-snowflakes'
import confetti from 'canvas-confetti'
@@ -71,13 +71,13 @@ export default class ThemeUtils {
// milliseconds apart so the color change won't blob in too late and annoy the user nor won't it change at all
// and annoy the user either ¯\_(ツ)_/¯
private applyColorInitially(count = 0) {
- if (count >= 11) return
+ if (count >= 17) return
setTimeout(
() => {
this.colorHandler()
this.applyColorInitially(++count)
},
- count == 0 ? 210 : 15
+ count == 0 ? 210 : 25
) // fade out duration = 200ms
}
@@ -111,7 +111,6 @@ export default class ThemeUtils {
this.storage.setObject(STORAGE_KEY, { theme: themeString, themeColor: themeColor } as StoredTheme)
this.userPreference = themeString
this.currentThemeColor = themeColor
-
this.toggleWinter(await this.isWinterEnabled(), false)
}
@@ -188,8 +187,13 @@ export default class ThemeUtils {
this.changeNavigationBarColor(isDarkThemed)
}
+ /**
+ *
+ * @param isDarkThemed Android bottom button bar
+ * @returns
+ */
private async changeNavigationBarColor(isDarkThemed) {
- if (!this.platform.is('android') && !this.platform.is('ios')) return
+ if (!Capacitor.isPluginAvailable('StatusBar')) return
try {
const themeColor = await this.getThemeColor()
if (themeColor == 'ethpool') {
@@ -203,14 +207,14 @@ export default class ThemeUtils {
else NavigationBar.setBackgroundColor({ color: '#f7f7f7' })
}
} catch (e) {
- console.warn('error in changeNavigationBarColor', e)
+ console.warn('error setting navigation bar color', e)
}
}
- private async changeStatusBarColor(color, isDarkThemed) {
+ private async changeStatusBarColor(color: string, isDarkThemed) {
+ let darker = isDarkThemed ? '#000000' : color.trim() //this.shadeColor(color, -12)
if (this.platform.is('android')) {
const themeColor = await this.getThemeColor()
- let darker = isDarkThemed ? '#000000' : color //this.shadeColor(color, -12)
if (themeColor == 'ethpool') {
darker = isDarkThemed ? '#262327' : '#e1d8d8'
}
@@ -218,25 +222,25 @@ export default class ThemeUtils {
darker = isDarkThemed ? '#262327' : '#fd9967'
}
- console.log('statusbar color', darker)
- StatusBar.setStyle({
- style: Style.Dark,
- })
- StatusBar.setBackgroundColor({
- color: darker,
- })
+ this.setStatusBarColor(darker)
this.currentStatusBarColor = darker
}
}
setStatusBarColor(color) {
- if (this.platform.is('android')) {
- StatusBar.setStyle({
- style: Style.Dark,
- })
- StatusBar.setBackgroundColor({
- color: color,
- })
+ try {
+ if (Capacitor.isPluginAvailable('StatusBar')) {
+ StatusBar.setStyle({
+ style: Style.Dark,
+ })
+ StatusBar.setBackgroundColor({
+ color: color,
+ })
+ } else {
+ console.info('Statusbar is not available on this platform')
+ }
+ } catch (e) {
+ console.warn('error setting status bar color', e)
}
}
diff --git a/src/app/utils/ValidatorUtils.ts b/src/app/utils/ValidatorUtils.ts
index ab0f185e..0fcaee89 100644
--- a/src/app/utils/ValidatorUtils.ts
+++ b/src/app/utils/ValidatorUtils.ts
@@ -185,7 +185,9 @@ export class ValidatorUtils extends CacheModule {
this.notifyListeners()
}
- async deleteValidatorLocal(validator: ValidatorResponse) {
+ private deletedWithoutNotifying: boolean = false
+
+ async deleteValidatorLocal(validator: ValidatorResponse, notifyListeners: boolean = true) {
const storageKey = await this.getStorageKey()
const current = await this.getMap(storageKey)
current.delete(validator.pubkey)
@@ -197,7 +199,15 @@ export class ValidatorUtils extends CacheModule {
console.log('delete set', deletedList)
this.storage.setObject(LAST_TIME_REMOVED_KEY, { timestamp: Date.now() })
- this.notifyListeners()
+ if (notifyListeners) this.notifyListeners()
+ else this.deletedWithoutNotifying = true
+ }
+
+ notifyListenersIfDeletedWithoutNotifying() {
+ if (this.deletedWithoutNotifying) {
+ this.notifyListeners()
+ this.deletedWithoutNotifying = false
+ }
}
async saveValidatorsLocal(validators: Validator[]) {
@@ -229,7 +239,7 @@ export class ValidatorUtils extends CacheModule {
}
async getValidatorLocal(pubkey: string): Promise {
- const current = await this.getMap(await this.getStorageKey())
+ const current = await this.getMapWithoutDeleted(await this.getStorageKey())
return current.get(pubkey)
}
diff --git a/src/global.scss b/src/global.scss
index 82ab1ea6..5c368cbf 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -120,7 +120,7 @@ body.dark .loading-wrapper {
ion-list,
ion-list-header,
-ion-virtual-scroll {
+cdk-virtual-scroll-viewport {
--background: var(--ion-background-color);
background: var(--ion-background-color);
}
@@ -129,6 +129,11 @@ ion-virtual-scroll {
display: none;
}
+.header-md {
+ -webkit-box-shadow: none !important;
+ box-shadow: none !important;
+}
+
h1,
h2,
h3 {
@@ -262,7 +267,9 @@ ion-tab-button {
}
}
-ion-label {
+ion-label,
+ion-toggle,
+ion-select::part(label) {
font-weight: bold;
}
diff --git a/src/index.html b/src/index.html
index 3b0b881b..14ef0496 100644
--- a/src/index.html
+++ b/src/index.html
@@ -20,6 +20,14 @@