Note: You are using the No-Google version of this app. Push notifications will not work, but you can configure webhook
- notifications on beaconcha.in directly or by clicking here.
+ notifications on {{ api.getHostName() }} directly or by clicking here.
diff --git a/src/app/pages/notifications/notifications.page.ts b/src/app/pages/notifications/notifications.page.ts
index 09232113..772a1900 100644
--- a/src/app/pages/notifications/notifications.page.ts
+++ b/src/app/pages/notifications/notifications.page.ts
@@ -73,7 +73,7 @@ export class NotificationsPage extends NotificationBase implements OnInit {
}
async configureWebhooks() {
- await Browser.open({ url: 'https://beaconcha.in/user/webhooks', toolbarColor: '#2f2e42' })
+ await Browser.open({ url: this.api.getBaseUrl() + '/user/webhooks', toolbarColor: '#2f2e42' })
}
async ionViewWillEnter() {
diff --git a/src/app/pages/subscribe/subscribe.page.ts b/src/app/pages/subscribe/subscribe.page.ts
index 1a582937..65b4c347 100644
--- a/src/app/pages/subscribe/subscribe.page.ts
+++ b/src/app/pages/subscribe/subscribe.page.ts
@@ -9,6 +9,7 @@ import { Toast } from '@capacitor/toast'
import FlavorUtils from 'src/app/utils/FlavorUtils'
import { Browser } from '@capacitor/browser'
+import { ApiService } from 'src/app/services/api.service'
@Component({
selector: 'app-subscribe',
@@ -32,7 +33,8 @@ export class SubscribePage implements OnInit {
private oauth: OAuthUtils,
private alertService: AlertService,
private platform: Platform,
- private flavor: FlavorUtils
+ private flavor: FlavorUtils,
+ private api: ApiService
) {
this.selectedPackage = this.merchant.PACKAGES[2]
}
@@ -80,7 +82,7 @@ export class SubscribePage implements OnInit {
'Yes',
async () => {
if (isNoGoogle) {
- await Browser.open({ url: 'https://beaconcha.in/premium', toolbarColor: '#2f2e42' })
+ await Browser.open({ url: this.api.getBaseUrl() + '/premium', toolbarColor: '#2f2e42' })
} else {
this.merchant.purchase(this.selectedPackage.purchaseKey)
}
@@ -90,7 +92,7 @@ export class SubscribePage implements OnInit {
}
if (isNoGoogle) {
- await Browser.open({ url: 'https://beaconcha.in/premium', toolbarColor: '#2f2e42' })
+ await Browser.open({ url: this.api.getBaseUrl() + '/premium', toolbarColor: '#2f2e42' })
} else {
this.merchant.purchase(this.selectedPackage.purchaseKey)
}
diff --git a/src/app/services/api.service.ts b/src/app/services/api.service.ts
index 47df85c3..d546ee20 100644
--- a/src/app/services/api.service.ts
+++ b/src/app/services/api.service.ts
@@ -38,7 +38,9 @@ const SERVER_TIMEOUT = 25000
providedIn: 'root',
})
export class ApiService extends CacheModule {
- networkConfig: Promise
+ private isInitialized = false
+
+ networkConfig: ApiNetwork
public connectionStateOK = true
@@ -74,7 +76,7 @@ export class ApiService extends CacheModule {
})
this.lastCacheInvalidate = Date.now()
//this.registerLogMiddleware()
- this.updateNetworkConfig()
+ this.initialize()
//this.isIOS15().then((result) => { this.forceNativeAll = result })
}
@@ -91,27 +93,26 @@ export class ApiService extends CacheModule {
}
}
- async updateNetworkConfig() {
- this.networkConfig = this.storage.getNetworkPreferences().then((config) => {
+ async initialize() {
+ this.networkConfig = await this.storage.getNetworkPreferences().then((config) => {
const temp = findConfigForKey(config.key)
if (temp) {
return temp
}
return config
})
-
- await this.networkConfig
+ this.isInitialized = true
}
networkName = null
async getNetworkName(): Promise {
- const temp = (await this.networkConfig).key
+ const temp = this.networkConfig.key
this.networkName = temp
return temp
}
async getNetwork(): Promise {
- const temp = await this.networkConfig
+ const temp = this.networkConfig
return temp
}
@@ -158,7 +159,7 @@ export class ApiService extends CacheModule {
const formBody = new FormData()
formBody.set('grant_type', 'refresh_token')
formBody.set('refresh_token', user.refreshToken)
- const url = await this.getResourceUrl(req.resource, req.endPoint)
+ const url = this.getResourceUrl(req.resource, req.endPoint)
// use js here for the request since the native http plugin performs inconsistent across platforms with non json requests
const resp = await fetch(url, {
@@ -195,16 +196,16 @@ export class ApiService extends CacheModule {
this.awaitingResponses[resource].release()
}
- async isNotMainnet(): Promise {
- const test = (await this.networkConfig).net != ''
+ isNotMainnet(): boolean {
+ const test = this.networkConfig.net != ''
return test
}
- private async getCacheKey(request: APIRequest): Promise {
+ private getCacheKey(request: APIRequest): string {
if (request.method == Method.GET) {
- return request.method + (await this.getResourceUrl(request.resource, request.endPoint))
+ return request.method + this.getResourceUrl(request.resource, request.endPoint)
} else if (request.cacheablePOST) {
- return request.method + (await this.getResourceUrl(request.resource, request.endPoint)) + JSON.stringify(request.postData)
+ return request.method + this.getResourceUrl(request.resource, request.endPoint) + JSON.stringify(request.postData)
}
return null
}
@@ -217,7 +218,7 @@ export class ApiService extends CacheModule {
}
// If cached and not stale, return cache
- const cached = (await this.getCache(await this.getCacheKey(request))) as Response
+ const cached = (await this.getCache(this.getCacheKey(request))) as Response
if (cached) {
if (this.lastRefreshed == 0) this.lastRefreshed = Date.now()
cached.cached = true
@@ -281,7 +282,7 @@ export class ApiService extends CacheModule {
}
if ((request.method == Method.GET || request.cacheablePOST) && result && result.status == 200 && result.data) {
- this.putCache(await this.getCacheKey(request), result, request.maxCacheAge)
+ this.putCache(this.getCacheKey(request), result, request.maxCacheAge)
}
if (request.updatesLastRefreshState) this.updateLastRefreshed(result)
@@ -295,7 +296,7 @@ export class ApiService extends CacheModule {
}
async clearSpecificCache(request: APIRequest) {
- this.putCache(await this.getCacheKey(request), null, request.maxCacheAge)
+ this.putCache(this.getCacheKey(request), null, request.maxCacheAge)
}
private updateLastRefreshed(response: Response) {
@@ -306,7 +307,7 @@ export class ApiService extends CacheModule {
private async get(resource: string, endpoint = 'default', ignoreFails = false, options: HttpOptions = { url: null, headers: {} }) {
const getOptions = {
- url: await this.getResourceUrl(resource, endpoint),
+ url: this.getResourceUrl(resource, endpoint),
method: 'get',
headers: options.headers,
}
@@ -324,7 +325,7 @@ export class ApiService extends CacheModule {
}
const postOptions = {
- url: await this.getResourceUrl(resource, endpoint),
+ url: this.getResourceUrl(resource, endpoint),
headers: options.headers,
data: this.formatPostData(data),
method: 'post',
@@ -339,7 +340,7 @@ export class ApiService extends CacheModule {
private async legacyGet(resource: string, endpoint = 'default', ignoreFails = false, options: HttpOptions = { url: null, headers: {} }) {
return this.httpLegacy
- .get(await this.getResourceUrl(resource, endpoint), options)
+ .get(this.getResourceUrl(resource, endpoint), options)
.catch((err) => {
this.updateConnectionState(ignoreFails, false)
console.warn('Connection err', err)
@@ -366,7 +367,7 @@ export class ApiService extends CacheModule {
})
.then((response: AxiosResponse) => this.validateResponseLegacy(ignoreFails, response));
*/
- const resp = await fetch(await this.getResourceUrl(resource, endpoint), {
+ const resp = await fetch(this.getResourceUrl(resource, endpoint), {
method: 'POST',
body: JSON.stringify(this.formatPostData(data)),
headers: options.headers,
@@ -427,23 +428,23 @@ export class ApiService extends CacheModule {
return response
}
- async getResourceUrl(resource: string, endpoint = 'default'): Promise {
- const base = await this.getBaseUrl()
+ getResourceUrl(resource: string, endpoint = 'default'): string {
+ const base = this.getBaseUrl()
if (endpoint == 'default') {
- return (await this.getApiBaseUrl()) + '/' + resource
+ return this.getApiBaseUrl() + '/' + resource
} else {
const substitute = endpoint.replace('{$BASE}', base)
return substitute + '/' + resource
}
}
- async getApiBaseUrl() {
- const cfg = await this.networkConfig
- return (await this.getBaseUrl()) + cfg.endpoint + cfg.version
+ getApiBaseUrl() {
+ const cfg = this.networkConfig
+ return this.getBaseUrl() + cfg.endpoint + cfg.version
}
- async getBaseUrl(): Promise {
- const cfg = await this.networkConfig
+ getBaseUrl(): string {
+ const cfg = this.networkConfig
return cfg.protocol + '://' + cfg.net + cfg.host
}
@@ -460,6 +461,7 @@ export class ApiService extends CacheModule {
for (const entry of MAP) {
if (entry.key == 'main') continue
+ if (entry.key == 'gnosis') continue
if (!entry.active) continue
if (entry.onlyDebug && !debug) continue
re.push([this.capitalize(entry.key) + ' (Testnet)', entry.key])
@@ -470,6 +472,15 @@ export class ApiService extends CacheModule {
capitalize(text) {
return text.charAt(0).toUpperCase() + text.slice(1)
}
+
+ getHostName() {
+ const network = this.networkConfig
+ return network.host
+ }
+
+ isGnosis() {
+ return this.networkConfig.key == 'gnosis'
+ }
}
export interface Response extends HttpResponse {
@@ -479,3 +490,7 @@ export interface Response extends HttpResponse {
export interface DevModeEnabled {
enabled: boolean
}
+
+export function initializeApiService(service: ApiService): () => Promise {
+ return () => service.initialize()
+}
diff --git a/src/app/services/storage.service.ts b/src/app/services/storage.service.ts
index e21022a3..e123e441 100644
--- a/src/app/services/storage.service.ts
+++ b/src/app/services/storage.service.ts
@@ -139,7 +139,7 @@ export class StorageService extends CacheModule {
}
async openLogSession(modalCtr, offset: number) {
- let lastLogSession = parseInt(await window.localStorage.getItem('last_log_session'))
+ let lastLogSession = parseInt(window.localStorage.getItem('last_log_session'))
if (isNaN(lastLogSession)) lastLogSession = 0
const modal = await modalCtr.create({
diff --git a/src/app/services/sync.service.ts b/src/app/services/sync.service.ts
index a80c7a30..07e02395 100644
--- a/src/app/services/sync.service.ts
+++ b/src/app/services/sync.service.ts
@@ -293,7 +293,7 @@ export class SyncService {
if (success) this.lastNotifySync = Date.now()
for (let j = 0; j < splice.length; j++) {
- await splice[j].onComplete(success)
+ splice[j].onComplete(success)
}
}
}
@@ -372,7 +372,7 @@ export class SyncService {
}
async changeNotifyEvent(key: string, event: string, value: boolean, filter: string = null, threshold: number = null) {
- const net = (await this.api.networkConfig).net
+ const net = this.api.networkConfig.net
this.storage.setBooleanSetting(net + key, value)
this.setLastChanged(net + key, event, filter, threshold, value ? 'subscribe' : 'unsubscribe')
}
@@ -421,7 +421,7 @@ export class SyncService {
lastChanged: current.lastChanged,
lastSynced: value,
eventName: event,
- network: await this.api.getApiBaseUrl(),
+ network: this.api.getApiBaseUrl(),
eventFilter: current.eventFilter,
eventThreshold: current.eventThreshold,
subscribeAction: subscribeAction,
@@ -441,7 +441,7 @@ export class SyncService {
lastChanged: value,
lastSynced: current.lastSynced,
eventName: event,
- network: await this.api.getApiBaseUrl(),
+ network: this.api.getApiBaseUrl(),
eventFilter: filter,
eventThreshold: threshold,
subscribeAction: subscribeAction,
@@ -463,7 +463,7 @@ export class SyncService {
lastChanged: 0,
lastSynced: 0,
eventName: '',
- network: await this.api.getApiBaseUrl(),
+ network: this.api.getApiBaseUrl(),
eventFilter: null,
eventThreshold: null,
subscribeAction: 'subscribe',
diff --git a/src/app/services/unitconv.service.ts b/src/app/services/unitconv.service.ts
index af0e9376..9b6d6dcd 100644
--- a/src/app/services/unitconv.service.ts
+++ b/src/app/services/unitconv.service.ts
@@ -116,6 +116,12 @@ export class UnitconvService {
unitStored.value = convertEthUnits(price, MAPPING.get('WEI'), Unit.ETHER)
}
+ getRPLPrice() {
+ const unitStored: Unit = MAPPING.get('RPL')
+ if (!unitStored) return
+ return unitStored.value
+ }
+
setRETHPrice(price: BigNumber) {
const unitStored: Unit = MAPPING.get('RETH')
if (!unitStored) return
diff --git a/src/app/tab-preferences/notification-base.ts b/src/app/tab-preferences/notification-base.ts
index 7a4706b6..02042c98 100644
--- a/src/app/tab-preferences/notification-base.ts
+++ b/src/app/tab-preferences/notification-base.ts
@@ -97,7 +97,7 @@ export class NotificationBase implements OnInit {
async loadAllToggles() {
if (!(await this.storage.isLoggedIn())) return
- const net = (await this.api.networkConfig).net
+ const net = this.api.networkConfig.net
const request = new NotificationGetRequest()
const response = await this.api.execute(request)
@@ -166,7 +166,7 @@ export class NotificationBase implements OnInit {
// locking toggle so we dont execute onChange when setting initial values
const preferences = await this.storage.loadPreferencesToggles(net)
- if (await this.api.isNotMainnet()) {
+ if (this.api.isNotMainnet()) {
this.notify = preferences
this.notifyInitialized = true
this.disableToggleLock()
@@ -208,10 +208,10 @@ export class NotificationBase implements OnInit {
}
}
- const net = (await this.api.networkConfig).net
+ const net = this.api.networkConfig.net
this.storage.setBooleanSetting(net + SETTING_NOTIFY, this.notify)
this.settingsChanged = true
- if (!(await this.api.isNotMainnet())) {
+ if (!this.api.isNotMainnet()) {
this.sync.changeGeneralNotify(this.notify)
}
diff --git a/src/app/tab-preferences/tab-preferences.page.html b/src/app/tab-preferences/tab-preferences.page.html
index 95232011..239dab64 100644
--- a/src/app/tab-preferences/tab-preferences.page.html
+++ b/src/app/tab-preferences/tab-preferences.page.html
@@ -211,6 +211,7 @@
Mainnet
+ Gnosis
{{ item[0] }}