From 20d30013d06d605e51d8283eb59b1c753af07c25 Mon Sep 17 00:00:00 2001
From: Omar Hatem <omarh.ismail1@gmail.com>
Date: Wed, 25 Dec 2024 21:26:15 +0200
Subject: [PATCH] support Adding query params to node url (#1901)

* support Adding query params to node url

* minor ui fix [skip ci]
---
 cw_core/lib/node.dart                           | 17 +++++------------
 .../seed_verification_step_view.dart            |  4 +++-
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/cw_core/lib/node.dart b/cw_core/lib/node.dart
index 18d2ffc44..aa7d27254 100644
--- a/cw_core/lib/node.dart
+++ b/cw_core/lib/node.dart
@@ -22,8 +22,8 @@ class Node extends HiveObject with Keyable {
     this.useSSL,
     this.trusted = false,
     this.socksProxyAddress,
+    this.path = '',
     String? uri,
-    String? path,
     WalletType? type,
   }) {
     if (uri != null) {
@@ -32,9 +32,6 @@ class Node extends HiveObject with Keyable {
     if (type != null) {
       this.type = type;
     }
-    if (path != null) {
-      this.path = path;
-    }
   }
 
   Node.fromMap(Map<String, Object?> map)
@@ -95,19 +92,15 @@ class Node extends HiveObject with Keyable {
       case WalletType.bitcoin:
       case WalletType.litecoin:
       case WalletType.bitcoinCash:
-        return createUriFromElectrumAddress(uriRaw, path ?? '');
+        return createUriFromElectrumAddress(uriRaw, path!);
       case WalletType.nano:
       case WalletType.banano:
-        if (isSSL) {
-          return Uri.https(uriRaw, path ?? '');
-        } else {
-          return Uri.http(uriRaw, path ?? '');
-        }
       case WalletType.ethereum:
       case WalletType.polygon:
       case WalletType.solana:
       case WalletType.tron:
-        return Uri.https(uriRaw, path ?? '');
+      return Uri.parse(
+          "http${isSSL ? "s" : ""}://$uriRaw${path!.startsWith("/") ? path : "/$path"}");
       case WalletType.none:
         throw Exception('Unexpected type ${type.toString()} for Node uri');
     }
@@ -247,7 +240,7 @@ class Node extends HiveObject with Keyable {
     if (proxy == null) {
       return false;
     }
-    final proxyAddress = proxy!.split(':')[0];
+    final proxyAddress = proxy.split(':')[0];
     final proxyPort = int.parse(proxy.split(':')[1]);
     try {
       final socket = await Socket.connect(proxyAddress, proxyPort, timeout: Duration(seconds: 5));
diff --git a/lib/src/screens/seed/seed_verification/seed_verification_step_view.dart b/lib/src/screens/seed/seed_verification/seed_verification_step_view.dart
index b8c1500dc..8eb5e2cb7 100644
--- a/lib/src/screens/seed/seed_verification/seed_verification_step_view.dart
+++ b/lib/src/screens/seed/seed_verification/seed_verification_step_view.dart
@@ -81,7 +81,9 @@ class SeedVerificationStepView extends StatelessWidget {
                             );
 
                             if (isSecondWrongEntry) {
-                              Navigator.pop(context);
+                              if (context.mounted) {
+                                Navigator.pop(context);
+                              }
                             }
                           }
                         },