Merge pull request #367 from stratisproject/ui

Add transaction fee to send confirmation

Breeze.UI/src/app/wallet/send/send-confirmation/send-confirmation.component.html

@@ -20,6 +20,10 @@
               <li class="list-inline-item col blockLabel">Amount</li>
               <li class="list-inline-item col-9 blockText text-danger">-{{ transaction.amount | number:'1.8-8' }} {{ coinUnit }}</li>
             </ul>
+            <ul class="list-inline row">
+              <li class="list-inline-item col blockLabel">Fee</li>
+              <li class="list-inline-item col-9 blockText text-danger">-{{ transactionFee }} {{ coinUnit }}</li>
+            </ul>
             <ul class="list-inline row">
               <li class="list-inline-item col blockLabel">Destination</li>
               <li class="list-inline-item col blockText mt-2"><code>{{ transaction.destinationAddress }}</code></li>

Breeze.UI/src/app/wallet/send/send-confirmation/send-confirmation.component.ts

@@ -4,6 +4,8 @@ import { NgbModal, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 
 import { GlobalService } from '../../../shared/services/global.service';
 
+import { CoinNotationPipe } from '../../../shared/pipes/coin-notation.pipe';
+
 @Component({
   selector: 'app-send-confirmation',
   templateUrl: './send-confirmation.component.html',
@@ -12,6 +14,7 @@ import { GlobalService } from '../../../shared/services/global.service';
 export class SendConfirmationComponent implements OnInit {
 
   @Input() transaction: any;
+  @Input() transactionFee: any;
   constructor(private globalService: GlobalService, public activeModal: NgbActiveModal) { }
 
   public showDetails: boolean = false;
@@ -19,6 +22,8 @@ export class SendConfirmationComponent implements OnInit {
 
   ngOnInit() {
     this.coinUnit = this.globalService.getCoinUnit();
+    this.transactionFee = new CoinNotationPipe(this.globalService).transform(this.transactionFee);
+    this.transaction.amount = +this.transaction.amount + +this.transactionFee;
   }
 
   toggleDetails() {

Breeze.UI/src/app/wallet/send/send.component.ts

@@ -4,6 +4,7 @@ import { FormGroup, FormControl, Validators, FormBuilder } from '@angular/forms'
 import { ApiService } from '../../shared/services/api.service';
 import { GlobalService } from '../../shared/services/global.service';
 import { ModalService } from '../../shared/services/modal.service';
+import { CoinNotationPipe } from '../../shared/pipes/coin-notation.pipe';
 
 import { NgbModal, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 
@@ -112,7 +113,6 @@ export class SendComponent implements OnInit {
         response => {
           if (response.status >= 200 && response.status < 400){
             balanceResponse = response.json();
-            console.log(balanceResponse);
           }
         },
         error => {
@@ -131,7 +131,7 @@ export class SendComponent implements OnInit {
           }
         },
         () => {
-          this.sendForm.patchValue({amount: balanceResponse.maxSpendableAmount});
+          this.sendForm.patchValue({amount: +new CoinNotationPipe(this.globalService).transform(balanceResponse.maxSpendableAmount)});
           this.estimatedFee = balanceResponse.fee;
         }
       )