From 69b5c74f00aa8ee83af8f520d92efcc9175ea8f5 Mon Sep 17 00:00:00 2001
From: Achintha Isuru <achinthaisuru444@gmail.com>
Date: Sun, 22 Feb 2026 21:34:16 -0500
Subject: [PATCH] refactor: streamline shift navigation calls and set default
 shifts tab to 'myshifts'.

---
 .../packages/core/lib/src/routing/staff/navigator.dart      | 6 +-----
 .../lib/src/presentation/pages/shift_details_page.dart      | 2 +-
 .../shifts/lib/src/presentation/widgets/my_shift_card.dart  | 5 +----
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/apps/mobile/packages/core/lib/src/routing/staff/navigator.dart b/apps/mobile/packages/core/lib/src/routing/staff/navigator.dart
index e83a85d2..f8761802 100644
--- a/apps/mobile/packages/core/lib/src/routing/staff/navigator.dart
+++ b/apps/mobile/packages/core/lib/src/routing/staff/navigator.dart
@@ -113,11 +113,7 @@ extension StaffNavigator on IModularNavigator {
     if (refreshAvailable == true) {
       args['refreshAvailable'] = true;
     }
-    pushNamedAndRemoveUntil(
-      StaffPaths.shifts,
-      (_) => false,
-      arguments: args.isEmpty ? null : args,
-    );
+    navigate(StaffPaths.shifts, arguments: args.isEmpty ? null : args);
   }
 
   /// Navigates to the Payments tab.
diff --git a/apps/mobile/packages/features/staff/shifts/lib/src/presentation/pages/shift_details_page.dart b/apps/mobile/packages/features/staff/shifts/lib/src/presentation/pages/shift_details_page.dart
index fcb8f22a..c5fc15d3 100644
--- a/apps/mobile/packages/features/staff/shifts/lib/src/presentation/pages/shift_details_page.dart
+++ b/apps/mobile/packages/features/staff/shifts/lib/src/presentation/pages/shift_details_page.dart
@@ -96,7 +96,7 @@ class _ShiftDetailsPageState extends State<ShiftDetailsPage> {
             );
             Modular.to.toShifts(
               selectedDate: state.shiftDate,
-              initialTab: 'find',
+              initialTab: 'myshifts',
               refreshAvailable: true,
             );
           } else if (state is ShiftDetailsError) {
diff --git a/apps/mobile/packages/features/staff/shifts/lib/src/presentation/widgets/my_shift_card.dart b/apps/mobile/packages/features/staff/shifts/lib/src/presentation/widgets/my_shift_card.dart
index ee2944e0..10f68a6f 100644
--- a/apps/mobile/packages/features/staff/shifts/lib/src/presentation/widgets/my_shift_card.dart
+++ b/apps/mobile/packages/features/staff/shifts/lib/src/presentation/widgets/my_shift_card.dart
@@ -161,10 +161,7 @@ class _MyShiftCardState extends State<MyShiftCard> {
 
     return GestureDetector(
       onTap: () {
-        Modular.to.pushNamed(
-          StaffPaths.shiftDetails(widget.shift.id),
-          arguments: widget.shift,
-        );
+        Modular.to.toShiftDetails(widget.shift);
       },
       child: Container(
         margin: const EdgeInsets.only(bottom: UiConstants.space3),