fix

lib/presentation/components/sheet/current_rides_sheet.dart

@@ -218,6 +218,9 @@ class _RideCardState extends State<_RideCard> {
     } else {
       displayTime = _elapsedTime;
     }
+
+    final isExpired = isReserved && (_reservationTime - _elapsedTime).isNegative;
+
     final timeString = _formatDuration(displayTime);
     final statusText = widget.order.status == 'Booking' ? 'Забронирован' : "Активный";
     final statusColor = widget.order.status == 'Booking' ?  Color(0xFFFFCC00) : Color(0xFF8bffaa);
@@ -347,7 +350,8 @@ class _RideCardState extends State<_RideCard> {
                     height: 32,
                     width: 100,
                     fontSize: 11,
-                    onTap: () {
+                    enabled: !isExpired,
+                    onTap: !isExpired ? () {
                       if (isReserved) {
                         Navigator.pop(context);
                         showModalBottomSheet(
@@ -374,7 +378,7 @@ class _RideCardState extends State<_RideCard> {
                           ),
                         );
                       }
-                    },
+                    } : null,
                   ),
                 ),
               ],

lib/presentation/components/sheet/payment_method_sheet.dart

@@ -174,7 +174,7 @@ class _PaymentMethodSheetState extends State<PaymentMethodSheet> {
                             if (widget.showBalance) ...[
                               PaymentOption(
                                 title: 'Баланс',
-                                subtitle: '${state.balance.toStringAsFixed(2)} BYN',
+                                subtitle: '${state.balance} баллов',
                                 isSelected: _selectedPaymentMethod == -1,
                                 onTap: () {
                                   setState(() {
@@ -192,7 +192,7 @@ class _PaymentMethodSheetState extends State<PaymentMethodSheet> {
                               return Padding(
                                 padding: const EdgeInsets.only(bottom: 12),
                                 child: PaymentOption(
-                                  title: card.isMain ? "Основная" : "",
+                                  title: card.isMain ? "Основная" : "Карта",
                                   subtitle: '${card.cardLastNumber}',
                                   isSelected: _selectedPaymentMethod == index,
                                   onTap: () async {

lib/presentation/components/sheet/tariff_sheet.dart

@@ -12,6 +12,7 @@ import '../../../domain/entities/payment_card.dart';
 import '../../../domain/entities/scooter.dart';
 import '../../../domain/entities/tariff.dart';
 import '../../../domain/usecase/get_payment_cards_usecase.dart';
+import '../../../domain/usecase/get_profile_usecase.dart';
 import '../../../domain/usecase/set_main_payment_card_usecase.dart';
 import '../../event/payment_method_sheet_event.dart';
 import '../../event/tariff_sheet_event.dart';
@@ -40,6 +41,24 @@ class _TariffSheetState extends State<TariffSheet> {
 
   @override
   Widget build(BuildContext context) {
+    final double remainingKm = (62 * widget.scooter.batteryLevel) / 100;
+
+    final String kmText = remainingKm % 1 == 0
+        ? '${remainingKm.toInt()} км'
+        : '${remainingKm.toStringAsFixed(1)} км';
+
+    final int totalMinutes = ((150 * widget.scooter.batteryLevel) / 100).round();
+    final int hours = totalMinutes ~/ 60;
+    final int minutes = totalMinutes % 60;
+
+    String timeText = '';
+    if (hours > 0 && minutes > 0) {
+      timeText = '$hours ч $minutes мин';
+    } else if (hours > 0) {
+      timeText = '$hours ч';
+    } else {
+      timeText = '$minutes мин';
+    }
     return BlocConsumer<TariffSheetBloc, TariffSheetState>(
       listener: (context, state) {
         if (state.status == TariffSheetStatus.failure && state.errorMessage != null) {
@@ -135,7 +154,6 @@ class _TariffSheetState extends State<TariffSheet> {
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    // 🔹 HEADER
                     Padding(
                       padding: const EdgeInsets.symmetric(horizontal: 20),
                       child: Row(
@@ -227,7 +245,7 @@ class _TariffSheetState extends State<TariffSheet> {
                                   const SizedBox(width: 12),
                                   Expanded(
                                     child: Text(
-                                      'Заряда хватит на 4 часа 17 минут\nили 47 км',
+                                      'Заряда хватит на $kmText или $timeText',
                                       style: const TextStyle(
                                         color: Colors.white,
                                         fontSize: 13,
@@ -303,6 +321,7 @@ class _TariffSheetState extends State<TariffSheet> {
                                 create: (context) => PaymentMethodSheetBloc(
                                   getIt<GetPaymentCardsUsecase>(),
                                   getIt<SetMainPaymentCardUsecase>(),
+                                  getIt<GetProfileUseCase>(),
                                 )..add(PaymentMethodSheetStarted()),
                                 child: PaymentMethodSheet(
                                   initialSelectedCard: state.useBalance ? null : state.selectedCard,
@@ -547,7 +566,7 @@ class _TariffCard extends StatelessWidget {
                     context: context,
                     isScrollControlled: true,
                     backgroundColor: Colors.transparent,
-                    builder: (context) => TariffInfoSheet(
+                    builder: (_) => TariffInfoSheet(
                         tariff: tariff,
                         isInsurance: isInsurance,
                         onChanged: (val) {