Merge pull request #71 from fassadlr/fixfeedisp

Fix Amount and Fee display
stratisproject · May 20, 2021 · b4c7086 · b4c7086
2 parents 923d503 + 725f13b
commit b4c7086
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/src/app/wallet/transaction-details/transaction-details.component.html b/src/app/wallet/transaction-details/transaction-details.component.html
@@ -18,20 +18,13 @@
   </ul>
   <ul class="list-inline row">
     <li class="list-inline-item col blockLabel">Total Amount</li>
-    <li *ngIf="transaction.transactionType == 'staked'"
-        class="list-inline-item col-8 blockText text-success">{{ transaction.transactionAmount | coinNotation }}
-      <small>{{ coinUnit }}</small></li>
-    <li *ngIf="transaction.transactionType == 'received'"
-        class="list-inline-item col-8 blockText text-success">{{ transaction.transactionAmount | coinNotation }}
-      <small>{{ coinUnit }}</small></li>
-    <li *ngIf="transaction.transactionType == 'sent'"
-        class="list-inline-item col-8 blockText text-danger">{{ transaction.transactionAmount + transaction.transactionFee | coinNotation }}
+    <li class="list-inline-item col-8 blockText text-success">{{ transaction.transactionAmount | coinNotation }}
       <small>{{ coinUnit }}</small></li>
   </ul>
   <ul class="list-inline row" *ngIf="transaction.transactionType == 'sent'">
     <li class="list-inline-item col blockLabel">Amount Sent</li>
     <li *ngIf="transaction.transactionType == 'sent'"
-        class="list-inline-item col-8 blockText text-danger">{{ transaction.transactionAmount | coinNotation }}
+        class="list-inline-item col-8 blockText text-danger">{{ transaction.transactionAmount - transaction.transactionFee  | coinNotation }}
       <small>{{ coinUnit }}</small></li>
   </ul>
   <ul class="list-inline row" *ngIf="transaction.transactionType == 'sent'">

diff --git a/src/app/wallet/transactions/transactions.component.html b/src/app/wallet/transactions/transactions.component.html
@@ -18,7 +18,7 @@
         </span>
       </td>
       <td class="text-left">{{transaction.transactionType == 'sent' ? '- ' : '+ '}}
-        <strong> {{ transaction.transactionAmount + transaction.transactionFee | coinNotation }} {{ globalService.coinUnit }}</strong>
+        <strong> {{ transaction.transactionAmount | coinNotation }} {{ globalService.coinUnit }}</strong>
       </td>
       <td class="text-left">{{ transaction.transactionTimestamp * 1000 | date:'medium' }}</td>
       <td class="text-center"><span (click)="showTransactionDetails(transaction)" class="lnr-transaction lnr-menu-circle"></span></td>