fixes for network switch

README.md

@@ -70,7 +70,7 @@ Build the the app at least once before proceeding:
 
 Make sure port 8100 is accessable on your computer and use the following command to run a livereload server
 
-`ionic capacitor run android --livereload --external --host=192.168.0.124 --disableHostCheck`
+`ionic cap run android --livereload --external --host=192.168.1.64 --disableHostCheck --configuration=development`
 
 Adapt the --host param to match your computers IP. 
 
@@ -98,7 +98,7 @@ Build the the app at least once before proceeding:
 
 Make sure port 8100 is accessable on your mac and use the following command to run a livereload server
 
-`ionic capacitor run ios --livereload --external --host=192.168.0.124 --disableHostCheck`
+`ionic cap run ios --livereload --external --host=192.168.1.64 --disableHostCheck --configuration=development`
 
 Adapt the --host param to match your macs IP. 
 

angular.json

@@ -19,6 +19,11 @@
 						"main": "src/main.ts",
 						"polyfills": "src/polyfills.ts",
 						"tsConfig": "tsconfig.app.json",
+						 "allowedCommonJsDependencies": [
+							"highcharts",
+							"ethereum-blockies",
+							"magic-snowflakes"
+						],
 						"assets": [
 							{
 								"glob": "**/*",

package.json

@@ -44,7 +44,7 @@
 		"@ionic/angular": "^7.4.3",
 		"async-mutex": "^0.2.6",
 		"axios": "^0.27.2",
-		"bignumber.js": "^9.0.2",
+		"bignumber.js": "^9.1.2",
 		"canvas-confetti": "^1.3.3",
 		"capacitor-navigationbarnx": "0.1.6",
 		"cordova-plugin-purchase": "^13.8.6",

src/app/app.module.ts

@@ -18,7 +18,7 @@
  *  // along with Beaconchain Dashboard.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import { APP_INITIALIZER, NgModule } from '@angular/core'
+import { APP_INITIALIZER, Injectable, NgModule } from '@angular/core'
 import { BrowserModule, HammerModule } from '@angular/platform-browser'
 import { RouteReuseStrategy } from '@angular/router'
 
@@ -34,6 +34,7 @@ import { ApiService, initializeApiService } from './services/api.service'
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 declare let Hammer: any
+@Injectable()
 export class MyHammerConfig extends HammerGestureConfig {
 	buildHammer(element: HTMLElement) {
 		const mc = new Hammer(element, {

src/app/services/storage.service.ts

@@ -92,7 +92,7 @@ export class StorageService extends CacheModule {
 	}
 
 	async setNetworkPreferences(value: StorageTypes.ApiNetwork) {
-		return this.setObject(PREFERENCES, value)
+		return await this.setObject(PREFERENCES, value)
 	}
 
 	async loadPreferencesToggles(network: string): Promise<boolean> {

src/app/services/unitconv.service.ts

@@ -78,7 +78,15 @@ export class UnitconvService {
 	}
 
 	public async changeCurrency(value: string) {
+		UnitconvService.currencyPipe = { Cons: null, Exec: null, RPL: null }
+
 		this.pref.Cons = this.createCurrency(value, 'cons')
+		if (this.isDefaultCurrency(this.pref.Cons)) {
+			this.pref.Exec = this.createCurrency(this.getNetworkDefaultCurrency(this.pref.Exec), 'exec')
+		} else {
+			this.pref.Exec = this.createCurrency(value, 'exec')
+		}
+
 		await this.updatePriceData()
 	}
 

src/app/tab-preferences/tab-preferences.page.html

@@ -55,7 +55,6 @@
 			<ion-icon slot="start" name="wallet-outline" class="opacity-icon"></ion-icon>
 			<ion-select
 				label="Display Currency"
-				[value]="unit.getNetworkDefaultCurrency(unit.pref.Cons)"
 				[(ngModel)]="currentFiatCurrency"
 				(ionChange)="changeCurrency()"
 				interface="popover"

src/app/tab-preferences/tab-preferences.page.ts

@@ -321,6 +321,7 @@ export class Tab3Page {
 		await this.api.initialize()
 		await this.notificationBase.loadAllToggles()
 		await this.unit.networkSwitchReload()
+		//await this.unit.changeCurrency(this.currentFiatCurrency)
 		this.validatorUtils.notifyListeners()
 	}