From aff82ce4aef9c8a49edc8b80429d9a185534a57e Mon Sep 17 00:00:00 2001
From: Fabian Freund <github@fabi.online>
Date: Wed, 1 Oct 2025 12:56:16 +0200
Subject: [PATCH] change container creation handling

---
 .../tabs/presentation/screens/container_edit.dart      |  2 +-
 .../tabs/presentation/screens/container_list.dart      | 10 ++--------
 .../tabs/presentation/screens/container_selection.dart | 10 ++--------
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/app/lib/features/geckoview/features/tabs/presentation/screens/container_edit.dart b/app/lib/features/geckoview/features/tabs/presentation/screens/container_edit.dart
index 82ed4782..7dc4d928 100644
--- a/app/lib/features/geckoview/features/tabs/presentation/screens/container_edit.dart
+++ b/app/lib/features/geckoview/features/tabs/presentation/screens/container_edit.dart
@@ -134,7 +134,7 @@ class ContainerEditScreen extends HookConsumerWidget {
               }
 
               if (context.mounted) {
-                context.pop();
+                context.pop(container);
               }
             },
             icon: const Icon(Icons.check),
diff --git a/app/lib/features/geckoview/features/tabs/presentation/screens/container_list.dart b/app/lib/features/geckoview/features/tabs/presentation/screens/container_list.dart
index 73fc22e9..bf42a636 100644
--- a/app/lib/features/geckoview/features/tabs/presentation/screens/container_list.dart
+++ b/app/lib/features/geckoview/features/tabs/presentation/screens/container_list.dart
@@ -156,15 +156,9 @@ class ContainerListScreen extends HookConsumerWidget {
               .unusedRandomContainerColor();
 
           if (context.mounted) {
-            final result = await ContainerCreateRoute(
+            await ContainerCreateRoute(
               ContainerData(id: uuid.v7(), color: initialColor),
-            ).push<ContainerData?>(context);
-
-            if (result != null) {
-              await ref
-                  .read(containerRepositoryProvider.notifier)
-                  .addContainer(result);
-            }
+            ).push(context);
           }
         },
         label: const Text('Container'),
diff --git a/app/lib/features/geckoview/features/tabs/presentation/screens/container_selection.dart b/app/lib/features/geckoview/features/tabs/presentation/screens/container_selection.dart
index 2eaace19..e8639248 100644
--- a/app/lib/features/geckoview/features/tabs/presentation/screens/container_selection.dart
+++ b/app/lib/features/geckoview/features/tabs/presentation/screens/container_selection.dart
@@ -83,15 +83,9 @@ class ContainerSelectionScreen extends HookConsumerWidget {
               .unusedRandomContainerColor();
 
           if (context.mounted) {
-            final result = await ContainerCreateRoute(
+            await ContainerCreateRoute(
               ContainerData(id: uuid.v7(), color: initialColor),
-            ).push<ContainerData?>(context);
-
-            if (result != null) {
-              await ref
-                  .read(containerRepositoryProvider.notifier)
-                  .addContainer(result);
-            }
+            ).push(context);
           }
         },
         label: const Text('Container'),