Add fee amount to transaction balance

Breeze.UI/src/app/wallet/dashboard/dashboard.component.html

@@ -56,7 +56,7 @@
                 <li class="list-inline-item col-4 amount text-left align-baseline">
                   <span *ngIf="transaction.transactionType == 'received'" class="text-success">+</span>
                   <span *ngIf="transaction.transactionType == 'sent'" class="text-danger">-</span>
-                  {{ transaction.transactionAmount | coinNotation }}
+                  {{ transaction.transactionAmount + transaction.transactionFee | coinNotation }}
                   <small class="text-uppercase">{{ coinUnit }}</small>
                   <span *ngIf="transaction.transactionConfirmedInBlock" class="badge badge-success text-capitalize">Confirmed</span>
                   <span *ngIf="!transaction.transactionConfirmedInBlock" class="badge badge-warning text-capitalize">Pending</span>

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

@@ -134,7 +134,12 @@ export class DashboardComponent implements OnInit {
       }
       let transactionId = transaction.id;
       let transactionAmount = transaction.amount;
-      let transactionFee = transaction.fee;
+      let transactionFee;
+      if (transaction.fee) {
+        transactionFee = transaction.fee;
+      } else {
+        transactionFee = 0;
+      }
       let transactionConfirmedInBlock = transaction.confirmedInBlock;
       let transactionTimestamp = transaction.timestamp;
       let transactionConfirmed;

Breeze.UI/src/app/wallet/history/history.component.html

@@ -30,7 +30,7 @@
                   <li class="list-inline-item col-4 amount text-left align-baseline">
                     <span *ngIf="transaction.transactionType == 'received'" class="text-success">+</span>
                     <span *ngIf="transaction.transactionType == 'sent'" class="text-danger">-</span>
-                    {{ transaction.transactionAmount | coinNotation }}
+                    {{ transaction.transactionAmount + transaction.transactionFee | coinNotation }}
                     <small class="text-uppercase"> {{ coinUnit }} </small>
                     <span *ngIf="transaction.transactionConfirmedInBlock" class="badge badge-success text-capitalize">Confirmed</span>
                     <span *ngIf="!transaction.transactionConfirmedInBlock" class="badge badge-warning text-capitalize">Pending</span>

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

@@ -89,7 +89,12 @@ export class HistoryComponent {
       }
       let transactionId = transaction.id;
       let transactionAmount = transaction.amount;
-      let transactionFee = transaction.fee;
+      let transactionFee;
+      if (transaction.fee) {
+        transactionFee = transaction.fee;
+      } else {
+        transactionFee = 0;
+      }
       let transactionConfirmedInBlock = transaction.confirmedInBlock;
       let transactionTimestamp = transaction.timestamp;
       let transactionConfirmed;