From 467f57c74e1f3902acf221d1903b24dc7be33c82 Mon Sep 17 00:00:00 2001
From: ryleedavis <rylee@cypherstack.com>
Date: Wed, 23 Aug 2023 10:59:13 -0600
Subject: [PATCH] resolve merge conflicts

---
 .../manage_nodes_views/add_edit_node_view.dart   |  9 +++++----
 .../manage_nodes_views/node_details_view.dart    | 16 ++++++++--------
 lib/utilities/enums/coin_enum.dart               |  3 ++-
 lib/widgets/node_card.dart                       |  5 +++--
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart b/lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
index c4c10a618..5ae04920d 100644
--- a/lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
+++ b/lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
@@ -196,10 +196,11 @@ class _AddEditNodeViewState extends ConsumerState<AddEditNodeView> {
         } catch (_) {}
         break;
       case Coin.stellar:
-      case Coin.stellarTestnet:
+      case Coin.stellarTestNet:
         try {
-          testPassed = await testStellarNodeConnection(formData.host!, formData.port!);
-        } catch(_) {}
+          testPassed =
+              await testStellarNodeConnection(formData.host!, formData.port!);
+        } catch (_) {}
         break;
 
       case Coin.nano:
@@ -749,7 +750,7 @@ class _NodeFormState extends ConsumerState<NodeForm> {
       case Coin.banano:
       case Coin.eCash:
       case Coin.stellar:
-      case Coin.stellarTestnet:
+      case Coin.stellarTestNet:
         return false;
 
       case Coin.ethereum:
diff --git a/lib/pages/settings_views/global_settings_view/manage_nodes_views/node_details_view.dart b/lib/pages/settings_views/global_settings_view/manage_nodes_views/node_details_view.dart
index 0b339469e..d306260d6 100644
--- a/lib/pages/settings_views/global_settings_view/manage_nodes_views/node_details_view.dart
+++ b/lib/pages/settings_views/global_settings_view/manage_nodes_views/node_details_view.dart
@@ -26,6 +26,7 @@ import 'package:stackwallet/utilities/logger.dart';
 import 'package:stackwallet/utilities/test_epic_box_connection.dart';
 import 'package:stackwallet/utilities/test_eth_node_connection.dart';
 import 'package:stackwallet/utilities/test_monero_node_connection.dart';
+import 'package:stackwallet/utilities/test_stellar_node_connection.dart';
 import 'package:stackwallet/utilities/text_styles.dart';
 import 'package:stackwallet/utilities/util.dart';
 import 'package:stackwallet/widgets/background.dart';
@@ -172,20 +173,19 @@ class _NodeDetailsViewState extends ConsumerState<NodeDetailsView> {
 
       case Coin.nano:
       case Coin.banano:
-      case Coin.tezos:
       case Coin.stellar:
       case Coin.stellarTestNet:
-      try {
-        testPassed = await testStellarNodeConnection(node!.host, node.port);
-      } catch(_) {
-        testPassed = false;
-      }
+        try {
+          testPassed = await testStellarNodeConnection(node!.host, node.port);
+        } catch (_) {
+          testPassed = false;
+        }
         break;
       case Coin.nano:
       case Coin.banano:
-
+      case Coin.tezos:
         throw UnimplementedError();
-        //TODO: check network/node
+      //TODO: check network/node
     }
 
     if (testPassed) {
diff --git a/lib/utilities/enums/coin_enum.dart b/lib/utilities/enums/coin_enum.dart
index f4a4ca28f..b8af7f53c 100644
--- a/lib/utilities/enums/coin_enum.dart
+++ b/lib/utilities/enums/coin_enum.dart
@@ -262,7 +262,8 @@ extension CoinExt on Coin {
       case Coin.ethereum:
       case Coin.eCash:
       case Coin.stellar:
-      case Coin.stellarTestnet:
+      case Coin.stellarTestNet:
+      case Coin.tezos:
         return true;
 
       case Coin.epicCash:
diff --git a/lib/widgets/node_card.dart b/lib/widgets/node_card.dart
index a75b09c64..b63c21b93 100644
--- a/lib/widgets/node_card.dart
+++ b/lib/widgets/node_card.dart
@@ -29,6 +29,7 @@ import 'package:stackwallet/utilities/logger.dart';
 import 'package:stackwallet/utilities/test_epic_box_connection.dart';
 import 'package:stackwallet/utilities/test_eth_node_connection.dart';
 import 'package:stackwallet/utilities/test_monero_node_connection.dart';
+import 'package:stackwallet/utilities/test_stellar_node_connection.dart';
 import 'package:stackwallet/utilities/text_styles.dart';
 import 'package:stackwallet/utilities/util.dart';
 import 'package:stackwallet/widgets/conditional_parent.dart';
@@ -199,7 +200,7 @@ class _NodeCardState extends ConsumerState<NodeCard> {
       case Coin.stellarTestNet:
         try {
           testPassed = await testStellarNodeConnection(node.host, node.port);
-        } catch(_) {
+        } catch (_) {
           testPassed = false;
         }
         break;
@@ -207,7 +208,7 @@ class _NodeCardState extends ConsumerState<NodeCard> {
       case Coin.nano:
       case Coin.banano:
         throw UnimplementedError();
-        //TODO: check network/node
+      //TODO: check network/node
     }
 
     if (testPassed) {