From 1067157c367cb8d41139880d5c54b7e7437427b4 Mon Sep 17 00:00:00 2001
From: OmarHatem <omarh.ismail1@gmail.com>
Date: Mon, 26 Jan 2026 20:03:48 +0200
Subject: [PATCH] Disable ETA by default, use electrs node as a fallback not
 hardcoded

---
 cw_bitcoin/lib/electrum.dart                 | 2 +-
 cw_bitcoin/lib/electrum_wallet.dart          | 2 +-
 lib/entities/default_settings_migration.dart | 8 ++++++--
 lib/main.dart                                | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/cw_bitcoin/lib/electrum.dart b/cw_bitcoin/lib/electrum.dart
index b6469acca..e7993d4c2 100644
--- a/cw_bitcoin/lib/electrum.dart
+++ b/cw_bitcoin/lib/electrum.dart
@@ -40,7 +40,7 @@ class ElectrumClient {
         unterminatedString = '';
 
   static const connectionTimeout = Duration(seconds: 5);
-  static const aliveTimerDuration = Duration(seconds: 4);
+  static const aliveTimerDuration = Duration(seconds: 5);
 
   bool get isConnected => socket != null && socket?.isClosed == false;
   ProxySocket? socket;
diff --git a/cw_bitcoin/lib/electrum_wallet.dart b/cw_bitcoin/lib/electrum_wallet.dart
index 4bcee04d0..972cfe5ea 100644
--- a/cw_bitcoin/lib/electrum_wallet.dart
+++ b/cw_bitcoin/lib/electrum_wallet.dart
@@ -3013,7 +3013,7 @@ Future<void> _handleScanSilentPayments(ScanData scanData) async {
   final hasForcedRescanHeights = !shouldUpdateSyncStatus;
   CakeTor.instance = await CakeTorInstance.getInstance();
 
-  var node = Uri.parse("tcp://electrs.cakewallet.com:50001");
+  var node = scanData.node?.uri ?? Uri.parse("tcp://electrs.cakewallet.com:50001");
 
   void log(String message, LogLevel level) {
     printV("[Scanning] $message", file: scanData.debugLogPath, level: level);
diff --git a/lib/entities/default_settings_migration.dart b/lib/entities/default_settings_migration.dart
index c176ebe57..a71604e64 100644
--- a/lib/entities/default_settings_migration.dart
+++ b/lib/entities/default_settings_migration.dart
@@ -5,8 +5,8 @@ import 'package:cake_wallet/core/secure_storage.dart';
 import 'package:cake_wallet/entities/exchange_api_mode.dart';
 import 'package:cake_wallet/entities/fiat_api_mode.dart';
 import 'package:cake_wallet/entities/haven_seed_store.dart';
+import 'package:cake_wallet/entities/sync_status_display_mode.dart';
 import 'package:cake_wallet/wownero/wownero.dart';
-import 'package:cw_core/cake_hive.dart';
 import 'package:cw_core/pathForWallet.dart';
 import 'package:cake_wallet/entities/secret_store_key.dart';
 import 'package:cw_core/root_dir.dart';
@@ -23,7 +23,6 @@ import 'package:cake_wallet/monero/monero.dart';
 import 'package:cake_wallet/entities/contact.dart';
 import 'package:cake_wallet/entities/fs_migration.dart';
 import 'package:cw_core/wallet_info.dart';
-import 'package:cw_core/wallet_info_legacy.dart' as wiLegacy;
 import 'package:cake_wallet/exchange/trade.dart';
 import 'package:encrypt/encrypt.dart' as encrypt;
 import 'package:collection/collection.dart';
@@ -568,6 +567,11 @@ Future<void> defaultSettingsMigration(
             type: WalletType.zcash,
             currentNodePreferenceKey: PreferencesKey.currentZcashNodeIdKey,
           );
+          break;
+        case 56:
+          await sharedPreferences.setString(
+              PreferencesKey.syncStatusDisplayMode, SyncStatusDisplayMode.blocksRemaining.name);
+          break;
         default:
           break;
       }
diff --git a/lib/main.dart b/lib/main.dart
index 21e1d4c19..9d8a416ea 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -313,7 +313,7 @@ Future<void> initializeAppConfigs({bool loadWallet = true}) async {
     payjoinSessionSource: payjoinSessionSource,
     anonpayInvoiceInfo: anonpayInvoiceInfo,
     havenSeedStore: havenSeedStore,
-    initialMigrationVersion: 55,
+    initialMigrationVersion: 56,
   );
 }