Merge remote-tracking branch 'upstream/main' into consultations

lib/features/consultations/models/consultation_model.dart

@@ -10,12 +10,14 @@ abstract class ConsultationModel with _$ConsultationModel {
   factory ConsultationModel({
     required int id,
     @JsonKey(name: 'last_state') required ChosenPlanStateEnum chosenPlanState,
-    required String planTitle,
+    @JsonKey(name: 'plan_title') required String planTitle,
-    required String userName,
+    @JsonKey(name: 'user_name') required String userName,
-    required String userSlug,
+    @JsonKey(name: 'user_slug') required String userSlug,
-    required double consultantPayment,
+    @JsonKey(name: 'consultant_payment') required double consultantPayment,
     required int duration,
-    required int currentDiaryDay,
+    @JsonKey(name: 'current_diary_day') required int currentDiaryDay,
+    @JsonKey(name: 'user_profile_photo_url') required String userProfilePhotoUrl,
+    @JsonKey(name: 'consultation_option_price') required int consultationOptionPrice,
     @JsonKey(name: 'start_date', fromJson: parseDate) required DateTime startDate,
     @JsonKey(name: 'end_date', fromJson: parseDate) required DateTime endDate,
     @JsonKey(name: 'consultant_id') required int consultantId,

lib/features/consultations/presentation/pages/consultations_screen.dart

@@ -42,7 +42,9 @@ class ConsultationsContent extends StatelessWidget {
             ),
             body: switch (state.state) {
               BaseState.loading => const Loader(),
-              BaseState.error => DataErrorWidget(onReload: () async {}),
+              BaseState.error => DataErrorWidget(onReload: () async {
+                  context.read<ConsultationsCubit>().loadConsultations();
+                }),
               BaseState.initial => const Loader(),
               BaseState.success => ListView.separated(
                   padding: const EdgeInsets.symmetric(vertical: 12),

lib/features/consultations/presentation/widgets/consultation_card_widget.dart

@@ -71,8 +71,9 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
           children: [
             Row(
               children: [
-                const CircleAvatar(
+                CircleAvatar(
                   radius: 30,
+                  backgroundImage: NetworkImage(widget.consultationsModel.userProfilePhotoUrl),
                 ),
                 const SizedBox(width: 12),
                 Column(
@@ -272,7 +273,7 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
             const CustomDivider(),
             const SizedBox(height: 12),
             Text(
-              '${widget.consultationsModel.consultantPayment.toStringAsFixed(0)} ₽',
+              '${widget.consultationsModel.consultationOptionPrice.toStringAsFixed(0)} ₽',
               style: const TextStyle(
                 color: Color(0xFF019A3E),
                 fontSize: 20,