From 3008f996687a2d17d855ff5e57b88ac1db0734c4 Mon Sep 17 00:00:00 2001
From: softsimon <softsimon@protonmail.com>
Date: Tue, 14 Jul 2020 23:49:57 +0700
Subject: [PATCH] Show fiat value of totalRecieved for addresses. Rename fee to
 fee burnt.

---
 backend/.gitignore                                          | 1 -
 .../src/app/bisq/bisq-address/bisq-address.component.html   | 2 +-
 frontend/src/app/bisq/bisq-icon/bisq-icon.component.ts      | 6 +++---
 frontend/src/app/bisq/bisq-stats/bisq-stats.component.html  | 2 +-
 .../bisq/bisq-transaction/bisq-transaction.component.html   | 2 +-
 .../app/bisq/bisq-transfers/bisq-transfers.component.html   | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/backend/.gitignore b/backend/.gitignore
index e0bd6b423..ba8416a23 100644
--- a/backend/.gitignore
+++ b/backend/.gitignore
@@ -43,4 +43,3 @@ testem.log
 Thumbs.db
 
 cache.json
-blocks.json
diff --git a/frontend/src/app/bisq/bisq-address/bisq-address.component.html b/frontend/src/app/bisq/bisq-address/bisq-address.component.html
index 054fb1fcb..2413b90a0 100644
--- a/frontend/src/app/bisq/bisq-address/bisq-address.component.html
+++ b/frontend/src/app/bisq/bisq-address/bisq-address.component.html
@@ -26,7 +26,7 @@
               </tr>
               <tr>
                 <td>Final balance</td>
-                <td>{{ (totalReceived - totalSent) / 100 | number: '1.2-2' }} BSQ</td>
+                <td>{{ (totalReceived - totalSent) / 100 | number: '1.2-2' }} BSQ (<app-bsq-amount [bsq]="totalReceived - totalSent" [forceFiat]="true" [green]="true"></app-bsq-amount>)</td>
               </tr>
             </tbody>
           </table>
diff --git a/frontend/src/app/bisq/bisq-icon/bisq-icon.component.ts b/frontend/src/app/bisq/bisq-icon/bisq-icon.component.ts
index f9128dd15..455b6b2ef 100644
--- a/frontend/src/app/bisq/bisq-icon/bisq-icon.component.ts
+++ b/frontend/src/app/bisq/bisq-icon/bisq-icon.component.ts
@@ -1,4 +1,4 @@
-import { Component, ChangeDetectionStrategy, OnInit, Input } from '@angular/core';
+import { Component, ChangeDetectionStrategy, Input, OnChanges } from '@angular/core';
 import { IconPrefix, IconName } from '@fortawesome/fontawesome-common-types';
 
 @Component({
@@ -7,7 +7,7 @@ import { IconPrefix, IconName } from '@fortawesome/fontawesome-common-types';
   styleUrls: ['./bisq-icon.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class BisqIconComponent implements OnInit {
+export class BisqIconComponent implements OnChanges {
   @Input() txType: string;
 
   iconProp: [IconPrefix, IconName] = ['fas', 'leaf'];
@@ -15,7 +15,7 @@ export class BisqIconComponent implements OnInit {
 
   constructor() { }
 
-  ngOnInit() {
+  ngOnChanges() {
     switch (this.txType) {
       case 'UNVERIFIED':
         this.iconProp[1] = 'question';
diff --git a/frontend/src/app/bisq/bisq-stats/bisq-stats.component.html b/frontend/src/app/bisq/bisq-stats/bisq-stats.component.html
index 4d23bc87c..b34cc17ce 100644
--- a/frontend/src/app/bisq/bisq-stats/bisq-stats.component.html
+++ b/frontend/src/app/bisq/bisq-stats/bisq-stats.component.html
@@ -42,7 +42,7 @@
           </tr>
           <tr>
             <td>Market cap</td>
-            <td><app-fiat [value]="price * (stats.minted - stats.burnt) / 100 "></app-fiat></td>
+            <td><app-fiat [value]="price * (stats.minted - stats.burnt) / 100"></app-fiat></td>
           </tr>
         </tbody>
       </table>
diff --git a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html
index 1c8a0c345..f8d4fdad4 100644
--- a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html
+++ b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html
@@ -34,7 +34,7 @@
           <table class="table table-borderless table-striped">
             <tbody>
                 <tr>
-                  <td class="td-width">Fee burnt</td>
+                  <td class="td-width">Burnt</td>
                   <td>
                     {{ bisqTx.burntFee / 100 | number: '1.2-2' }} BSQ (<app-bsq-amount [bsq]="bisqTx.burntFee" [forceFiat]="true" [green]="true"></app-bsq-amount>)
                 </tr>
diff --git a/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.html b/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.html
index e7f7eadd1..d2da552f2 100644
--- a/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.html
+++ b/frontend/src/app/bisq/bisq-transfers/bisq-transfers.component.html
@@ -59,7 +59,7 @@
 
   <div>
     <div class="float-left mt-2-5" *ngIf="showConfirmations && tx.burntFee">
-      Fee: {{ tx.burntFee / 100 | number: '1.2-2' }} BSQ (<app-bsq-amount [bsq]="tx.burntFee" [forceFiat]="true" [green]="true"></app-bsq-amount>)
+      Burnt: {{ tx.burntFee / 100 | number: '1.2-2' }} BSQ (<app-bsq-amount [bsq]="tx.burntFee" [forceFiat]="true" [green]="true"></app-bsq-amount>)
     </div>
 
     <div class="float-right">