From 660e3ec4277b66f9e4baf9fd9fe28d2088b55bfe Mon Sep 17 00:00:00 2001
From: Matthew Fosse <matt@fosse.co>
Date: Mon, 4 Mar 2024 15:19:44 -0800
Subject: [PATCH] fixes

---
 cw_bitcoin/lib/bitcoin_wallet.dart     | 37 ++++++++++++++++----------
 cw_lightning/lib/lightning_wallet.dart | 16 +++--------
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/cw_bitcoin/lib/bitcoin_wallet.dart b/cw_bitcoin/lib/bitcoin_wallet.dart
index e9f6ac4e7..3921d162b 100644
--- a/cw_bitcoin/lib/bitcoin_wallet.dart
+++ b/cw_bitcoin/lib/bitcoin_wallet.dart
@@ -31,19 +31,28 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
     Map<String, int>? initialRegularAddressIndex,
     Map<String, int>? initialChangeAddressIndex,
   }) : super(
-            mnemonic: mnemonic,
-            password: password,
-            walletInfo: walletInfo,
-            unspentCoinsInfo: unspentCoinsInfo,
-            networkType: networkParam == null
-                ? bitcoin.bitcoin
-                : networkParam == BitcoinNetwork.mainnet
-                    ? bitcoin.bitcoin
-                    : bitcoin.testnet,
-            initialAddresses: initialAddresses,
-            initialBalance: initialBalance,
-            seedBytes: seedBytes,
-            currency: CryptoCurrency.btc) {
+          mnemonic: mnemonic,
+          password: password,
+          walletInfo: walletInfo,
+          unspentCoinsInfo: unspentCoinsInfo,
+          networkType: networkParam == null
+              ? bitcoin.bitcoin
+              : networkParam == BitcoinNetwork.mainnet
+                  ? bitcoin.bitcoin
+                  : bitcoin.testnet,
+          initialAddresses: initialAddresses,
+          initialBalance: initialBalance,
+          seedBytes: seedBytes,
+          currency: CryptoCurrency.btc,
+          balanceFactory: (
+              {required int confirmed, required int unconfirmed, required int frozen}) {
+            return ElectrumBalance(
+              confirmed: confirmed,
+              unconfirmed: unconfirmed,
+              frozen: frozen,
+            );
+          },
+        ) {
     walletAddresses = BitcoinWalletAddresses(
       walletInfo,
       electrumClient: electrumClient,
@@ -109,4 +118,4 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
       networkParam: snp.network,
     );
   }
-}
\ No newline at end of file
+}
diff --git a/cw_lightning/lib/lightning_wallet.dart b/cw_lightning/lib/lightning_wallet.dart
index 268dd0e49..2ba558de4 100644
--- a/cw_lightning/lib/lightning_wallet.dart
+++ b/cw_lightning/lib/lightning_wallet.dart
@@ -32,15 +32,6 @@ part 'lightning_wallet.g.dart';
 
 class LightningWallet = LightningWalletBase with _$LightningWallet;
 
-ElectrumBalance myBalanceFactory(
-    {required int confirmed, required int unconfirmed, required int frozen}) {
-  return ElectrumBalance(
-    confirmed: confirmed,
-    unconfirmed: unconfirmed,
-    frozen: frozen,
-  );
-}
-
 abstract class LightningWalletBase
     extends ElectrumWalletBase<LightningBalance, LightningTransactionInfo> with Store {
   bool _isTransactionUpdating;
@@ -72,13 +63,12 @@ abstract class LightningWalletBase
           initialBalance: initialBalance,
           seedBytes: seedBytes,
           currency: CryptoCurrency.btcln,
-          // balanceFactory: myBalanceFactory,
           balanceFactory: (
               {required int confirmed, required int unconfirmed, required int frozen}) {
             return LightningBalance(
-              confirmed: 0,
-              unconfirmed: 0,
-              frozen: 0,
+              confirmed: confirmed,
+              unconfirmed: unconfirmed,
+              frozen: frozen,
             );
           },
         ) {