From 46e89d1d727211d2e1d8364aba0813f7bb0fd552 Mon Sep 17 00:00:00 2001
From: fosse <matt.cfosse@gmail.com>
Date: Thu, 25 Jan 2024 11:24:12 -0500
Subject: [PATCH] remove tor icon on electrum based coins
---
lib/entities/default_settings_migration.dart | 6 ++++++
lib/src/screens/dashboard/widgets/sync_indicator.dart | 8 ++++++--
lib/view_model/dashboard/dashboard_view_model.dart | 4 ++++
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/lib/entities/default_settings_migration.dart b/lib/entities/default_settings_migration.dart
index 084bb8df2..bd9bc131d 100644
--- a/lib/entities/default_settings_migration.dart
+++ b/lib/entities/default_settings_migration.dart
@@ -191,6 +191,7 @@ Future<void> defaultSettingsMigration(
break;
case 27:
await migrateTorPreferences(sharedPreferences: sharedPreferences);
+ await addOnionNode(nodes);
break;
default:
break;
@@ -287,11 +288,16 @@ Future<void> validateBitcoinSavedTransactionPriority(SharedPreferences sharedPre
Future<void> addOnionNode(Box<Node> nodes) async {
final onionNodeUri = "cakexmrl7bonq7ovjka5kuwuyd3f7qnkz6z6s6dmsy3uckwra7bvggyd.onion:18081";
+ final onionNodeUri2 = "sfprpc5klzs5vyitq2mrooicgk2wcs5ho2nm3niqduvzn5o6ylaslaqd.onion:18089";
// check if the user has this node before (added it manually)
if (nodes.values.firstWhereOrNull((element) => element.uriRaw == onionNodeUri) == null) {
await nodes.add(Node(uri: onionNodeUri, type: WalletType.monero));
}
+
+ if (nodes.values.firstWhereOrNull((element) => element.uriRaw == onionNodeUri2) == null) {
+ await nodes.add(Node(uri: onionNodeUri2, type: WalletType.monero));
+ }
}
Future<void> replaceNodesMigration({required Box<Node> nodes}) async {
diff --git a/lib/src/screens/dashboard/widgets/sync_indicator.dart b/lib/src/screens/dashboard/widgets/sync_indicator.dart
index e3130a796..4d65a274a 100644
--- a/lib/src/screens/dashboard/widgets/sync_indicator.dart
+++ b/lib/src/screens/dashboard/widgets/sync_indicator.dart
@@ -8,8 +8,7 @@ import 'package:cw_core/sync_status.dart';
import 'package:cake_wallet/src/screens/dashboard/widgets/sync_indicator_icon.dart';
class SyncIndicator extends StatelessWidget {
- SyncIndicator(
- {required this.dashboardViewModel, required this.onTap});
+ SyncIndicator({required this.dashboardViewModel, required this.onTap});
final DashboardViewModel dashboardViewModel;
final Function() onTap;
@@ -55,6 +54,11 @@ class SyncIndicator extends StatelessWidget {
Row(
children: [
Observer(builder: (_) {
+ if (dashboardViewModel.isElectrumBased) {
+ return Container(
+ width: 15,
+ );
+ }
Widget torImage;
switch (dashboardViewModel.torViewModel.torConnectionStatus) {
case TorConnectionStatus.connected:
diff --git a/lib/view_model/dashboard/dashboard_view_model.dart b/lib/view_model/dashboard/dashboard_view_model.dart
index 97f00e497..1d4d8ed2c 100644
--- a/lib/view_model/dashboard/dashboard_view_model.dart
+++ b/lib/view_model/dashboard/dashboard_view_model.dart
@@ -279,6 +279,10 @@ abstract class DashboardViewModelBase with Store {
bool get hasRescan => wallet.type == WalletType.monero || wallet.type == WalletType.haven;
+ @computed
+ bool get isElectrumBased =>
+ [WalletType.bitcoin, WalletType.litecoin, WalletType.bitcoinCash].contains(wallet.type);
+
final KeyService keyService;
BalanceViewModel balanceViewModel;