diff --git a/lib/features/home/latest_store_operations/ui/latest_store_operations_card.dart b/lib/features/home/latest_store_operations/ui/latest_store_operations_card.dart
index 8d037c1..d95a4ae 100644
--- a/lib/features/home/latest_store_operations/ui/latest_store_operations_card.dart
+++ b/lib/features/home/latest_store_operations/ui/latest_store_operations_card.dart
@@ -137,8 +137,8 @@ class _LatestOperationsCardContent extends StatelessWidget {
                             return InkWell(
                               onTap: () => context.pushNamed(
                                 Routes.operationForm,
+                                extra: (createdBy: null, operation: operation),
                                 pathParameters: {'id': operation.id!},
-                                extra: operation,
                               ),
                               child: Padding(
                                 padding: const EdgeInsets.symmetric(
diff --git a/lib/features/operations/ui/operation_list_screen.dart b/lib/features/operations/ui/operation_list_screen.dart
index e22d25c..5b0f405 100644
--- a/lib/features/operations/ui/operation_list_screen.dart
+++ b/lib/features/operations/ui/operation_list_screen.dart
@@ -169,12 +169,9 @@ class _OperationListScreenState extends State<OperationListScreen> {
         ),
         trailing: const Icon(Icons.chevron_right),
         onTap: () => context.pushNamed(
-          'operations/form/id=${operation.id}',
-          extra: operation, // <-- LA MAGIA È QUI: Passa l'oggetto intero!
-          // Teniamo anche il parametro URL per coerenza di routing
-          queryParameters: operation.id != null
-              ? {'operationId': operation.id!}
-              : {},
+          Routes.operationForm,
+          extra: (createdBy: null, operation: operation),
+          pathParameters: {'id': operation.id!},
         ),
       ),
     );
diff --git a/lib/features/tickets/ui/ticket_list_screen.dart b/lib/features/tickets/ui/ticket_list_screen.dart
index eeb2350..d969eb0 100644
--- a/lib/features/tickets/ui/ticket_list_screen.dart
+++ b/lib/features/tickets/ui/ticket_list_screen.dart
@@ -292,11 +292,9 @@ class _TicketCard extends StatelessWidget {
                 ),
                 onTap: () {
                   context.pushNamed(
-                    'ticket-form',
+                    Routes.ticketForm,
                     pathParameters: {'id': ticket.id!},
-                    extra:
-                        ticket, // <-- LA MAGIA È QUI: Passa l'oggetto intero!
-                    // Teniamo anche il parametro URL per coerenza di routing
+                    extra: (ticket: ticket, createdBy: null),
                   );
                 },
               ),