diff --git a/cw_core/lib/wallet_info.dart b/cw_core/lib/wallet_info.dart index c4ccea00a..e1dcf2d94 100644 --- a/cw_core/lib/wallet_info.dart +++ b/cw_core/lib/wallet_info.dart @@ -37,7 +37,7 @@ class DerivationInfo { String address; int height; final DerivationType derivationType; - final String? derivationPath; + String? derivationPath; final String? script_type; final String? description; } diff --git a/lib/di.dart b/lib/di.dart index 7dbb5499b..f17e2969f 100644 --- a/lib/di.dart +++ b/lib/di.dart @@ -36,7 +36,6 @@ import 'package:cake_wallet/src/screens/receive/anonpay_receive_page.dart'; import 'package:cake_wallet/src/screens/restore/wallet_restore_choose_derivation.dart'; import 'package:cake_wallet/src/screens/settings/display_settings_page.dart'; import 'package:cake_wallet/src/screens/settings/manage_nodes_page.dart'; -import 'package:cake_wallet/src/screens/settings/manage_pow_nodes_page.dart'; import 'package:cake_wallet/src/screens/settings/other_settings_page.dart'; import 'package:cake_wallet/src/screens/settings/privacy_page.dart'; import 'package:cake_wallet/src/screens/settings/security_backup_page.dart'; @@ -766,10 +765,6 @@ Future setup({ type ?? getIt.get().wallet!.type, getIt.get())); - getIt.registerFactoryParam( - (WalletType? type, _) => PowNodeCreateOrEditViewModel( - _powNodeSource, type ?? getIt.get().wallet!.type, getIt.get())); - getIt.registerFactoryParam( (Node? editingNode, bool? isSelected) => NodeCreateOrEditPage( nodeCreateOrEditViewModel: getIt.get(param2: false), @@ -781,12 +776,6 @@ Future setup({ nodeCreateOrEditViewModel: getIt.get(param2: true), editingNode: editingNode, isSelected: isSelected)); - - getIt.registerFactoryParam( - (Node? editingNode, bool? isSelected) => PowNodeCreateOrEditPage( - nodeCreateOrEditViewModel: getIt.get(), - editingNode: editingNode, - isSelected: isSelected)); getIt.registerFactory( () => RobinhoodBuyProvider(wallet: getIt.get().wallet!)); diff --git a/lib/router.dart b/lib/router.dart index 5f7a28974..126830308 100644 --- a/lib/router.dart +++ b/lib/router.dart @@ -24,7 +24,6 @@ import 'package:cake_wallet/src/screens/restore/wallet_restore_choose_derivation import 'package:cake_wallet/src/screens/settings/desktop_settings/desktop_settings_page.dart'; import 'package:cake_wallet/src/screens/settings/display_settings_page.dart'; import 'package:cake_wallet/src/screens/settings/manage_nodes_page.dart'; -import 'package:cake_wallet/src/screens/settings/manage_pow_nodes_page.dart'; import 'package:cake_wallet/src/screens/settings/other_settings_page.dart'; import 'package:cake_wallet/src/screens/settings/privacy_page.dart'; import 'package:cake_wallet/src/screens/settings/security_backup_page.dart'; @@ -590,9 +589,6 @@ Route createRoute(RouteSettings settings) { case Routes.managePowNodes: return MaterialPageRoute(builder: (_) => getIt.get(param1: true)); - case Routes.managePowNodes: - return MaterialPageRoute(builder: (_) => getIt.get()); - default: return MaterialPageRoute( builder: (_) => Scaffold( diff --git a/lib/src/screens/restore/wallet_restore_page.dart b/lib/src/screens/restore/wallet_restore_page.dart index a3fc4f99c..9081e24a9 100644 --- a/lib/src/screens/restore/wallet_restore_page.dart +++ b/lib/src/screens/restore/wallet_restore_page.dart @@ -1,5 +1,6 @@ import 'package:cake_wallet/bitcoin/bitcoin.dart'; import 'package:cake_wallet/di.dart'; +import 'package:cake_wallet/nano/nano.dart'; import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/store/app_store.dart'; import 'package:cake_wallet/themes/extensions/keyboard_theme.dart';