some fix

# Conflicts:
#	lib/presentation/navigation/app_router.dart
#	pubspec.yaml

lib/presentation/viewmodel/current_rides_bloc.dart

@@ -1,42 +1,42 @@
-import 'package:be_happy/domain/usecase/get_profile_usecase.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '../../core/result.dart';
-import '../../domain/entities/scooter_order.dart';
-import '../../domain/usecase/get_client_orders_usecase.dart';
-import '../event/current_rides_event.dart';
-import '../state/current_rides_state.dart';
-
-class CurrentRidesBloc extends Bloc<CurrentRidesEvent, CurrentRidesState> {
-  final GetClientOrdersUsecase _getClientOrdersUsecase;
-
-  CurrentRidesBloc(this._getClientOrdersUsecase) : super(const CurrentRidesState()) {
-    on<LoadClientOrders>(_onLoadClientOrders);
-  }
-
-  Future<void> _onLoadClientOrders(
-    LoadClientOrders event,
-    Emitter<CurrentRidesState> emit,
-  ) async {
-    emit(state.copyWith(status: CurrentRidesStatus.loading));
-
-    await Future.delayed(const Duration(seconds: 2));
-
-    final result = await _getClientOrdersUsecase();
-
-    if (result is Success<List<ScooterOrder>>) {
-
-      print("RESULT: ${result.data}");
-
-      emit(state.copyWith(
-        status: CurrentRidesStatus.success,
-        orders: result.data ?? [],
-      ));
-    } else if (result is Failure) {
-      emit(state.copyWith(
-        status: CurrentRidesStatus.failure,
-        errorMessage: "Не удалось загрузить заказы",
-      ));
-    }
-  }
-}
+import 'package:be_happy/domain/usecase/get_profile_usecase.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../../core/result.dart';
+import '../../domain/entities/scooter_order.dart';
+import '../../domain/usecase/get_client_orders_usecase.dart';
+import '../event/current_rides_event.dart';
+import '../state/current_rides_state.dart';
+
+class CurrentRidesBloc extends Bloc<CurrentRidesEvent, CurrentRidesState> {
+  final GetClientOrdersUsecase _getClientOrdersUsecase;
+
+  CurrentRidesBloc(this._getClientOrdersUsecase) : super(const CurrentRidesState()) {
+    on<LoadClientOrders>(_onLoadClientOrders);
+  }
+
+  Future<void> _onLoadClientOrders(
+    LoadClientOrders event,
+    Emitter<CurrentRidesState> emit,
+  ) async {
+    emit(state.copyWith(status: CurrentRidesStatus.loading));
+
+    await Future.delayed(const Duration(seconds: 2));
+
+    final result = await _getClientOrdersUsecase();
+
+    if (result is Success<List<ScooterOrder>>) {
+
+      print("RESULT: ${result.data}");
+
+      emit(state.copyWith(
+        status: CurrentRidesStatus.success,
+        orders: result.data ?? [],
+      ));
+    } else if (result is Failure) {
+      emit(state.copyWith(
+        status: CurrentRidesStatus.failure,
+        errorMessage: "Не удалось загрузить заказы",
+      ));
+    }
+  }
+}