-
{{address}}
+
+ Payment Expires:
+ {{remainingTimeStr}}
+ Expired
+
+
+ To
+
+
+
+
+
+
+ {{tx.toAddress}}
+ {{tx.name}}
+
+
+
+
+
+ {{tx.paypro.domain || tx.paypro.toAddress}}
+ {{tx.name}}
+
+
+
+
+
+
+ {{tx.toAddress}}
+ {{tx.name}}
+
+
+
+
+
+ {{tx.name}}
+ {{tx.toAddress}}
+
-
-
- From
+
+
-
Send
+
+ Click to send
+
\ No newline at end of file
diff --git a/src/pages/send/confirm/confirm.scss b/src/pages/send/confirm/confirm.scss
index f586a4372..7a7fc2f05 100644
--- a/src/pages/send/confirm/confirm.scss
+++ b/src/pages/send/confirm/confirm.scss
@@ -1,3 +1,64 @@
page-confirm {
+ .item-md {
+ padding: 0rem;
+ }
+ ion-label {
+ padding: 1rem 1rem 1rem 3rem;
+ }
+ span.label {
+ color: color($global-colors, labels);
+ margin-bottom: 0.5rem;
+ }
+ .sending-label {
+ display: flex;
+ align-items: center;
+ .sending-img {
+ margin-right: 2rem;
+ }
+ span {
+ font-size: 1.8rem;
+ }
+ }
+ .amount-label {
+ padding-top: 2rem;
+ .amount {
+ font-size: 3.5rem;
+ .unit {
+ font-weight: 100;
+ }
+ }
+ .alternative {
+ margin-top: 1rem;
+ color: color($global-colors, light-grey);
+ }
+ }
+ @mixin row-flex {
+ display: flex;
+ align-items: center;
+ margin-top: 1rem;
+ }
+
+ .container-to, .container-from {
+ .wallet, .payment-proposal-to {
+ @include row-flex;
+ .icon-wallet {
+ margin-right: 1rem;
+ width: 35px !important;
+ background-color: color($colors, primary);
+ &.disabled {
+ background-color: color($global-colors, light-grey);
+ }
+ }
+ .icon-bitcoin {
+ margin-right: 1rem;
+ }
+ }
+ }
+
+ .wallet-selector {
+ ion-item {
+ cursor: pointer;
+ }
+ }
}
diff --git a/src/pages/send/confirm/confirm.ts b/src/pages/send/confirm/confirm.ts
index 8a2b4100a..7159a01d5 100644
--- a/src/pages/send/confirm/confirm.ts
+++ b/src/pages/send/confirm/confirm.ts
@@ -33,6 +33,7 @@ export class ConfirmPage {
public toAddress: string;
public amount: string;
public coin: string;
+ public recipientType: string;
public countDown = null;
public CONFIRM_LIMIT_USD: number = 20;
@@ -50,6 +51,7 @@ export class ConfirmPage {
public paymentExpired: boolean;
public remainingTimeStr: string;
public sendStatus: string;
+ public showFee: boolean;
// Config Related values
public config: any;
@@ -91,6 +93,7 @@ export class ConfirmPage {
this.unitDecimals = this.walletConfig.settings.unitDecimals;
this.satToUnit = 1 / this.unitToSatoshi;
this.configFeeLevel = this.walletConfig.settings.feeLevel ? this.walletConfig.settings.feeLevel : 'normal';
+ this.showFee = false;
}
ionViewDidLoad() {
@@ -99,6 +102,7 @@ export class ConfirmPage {
this.toAddress = this.navParams.data.toAddress;
this.amount = this.navParams.data.amount;
this.coin = this.navParams.data.coin;
+ this.recipientType = this.navParams.data.recipientType;
}
ionViewDidEnter() {
@@ -243,8 +247,6 @@ export class ConfirmPage {
/* sets a wallet on the UI, creates a TXPs for that wallet */
private setWallet(wallet: any, tx: any): void {
- console.log("&&&& wallet", wallet);
- console.log("&&&& tx", tx);
this.wallet = wallet;
// If select another wallet
@@ -389,7 +391,9 @@ export class ConfirmPage {
txp.feeToHigh = per > this.FEE_TOO_HIGH_LIMIT_PER;
tx.txp[wallet.id] = txp;
+ this.tx = tx;
this.logger.debug('Confirm. TX Fully Updated for wallet:' + wallet.id, tx);
+ this.showFee = true;
return resolve();
}).catch((err: any) => {
return reject(err);
@@ -485,7 +489,7 @@ export class ConfirmPage {
txp.feePerKb = tx.feeRate;
} else txp.feeLevel = tx.feeLevel;
}
- txp.feeLevel = 'normal';
+
txp.message = tx.description;
if (tx.paypro) {
@@ -513,7 +517,9 @@ export class ConfirmPage {
}
public onWalletSelect(wallet: any): void {
+ this.showFee = false;
this.setWallet(wallet, this.tx);
+ this.walletSelector = false;
}
public showDescriptionPopup(tx) {
diff --git a/src/providers/on-going-process/on-going-process.ts b/src/providers/on-going-process/on-going-process.ts
index ccb5d4774..839fba31b 100644
--- a/src/providers/on-going-process/on-going-process.ts
+++ b/src/providers/on-going-process/on-going-process.ts
@@ -1,14 +1,27 @@
import { Injectable } from '@angular/core';
+import { LoadingController } from 'ionic-angular';
@Injectable()
export class OnGoingProcessProvider {
-
- constructor() {
+ private loading: any;
+ constructor(
+ private loadingCtrl: LoadingController,
+ ) {
console.log('Hello OnGoingProcessProvider Provider');
}
public set(processName: string, isOn: boolean, customHandler?: any) {
console.log('TODO: OnGoingProcessProvider set()...');
+ if (isOn) {
+ this.loading = this.loadingCtrl.create({
+ content: processName
+ });
+ this.loading.present();
+
+ }
+ else {
+ this.loading.dismiss();
+ }
}
-}
+}
\ No newline at end of file
diff --git a/src/theme/global.scss b/src/theme/global.scss
index b9cf04828..cb9ebe429 100644
--- a/src/theme/global.scss
+++ b/src/theme/global.scss
@@ -2,6 +2,11 @@
// Position
// --------------------------------------------------
+$global-colors: (
+ light-grey: #9B9B9B,
+ labels: #6C6C6E,
+);
+
.bottom-absolute {
width: 100%;
position: absolute;