Merge pull request #494 from ArkEcosystem/hotfix/1.7.1

release: hotfix 1.7.1

Author: luciorubeens

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="io.ark.wallet.mobile" version="1.7.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="io.ark.wallet.mobile" version="1.7.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Ark Mobile</name>
     <description>ARK</description>
     <author email="mobile@ark.io" href="http://ark.io/">Ark Ecosystem</author>

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ark-mobile",
-	"version": "1.7.0",
+	"version": "1.7.1",
 	"author": "Ark Ecosystem <mobile@ark.io>",
 	"homepage": "https://github.com/ArkEcosystem/mobile-wallet#readme",
 	"scripts": {

src/app/app-routing.module.ts

@@ -12,10 +12,17 @@ const routes: Routes = [
 	{
 		path: "network-status",
 		loadChildren: () =>
-			import("./pages/network-status/network-status.module").then(
+			import("./pages/network/network-status/network-status.module").then(
 				m => m.NetworkStatusPageModule,
 			),
 	},
+	{
+		path: "network-overview",
+		loadChildren: () =>
+			import(
+				"./pages/network/network-overview/network-overview.module"
+			).then(m => m.NetworkOverviewPageModule),
+	},
 	{
 		path: "login",
 		loadChildren: () =>

src/app/components/address-list/address-list.html

@@ -14,7 +14,7 @@ <h3 class="item-title">{{ item.key }}</h3>
 			color="medium"
 			fill="clear"
 			class="more disable-hover"
-			*ngIf="icon"
+			*ngIf="icon && item.hasMore"
 			(click)="onMore(item.index)"
 		>
 			<ion-icon slot="icon-only" [name]="icon"></ion-icon>

src/app/components/amount/amount.html

@@ -0,0 +1,33 @@
+<ion-row>
+	<ion-col>
+		<ion-grid no-padding class="amount-container">
+			<ion-row>
+				<ion-col class="pl-0">
+					<ion-item>
+						<ion-label position="stacked">{{
+							currentNetwork?.token
+						}}</ion-label>
+						<input-currency
+							name="amount"
+							formControlName="amount"
+							[fractionDigits]="tokenFractionDigits"
+							placeholder="0"
+						></input-currency>
+					</ion-item>
+				</ion-col>
+				<ion-col class="ml-1 pr-0" appMarketNetOnly>
+					<ion-item>
+						<ion-label position="stacked">{{
+							marketCurrency?.code | uppercase
+						}}</ion-label>
+						<input-currency
+							name="amountEquivalent"
+							formControlName="amountEquivalent"
+							[fractionDigits]="fiatFractionDigits"
+						></input-currency>
+					</ion-item>
+				</ion-col>
+			</ion-row>
+		</ion-grid>
+	</ion-col>
+</ion-row>

src/app/components/amount/amount.model.ts

@@ -0,0 +1,83 @@
+import * as constants from "@/app/app.constants";
+import { MarketCurrency } from "@/models/model";
+import { MarketDataProvider } from "@/services/market-data/market-data";
+import { SettingsDataProvider } from "@/services/settings-data/settings-data";
+import { UserDataProvider } from "@/services/user-data/user-data";
+import BigNumber, { SafeBigNumber } from "@/utils/bignumber";
+import { Component, OnInit } from "@angular/core";
+import {
+	ControlContainer,
+	FormControl,
+	FormGroupDirective,
+} from "@angular/forms";
+import { Network } from "ark-ts/model";
+
+@Component({
+	selector: "input-amount",
+	templateUrl: "input-amount.component.html",
+	styleUrls: ["input-amount.component.scss"],
+	viewProviders: [
+		{
+			provide: ControlContainer,
+			useExisting: FormGroupDirective,
+		},
+	],
+})
+export class InputAmountComponent implements OnInit {
+	public tokenFractionDigits = constants.ARKTOSHI_DP;
+	public fiatFractionDigits = 2;
+	public marketCurrency: MarketCurrency;
+	public currentNetwork: Network;
+
+	public constructor(
+		private userDataProvider: UserDataProvider,
+		private marketDataProvider: MarketDataProvider,
+		private settingsDataProvider: SettingsDataProvider,
+		private parentForm: FormGroupDirective,
+	) {
+		this.currentNetwork = this.userDataProvider.currentNetwork;
+	}
+
+	public ngOnInit() {
+		this.parentForm.form.addControl("amount", new FormControl("amount"));
+		this.parentForm.form.addControl(
+			"amountEquivalent",
+			new FormControl("amountEquivalent"),
+		);
+
+		this.parentForm.form.controls.amount.valueChanges.subscribe(value =>
+			this.onInputToken(value),
+		);
+		this.parentForm.form.controls.amountEquivalent.valueChanges.subscribe(
+			value => this.onInputFiat(value),
+		);
+
+		this.marketDataProvider.ticker.subscribe(ticker => {
+			this.settingsDataProvider.settings.subscribe(settings => {
+				this.marketCurrency = ticker.getCurrency({
+					code: settings.currency,
+				});
+				this.fiatFractionDigits =
+					this.marketCurrency.code === "btc" ? 8 : 3;
+			});
+		});
+	}
+
+	public onInputToken(currency: string | BigNumber) {
+		const fiatAmount = new SafeBigNumber(currency).multipliedBy(
+			this.marketCurrency.price,
+		);
+		this.parentForm.form.controls.amountEquivalent.setValue(fiatAmount, {
+			emitEvent: false,
+		});
+	}
+
+	public onInputFiat(currency: string | BigNumber) {
+		const tokenAmount = new SafeBigNumber(currency).dividedBy(
+			this.marketCurrency.price,
+		);
+		this.parentForm.form.controls.amount.setValue(tokenAmount, {
+			emitEvent: false,
+		});
+	}
+}