From 56e026e422fec592c6f821de640e42b7fb07931f Mon Sep 17 00:00:00 2001
From: Matthew Fosse <matt@fosse.co>
Date: Thu, 4 Jan 2024 13:48:57 -0500
Subject: [PATCH] fixes

---
 .../settings/connection_sync_page.dart        | 29 ++++++++-------
 .../settings/widgets/settings_tor_status.dart | 37 ++++++++++---------
 lib/view_model/settings/tor_view_model.dart   |  6 ---
 3 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/lib/src/screens/settings/connection_sync_page.dart b/lib/src/screens/settings/connection_sync_page.dart
index 7658bd512..5d79677f7 100644
--- a/lib/src/screens/settings/connection_sync_page.dart
+++ b/lib/src/screens/settings/connection_sync_page.dart
@@ -106,23 +106,24 @@ class ConnectionSyncPage extends BasePage {
                     decoration: BoxDecoration(
                       borderRadius: BorderRadius.only(
                           topLeft: Radius.circular(25), topRight: Radius.circular(25)),
-                      color: Theme.of(context).extension<SyncIndicatorTheme>()!.notSyncedBackgroundColor,
+                      color: Theme.of(context)
+                          .extension<SyncIndicatorTheme>()!
+                          .notSyncedBackgroundColor,
                     ),
                   );
                 }),
-                Observer(builder: (context) {
-                  return TorStatus(
-                    torViewModel: dashboardViewModel.torViewModel,
-                    decoration: BoxDecoration(
-                      borderRadius: BorderRadius.only(
-                          bottomLeft: Radius.circular(25), bottomRight: Radius.circular(25)),
-                      color: Theme.of(context).extension<SyncIndicatorTheme>()!.notSyncedBackgroundColor,
-                    ),
-                    title: S.current.tor_status,
-                    isSelected: false,
-                    onTap: (context) {},
-                  );
-                }),
+                TorStatus(
+                  torViewModel: dashboardViewModel.torViewModel,
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.only(
+                        bottomLeft: Radius.circular(25), bottomRight: Radius.circular(25)),
+                    color:
+                        Theme.of(context).extension<SyncIndicatorTheme>()!.notSyncedBackgroundColor,
+                  ),
+                  title: S.current.tor_status,
+                  isSelected: false,
+                  onTap: (context) {},
+                ),
               ]),
             ),
           ],
diff --git a/lib/src/screens/settings/widgets/settings_tor_status.dart b/lib/src/screens/settings/widgets/settings_tor_status.dart
index a5bed5660..ab56d01ad 100644
--- a/lib/src/screens/settings/widgets/settings_tor_status.dart
+++ b/lib/src/screens/settings/widgets/settings_tor_status.dart
@@ -5,6 +5,7 @@ import 'package:cake_wallet/src/widgets/standard_list.dart';
 import 'package:cake_wallet/view_model/settings/tor_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/themes/extensions/filter_theme.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
 
 class TorStatus extends StandardListRow {
   TorStatus(
@@ -19,23 +20,25 @@ class TorStatus extends StandardListRow {
 
   @override
   Widget buildTrailing(BuildContext context) {
-    Color? color;
-    String? text;
-    switch (torViewModel.torConnectionStatus) {
-      case TorConnectionStatus.connected:
-        color = Palette.green;
-        text = S.current.connected;
-        break;
-      case TorConnectionStatus.connecting:
-        color = Colors.amber;
-        text = S.current.connecting;
-        break;
-      case TorConnectionStatus.disconnected:
-        color = Palette.red;
-        text = S.current.disconnected;
-        break;
-    }
-    return NodeIndicator(color: color, text: text);
+    return Observer(builder: (context) {
+      Color? color;
+      String? text;
+      switch (torViewModel.torConnectionStatus) {
+        case TorConnectionStatus.connected:
+          color = Palette.green;
+          text = S.current.connected;
+          break;
+        case TorConnectionStatus.connecting:
+          color = Colors.amber;
+          text = S.current.connecting;
+          break;
+        case TorConnectionStatus.disconnected:
+          color = Palette.red;
+          text = S.current.disconnected;
+          break;
+      }
+      return NodeIndicator(color: color, text: text);
+    });
   }
 }
 
diff --git a/lib/view_model/settings/tor_view_model.dart b/lib/view_model/settings/tor_view_model.dart
index 224141f87..07ff3610f 100644
--- a/lib/view_model/settings/tor_view_model.dart
+++ b/lib/view_model/settings/tor_view_model.dart
@@ -25,12 +25,6 @@ abstract class TorViewModelBase with Store {
   @action
   void setTorConnectionMode(TorConnectionMode mode) => _settingsStore.torConnectionMode = mode;
 
-  // @computed
-  // bool get isTorConnected =>
-  //     (_settingsStore.torConnectionMode == TorConnectionMode.enabled ||
-  //         _settingsStore.torConnectionMode == TorConnectionMode.onionOnly) &&
-  //     (Tor.instance.port != -1);
-
   @computed
   TorConnectionStatus get torConnectionStatus {