diff --git a/src/app/pages/redeem/redeem.page.html b/src/app/pages/redeem/redeem.page.html
index 2b3a0ce..c023a9b 100644
--- a/src/app/pages/redeem/redeem.page.html
+++ b/src/app/pages/redeem/redeem.page.html
@@ -38,42 +38,88 @@
-
-
- Amount({{currency_code}})
-
-
+
+
+ Amount({{currency_code}})
+
+
+
+
+
+ Fee
+
+
+
+
+
+ Total
+
+
+
+
+
+ Recipient
+
+
+
+
+
+ {{item.recipient}}
+
+
+
+
+
+
+ {{recipient_name}}
+
+
-
- Fee
-
-
+
+
+ Continue
+
+
-
- Total
-
-
+
+
+
-
-
-
-
-
-
+
+
-
-
-
- {{item.recipient}}
-
- {{recipient_name}}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- Continue
diff --git a/src/app/pages/redeem/redeem.page.scss b/src/app/pages/redeem/redeem.page.scss
index 121c070..3207fcc 100644
--- a/src/app/pages/redeem/redeem.page.scss
+++ b/src/app/pages/redeem/redeem.page.scss
@@ -16,6 +16,22 @@ ion-content {
}
}
+ .send-grid{
+ background-color: #eff2f4;
+ border-radius: 10px;
+ font-size: 14px;
+ font-weight: bolder;
+ ion-select, ion-input{
+ border-radius: 10px;
+ border-color: #383a3e;
+ background-color: white;
+ text-align: right;
+ }
+ .intr{
+ text-align: right;
+ margin-top: 10px;
+ }
+ }
.flex {
display: flex;
justify-content: space-between;
diff --git a/src/app/pages/redeem/redeem.page.ts b/src/app/pages/redeem/redeem.page.ts
index 1d9e845..f4def98 100644
--- a/src/app/pages/redeem/redeem.page.ts
+++ b/src/app/pages/redeem/redeem.page.ts
@@ -56,13 +56,15 @@ wallet_uid
private wrenchService: WrenchService
) {
this.walletData = this.router.getCurrentNavigation().extras.state;
- this.curr_balance =this.walletData.amount*0.01;
- this.currency_code = this.walletData.code;
- this.currency_description = this.walletData.description;
- this.wallet_uid= this.walletData.wallet_uid;
-
-
- // debugger;
+ if ( this.walletData != undefined ){
+ this.curr_balance = this.walletData.amount*0.01;
+ this.currency_code = this.walletData.code;
+ this.currency_description = this.walletData.description;
+ this.wallet_uid= this.walletData.wallet_uid;
+ }
+ else{
+ this.onBack();
+ }
}
ngOnInit() {
@@ -118,7 +120,9 @@ array (size=4)
amount:number =0;
fee:number = 0;
+ fee_display: string;
total:number = 0;
+ total_display: string;
recipient:string ='';
recipient_name:string ='';
@@ -139,8 +143,12 @@ array (size=4)
this.feeReturn = feeReturn;
if ( this.feeReturn != null && this.feeReturn.processing_fee >= 0 ){
this.fee = this.feeReturn.processing_fee*0.01;
+ var num = new Number(this.fee);
+ this.fee_display = num.toFixed(2); //outputs 14
// parseFloat("123.456").toFixed(2);
this.total = this.feeReturn.total_amount*0.01;
+ var numt = new Number(this.total);
+ this.total_display= numt.toFixed(2); //outputs 14
}
}
);
diff --git a/src/app/pages/transaction/transaction.page.html b/src/app/pages/transaction/transaction.page.html
index 73f612a..e887e6e 100644
--- a/src/app/pages/transaction/transaction.page.html
+++ b/src/app/pages/transaction/transaction.page.html
@@ -45,10 +45,11 @@
-
+
{{item.description}}
Balance {{item.amount*0.01 | number : '1.2-2'}}
@@ -56,22 +57,22 @@
-
- Redeem
-
+
-
+
+ Redeem
+
+
+
-
-
-
-
diff --git a/src/app/pages/transaction/transaction.page.scss b/src/app/pages/transaction/transaction.page.scss
index bed65f5..45397b6 100644
--- a/src/app/pages/transaction/transaction.page.scss
+++ b/src/app/pages/transaction/transaction.page.scss
@@ -13,15 +13,27 @@ ion-header {
}
}
+
ion-content {
.wallets{
- background-color: #c8d5e0;
+ background-color: #dddae1;
width: 100%;
min-height: 110px;
padding: 0px;
+ .text{
+ width: 100%;
+ }
ion-row{
margin: 0px;
+ background-color: #ffffff; // #ddcfef;
+ min-height:40px;
+ padding: 2px;
+ border-radius: 15px;
}
+ //.men_image{
+ // height: 200px;
+ // width: auto;
+ //}
}
.wallet_panel{
background-color: aliceblue;