Merge branch 'main' into test/setup-event-db-environment

Author: apskhem

catalyst_voices/apps/voices/lib/configs/bootstrap.dart

@@ -74,6 +74,7 @@ Future<void> _doBootstrapAndRun(BootstrapWidgetBuilder builder) async {
   await _runApp(app);
 }
 
+@visibleForTesting
 GoRouter buildAppRouter({
   String? initialLocation,
 }) {
@@ -85,6 +86,18 @@ GoRouter buildAppRouter({
   );
 }
 
+@visibleForTesting
+Future<void> registerDependencies() async {
+  if (!Dependencies.instance.isInitialized) {
+    await Dependencies.instance.init();
+  }
+}
+
+@visibleForTesting
+Future<void> restartDependencies() async {
+  await Dependencies.instance.reset;
+}
+
 /// Initializes the application before it can be run. Should setup all
 /// the things which are necessary before the actual app is run,
 /// either via [runApp] or injected into a test environment during
@@ -102,7 +115,7 @@ Future<BootstrapArgs> bootstrap({
   GoRouter.optionURLReflectsImperativeAPIs = true;
   setPathUrlStrategy();
 
-  await Dependencies.instance.init();
+  await registerDependencies();
 
   // Key derivation needs to be initialized before it can be used
   await CatalystKeyDerivation.init();

catalyst_voices/apps/voices/lib/dependency/dependencies.dart

@@ -10,13 +10,26 @@ import 'package:catalyst_voices_shared/catalyst_voices_shared.dart';
 final class Dependencies extends DependencyProvider {
   static final Dependencies instance = Dependencies._();
 
+  bool _isInitialized = false;
+
   Dependencies._();
 
   Future<void> init() async {
     DependencyProvider.instance = this;
     _registerServices();
     _registerRepositories();
     _registerBlocsWithDependencies();
+
+    _isInitialized = true;
+  }
+
+  bool get isInitialized => _isInitialized;
+
+  @override
+  Future<void> get reset {
+    return super.reset.whenComplete(() {
+      _isInitialized = false;
+    });
   }
 
   void _registerBlocsWithDependencies() {