diff --git a/lib/main.dart b/lib/main.dart
index 2bce434..923fcbc 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,7 +1,8 @@
 import 'package:donationwallet/src/data/providers/chain_api.dart';
-import 'package:donationwallet/src/data/providers/wallet_secure_storage.dart';
+import 'package:donationwallet/src/data/providers/secure_storage.dart';
 import 'package:donationwallet/src/data/repositories/chain_repository.dart';
 import 'package:donationwallet/src/data/repositories/wallet_repository.dart';
+import 'package:donationwallet/src/domain/usecases/create_wallet_usecase.dart';
 import 'package:donationwallet/src/domain/usecases/delete_wallet_usecase.dart';
 import 'package:donationwallet/src/domain/usecases/get_chain_tip_usecase.dart';
 import 'package:donationwallet/src/domain/usecases/load_wallet_usecase.dart';
@@ -29,21 +30,26 @@ class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     AndroidOptions getAndroidOptions() => const AndroidOptions(
-        encryptedSharedPreferences: true,
-      );
+          encryptedSharedPreferences: true,
+        );
     final storage = FlutterSecureStorage(aOptions: getAndroidOptions());
     return MultiProvider(
       providers: [
-        ChangeNotifierProvider(create: (_) => WalletNotifier(
-          SaveWalletUseCase(WalletRepository(WalletSecureStorageProvider(storage))),
-          LoadWalletUseCase(WalletRepository(WalletSecureStorageProvider(storage))),
-          DeleteWalletUseCase(WalletRepository(WalletSecureStorageProvider(storage))),
-          UpdateWalletUseCase(ChainRepository(ChainApiProvider())),
-        )), 
-        ChangeNotifierProvider(create: (_) => ChainNotifier(
-          GetChainTipUseCase(ChainRepository(ChainApiProvider()))
-          )
-        )
+        ChangeNotifierProvider<WalletNotifier>(
+            create: (_) => WalletNotifier(
+                  SaveWalletUseCase(
+                      WalletRepository(SecureStorageProvider(storage))),
+                  LoadWalletUseCase(
+                      WalletRepository(SecureStorageProvider(storage))),
+                  DeleteWalletUseCase(
+                      WalletRepository(SecureStorageProvider(storage))),
+                  UpdateWalletUseCase(ChainRepository(ChainApiProvider())),
+                  CreateWalletUseCase(
+                      WalletRepository(SecureStorageProvider(storage))),
+                )),
+        ChangeNotifierProvider<ChainNotifier>(
+            create: (_) => ChainNotifier(
+                GetChainTipUseCase(ChainRepository(ChainApiProvider()))))
       ],
       child: const SilentPaymentApp(),
     );
