Merge branch 'main' into zano-pr

cw_monero/lib/ledger.dart

@@ -47,10 +47,6 @@ void enableLedgerExchange(monero.wallet ptr, LedgerConnection connection) {
 
 void keepAlive(LedgerConnection connection) {
   if (connection.connectionType == ConnectionType.ble) {
-    UniversalBle.onConnectionChange = (String deviceId, bool isConnected) {
-      print("[Monero] Ledger Disconnected");
-      _ledgerKeepAlive?.cancel();
-    };
     _ledgerKeepAlive = Timer.periodic(Duration(seconds: 10), (_) async {
       try {
         UniversalBle.setNotifiable(
@@ -59,7 +55,7 @@ void keepAlive(LedgerConnection connection) {
           connection.device.deviceInfo.notifyCharacteristicKey,
           BleInputProperty.notification,
         );
-      } catch (_){}
+      } catch (_) {}
     });
   }
 }

cw_monero/lib/monero_wallet_service.dart

@@ -146,6 +146,11 @@ class MoneroWalletService extends WalletService<
           password: password);
       final isValid = wallet.walletAddresses.validate();
 
+      if (wallet.isHardwareWallet) {
+        wallet.setLedgerConnection(gLedger!);
+        gLedger = null;
+      }
+
       if (!isValid) {
         await restoreOrResetWalletFiles(name);
         wallet.close(shouldCleanup: false);

lib/entities/parse_address_from_domain.dart

@@ -41,7 +41,8 @@ class AddressResolver {
     'kresus',
     'anime',
     'manga',
-    'binanceus'
+    'binanceus',
+    'xmr',
   ];
 
   static String? extractAddressByType({required String raw, required CryptoCurrency type}) {

lib/monero/cw_monero.dart

@@ -402,6 +402,10 @@ class CWMonero extends Monero {
     moneroWallet.setLedgerConnection(connection);
   }
 
+  void resetLedgerConnection() {
+    disableLedgerExchange();
+  }
+
   @override
   void setGlobalLedgerConnection(ledger.LedgerConnection connection) {
     gLedger = connection;

lib/reactions/on_current_wallet_change.dart

@@ -10,9 +10,6 @@ import 'package:cw_core/transaction_history.dart';
 import 'package:cw_core/balance.dart';
 import 'package:cw_core/transaction_info.dart';
 import 'package:mobx/mobx.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:cake_wallet/di.dart';
-import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:cake_wallet/reactions/check_connection.dart';
 import 'package:cake_wallet/reactions/on_wallet_sync_status_change.dart';
 import 'package:cake_wallet/store/dashboard/fiat_conversion_store.dart';
@@ -65,10 +62,6 @@ void startCurrentWalletChangeReaction(
 
       startWalletSyncStatusChangeReaction(wallet, fiatConversionStore);
       startCheckConnectionReaction(wallet, settingsStore);
-      await getIt.get<SharedPreferences>().setString(PreferencesKey.currentWalletName, wallet.name);
-      await getIt
-          .get<SharedPreferences>()
-          .setInt(PreferencesKey.currentWalletType, serializeToInt(wallet.type));
 
       if (wallet.type == WalletType.monero ||
           wallet.type == WalletType.wownero ||

lib/store/app_store.dart

@@ -1,8 +1,10 @@
 import 'package:cake_wallet/core/wallet_connect/web3wallet_service.dart';
 import 'package:cake_wallet/di.dart';
+import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:cake_wallet/reactions/wallet_connect.dart';
 import 'package:cake_wallet/utils/exception_handler.dart';
 import 'package:cw_core/transaction_info.dart';
+import 'package:cw_core/wallet_type.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cw_core/balance.dart';
 import 'package:cw_core/wallet_base.dart';
@@ -11,6 +13,7 @@ import 'package:cake_wallet/store/wallet_list_store.dart';
 import 'package:cake_wallet/store/authentication_store.dart';
 import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/store/node_list_store.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 part 'app_store.g.dart';
 
@@ -47,5 +50,9 @@ abstract class AppStoreBase with Store {
       getIt.get<Web3WalletService>().create();
       await getIt.get<Web3WalletService>().init();
     }
+    await getIt.get<SharedPreferences>().setString(PreferencesKey.currentWalletName, wallet.name);
+    await getIt
+        .get<SharedPreferences>()
+        .setInt(PreferencesKey.currentWalletType, serializeToInt(wallet.type));
   }
 }

lib/view_model/hardware_wallet/ledger_view_model.dart

@@ -98,7 +98,9 @@ abstract class LedgerViewModelBase with Store {
         print('Ledger Device State Changed: $event');
         if (event == sdk.BleConnectionState.disconnected) {
           _connection = null;
-          _connectionChangeListener?.cancel();
+          if (type == WalletType.monero) {
+            monero!.resetLedgerConnection();
+          }
         }
       });
     }

tool/configure.dart

@@ -420,6 +420,7 @@ abstract class Monero {
   WalletService createMoneroWalletService(Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource);
   Map<String, String> pendingTransactionInfo(Object transaction);
   void setLedgerConnection(Object wallet, ledger.LedgerConnection connection);
+  void resetLedgerConnection();
   void setGlobalLedgerConnection(ledger.LedgerConnection connection);
 }