solving problem to move to search from home

apps/mobile/packages/features/staff/home/lib/src/presentation/navigation/home_navigator.dart

@@ -31,9 +31,11 @@ extension HomeNavigator on IModularNavigator {
   /// Optionally provide a [tab] query param (e.g. `find`).
   void pushShifts({String? tab}) {
     if (tab == null) {
-      pushNamed('/worker-main/shifts');
+      navigate('/worker-main/shifts');
     } else {
-      pushNamed('/worker-main/shifts?tab=$tab');
+      navigate('/worker-main/shifts', arguments: <String, dynamic>{
+        'initialTab': tab,
+      });
     }
   }
 

apps/mobile/packages/features/staff/home/lib/src/presentation/pages/worker_home_page.dart

@@ -132,8 +132,7 @@ class WorkerHomePage extends StatelessWidget {
                                 EmptyStateWidget(
                                   message: emptyI18n.no_shifts_today,
                                   actionLink: emptyI18n.find_shifts_cta,
-                                  onAction: () =>
-                                      Modular.to.pushShifts(tab: 'find'),
+                                  onAction: () => Modular.to.pushShifts(tab: 'find'),
                                 )
                               else
                                 Column(

apps/mobile/packages/features/staff/shifts/lib/src/presentation/blocs/shifts/shifts_bloc.dart

@@ -31,6 +31,7 @@ class ShiftsBloc extends Bloc<ShiftsEvent, ShiftsState> {
     on<LoadShiftsEvent>(_onLoadShifts);
     on<LoadHistoryShiftsEvent>(_onLoadHistoryShifts);
     on<LoadAvailableShiftsEvent>(_onLoadAvailableShifts);
+    on<LoadFindFirstEvent>(_onLoadFindFirst);
     on<LoadShiftsForRangeEvent>(_onLoadShiftsForRange);
     on<FilterAvailableShiftsEvent>(_onFilterAvailableShifts);
   }
@@ -113,6 +114,65 @@ class ShiftsBloc extends Bloc<ShiftsEvent, ShiftsState> {
     }
   }
 
+  Future<void> _onLoadFindFirst(
+    LoadFindFirstEvent event,
+    Emitter<ShiftsState> emit,
+  ) async {
+    if (state is! ShiftsLoaded) {
+      emit(const ShiftsLoaded(
+        myShifts: [],
+        pendingShifts: [],
+        cancelledShifts: [],
+        availableShifts: [],
+        historyShifts: [],
+        availableLoading: false,
+        availableLoaded: false,
+        historyLoading: false,
+        historyLoaded: false,
+        searchQuery: '',
+        jobType: 'all',
+      ));
+    }
+
+    final currentState =
+        state is ShiftsLoaded ? state as ShiftsLoaded : null;
+    if (currentState != null && currentState.availableLoaded) return;
+
+    if (currentState != null) {
+      emit(currentState.copyWith(availableLoading: true));
+    }
+
+    try {
+      final availableResult =
+          await getAvailableShifts(const GetAvailableShiftsArguments());
+      final loadedState = state is ShiftsLoaded
+          ? state as ShiftsLoaded
+          : const ShiftsLoaded(
+              myShifts: [],
+              pendingShifts: [],
+              cancelledShifts: [],
+              availableShifts: [],
+              historyShifts: [],
+              availableLoading: true,
+              availableLoaded: false,
+              historyLoading: false,
+              historyLoaded: false,
+              searchQuery: '',
+              jobType: 'all',
+            );
+      emit(loadedState.copyWith(
+        availableShifts: _filterPastShifts(availableResult),
+        availableLoading: false,
+        availableLoaded: true,
+      ));
+    } catch (_) {
+      if (state is ShiftsLoaded) {
+        final current = state as ShiftsLoaded;
+        emit(current.copyWith(availableLoading: false));
+      }
+    }
+  }
+
   Future<void> _onLoadShiftsForRange(
     LoadShiftsForRangeEvent event,
     Emitter<ShiftsState> emit,

apps/mobile/packages/features/staff/shifts/lib/src/presentation/blocs/shifts/shifts_event.dart

@@ -14,6 +14,8 @@ class LoadHistoryShiftsEvent extends ShiftsEvent {}
 
 class LoadAvailableShiftsEvent extends ShiftsEvent {}
 
+class LoadFindFirstEvent extends ShiftsEvent {}
+
 class LoadShiftsForRangeEvent extends ShiftsEvent {
   final DateTime start;
   final DateTime end;

apps/mobile/packages/features/staff/shifts/lib/src/presentation/pages/shifts_page.dart

@@ -21,6 +21,7 @@ class ShiftsPage extends StatefulWidget {
 class _ShiftsPageState extends State<ShiftsPage> {
   late String _activeTab;
   DateTime? _selectedDate;
+  bool _prioritizeFind = false;
   final ShiftsBloc _bloc = Modular.get<ShiftsBloc>();
 
   @override
@@ -28,12 +29,22 @@ class _ShiftsPageState extends State<ShiftsPage> {
     super.initState();
     _activeTab = widget.initialTab ?? 'myshifts';
     _selectedDate = widget.selectedDate;
-    _bloc.add(LoadShiftsEvent());
+    print('ShiftsPage init: initialTab=$_activeTab');
+    _prioritizeFind = widget.initialTab == 'find';
+    if (_prioritizeFind) {
+      _bloc.add(LoadFindFirstEvent());
+    } else {
+      _bloc.add(LoadShiftsEvent());
+    }
     if (_activeTab == 'history') {
+      print('ShiftsPage init: loading history tab');
       _bloc.add(LoadHistoryShiftsEvent());
     }
     if (_activeTab == 'find') {
-      _bloc.add(LoadAvailableShiftsEvent());
+      print('ShiftsPage init: entering find tab (not loaded yet)');
+      if (!_prioritizeFind) {
+        _bloc.add(LoadAvailableShiftsEvent());
+      }
     }
   }
 
@@ -43,6 +54,7 @@ class _ShiftsPageState extends State<ShiftsPage> {
     if (widget.initialTab != null && widget.initialTab != _activeTab) {
       setState(() {
         _activeTab = widget.initialTab!;
+        _prioritizeFind = widget.initialTab == 'find';
       });
     }
     if (widget.selectedDate != null && widget.selectedDate != _selectedDate) {
@@ -86,6 +98,7 @@ class _ShiftsPageState extends State<ShiftsPage> {
           final bool historyLoaded = (state is ShiftsLoaded)
               ? state.historyLoaded
               : false;
+          final bool blockTabsForFind = _prioritizeFind && !availableLoaded;
 
           // Note: "filteredJobs" logic moved to FindShiftsTab
           // Note: Calendar logic moved to MyShiftsTab
@@ -124,7 +137,7 @@ class _ShiftsPageState extends State<ShiftsPage> {
                             "My Shifts",
                             UiIcons.calendar,
                             myShifts.length,
-                            enabled: true,
+                            enabled: !blockTabsForFind,
                           ),
                           const SizedBox(width: 8),
                           _buildTab(
@@ -143,7 +156,7 @@ class _ShiftsPageState extends State<ShiftsPage> {
                             UiIcons.clock,
                             historyShifts.length,
                             showCount: historyLoaded,
-                            enabled: baseLoaded,
+                            enabled: !blockTabsForFind && baseLoaded,
                           ),
                         ],
                       ),

apps/mobile/packages/features/staff/shifts/lib/src/presentation/widgets/tabs/find_shifts_tab.dart

@@ -22,6 +22,12 @@ class _FindShiftsTabState extends State<FindShiftsTab> {
   String _searchQuery = '';
   String _jobType = 'all';
 
+  @override
+  void initState() {
+    super.initState();
+    print('FindShiftsTab init: tab entered, data pending');
+  }
+
   Widget _buildFilterTab(String id, String label) {
     final isSelected = _jobType == id;
     return GestureDetector(