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 6f332101..ea532d7a 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
@@ -117,9 +117,7 @@ class _ShiftDetailsPageState extends State<ShiftDetailsPage> {
             );
           }
 
-          final Shift displayShift = state is ShiftDetailsLoaded
-              ? widget.shift
-              : widget.shift;
+          final Shift displayShift = widget.shift;
           final i18n = Translations.of(context).staff_shifts.shift_details;
 
           final duration = _calculateDuration(displayShift);
diff --git a/apps/mobile/packages/features/staff/shifts/lib/src/presentation/widgets/shift_details/shift_details_bottom_bar.dart b/apps/mobile/packages/features/staff/shifts/lib/src/presentation/widgets/shift_details/shift_details_bottom_bar.dart
index 28a26d33..ccfeae3b 100644
--- a/apps/mobile/packages/features/staff/shifts/lib/src/presentation/widgets/shift_details/shift_details_bottom_bar.dart
+++ b/apps/mobile/packages/features/staff/shifts/lib/src/presentation/widgets/shift_details/shift_details_bottom_bar.dart
@@ -57,11 +57,10 @@ class ShiftDetailsBottomBar extends StatelessWidget {
 
   Widget _buildButtons(String status, dynamic i18n, BuildContext context) {
     if (status == 'confirmed') {
-      return Expanded(
-        child: UiButton.primary(
-          onPressed: () => Modular.to.toClockIn(),
-          child: Text(i18n.clock_in, style: UiTypography.body2b.white),
-        ),
+      return UiButton.primary(
+        onPressed: () => Modular.to.toClockIn(),
+        fullWidth: true,
+        child: Text(i18n.clock_in, style: UiTypography.body2b.white),
       );
     }