From 1f14cbfcaa8da334137b8c0c6a9013b938b4a7f2 Mon Sep 17 00:00:00 2001
From: Mononaut <github@monospace.live>
Date: Fri, 16 Feb 2024 05:55:36 +0000
Subject: [PATCH] Fix websocket wallet balances, reposition logo

---
 .../address-group/address-group.component.html       |  3 ++-
 .../address-group/address-group.component.scss       | 12 ++++++++++++
 .../address-group/address-group.component.ts         |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/components/address-group/address-group.component.html b/frontend/src/app/components/address-group/address-group.component.html
index e7f559ba1..174853600 100644
--- a/frontend/src/app/components/address-group/address-group.component.html
+++ b/frontend/src/app/components/address-group/address-group.component.html
@@ -1,7 +1,8 @@
 <div class="frame {{ screenSize }}" [class.liquid-address]="network === 'liquid' || network === 'liquidtestnet'">
   <div class="heading">
-    <h3 i18n="addresses.balance">Balances</h3>
     <app-svg-images name="officialMempoolSpace" style="width: 144px; height: 36px" width="500" height="126" viewBox="0 0 500 126"></app-svg-images>
+    <h3 i18n="addresses.balance">Balances</h3>
+    <div class="spacer"></div>
   </div>
   <table class="table table-borderless table-striped table-fixed">
     <tr>
diff --git a/frontend/src/app/components/address-group/address-group.component.scss b/frontend/src/app/components/address-group/address-group.component.scss
index d99e9b522..fedb57d2d 100644
--- a/frontend/src/app/components/address-group/address-group.component.scss
+++ b/frontend/src/app/components/address-group/address-group.component.scss
@@ -10,6 +10,16 @@
   flex-direction: row;
   justify-content: space-between;
   align-items: start;
+
+  & > * {
+    flex-basis: 0;
+    flex-grow: 1;
+  }
+
+  h3 {
+    text-align: center;
+    margin: 0 1em;
+  }
 }
 
 .pagination {
@@ -19,6 +29,8 @@
 }
 
 .table {
+  margin-top: 0.5em;
+
   td, th {
     padding: 0.15rem 0.5rem;
 
diff --git a/frontend/src/app/components/address-group/address-group.component.ts b/frontend/src/app/components/address-group/address-group.component.ts
index ec9b2ed1d..30bee7543 100644
--- a/frontend/src/app/components/address-group/address-group.component.ts
+++ b/frontend/src/app/components/address-group/address-group.component.ts
@@ -94,7 +94,7 @@ export class AddressGroupComponent implements OnInit, OnDestroy {
               - addressBalance.chain_stats.spent_txo_sum
               - addressBalance.mempool_stats.spent_txo_sum;
             this.balance += this.addresses[address];
-            this.confirmed += this.addresses[address];
+            this.confirmed += (addressBalance.chain_stats.funded_txo_sum - addressBalance.chain_stats.spent_txo_sum);
           }
           this.addressInfo[address] = addressData[2] ? addressData[2] as AddressInformation : null;
         }