diff --git a/apps/mobile/packages/features/staff/home/lib/src/data/repositories/home_repository_impl.dart b/apps/mobile/packages/features/staff/home/lib/src/data/repositories/home_repository_impl.dart index d2d61c63..508e350a 100644 --- a/apps/mobile/packages/features/staff/home/lib/src/data/repositories/home_repository_impl.dart +++ b/apps/mobile/packages/features/staff/home/lib/src/data/repositories/home_repository_impl.dart @@ -63,7 +63,15 @@ class HomeRepositoryImpl implements HomeRepository { final response = await ExampleConnector.instance.listShifts().execute(); return response.data.shifts - .where((s) => s.status is Known && (s.status as Known).value == ShiftStatus.OPEN) + .where((s) { + final isOpen = s.status is Known && (s.status as Known).value == ShiftStatus.OPEN; + if (!isOpen) return false; + + final start = s.startTime?.toDate(); + if (start == null) return false; + + return start.isAfter(DateTime.now()); + }) .take(10) .map((s) => _mapConnectorShiftToDomain(s)) .toList(); diff --git a/apps/mobile/packages/features/staff/home/lib/src/presentation/widgets/home_page/home_header.dart b/apps/mobile/packages/features/staff/home/lib/src/presentation/widgets/home_page/home_header.dart index 247d380e..17127ce5 100644 --- a/apps/mobile/packages/features/staff/home/lib/src/presentation/widgets/home_page/home_header.dart +++ b/apps/mobile/packages/features/staff/home/lib/src/presentation/widgets/home_page/home_header.dart @@ -53,9 +53,7 @@ class HomeHeader extends StatelessWidget { children: [ Text( headerI18n.welcome_back, - style: UiTypography.body3r.copyWith( - color: UiColors.mutedForeground, - ), + style: UiTypography.body3r.textSecondary, ), Text(nameToDisplay, style: UiTypography.headline4m), ],