From bad9b4c60890f950cd9ecaf917be14bbe633d731 Mon Sep 17 00:00:00 2001
From: Adegoke David <64401859+Blazebrain@users.noreply.github.com>
Date: Thu, 5 Oct 2023 13:04:08 +0100
Subject: [PATCH] fix: Wallet type check when registering key service (#1111)

* fix: Wallet type check when registering key service

* fix: WalletConnect dependency registration
---
 lib/di.dart                                        | 10 +++++++---
 lib/src/screens/settings/connection_sync_page.dart |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/di.dart b/lib/di.dart
index 96c7505ef..aec07ff3f 100644
--- a/lib/di.dart
+++ b/lib/di.dart
@@ -740,9 +740,13 @@ Future<void> setup({
     return PowNodeListViewModel(_powNodeSource, appStore);
   });
 
-  getIt.registerFactory(
-    () => ConnectionSyncPage(getIt.get<DashboardViewModel>(), getIt.get<Web3WalletService>()),
-  );
+  getIt.registerFactory(() {
+    final wallet = getIt.get<AppStore>().wallet;
+    return ConnectionSyncPage(
+      getIt.get<DashboardViewModel>(),
+      wallet?.type == WalletType.ethereum ? getIt.get<Web3WalletService>() : null,
+    );
+  });
 
   getIt.registerFactory(
       () => SecurityBackupPage(getIt.get<SecuritySettingsViewModel>(), getIt.get<AuthService>()));
diff --git a/lib/src/screens/settings/connection_sync_page.dart b/lib/src/screens/settings/connection_sync_page.dart
index 468a237cb..573778ed2 100644
--- a/lib/src/screens/settings/connection_sync_page.dart
+++ b/lib/src/screens/settings/connection_sync_page.dart
@@ -23,7 +23,7 @@ class ConnectionSyncPage extends BasePage {
   @override
   String get title => S.current.connection_sync;
 
-  final Web3WalletService web3walletService;
+  final Web3WalletService? web3walletService;
   final DashboardViewModel dashboardViewModel;
 
   @override
@@ -91,7 +91,7 @@ class ConnectionSyncPage extends BasePage {
                 Navigator.of(context).push(
                   MaterialPageRoute(
                     builder: (context) {
-                      return WalletConnectConnectionsView(web3walletService: web3walletService);
+                      return WalletConnectConnectionsView(web3walletService: web3walletService!);
                     },
                   ),
                 );