diff --git a/lib/src/data/models/sp_receiver_model.dart b/lib/src/data/models/sp_receiver_model.dart
index 92cb494..ea03bed 100644
--- a/lib/src/data/models/sp_receiver_model.dart
+++ b/lib/src/data/models/sp_receiver_model.dart
@@ -19,7 +19,11 @@ class SPReceiver {
 
   factory SPReceiver.fromJson(Map<String, dynamic> json) {
     var labelsList = json['labels'] as List;
-    List<Label> labels = labelsList.map((i) => Label.fromJson(i)).toList();
+    
+    // List<Label> labels = labelsList.map((i) => Label.fromJson(i)).toList();
+
+    // List<Label> labels = Label.fromJson(labelsList).toList();
+    final labels = List<Label>.empty();
 
     return SPReceiver(
       version: json['version'],
diff --git a/lib/src/data/providers/wallet_secure_storage.dart b/lib/src/data/providers/wallet_secure_storage.dart
deleted file mode 100644
index 272f035..0000000
--- a/lib/src/data/providers/wallet_secure_storage.dart
+++ /dev/null
@@ -1,38 +0,0 @@
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:logger/logger.dart';
-
-class WalletSecureStorageProvider {
-  final FlutterSecureStorage secureStorage;
-
-  WalletSecureStorageProvider(this.secureStorage);
-
-  Future<void> saveWalletToSecureStorage(String label, String spWallet) async {
-    try {
-      await secureStorage.write(key: label, value: spWallet);
-    } catch (e) {
-      rethrow;
-    }
-  }
-
-  Future<String> rmWalletFromSecureStorage(String label) async {
-    final wallet = await secureStorage.read(key: label);
-
-    if (wallet == null) {
-      throw Exception("Wallet $label doesn't exist");
-    }
-
-    await secureStorage.write(key: label, value: null);
-
-    return wallet;
-  }
-
-  Future<String> getWalletFromSecureStorage(String label) async {
-    final wallet = await secureStorage.read(key: label);
-
-    if (wallet == null) {
-      throw Exception("Wallet $label doesn't exist");
-    }
-
-    return wallet;
-  }
-}
diff --git a/lib/src/data/repositories/wallet_repository.dart b/lib/src/data/repositories/wallet_repository.dart
index 9030866..cd0b177 100644
--- a/lib/src/data/repositories/wallet_repository.dart
+++ b/lib/src/data/repositories/wallet_repository.dart
@@ -1,12 +1,12 @@
 import 'dart:convert';
 
-import 'package:donationwallet/src/data/providers/wallet_secure_storage.dart';
+import 'package:donationwallet/src/data/providers/secure_storage.dart';
 import 'package:donationwallet/src/domain/entities/wallet_entity.dart';
 import 'package:donationwallet/src/data/models/sp_wallet_model.dart';
 import 'package:logger/logger.dart';
 
 class WalletRepository {
-  final WalletSecureStorageProvider secureStorageProvider;
+  final SecureStorageProvider secureStorageProvider;
 
   WalletRepository(this.secureStorageProvider);
 
diff --git a/lib/src/presentation/notifiers/wallet_notifier.dart b/lib/src/presentation/notifiers/wallet_notifier.dart
index 0647d4f..26a5502 100644
--- a/lib/src/presentation/notifiers/wallet_notifier.dart
+++ b/lib/src/presentation/notifiers/wallet_notifier.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:donationwallet/src/data/models/sp_wallet_model.dart';
+import 'package:donationwallet/src/domain/usecases/create_wallet_usecase.dart';
 import 'package:donationwallet/src/domain/usecases/delete_wallet_usecase.dart';
 import 'package:donationwallet/src/domain/usecases/load_wallet_usecase.dart';
 import 'package:donationwallet/src/domain/usecases/save_wallet_usecase.dart';
@@ -14,15 +15,20 @@ class WalletNotifier extends ChangeNotifier {
   final LoadWalletUseCase loadWalletUseCase;
   final DeleteWalletUseCase deleteWalletUseCase;
   final UpdateWalletUseCase updateWalletUseCase;
-
-  WalletNotifier(this.saveWalletUseCase, this.loadWalletUseCase,
-      this.deleteWalletUseCase, this.updateWalletUseCase) {
-    _initialize();
+  final CreateWalletUseCase createWalletUseCase;
+
+  WalletNotifier(
+      this.saveWalletUseCase,
+      this.loadWalletUseCase,
+      this.deleteWalletUseCase,
+      this.updateWalletUseCase,
+      this.createWalletUseCase) {
+    // _initialize();
   }
 
-  Future<void> _initialize() async {
-    await loadWallet(defaultLabel);
-  }
+  // Future<void> _initialize() async {
+  //   await loadWallet(defaultLabel);
+  // }
 
   WalletEntity? _wallet;
   WalletEntity? get wallet => _wallet;
@@ -103,4 +109,19 @@ class WalletNotifier extends ChangeNotifier {
       notifyListeners();
     }
   }
+
+  Future<void> createWallet(String label, String network, int birthday) async {
+    _isLoading = true;
+    _error = null;
+    notifyListeners();
+
+    try {
+      _wallet = await createWalletUseCase(label, network, birthday);
+    } catch (e) {
+      _error = e.toString();
+    } finally {
+      _isLoading = false;
+      notifyListeners();
+    }
+  }
 }
diff --git a/lib/src/presentation/screens/setupwallet_screen.dart b/lib/src/presentation/screens/setupwallet_screen.dart
index 46dc6fc..1ea4d49 100644
--- a/lib/src/presentation/screens/setupwallet_screen.dart
+++ b/lib/src/presentation/screens/setupwallet_screen.dart
@@ -1,43 +1,13 @@
-import 'dart:async';
-import 'dart:convert';
-
-import 'package:donationwallet/generated/rust/api/simple.dart';
-import 'package:donationwallet/src/data/models/sp_wallet_model.dart';
 import 'package:donationwallet/src/presentation/notifiers/chain_notifier.dart';
-import 'package:donationwallet/src/presentation/screens/home_screen.dart';
 import 'package:donationwallet/src/presentation/notifiers/wallet_notifier.dart';
+import 'package:donationwallet/src/presentation/screens/home_screen.dart';
 import 'package:donationwallet/src/utils/constants.dart';
 import 'package:flutter/material.dart';
-import 'package:logger/logger.dart';
 import 'package:provider/provider.dart';
 
 class SetupWalletScreen extends StatelessWidget {
   const SetupWalletScreen({super.key});
 
-  Future<void> _setup(WalletNotifier walletNotifier, String? mnemonic,
-      String? scanKey, String? spendKey, int birthday, String network) async {
-    if (walletNotifier.wallet != null) {
-      return;
-    }
-
-    try {
-      final wallet = await setup(
-        label: defaultLabel,
-        mnemonic: mnemonic,
-        scanKey: scanKey,
-        spendKey: spendKey,
-        birthday: birthday,
-        network: network,
-      );
-      final spWallet =
-          SpWallet.fromJson(jsonDecode(wallet) as Map<String, dynamic>);
-      await walletNotifier.saveWallet(defaultLabel, spWallet);
-      await walletNotifier.loadWallet(defaultLabel);
-    } catch (e) {
-      rethrow;
-    }
-  }
-
   // Future<void> _showKeysInputDialog(BuildContext context, bool watchOnly,
   //     Function(Exception? e) onSetupComplete) async {
   //   TextEditingController scanKeyController = TextEditingController();
@@ -231,6 +201,19 @@ class SetupWalletScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final walletNotifier = Provider.of<WalletNotifier>(context);
+    final chainNotifier = Provider.of<ChainNotifier>(context);
+
+    // final walletNotifier = context.watch()<WalletNotifier>();
+    // final chainNotifier = context.watch()<ChainNotifier>();
+
+    // if wallet exists, go to home screen
+    if (walletNotifier.wallet != null) {
+      Navigator.of(context).pushReplacement(
+        MaterialPageRoute(builder: (context) => const HomeScreen()),
+      );
+    }
+
     return Scaffold(
       appBar: AppBar(
         title: const Text('Wallet creation/restoration'),
@@ -240,21 +223,21 @@ class SetupWalletScreen extends StatelessWidget {
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
-            const Spacer(),
-            Consumer<WalletNotifier>(builder: (context, walletNotifier, child) {
-              return Expanded(
-                  child: _buildButton(context, 'Create New Wallet', () async {
-                final tip =
-                    Provider.of<ChainNotifier>(context, listen: false).tip;
-                await _setup(
-                    walletNotifier, null, null, null, tip, defaultNetwork);
-                if (walletNotifier.wallet != null) {
-                  Navigator.of(context).pushReplacement(
-                    MaterialPageRoute(builder: (context) => HomeScreen()),
-                  );
-                }
-              }));
-            }),
+            Expanded(
+                child: _buildButton(context, 'Create new Wallet', () async {
+              final tip = chainNotifier.tip;
+              await walletNotifier.createWallet(
+                  defaultLabel, defaultNetwork, tip);
+              // goToHomeScreen();
+            })),
+
+            // const Spacer(),
+            // Consumer<WalletNotifier>(builder: (context, walletNotifier, child) {
+            //   return Expanded(
+            //       child: _buildButton(context, 'Create New Wallet', () async {
+            //     createWallet(context);
+            //   }));
+            // }),
           ],
         ),
       ),
@@ -338,3 +321,13 @@ class SetupWalletScreen extends StatelessWidget {
     );
   }
 }
+
+// Future<void> createWallet(BuildContext context) async {
+//   final tip = Provider.of<ChainNotifier>(context, listen: false).tip;
+//   await walletNotifier.createWalletUseCase(defaultLabel, defaultNetwork, tip);
+//   if (walletNotifier.wallet != null) {
+//     Navigator.of(context).pushReplacement(
+//       MaterialPageRoute(builder: (context) => HomeScreen()),
+//     );
+//   }
+// }
diff --git a/lib/src/presentation/screens/spend_screen.dart b/lib/src/presentation/screens/spend_screen.dart
index 6008737..8bbc841 100644
--- a/lib/src/presentation/screens/spend_screen.dart
+++ b/lib/src/presentation/screens/spend_screen.dart
@@ -81,10 +81,10 @@ class SpendScreen extends StatelessWidget {
                     ? "Tap here to choose which coin to spend"
                     : "Spending ${transactionNotifer.getInputs().length} output(s) for a total of ${transactionNotifer.getTotalAvailable()} sats available",
                 onTap: () {
-                  Navigator.of(context).push(
-                    MaterialPageRoute(
-                        builder: (context) => const OutputsScreen()),
-                  );
+                  // Navigator.of(context).push(
+                  //   MaterialPageRoute(
+                  //       builder: (context) => const OutputsScreen()),
+                  // );
                 }),
             const Spacer(),
             SummaryWidget(
@@ -92,10 +92,10 @@ class SpendScreen extends StatelessWidget {
                     ? "Tap here to add destinations"
                     : "Sending to ${transactionNotifer.recipientsLength()} output(s) for a total of ${transactionNotifer.getTotalSpent()} sats",
                 onTap: () {
-                  Navigator.of(context).push(
-                    MaterialPageRoute(
-                        builder: (context) => const DestinationScreen()),
-                  );
+                  // Navigator.of(context).push(
+                  //   MaterialPageRoute(
+                  //       builder: (context) => const DestinationScreen()),
+                  // );
                 }),
             const Spacer(),
             const Text('Fee Rate (satoshis/vB)'),
@@ -116,14 +116,14 @@ class SpendScreen extends StatelessWidget {
                 }
                 final wallet = await walletNotifier.loadWalletUseCase(defaultLabel);
                 try {
-                  transactionNotifer.createTransactionUsecase();
+                  // transactionNotifer.createTransactionUsecase();
 
                   if (!context.mounted) return;
 
                   // navigate to main screen
                   Navigator.popUntil(context, (route) => route.isFirst);
 
-                  showAlertDialog('Transaction successfully sent', sentTxId);
+                  // showAlertDialog('Transaction successfully sent', sentTxId);
                 } catch (e) {
                   rethrow;
                 }
diff --git a/lib/src/presentation/screens/wallet_screen.dart b/lib/src/presentation/screens/wallet_screen.dart
index db2acbc..11bd19e 100644
--- a/lib/src/presentation/screens/wallet_screen.dart
+++ b/lib/src/presentation/screens/wallet_screen.dart
@@ -1,4 +1,5 @@
 import 'package:bitcoin_ui/bitcoin_ui.dart';
+import 'package:donationwallet/src/presentation/screens/spend_screen.dart';
 import 'package:donationwallet/src/utils/global_functions.dart';
 import 'package:donationwallet/src/presentation/notifiers/wallet_notifier.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/src/utils/global_functions.dart b/lib/src/utils/global_functions.dart
index 5acfc21..888ab49 100644
--- a/lib/src/utils/global_functions.dart
+++ b/lib/src/utils/global_functions.dart
@@ -1,3 +1,4 @@
+import 'package:donationwallet/src/presentation/screens/home_screen.dart';
 import 'package:flutter/material.dart';
 
 final globalNavigatorKey = GlobalKey<NavigatorState>();