From aeff8972eac5128b41aeda99e0fdc3a1aef563fd Mon Sep 17 00:00:00 2001
From: Serhii <borodenko.sv@gmail.com>
Date: Tue, 21 May 2024 05:12:12 +0300
Subject: [PATCH 1/2] Update electrum_wallet.dart (#1443)

---
 cw_bitcoin/lib/electrum_wallet.dart | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cw_bitcoin/lib/electrum_wallet.dart b/cw_bitcoin/lib/electrum_wallet.dart
index 783eb10d7..b899744a6 100644
--- a/cw_bitcoin/lib/electrum_wallet.dart
+++ b/cw_bitcoin/lib/electrum_wallet.dart
@@ -877,7 +877,6 @@ abstract class ElectrumWalletBase
           coin.isFrozen = coinInfo.isFrozen;
           coin.isSending = coinInfo.isSending;
           coin.note = coinInfo.note;
-          coin.bitcoinAddressRecord.balance += coinInfo.value;
         } else {
           _addCoinInfo(coin);
         }

From f846f91e5f78726515a2eb66580ec5c880f93cb7 Mon Sep 17 00:00:00 2001
From: Omar Hatem <omarh.ismail1@gmail.com>
Date: Tue, 21 May 2024 05:26:49 +0300
Subject: [PATCH 2/2] Maybe Fix Bluetooth Popup (#1458)

Co-authored-by: Konstantin Ullrich <konstantinullrich12@gmail.com>
---
 lib/di.dart                                             | 3 ++-
 lib/src/screens/connect_device/connect_device_page.dart | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/di.dart b/lib/di.dart
index 92bf25c9a..69168451f 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -311,7 +311,6 @@ Future<void> setup({
   getIt.registerFactory<Box<Node>>(() => _powNodeSource, instanceName: Node.boxName + "pow");
 
   getIt.registerSingleton(AuthenticationStore());
-  getIt.registerSingleton(LedgerViewModel());
   getIt.registerSingleton<WalletListStore>(WalletListStore());
   getIt.registerSingleton(NodeListStoreBase.instance);
   getIt.registerSingleton<SettingsStore>(settingsStore);
@@ -336,6 +335,8 @@ Future<void> setup({
   getIt.registerSingleton<AnonpayTransactionsStore>(
       AnonpayTransactionsStore(anonpayInvoiceInfoSource: _anonpayInvoiceInfoSource));
 
+  getIt.registerLazySingleton(() => LedgerViewModel());
+
   final secretStore = await SecretStoreBase.load(getIt.get<SecureStorage>());
 
   getIt.registerSingleton<SecretStore>(secretStore);
diff --git a/lib/src/screens/connect_device/connect_device_page.dart b/lib/src/screens/connect_device/connect_device_page.dart
index 80b396a34..a482b1c41 100644
--- a/lib/src/screens/connect_device/connect_device_page.dart
+++ b/lib/src/screens/connect_device/connect_device_page.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
-// import 'package:cake_wallet/src/screens/connect_device/debug_device_page.dart';
+import 'package:cake_wallet/src/screens/connect_device/debug_device_page.dart';
 import 'package:cake_wallet/src/screens/connect_device/widgets/device_tile.dart';
 import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
@@ -105,7 +105,7 @@ class ConnectDevicePageBodyState extends State<ConnectDevicePageBody> {
     try {
       _bleRefresh = ledger.scan().listen((device) => setState(() => bleDevices.add(device)))
         ..onError((e) {
-          throw e as Exception;
+          throw e.toString();
         });
       setState(() => bleIsEnabled = true);
       _bleRefreshTimer?.cancel();