пофиксили отображение коунтера карусели при переключении картинок, при посте с одной картинкой и одним видео. добавили таймер на видео.

Reviewed-on: #1

.gitea/workflows/test.yml

@@ -152,9 +152,10 @@ jobs:
 
       - name: Get dependencies
         run: |
-          flutter clean
-          flutter pub get
-          dart run build_runner build --delete-conflicting-outputs
+            flutter clean
+            flutter pub cache repair
+            flutter pub get
+            dart run build_runner build --delete-conflicting-outputs
 
       - name: Native Analyze
         run: flutter analyze

.kilocode/rules/memory-bank/context.md

@@ -1,7 +1,7 @@
 # Current Context
 
 ## Project Status
-Memory Bank initialized on 2025-10-16. This is a mature Flutter application (v1.3.0+79) currently in production.
+Memory Bank initialized on 2025-10-16. This is a mature Flutter application (v1.3.24+106) currently in production.
 
 ## Recent Activity
 - Memory Bank initialization completed
@@ -9,10 +9,19 @@ Memory Bank initialized on 2025-10-16. This is a mature Flutter application (v1.
 - Architecture and technology stack catalogued
 
 ## Current Focus
-Ready for development tasks. No active work in progress.
+Виджет видеоплеера ленты (`lib/features/feed/presentation/widgets/feed_video_player_widget.dart`)
+мигрирован с `webview_flutter` v4 на `flutter_inappwebview` 6.1.5. Цель — фикс
+fullscreen-кнопки внутри embed-плеера (Rutube/YouTube): `webview_flutter` не реализует
+Android `WebChromeClient.onShowCustomView/onHideCustomView`, а `flutter_inappwebview`
+делает это нативно (`InAppWebViewChromeClient`). Паритет UX сохранён (превью → play →
+скрытая загрузка → fade-in по Rutube `player:canPlay`, плюс страховочный таймер 4с
+для провайдеров без этого протокола). Добавлена ориентация landscape на fullscreen.
+Остальные 4 экрана на `webview_flutter` не трогались; обе зависимости в `pubspec.yaml`.
 
 ## Known Issues
-None documented at initialization.
+- 2 теста в `test/features/feed/` (`post_feed_pagination_model_test`,
+  `post_feed_mapper_test`) падают на ветке `personalized_feed` — пре-существующие,
+  связаны с fixtures/маппингом, не с видеоплеером.
 
 ## Next Steps
 Awaiting user direction for:

Makefile

@@ -10,4 +10,4 @@ build-generated-files:
 	dart run build_runner build --delete-conflicting-outputs
 
 clean-coverage:
-	@./scripts/remove_generated_from_coverage.sh
+	@./scripts/remove_generated_from_coverage.sh

android/app/src/main/AndroidManifest.xml

@@ -88,5 +88,168 @@
             <action android:name="android.intent.action.PROCESS_TEXT"/>
             <data android:mimeType="text/plain"/>
         </intent>
+        <!-- SBP bank packages for СБП payment detection -->
+        <package android:name="ru.sberbankmobile" />
+        <package android:name="com.idamob.tinkoff.android" />
+        <package android:name="ru.vtb24.mobilebanking.android" />
+        <package android:name="ru.alfabank.mobile.android" />
+        <package android:name="ru.raiffeisennews" />
+        <package android:name="com.openbank" />
+        <package android:name="ru.gazprombank.android.mobilebank.app" />
+        <package android:name="com.logo.mbanking" />
+        <package android:name="ru.sovcomcard.halva.v1" />
+        <package android:name="ru.rosbank.android" />
+        <package android:name="ru.rshb.dbo" />
+        <package android:name="ru.mkb.mobile" />
+        <package android:name="ru.ucb.android" />
+        <package android:name="ru.unicredit.android" />
+        <package android:name="ru.skbbank.ib" />
+        <package android:name="ru.gebank.ib" />
+        <package android:name="ru.avangard.sbpent" />
+        <package android:name="ru.elplat.elplat2" />
+        <package android:name="com.bifit.rncbbeta" />
+        <package android:name="ru.ftc.faktura.expobank" />
+        <package android:name="com.bssys.vbrrretail" />
+        <package android:name="ru.wildberries.razz" />
+        <package android:name="ru.artsofte.russiafl" />
+        <package android:name="ru.ftc.faktura.multibank" />
+        <package android:name="ru.bank_hlynov.xbank" />
+        <package android:name="ru.ftc.faktura.vesta" />
+        <package android:name="com.isimplelab.ibank.solidarnost" />
+        <package android:name="com.bssys.roscapretail" />
+        <package android:name="ru.ftc.faktura.kbhmb" />
+        <package android:name="ru.mts.money" />
+        <package android:name="ru.ftc.faktura.pskb" />
+        <package android:name="ru.ftc.faktura.nskbl" />
+        <package android:name="ru.akbars.mobile" />
+        <package android:name="ru.ftc.faktura.rostfinance" />
+        <package android:name="ru.ilb.bbmobile" />
+        <package android:name="ru.mcbankrus.MCBankRus" />
+        <package android:name="ru.albank.online.aebit" />
+        <package android:name="com.bifit.mobile.citizen.icbru" />
+        <package android:name="ru.ftc.faktura.orbank" />
+        <package android:name="ru.ftc.faktura.agropromkredit" />
+        <package android:name="com.energobank.digital" />
+        <package android:name="com.bifit.mobile.citizen.kbnk" />
+        <package android:name="ru.ftc.faktura.sdm" />
+        <package android:name="com.bifit.mobile.citizen.mbb" />
+        <package android:name="ru.ftc.faktura.absolutbank" />
+        <package android:name="ru.ftc.faktura.akcept" />
+        <package android:name="ru.faktura.etbank.person" />
+        <package android:name="ru.ftc.faktura.razvitiestolica" />
+        <package android:name="ru.ftc.faktura.resokreditbank" />
+        <package android:name="ru.yoo.money" />
+        <package android:name="ru.bspb" />
+        <package android:name="com.isimplelab.ibank.kubankredit" />
+        <package android:name="com.tochka.bank" />
+        <package android:name="com.bssys.novikomretail" />
+        <package android:name="ru.rosdorbank.physical" />
+        <package android:name="ru.ftc.faktura.primsoc" />
+        <package android:name="ru.ftc.faktura.banksaratov" />
+        <package android:name="ru.ftc.faktura.tavrich" />
+        <package android:name="com.bifit.mobile.citizen.thbank" />
+        <package android:name="ru.ftc.faktura.kremlevskiy" />
+        <package android:name="ru.ftc.faktura.tkbbank" />
+        <package android:name="ru.chelyabinvestbank.investpay" />
+        <package android:name="ru.ftc.faktura.derzhava" />
+        <package android:name="ru.nbd.android" />
+        <package android:name="ru.sngb.dbo.client.android" />
+        <package android:name="ru.ftc.faktura.united" />
+        <package android:name="ru.ftc.faktura.venetsbank" />
+        <package android:name="ru.letobank.Prometheus" />
+        <package android:name="ru.simpls.brs2.mobbank" />
+        <package android:name="com.bifit.dvbank" />
+        <package android:name="ru.ftc.faktura.intesabank" />
+        <package android:name="com.mmonline.mobile" />
+        <package android:name="cb.ibank.vuz" />
+        <package android:name="ru.uralprombank.mobilebanknew.googleplay" />
+        <package android:name="ru.ftc.faktura.nsbank" />
+        <package android:name="ru.emb.android" />
+        <package android:name="ru.ftc.faktura.maritimebank" />
+        <package android:name="com.credituralbank.CUBmobilenew" />
+        <package android:name="com.isimplelab.isimpleceo.uglemet" />
+        <package android:name="com.bssys.stroylesretail" />
+        <package android:name="ru.ftc.faktura.iturup" />
+        <package android:name="ru.ftc.faktura.finbank" />
+        <package android:name="ru.faktura.gaztransbank.person" />
+        <package android:name="com.isimplelab.ibank.chelind" />
+        <package android:name="ru.ftc.faktura.nokss" />
+        <package android:name="ru.ftc.faktura.vlbb" />
+        <package android:name="ru.ftc.faktura.kbb" />
+        <package android:name="ru.faktura.avtograd.person" />
+        <package android:name="ru.ftc.faktura.forshtadt" />
+        <package android:name="ru.ftc.faktura.solidbank" />
+        <package android:name="ru.ftc.faktura.alexbank" />
+        <package android:name="ru.ftc.faktura.akibank" />
+        <package android:name="ru.ftc.faktura.nipbank" />
+        <package android:name="ru.ftc.faktura.alefbank" />
+        <package android:name="com.bifit.vfbank" />
+        <package android:name="com.bssys.uralfdretail" />
+        <package android:name="com.snb.online" />
+        <package android:name="com.bifit.mobile.citizen.okbank" />
+        <package android:name="com.tatsotsbank.dbomobile" />
+        <package android:name="ru.vtkbank.android" />
+        <package android:name="ru.faktura.jtbank.person" />
+        <package android:name="ru.ftc.faktura.ns" />
+        <package android:name="ru.ftc.faktura.zemskybank" />
+        <package android:name="com.bssys.aversretail" />
+        <package android:name="ru.rusnarbank.correqts.retail" />
+        <package android:name="ru.ftc.faktura.baikalinvestbank" />
+        <package android:name="ru.sbi.android" />
+        <package android:name="com.metkombank.mobile" />
+        <package android:name="com.isimplelab.ionic.kazan.fl" />
+        <package android:name="com.intervale.sbpas" />
+        <package android:name="com.bifit.mobile.citizen.zarech" />
+        <package android:name="ru.centrinvest.mobilebanking2018" />
+        <package android:name="com.mifors.izhcombank" />
+        <package android:name="com.bifit.pmobile.isbank" />
+        <package android:name="ru.zenit.android" />
+        <package android:name="ru.briginvest.sense" />
+        <package android:name="com.bifit.mobile.citizen.cfb" />
+        <package android:name="com.isimplelab.ionic.gorbank.prod" />
+        <package android:name="ru.ftc.faktura.moscombank" />
+        <package android:name="com.timerbank.retail" />
+        <package android:name="com.mob.android" />
+        <package android:name="com.citibank.mobile.ru" />
+        <package android:name="com.bifit.atbbank" />
+        <package android:name="ru.mw" />
+        <package android:name="ru.bankuralsib.mb.android" />
+        <package android:name="com.banksoyuz.artsofte" />
+        <package android:name="ru.rubank.ubsmobile" />
+        <package android:name="cb.ibank" />
+        <package android:name="ru.ipb.ubsmobile" />
+        <package android:name="com.openwaygroup.ic.panda.poidem" />
+        <package android:name="com.bifit.mobile.citizen.tenderbank" />
+        <package android:name="ru.otpbank.mobile" />
+        <package android:name="ru.krk.ubsmobile" />
+        <package android:name="ru.homecredit.mycredit" />
+        <package android:name="cz.bsc.rc" />
+        <package android:name="com.bifit.mobile.citizen.belsocbank" />
+        <package android:name="com.hicebank.android" />
+        <package android:name="com.bpc.crossplatform_trading.bpc_trading" />
+        <package android:name="com.bifit.nrb" />
+        <package android:name="com.bifit.mobile.citizen.moskb" />
+        <package android:name="ru.isfront.android.kt" />
+        <package android:name="ru.ftc.faktura.novobank" />
+        <package android:name="com.smp.android" />
+        <package android:name="com.bifit.mobile.citizen.nkbank" />
+        <package android:name="com.isimplelab.ibank.toyota" />
+        <package android:name="com.bifit.mobile.private.bbr" />
+        <package android:name="ru.ftc.faktura.lanta" />
+        <package android:name="com.yandex.bank" />
+        <package android:name="ru.ftc.faktura.bgfbank" />
+        <package android:name="com.idamobile.android.LockoBank" />
+        <package android:name="com.bifit.mobile.citizen.MCBank" />
+        <package android:name="com.cetelem.cetelem_android" />
+        <package android:name="com.bssys.gutaretail" />
+        <package android:name="ru.ftc.faktura.siab" />
+        <package android:name="com.isimplelab.ionic.round.prod" />
+        <package android:name="com.priobank.prio" />
+        <package android:name="com.inbank.mobilebank" />
+        <package android:name="com.isimplelab.isimplemobile.payjet" />
+        <package android:name="ru.ftc.faktura.agroros" />
+        <package android:name="com.bifit.mobile.citizen.invb" />
+        <package android:name="com.compassplus.mobicash.customer" />
+        <package android:name="ru.finambank.app" />
     </queries>
 </manifest>

ios/Runner/Info.plist

@@ -74,6 +74,57 @@
 		<string>yandexauth</string>
 		<string>yandexauth2</string>
 		<string>yandexauth4</string>
+		<!-- SBP bank schemes (top ~50 by popularity, iOS 15+ caps at 50) -->
+		<string>bank100000000111</string>
+		<string>bank100000000004</string>
+		<string>bank100000000005</string>
+		<string>bank100000000008</string>
+		<string>bank100000000007</string>
+		<string>bank100000000015</string>
+		<string>bank100000000001</string>
+		<string>bank100000000010</string>
+		<string>bank100000000013</string>
+		<string>bank100000000012</string>
+		<string>bank100000000020</string>
+		<string>bank100000000025</string>
+		<string>bank100000000030</string>
+		<string>bank100000000030_new</string>
+		<string>bank100000000003</string>
+		<string>bank100000000043</string>
+		<string>bank100000000028</string>
+		<string>bank100000000086</string>
+		<string>bank100000000011</string>
+		<string>bank100000000044</string>
+		<string>bank100000000049</string>
+		<string>bank100000000500</string>
+		<string>bank100000000095</string>
+		<string>bank100000000900</string>
+		<string>bank100000000056</string>
+		<string>bank100000000053</string>
+		<string>bank100000000121</string>
+		<string>bank100000000082</string>
+		<string>bank100000000127</string>
+		<string>bank100000000017</string>
+		<string>bank100000000087</string>
+		<string>bank100000000052</string>
+		<string>bank100000000006</string>
+		<string>bank100000000098</string>
+		<string>bank100000000092</string>
+		<string>bank100000000229</string>
+		<string>bank100000000027</string>
+		<string>bank100000000080</string>
+		<string>bank100000000122</string>
+		<string>bank100000000124</string>
+		<string>bank100000000118</string>
+		<string>bank100000000159</string>
+		<string>bank100000000146</string>
+		<string>bank100000000069</string>
+		<string>bank100000000140</string>
+		<string>bank100000000047</string>
+		<string>bank100000000099</string>
+		<string>bank100000000135</string>
+		<string>bank100000000139</string>
+		<string>bank100000000022</string>
 	</array>
 	<key>YAClientId</key>
 	<string>5399b03636104c6d920b87c1ad329254</string>

lib/core/app_router.dart

@@ -123,7 +123,21 @@ class AppRouter {
     return '${InfoByOrderScreen.path}?planId=$consultationId';
   }
 
-  static String? _resolveDeepLinkUri(Uri uri) {
+  /// Deep link после оплаты Alfa: `finance/alfa/return/{orderId}` → чат с query `orderId`.
+  static String? _resolveFinanceAlfaReturnDeepLink(List<String> effectiveSegments) {
+    if (effectiveSegments.length != 4 ||
+        effectiveSegments[1] != 'alfa' ||
+        effectiveSegments[2] != 'return') {
+      return null;
+    }
+    final orderId = effectiveSegments[3];
+    if (orderId.isEmpty) return null;
+    developer.log('Deep link: finance/alfa/return/$orderId', name: 'AppRouter');
+    return '${RouteConstants.chatScreen}?orderId=$orderId';
+  }
+
+  /// Разбирает deep link URI в внутренний route target (или null, если host не наш).
+  static String? resolveDeepLinkTarget(Uri uri) {
     final host = uri.host.toLowerCase();
     final segments = uri.pathSegments;
 
@@ -189,6 +203,10 @@ class AppRouter {
         final target = _resolveConsultationsDeepLink(effectiveSegments);
         if (target != null) return target;
         break;
+      case 'finance':
+        final target = _resolveFinanceAlfaReturnDeepLink(effectiveSegments);
+        if (target != null) return target;
+        break;
     }
 
     developer.log('Unknown deep link format: ${effectiveSegments.length} effective segments, type=$type, redirecting to feed', name: 'AppRouter');
@@ -196,7 +214,7 @@ class AppRouter {
   }
 
   static String? _handleRedirect(BuildContext context, GoRouterState state) {
-    return _resolveDeepLinkUri(state.uri);
+    return resolveDeepLinkTarget(state.uri);
   }
 
   static void navigateByDeepLinkUrl(String url) {
@@ -230,7 +248,7 @@ class AppRouter {
       );
     }
 
-    final target = _resolveDeepLinkUri(uri);
+    final target = resolveDeepLinkTarget(uri);
     FlutterNativeSplash.remove();
     if (target != null) {
       appRouter.go(target);

lib/core/di/cubit_registrations.dart

@@ -39,6 +39,7 @@ import 'package:eatvio_app/features/my_finance/presentation/cubit/user_cards_cub
 import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_cubit.dart';
 import 'package:eatvio_app/features/notifications/presentation/notifications_cubit/notifications_cubit.dart';
 import 'package:eatvio_app/features/order_info/cubit/order_info_cubit.dart';
+import 'package:eatvio_app/features/payment/presentation/cubit/consultation_payment_cubit/consultation_payment_cubit.dart';
 import 'package:eatvio_app/features/personal_diet_suggestion/cubit/personal_diet_suggestion_cubit.dart';
 import 'package:eatvio_app/features/plans/presentation/cubit/about_plan_cubit.dart';
 import 'package:eatvio_app/features/profile/presentation/bloc/plans_cubit/plans_cubit.dart' as profile_plans;
@@ -135,6 +136,9 @@ class CubitRegistrations {
     sl.registerFactory<ComplainingCubit>(() => ComplainingCubit(repository: sl()));
     sl.registerFactory<UserCardsCubit>(() => UserCardsCubit(cardsRepository: sl()));
     sl.registerFactory<OrderInfoCubit>(() => OrderInfoCubit(chatRepository: sl(), profileRepository: sl()));
+    sl.registerFactory<ConsultationPaymentCubit>(
+      () => ConsultationPaymentCubit(paymentRepository: sl(), sbpRepository: sl()),
+    );
     sl.registerFactory<ConsultationsCubit>(() => ConsultationsCubit(consultationsRepository: sl()));
     sl.registerFactory<ConsultantCommentsCubit>(() => ConsultantCommentsCubit(diaryRepository: sl()));
     sl.registerFactory<CancelPlanCubit>(() => CancelPlanCubit(cancelPlanRepository: sl()));

lib/core/di/repository_registrations.dart

@@ -24,6 +24,8 @@ import 'package:eatvio_app/features/my_diets/repositories/my_diets_repository.da
 import 'package:eatvio_app/features/my_finance/repositories/cards_repository.dart';
 import 'package:eatvio_app/features/my_plans/repositories/my_diets_repository.dart';
 import 'package:eatvio_app/features/notifications/repository/notifications_repository.dart';
+import 'package:eatvio_app/features/payment/repositories/payment_repository.dart';
+import 'package:eatvio_app/features/payment/repositories/sbp_repository.dart';
 import 'package:eatvio_app/features/personal_diet_suggestion/repository/personal_diet_suggestion_repository.dart';
 import 'package:eatvio_app/features/plans/repositories/plan_repository.dart';
 import 'package:eatvio_app/features/plans/repositories/plans_repository.dart';
@@ -74,6 +76,8 @@ class RepositoryRegistrations {
     sl.registerLazySingleton<BlockedUsersRepository>(() => BlockedUsersRepository(blockedUserService: sl()));
     sl.registerLazySingleton<CommentsRepository>(() => CommentsRepository(service: sl()));
     sl.registerLazySingleton<NotificationSettingsRepository>(() => NotificationSettingsRepository(sl()));
+    sl.registerLazySingleton<SbpRepository>(() => SbpRepository(sbpService: sl()));
+    sl.registerLazySingleton<PaymentRepository>(() => PaymentRepository(chatService: sl()));
     sl.registerLazySingleton<PersonalDietSuggestionRepository>(() => PersonalDietSuggestionRepository(personalDietSuggestionService: sl()));
     sl.registerLazySingleton<RegistrationRepositoryV2>(() => RegistrationRepositoryV2(registrationService: sl()));
 

lib/core/di/service_registrations.dart

@@ -26,6 +26,7 @@ import 'package:eatvio_app/features/my_diets/services/my_diets_service.dart';
 import 'package:eatvio_app/features/my_finance/services/cards_service.dart';
 import 'package:eatvio_app/features/my_plans/services/my_plans_service.dart';
 import 'package:eatvio_app/features/notifications/service/notifications_service.dart';
+import 'package:eatvio_app/features/payment/services/sbp_service.dart';
 import 'package:eatvio_app/features/personal_diet_suggestion/services/personal_diet_suggestion_service.dart';
 import 'package:eatvio_app/features/plans/services/plan_service.dart';
 import 'package:eatvio_app/features/plans/services/plans_service.dart';
@@ -82,6 +83,7 @@ class ServiceRegistrations {
     sl.registerLazySingleton<ConsultantRatingService>(() => ConsultantRatingService(sl()));
     sl.registerLazySingleton<NotificationSettingsService>(() => NotificationSettingsService(sl()));
     sl.registerLazySingleton<ViewsService>(() => ViewsService(sl()));
+    sl.registerLazySingleton<SbpService>(() => const SbpServiceImpl());
     sl.registerLazySingleton<PersonalDietSuggestionService>(() => PersonalDietSuggestionService(sl()));
     sl.registerLazySingleton<RegistrationServiceV2>(() => RegistrationServiceV2(sl()));
 

lib/core/error_reporting/error_report_policy.dart

@@ -45,6 +45,7 @@ class ErrorReportPolicy {
       case DioExceptionType.sendTimeout:
       case DioExceptionType.receiveTimeout:
       case DioExceptionType.connectionError:
+      case DioExceptionType.transformTimeout:
         return true;
       case DioExceptionType.unknown:
       case DioExceptionType.badResponse:

lib/core/routing/other_routes.dart

@@ -211,13 +211,23 @@ class OtherRoutes {
         name: 'chatScreen',
         builder: (context, state) {
           final uuidFromQuery = state.uri.queryParameters['uuid'];
-          if (uuidFromQuery != null) {
-            return ChatScreen(uuid: uuidFromQuery, sendInitialMessage: false);
+          final orderIdFromQuery = state.uri.queryParameters['orderId'];
+          if (uuidFromQuery != null || orderIdFromQuery != null) {
+            return ChatScreen(
+              uuid: uuidFromQuery,
+              orderId: orderIdFromQuery,
+              sendInitialMessage: false,
+            );
           }
           final data = state.extra as Map<String, dynamic>;
-          final uuid = data['uuid'] as String;
+          final uuid = data['uuid'] as String?;
+          final orderId = data['orderId'] as String?;
           final sendInitialMessage = data['sendInitialMessage'] as bool?;
-          return ChatScreen(uuid: uuid, sendInitialMessage: sendInitialMessage);
+          return ChatScreen(
+            uuid: uuid,
+            orderId: orderId,
+            sendInitialMessage: sendInitialMessage,
+          );
         },
       ),
       GoRoute(

lib/features/chat/models/order_id_to_conversation_model.dart

@@ -0,0 +1,15 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'order_id_to_conversation_model.freezed.dart';
+part 'order_id_to_conversation_model.g.dart';
+
+@freezed
+abstract class OrderIdToConversationModel with _$OrderIdToConversationModel {
+  factory OrderIdToConversationModel({
+    @JsonKey(name: 'chosen_plan_id') required int chosenPlanId,
+    @JsonKey(name: 'conversation_uuid') required String conversationUuid,
+  }) = _OrderIdToConversationModel;
+
+  factory OrderIdToConversationModel.fromJson(Map<String, dynamic> json) =>
+      _$OrderIdToConversationModelFromJson(json);
+}

lib/features/chat/models/payment_model.dart

@@ -5,10 +5,12 @@ part 'payment_model.g.dart';
 
 @freezed
 abstract class PaymentModel with _$PaymentModel {
-
   factory PaymentModel({
     @JsonKey(name: 'checkout_url') required String paymentUrl,
+    @JsonKey(name: 'order_id') String? orderId,
+    @JsonKey(name: 'payment_provider') String? paymentProvider,
   }) = _PaymentModel;
 
-  factory PaymentModel.fromJson(Map<String, dynamic> json) => _$PaymentModelFromJson(json);
-}
+  factory PaymentModel.fromJson(Map<String, dynamic> json) =>
+      _$PaymentModelFromJson(json);
+}

lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart

@@ -91,17 +91,38 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
     }
   }
 
-  Future<void> initChat(String uuid, {bool sendInitialMessage = false}) async {
+  /// Инициализирует чат по [uuid] либо по [orderId] (resolve → conversation_uuid).
+  ///
+  /// При наличии [orderId] сначала вызывается
+  /// `GET /api/consultation/resolve/order_id_to_conversation/{orderId}`.
+  ///
+  /// Возвращает conversation uuid, которым инициализировали чат (для reload без повторного resolve).
+  Future<String?> initChat(String? uuid, {String? orderId, bool sendInitialMessage = false}) async {
     try {
       emit(const ChatRoomState.loading());
-      final chatRoom = await chatRepository.getChatRoom(uuid);
-      ChosenPlanModel? chosenPlan;
-      if (chatRoom.chosenPlanId != null) {
-        chosenPlan = await chatRepository.getChosenPlan(id: chatRoom.chosenPlanId!);
+
+      String? resolvedUuid = uuid;
+      int? resolvedChosenPlanId;
+
+      if (orderId != null && orderId.isNotEmpty) {
+        final resolved = await chatRepository.resolveOrderIdToConversation(orderId: orderId);
+        resolvedUuid = resolved.conversationUuid;
+        resolvedChosenPlanId = resolved.chosenPlanId;
       }
-      final chatMessages = await chatRepository.getChatMessages(uuid, currentPage);
+
+      if (resolvedUuid == null || resolvedUuid.isEmpty) {
+        throw ArgumentError('initChat requires uuid or orderId');
+      }
+
+      final chatRoom = await chatRepository.getChatRoom(resolvedUuid);
+      ChosenPlanModel? chosenPlan;
+      final planId = resolvedChosenPlanId ?? chatRoom.chosenPlanId;
+      if (planId != null) {
+        chosenPlan = await chatRepository.getChosenPlan(id: planId);
+      }
+      final chatMessages = await chatRepository.getChatMessages(resolvedUuid, currentPage);
       lastPage = chatMessages.meta.lastPage;
-      await _subscribeToChatChannel(uuid: uuid, chatId: chatRoom.id);
+      await _subscribeToChatChannel(uuid: resolvedUuid, chatId: chatRoom.id);
       emit(
         ChatRoomState.loaded(
           chatRoom: chatRoom.copyWith(chosenPlan: chosenPlan),
@@ -115,6 +136,7 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
       if (chosenPlan?.consultantId == chatRoom.users.sender.id) {
         await checkCards();
       }
+      return resolvedUuid;
     } catch (e, st) {
       await reportFrom(e, st, this);
       log(e.toString());
@@ -122,6 +144,7 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
       messagesSubscription?.cancel();
       wsManager.unsubscribeDirectChatChannel();
       emit(const ChatRoomState.error(errorMessage: 'Ошибка получеия данных'));
+      return null;
     }
   }
 
@@ -297,7 +320,7 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
     try {
       final planId = (state as ChatRoomStateLoaded).chatRoom.chosenPlan?.id;
       if (planId == null) return null;
-      final paymentModel = await chatRepository.getPaymentLink(id: planId);
+      final paymentModel = await chatRepository.getPaymentLink(id: planId, paymentProvider: 'alfa-bank');
       return paymentModel.paymentUrl;
     } catch (e, st) {
       await reportFrom(e, st, this);

lib/features/chat/presentation/pages/chat_screen.dart

@@ -36,10 +36,11 @@ import 'package:intl/intl.dart';
 import 'package:visibility_detector/visibility_detector.dart';
 
 class ChatScreen extends StatefulWidget {
-  final String uuid;
+  final String? uuid;
+  final String? orderId;
   final bool? sendInitialMessage;
 
-  const ChatScreen({required this.uuid, super.key, required this.sendInitialMessage});
+  const ChatScreen({this.uuid, this.orderId, super.key, required this.sendInitialMessage});
 
   @override
   State<ChatScreen> createState() => _ChatScreenState();
@@ -55,6 +56,11 @@ class _ChatScreenState extends State<ChatScreen> {
   late AppLifecycleListener _listener;
   List<File> pickedFiles = [];
 
+  /// Conversation uuid после успешного init (в т.ч. после resolve по orderId).
+  String? _effectiveUuid;
+
+  String? get _conversationUuid => _effectiveUuid ?? widget.uuid;
+
   void _onHide() {
     chatRoomCubit.cancelTimer();
   }
@@ -64,26 +70,41 @@ class _ChatScreenState extends State<ChatScreen> {
     chatRoomCubit.setTimer();
   }
 
+  Future<void> _initChatRoom() async {
+    final uuid = await chatRoomCubit.initChat(
+      _conversationUuid,
+      orderId: _effectiveUuid == null ? widget.orderId : null,
+      sendInitialMessage: widget.sendInitialMessage ?? false,
+    );
+    if (uuid != null && mounted) {
+      setState(() => _effectiveUuid = uuid);
+    }
+  }
+
   @override
   void didUpdateWidget(ChatScreen oldWidget) {
     super.didUpdateWidget(oldWidget);
-    if (oldWidget.uuid != widget.uuid) {
-      chatRoomCubit.initChat(widget.uuid, sendInitialMessage: widget.sendInitialMessage ?? false);
+    if (oldWidget.uuid != widget.uuid || oldWidget.orderId != widget.orderId) {
+      _effectiveUuid = widget.uuid;
+      _initChatRoom();
     }
   }
 
   @override
   void initState() {
     super.initState();
+    _effectiveUuid = widget.uuid;
     scrollController.addListener(_onScroll);
-    chatRoomCubit.initChat(widget.uuid, sendInitialMessage: widget.sendInitialMessage ?? false);
+    _initChatRoom();
     chatRoomCubit.setTimer();
     _listener = AppLifecycleListener(onHide: _onHide, onResume: _onResume);
   }
 
   void _onScroll() {
+    final uuid = _conversationUuid;
+    if (uuid == null) return;
     if (scrollController.offset >= scrollController.position.maxScrollExtent && !scrollController.position.outOfRange) {
-      chatRoomCubit.loadNextPage(widget.uuid);
+      chatRoomCubit.loadNextPage(uuid);
     }
   }
 
@@ -117,7 +138,7 @@ class _ChatScreenState extends State<ChatScreen> {
                   },
                 ),
               ),
-              body: DataErrorWidget(onReload: () => chatRoomCubit.initChat(widget.uuid)),
+              body: DataErrorWidget(onReload: _initChatRoom),
             );
           } else {
             return Scaffold(
@@ -242,7 +263,7 @@ class _ChatScreenState extends State<ChatScreen> {
                 GoRouter.of(context).pushNamed(
                   VideoCallScreen.name,
                   extra: <String, dynamic>{
-                    'conversationUuid': widget.uuid,
+                    'conversationUuid': _conversationUuid,
                     'counterpartName': state.chatRoom.users.receiver.name,
                     'localParticipantName': state.chatRoom.users.sender.name,
                   },

lib/features/chat/presentation/widgets/notification_banner.dart

@@ -2,15 +2,14 @@ import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/core/widgets/bottom_sheet_with_blur.dart';
 import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
-import 'package:eatvio_app/core/widgets/loader.dart';
 import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart';
 import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_state.dart';
-import 'package:eatvio_app/features/chat/presentation/pages/payment_screen.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/chose_plan_date_widget.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/complete_plan_bottom_sheet.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/plan_complain_bottom_sheet.dart';
 import 'package:eatvio_app/features/my_diets/presentation/my_diets_screen.dart';
 import 'package:eatvio_app/features/my_finance/presentation/pages/card_settings.dart';
+import 'package:eatvio_app/features/payment/presentation/payment_flow.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -29,7 +28,6 @@ class NotificationBanner extends StatefulWidget {
 }
 
 class _NotificationBannerState extends State<NotificationBanner> {
-  bool isLoading = false;
   @override
   Widget build(BuildContext context) {
     final size = MediaQuery.sizeOf(context);
@@ -54,13 +52,7 @@ class _NotificationBannerState extends State<NotificationBanner> {
                   padding: EdgeInsets.only(top: 12, right: 8, left: 12),
                   child: _StarIcon(),
                 ),
-              if (isLoading)
-                const Padding(
-                  padding: EdgeInsets.only(left: 40, top: 24),
-                  child: Loader(),
-                )
-              else
-                Padding(
+              Padding(
                   padding: const EdgeInsets.only(top: 16),
                   child: Column(
                     mainAxisSize: MainAxisSize.min,
@@ -111,21 +103,10 @@ class _NotificationBannerState extends State<NotificationBanner> {
                           ),
                           const SizedBox(height: 12),
                           GestureDetector(
-                            onTap: () async {
+                            onTap: () {
                               final planId = (context.read<ChatRoomCubit>().state as ChatRoomStateLoaded).chatRoom.chosenPlan?.id;
-                              setState(() {
-                                isLoading = true;
-                              });
-                              final paymentLink = await context.read<ChatRoomCubit>().getPaymentLink();
-                              setState(() {
-                                isLoading = false;
-                              });
-                              if (paymentLink != null && planId != null) {
-                                if (!context.mounted) return;
-                                GoRouter.of(context).pushReplacement(
-                                  PaymentScreen.path,
-                                  extra: {'url': paymentLink, 'planId': planId},
-                                );
+                              if (planId != null) {
+                                showConsultationPaymentFlow(context, planId: planId);
                               }
                             },
                             child: Text(s.pay, style: TextStyles.textLSemibold.copyWith(color: appTheme.blueA400)),

lib/features/chat/repositories/chat_repository.dart

@@ -6,6 +6,7 @@ import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
 import 'package:eatvio_app/features/chat/models/chat_messages_model.dart';
 import 'package:eatvio_app/features/chat/models/chat_room_model.dart';
 import 'package:eatvio_app/features/chat/models/chat_room_pagination_model.dart';
+import 'package:eatvio_app/features/chat/models/order_id_to_conversation_model.dart';
 import 'package:eatvio_app/features/chat/models/payment_model.dart';
 import 'package:eatvio_app/features/chat/models/plan_complain_model.dart';
 import 'package:eatvio_app/features/chat/services/chat_service.dart';
@@ -98,8 +99,19 @@ class ChatRepository {
 
   Future<PaymentModel> getPaymentLink({
     required int id,
+    required String paymentProvider,
   }) async {
-    return await chatService.getPaymentLink(id: id);
+    return await chatService.getPaymentLink(
+      id: id,
+      body: {'payment_provider': paymentProvider},
+    );
+
+  }
+
+  Future<OrderIdToConversationModel> resolveOrderIdToConversation({
+    required String orderId,
+  }) async {
+    return await chatService.resolveOrderIdToConversation(orderId: orderId);
 
   }
 

lib/features/chat/services/chat_service.dart

@@ -3,6 +3,7 @@ import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
 import 'package:eatvio_app/features/chat/models/chat_messages_model.dart';
 import 'package:eatvio_app/features/chat/models/chat_room_model.dart';
 import 'package:eatvio_app/features/chat/models/chat_room_pagination_model.dart';
+import 'package:eatvio_app/features/chat/models/order_id_to_conversation_model.dart';
 import 'package:eatvio_app/features/chat/models/payment_model.dart';
 import 'package:eatvio_app/features/chat/models/plan_complain_model.dart';
 import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
@@ -65,6 +66,12 @@ abstract class ChatService {
   @POST('/api/chosen_plans/{id}/start_payment_process')
   Future<PaymentModel> getPaymentLink({
     @Path() required int id,
+    @Body() required Map<String, String> body,
+  });
+
+  @GET('/api/consultation/resolve/order_id_to_conversation/{orderId}')
+  Future<OrderIdToConversationModel> resolveOrderIdToConversation({
+    @Path() required String orderId,
   });
 
   @GET('/api/chosen_plans/show/{id}')

lib/features/feed/models/feed_blog_post_model.dart

@@ -1,4 +1,5 @@
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_pagination_model.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'feed_blog_post_model.freezed.dart';
@@ -20,6 +21,9 @@ abstract class FeedBlogPostModel with _$FeedBlogPostModel {
     @JsonKey(name: "total_views") required int totalViews,
     @JsonKey(name: "total_comments") required int totalComments,
     @JsonKey(name: "was_liked_by_me") required bool wasLikedByMe,
+    @Default([]) List<FeedGalleryImage> images,
+    @JsonKey(name: "video_embed_url") String? videoEmbedUrl,
+    @JsonKey(name: "video_url_thumb") String? videoUrlThumb,
   }) = _FeedBlogPostModel;
 
   factory FeedBlogPostModel.fromJson(Map<String, Object?> json) => _$FeedBlogPostModelFromJson(json);

lib/features/feed/models/post_feed_mapper.dart

@@ -0,0 +1,41 @@
+import 'package:eatvio_app/core/app_config.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
+import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_pagination_model.dart';
+
+class PostFeedMapper {
+  static FeedBlogPostModel fromPostFeedItem(PostFeedItemModel item, {int? currentUserId}) {
+    return FeedBlogPostModel(
+      id: item.postId,
+      state: item.postState,
+      image: resolveMediaUrl(item.postImageUrl),
+      description: item.postTextMd ?? item.postShortDescription ?? '',
+      author: Author(
+        authorSlug: item.postAuthorDetails?.slug ?? '',
+        authorName: item.postAuthorName,
+        authorProfileIcon: resolveMediaUrl(item.postAuthorImageUrl),
+        authorIsMe: currentUserId != null && item.postAuthorId == currentUserId,
+        isEntitySubscribedByMe: item.isEntitySubscribedByMe,
+      ),
+      videoUrl: '',
+      createdAt: item.postCreatedAt,
+      updatedAt: item.updatedAt,
+      title: item.postTitle,
+      totalLikes: item.postLikesCount,
+      totalViews: item.postViewsCount,
+      totalComments: item.postCommentsCount,
+      wasLikedByMe: item.postIsLikedByUser,
+      images: item.images,
+      videoEmbedUrl: item.videoEmbedUrl,
+      videoUrlThumb: item.videoUrlThumb,
+    );
+  }
+
+  static String resolveMediaUrl(String? url) {
+    if (url == null || url.isEmpty) return '';
+    if (url.startsWith('http://') || url.startsWith('https://')) return url;
+    if (url.startsWith('/')) return '${sl<AppConfig>().baseUrl}$url';
+    return '${sl<AppConfig>().baseUrl}/storage/$url';
+  }
+}

lib/features/feed/models/post_feed_pagination_model.dart

@@ -0,0 +1,93 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'post_feed_pagination_model.freezed.dart';
+part 'post_feed_pagination_model.g.dart';
+
+@freezed
+abstract class PostFeedPaginationModel with _$PostFeedPaginationModel {
+  const factory PostFeedPaginationModel({
+    @JsonKey(name: 'data') required List<PostFeedItemModel> data,
+    required CursorLinks links,
+    required CursorMeta meta,
+  }) = _PostFeedPaginationModel;
+
+  factory PostFeedPaginationModel.fromJson(Map<String, Object?> json) => _$PostFeedPaginationModelFromJson(json);
+}
+
+@freezed
+abstract class PostFeedItemModel with _$PostFeedItemModel {
+  const factory PostFeedItemModel({
+    required int id,
+    @JsonKey(name: 'post_id') required int postId,
+    @JsonKey(name: 'post_author_id') required int postAuthorId,
+    @JsonKey(name: 'post_author_name') required String postAuthorName,
+    @JsonKey(name: 'post_author_image_url') String? postAuthorImageUrl,
+    @JsonKey(name: 'post_author_profile_url') String? postAuthorProfileUrl,
+    @JsonKey(name: 'post_created_at', fromJson: parseDateTime) required DateTime postCreatedAt,
+    @JsonKey(name: 'post_title') required String postTitle,
+    @JsonKey(name: 'post_short_description') String? postShortDescription,
+    @JsonKey(name: 'post_text_md') String? postTextMd,
+    @JsonKey(name: 'post_image_url') String? postImageUrl,
+    @Default([]) List<FeedGalleryImage> images,
+    @JsonKey(name: 'video_embed_url') String? videoEmbedUrl,
+    @JsonKey(name: 'post_views_count') required int postViewsCount,
+    @JsonKey(name: 'post_likes_count') required int postLikesCount,
+    @JsonKey(name: 'post_comments_count') required int postCommentsCount,
+    @JsonKey(name: 'post_is_liked_by_user') required bool postIsLikedByUser,
+    @JsonKey(name: 'is_entity_subscribed_by_me') bool? isEntitySubscribedByMe,
+    @JsonKey(name: 'post_url') String? postUrl,
+    @JsonKey(name: 'post_state') required String postState,
+    @JsonKey(name: 'post_author_detailz') PostAuthorDetails? postAuthorDetails,
+    @JsonKey(name: "video_url_thumb") String? videoUrlThumb,
+    @JsonKey(name: 'created_at', fromJson: parseDateTime) required DateTime createdAt,
+    @JsonKey(name: 'updated_at', fromJson: parseDateTime) required DateTime updatedAt,
+  }) = _PostFeedItemModel;
+
+  factory PostFeedItemModel.fromJson(Map<String, Object?> json) => _$PostFeedItemModelFromJson(json);
+}
+
+@freezed
+abstract class FeedGalleryImage with _$FeedGalleryImage {
+  const factory FeedGalleryImage({
+    required String url,
+    required String orientation,
+  }) = _FeedGalleryImage;
+
+  factory FeedGalleryImage.fromJson(Map<String, Object?> json) => _$FeedGalleryImageFromJson(json);
+}
+
+@freezed
+abstract class PostAuthorDetails with _$PostAuthorDetails {
+  const factory PostAuthorDetails({
+    required String slug,
+    @JsonKey(name: 'is_consultant') required bool isConsultant,
+  }) = _PostAuthorDetails;
+
+  factory PostAuthorDetails.fromJson(Map<String, Object?> json) => _$PostAuthorDetailsFromJson(json);
+}
+
+@freezed
+abstract class CursorLinks with _$CursorLinks {
+  const factory CursorLinks({
+    required String? first,
+    required String? last,
+    required String? prev,
+    required String? next,
+  }) = _CursorLinks;
+
+  factory CursorLinks.fromJson(Map<String, Object?> json) => _$CursorLinksFromJson(json);
+}
+
+@freezed
+abstract class CursorMeta with _$CursorMeta {
+  const factory CursorMeta({
+    required String path,
+    @JsonKey(name: 'per_page') required int perPage,
+    @JsonKey(name: 'next_cursor') String? nextCursor,
+    @JsonKey(name: 'prev_cursor') String? prevCursor,
+  }) = _CursorMeta;
+
+  factory CursorMeta.fromJson(Map<String, Object?> json) => _$CursorMetaFromJson(json);
+}
+
+DateTime parseDateTime(String date) => DateTime.parse(date).toLocal();

lib/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart

@@ -8,8 +8,8 @@ import 'package:eatvio_app/core/error_reporting/report_from.dart';
 
 class FeedCubit extends Cubit<FeedState> {
   final FeedRepository feedRepository;
-  int currentPage = 1;
-  late int lastPage;
+  String? _nextCursor;
+  bool _hasMore = true;
   bool isLoading = false;
   String? _query;
 
@@ -38,13 +38,16 @@ class FeedCubit extends Cubit<FeedState> {
     }
   }
 
-  Future<void> loadFeedBlogPostList({String? query}) async {
+  Future<void> loadFeedBlogPostList({String? query, int? currentUserId}) async {
     try {
       _query = query;
-      final feedBlogPosts = await feedRepository.getFeedBlogPosts(query: query);
-      lastPage = feedBlogPosts.meta.lastPage;
+      _nextCursor = null;
+      _hasMore = true;
+      final feed = await feedRepository.getFeed(search: query, currentUserId: currentUserId);
+      _nextCursor = feed.nextCursor;
+      _hasMore = _nextCursor != null;
       if (!isClosed) {
-        emit(FeedState.loaded(feedBlogPostList: feedBlogPosts.feedBlogPostList, isLoading: false));
+        emit(FeedState.loaded(feedBlogPostList: feed.posts, isLoading: false));
       }
     } catch (e, st) {
       await reportFrom(e, st, this);
@@ -54,29 +57,35 @@ class FeedCubit extends Cubit<FeedState> {
     }
   }
 
-  Future<void> loadNextPage() async {
-    if (currentPage < lastPage && !isLoading && !isClosed) {
-      isLoading = true;
+  Future<void> loadNextPage({int? currentUserId}) async {
+    if (!_hasMore || isLoading || isClosed || _nextCursor == null || state is! FeedStateLoaded) {
+      return;
+    }
 
-      if (!isClosed) {
-        emit((state as FeedStateLoaded).copyWith(isLoading: isLoading));
-      }
+    isLoading = true;
+    emit((state as FeedStateLoaded).copyWith(isLoading: true));
 
-      try {
-        if (currentPage < lastPage && !isClosed) {
-          currentPage++;
-          final feedBlogPosts = await feedRepository.getFeedBlogPosts(page: currentPage, query: _query);
-          isLoading = false;
-          if (!isClosed) {
-            emit(FeedState.loaded(feedBlogPostList: [...(state as FeedStateLoaded).feedBlogPostList, ...feedBlogPosts.feedBlogPostList], isLoading: isLoading));
-          }
-        }
-      } catch (e, st) {
-        await reportFrom(e, st, this);
-        if (!isClosed) {
-          emit(FeedState.error(errorMessage: e.toString()));
-        }
+    try {
+      final feed = await feedRepository.getFeed(search: _query, cursor: _nextCursor, currentUserId: currentUserId);
+      _nextCursor = feed.nextCursor;
+      _hasMore = _nextCursor != null;
+      if (!isClosed && state is FeedStateLoaded) {
+        emit(
+          FeedState.loaded(
+            feedBlogPostList: [...(state as FeedStateLoaded).feedBlogPostList, ...feed.posts],
+            isLoading: false,
+          ),
+        );
       }
+    } catch (e, st) {
+      await reportFrom(e, st, this);
+      if (!isClosed && state is FeedStateLoaded) {
+        emit((state as FeedStateLoaded).copyWith(isLoading: false));
+      } else if (!isClosed) {
+        emit(FeedState.error(errorMessage: e.toString()));
+      }
+    } finally {
+      isLoading = false;
     }
   }
 

lib/features/feed/presentation/pages/feed_screen.dart

@@ -83,7 +83,7 @@ class _FeedScreenContentState extends State<FeedScreenContent> {
       final state = feedCubit.state;
       // Загружаем данные, если они еще не загружены
       if (state is! FeedStateLoaded) {
-        feedCubit.loadFeedBlogPostList();
+        feedCubit.loadFeedBlogPostList(currentUserId: context.read<FeedProfileCubit>().state.profile?.id);
       }
     });
     super.initState();
@@ -201,7 +201,10 @@ class _FeedScreenContentState extends State<FeedScreenContent> {
                             EasyDebounce.debounce('searchFeed', const Duration(milliseconds: 500), () {
                               switch (_selectedChipIndex) {
                                 case 0:
-                                  context.read<FeedCubit>().loadFeedBlogPostList(query: query);
+                                  context.read<FeedCubit>().loadFeedBlogPostList(
+                                    query: query,
+                                    currentUserId: context.read<FeedProfileCubit>().state.profile?.id,
+                                  );
                                   break;
                                 case 1 when !hidePlans:
                                   context.read<PlansCubit>().loadPlans(query: query);
@@ -224,7 +227,9 @@ class _FeedScreenContentState extends State<FeedScreenContent> {
                             EasyDebounce.debounce('searchFeed', const Duration(milliseconds: 500), () {
                               switch (_selectedChipIndex) {
                                 case 0:
-                                  context.read<FeedCubit>().loadFeedBlogPostList();
+                                  context.read<FeedCubit>().loadFeedBlogPostList(
+                                    currentUserId: context.read<FeedProfileCubit>().state.profile?.id,
+                                  );
                                   break;
                                 case 1 when !hidePlans:
                                   context.read<PlansCubit>().loadPlans();

lib/features/feed/presentation/widgets/blog_post_widget.dart

@@ -1,4 +1,7 @@
+import 'dart:async';
+
 import 'package:cached_network_image/cached_network_image.dart';
+import 'package:carousel_slider_plus/carousel_slider_plus.dart';
 import 'package:dismissible_page/dismissible_page.dart';
 import 'package:eatvio_app/core/app_config.dart';
 import 'package:eatvio_app/core/enums/complained_content.dart';
@@ -9,8 +12,10 @@ import 'package:eatvio_app/core/widgets/custom_popup.dart';
 import 'package:eatvio_app/core/widgets/feed_icon_button.dart';
 import 'package:eatvio_app/core/widgets/markdown_html_widget.dart';
 import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
+import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_mapper.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
-import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_state.dart';
+import 'package:eatvio_app/features/feed/presentation/widgets/feed_video_player/feed_video_player_widget.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/subscribe_button_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -19,9 +24,9 @@ import 'package:go_router/go_router.dart';
 import 'package:share_plus/share_plus.dart';
 
 class BlogPostWidget extends StatefulWidget {
-  final int index;
+  final FeedBlogPostModel post;
 
-  const BlogPostWidget({super.key, required this.index});
+  const BlogPostWidget({super.key, required this.post});
 
   @override
   State<BlogPostWidget> createState() => _BlogPostWidgetState();
@@ -30,243 +35,448 @@ class BlogPostWidget extends StatefulWidget {
 class _BlogPostWidgetState extends State<BlogPostWidget> {
   late bool isLiked;
   late int totalLikes;
-  bool isMoreOptionsVisible = false;
+  int currentGalleryIndex = 0;
+
+  FeedBlogPostModel get post => widget.post;
+
+  @override
+  void initState() {
+    super.initState();
+    isLiked = post.wasLikedByMe;
+    totalLikes = post.totalLikes;
+  }
+
+  @override
+  void didUpdateWidget(covariant BlogPostWidget oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.post.id != post.id) {
+      currentGalleryIndex = 0;
+      isLiked = post.wasLikedByMe;
+      totalLikes = post.totalLikes;
+      return;
+    }
+    if (oldWidget.post.wasLikedByMe != post.wasLikedByMe || oldWidget.post.totalLikes != post.totalLikes) {
+      isLiked = post.wasLikedByMe;
+      totalLikes = post.totalLikes;
+    }
+  }
+
+  void _openGallery(List<String> imageUrls, int index) {
+    context.pushTransparentRoute(rootNavigator: true, PhotoViewScreen(imageUrls: imageUrls, index: index));
+  }
+
+  Future<void> _toggleLike() async {
+    final nextLiked = !isLiked;
+    setState(() {
+      isLiked = nextLiked;
+      nextLiked ? totalLikes++ : totalLikes--;
+    });
+    context.read<FeedCubit>().updateFeedBlogPostList(post, nextLiked);
+    if (nextLiked) {
+      await context.read<FeedCubit>().likePost(post.id);
+    } else {
+      await context.read<FeedCubit>().unlikedPost(post.id);
+    }
+  }
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<FeedCubit, FeedState>(
-      builder: (BuildContext context, FeedState state) {
-        if (state is FeedStateLoaded) {
-          isLiked = state.feedBlogPostList[widget.index].wasLikedByMe;
-          totalLikes = state.feedBlogPostList[widget.index].totalLikes;
-          return InkWell(
-            borderRadius: BorderRadius.circular(12),
-            onTap: () => GoRouter.of(context).pushNamed('blogPostScreen', extra: state.feedBlogPostList[widget.index].id),
-            child: Material(
-              borderRadius: BorderRadius.circular(12),
-              color: Colors.white,
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  const SizedBox(height: 12),
-                  Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 12),
-                    child: Row(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        GestureDetector(
-                          onTap: () {
-                            GoRouter.of(context).pushNamed('profileScreen', extra: state.feedBlogPostList[widget.index].author.authorSlug);
-                          },
-                          child: CircleAvatar(
-                            radius: 20,
-                            backgroundColor: Colors.black12,
-                            foregroundImage: NetworkImage(
-                              state.feedBlogPostList[widget.index].author.authorProfileIcon.contains('https')
-                                  ? state.feedBlogPostList[widget.index].author.authorProfileIcon
-                                  : sl<AppConfig>().baseUrl + state.feedBlogPostList[widget.index].author.authorProfileIcon,
-                            ),
-                            backgroundImage: const AssetImage('assets/images/no_avatar.png'),
-                          ),
-                        ),
-                        const SizedBox(width: 8),
-                        // Имя и дата внутри Expanded
-                        Expanded(
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Text(
-                                state.feedBlogPostList[widget.index].author.authorName,
-                                overflow: TextOverflow.ellipsis,
-                                style: const TextStyle(height: 1, color: Colors.black87, fontWeight: FontWeight.w500, fontSize: 16),
-                              ),
-                              const SizedBox(height: 4),
-                              Text(
-                                '${calculateDifference(state.feedBlogPostList[widget.index].createdAt)} в ${state.feedBlogPostList[widget.index].createdAt.hour.toString().padLeft(2, '0')}:${state.feedBlogPostList[widget.index].createdAt.minute.toString().padLeft(2, '0')}',
-                                style: const TextStyle(height: 1, color: Colors.black45, fontSize: 14),
-                              ),
-                            ],
-                          ),
-                        ),
-                        // Кнопка подписки (если нужно)
-                        if (!(state.feedBlogPostList[widget.index].author.isEntitySubscribedByMe ?? false) &&
-                            !state.feedBlogPostList[widget.index].author.authorIsMe)
-                          Padding(
-                            padding: const EdgeInsets.only(right: 8),
-                            child: SubscribeButtonWidget(slug: state.feedBlogPostList[widget.index].author.authorSlug),
-                          ),
-                        // Кнопка меню
-                        CustomPopup(
-                          isAuthor: state.feedBlogPostList[widget.index].author.authorIsMe,
-                          complainedContentType: ComplainedContent.posts,
-                          path: 'blog_post/${(state.feedBlogPostList[widget.index].id)}',
-                          id: state.feedBlogPostList[widget.index].id,
-                          feedBlogPostModel: state.feedBlogPostList[widget.index],
-                          userSlug: state.feedBlogPostList[widget.index].author.authorSlug,
-                        ),
-                      ],
-                    ),
-                  ),
-                  if (state.feedBlogPostList[widget.index].title.isNotEmpty) ...[
-                    const SizedBox(height: 12),
-                    Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 12),
-                      child: Text(
-                        state.feedBlogPostList[widget.index].title,
-                        style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600, color: Colors.black87),
-                      ),
-                    ),
-                  ],
-                  if (state.feedBlogPostList[widget.index].title.isEmpty) const SizedBox(height: 8),
-                  if (state.feedBlogPostList[widget.index].title.isNotEmpty && state.feedBlogPostList[widget.index].description.isNotEmpty)
-                    const SizedBox(height: 8),
-                  if (state.feedBlogPostList[widget.index].description.isNotEmpty)
-                    Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 12),
-                      child: Builder(
-                        builder: (context) {
-                          String description = state.feedBlogPostList[widget.index].description;
-                          final isLong = description.length > 200;
-                          
-                          if (isLong) {
-                            // Умная обрезка: обрезаем markdown текст, не ломая синтаксис
-                            int cutPoint = 200;
-                            
-                            // Проверяем, есть ли незакрытые markdown теги
-                            String preview = description.substring(0, cutPoint);
-                            
-                            // Считаем открывающие и закрывающие теги
-                            int boldOpen = (preview.split('**').length - 1) ~/ 2;
-                            int boldClose = preview.split('**').length - 1 - boldOpen * 2;
-                            bool hasUnclosedBold = boldOpen > boldClose;
-                            
-                            // Если есть незакрытый bold, ищем закрытие
-                            if (hasUnclosedBold) {
-                              int searchEnd = (cutPoint + 100).clamp(0, description.length);
-                              int boldClosePos = description.indexOf('**', cutPoint);
-                              if (boldClosePos != -1 && boldClosePos < searchEnd) {
-                                cutPoint = boldClosePos + 2;
-                              } else {
-                                // Если не нашли, обрезаем до последнего пробела
-                                cutPoint = description.lastIndexOf(' ', 200);
-                                if (cutPoint == -1 || cutPoint < 150) cutPoint = 200;
-                              }
-                            } else {
-                              // Обрезаем до последнего пробела для красоты
-                              cutPoint = description.lastIndexOf(' ', cutPoint);
-                              if (cutPoint == -1 || cutPoint < 150) cutPoint = 200;
-                            }
-                            
-                            description = description.substring(0, cutPoint);
-                          }
+    final imageUrl = PostFeedMapper.resolveMediaUrl(post.image);
+    final galleryUrls = post.images.map((e) => PostFeedMapper.resolveMediaUrl(e.url)).where((e) => e.isNotEmpty).toList();
+    final embedUrl = post.videoEmbedUrl?.trim();
 
-                          return MarkdownHtmlWidget(
-                            markdownText: description,
-                          );
-                        },
-                      ),
-                    ),
-                  if (state.feedBlogPostList[widget.index].description.length > 200)
-                    const Padding(
-                      padding: EdgeInsets.symmetric(horizontal: 12),
-                      child: Text(
-                        'Показать ещё',
-                        style: TextStyle(height: 1, color: Color(0xFF8B8B8B), fontSize: 14, fontWeight: FontWeight.w600),
-                      ),
-                    ),
-                  if (state.feedBlogPostList[widget.index].title.isNotEmpty || state.feedBlogPostList[widget.index].description.isNotEmpty)
-                    const SizedBox(height: 8),
-                  GestureDetector(
-                    onTap: () {
-                      context.pushTransparentRoute(
-                        rootNavigator: true,
-                        PhotoViewScreen(imageUrls: ['${sl<AppConfig>().baseUrl}/storage/${state.feedBlogPostList[widget.index].image}'], index: 0),
-                      );
-                    },
-                    child: Hero(
-                      tag: '${sl<AppConfig>().baseUrl}/storage/${state.feedBlogPostList[widget.index].image}',
-                      child: CachedNetworkImage(
-                        fit: BoxFit.fitWidth,
-                        width: MediaQuery.of(context).size.width,
-                        imageUrl: '${sl<AppConfig>().baseUrl}/storage/${state.feedBlogPostList[widget.index].image}',
-                        errorWidget: (context, str, object) => const SizedBox.shrink(),
-                      ),
-                    ),
-                  ),
-                  const SizedBox(height: 12),
-                  Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 12),
-                    child: Row(
-                      children: [
-                        FeedIconButton(
-                          icon: isLiked ? Icons.favorite_rounded : Icons.favorite_border_rounded,
-                          text: totalLikes.toString(),
-                          iconColor: isLiked ? Colors.red.withValues(alpha: 0.8) : null,
-                          backgroundColor: isLiked ? Colors.red.withValues(alpha: 0.1) : null,
-                          textColor: isLiked ? Colors.red.withValues(alpha: 0.8) : null,
-                          onTap: () async {
-                            setState(() {
-                              isLiked = !isLiked;
-                              isLiked ? totalLikes++ : totalLikes--;
-                            });
-                            // Update feed list immediately by ID (no reload)
-                            context.read<FeedCubit>().updateFeedBlogPostList(state.feedBlogPostList[widget.index], isLiked);
-                            // Fire network call without introducing UI delay
-                            if (isLiked) {
-                              await context.read<FeedCubit>().likePost(state.feedBlogPostList[widget.index].id);
-                            } else {
-                              await context.read<FeedCubit>().unlikedPost(state.feedBlogPostList[widget.index].id);
-                            }
-                          },
-                        ),
-                        const SizedBox(width: 8),
-                        FeedIconButton(
-                          svgIcon: SvgPicture.asset(
-                            'assets/icons/comment.svg',
-                            height: 20,
-                            width: 20,
-                            colorFilter: ColorFilter.mode(appTheme.gray600, BlendMode.srcIn),
-                          ),
-                          text: state.feedBlogPostList[widget.index].totalComments.toString(),
-                          onTap: () => GoRouter.of(context).pushNamed('blogPostScreen', extra: state.feedBlogPostList[widget.index].id),
-                        ),
-                        const SizedBox(width: 8),
-                        FeedIconButton(
-                          svgIcon: SvgPicture.asset(
-                            height: 15,
-                            width: 12,
-                            'assets/icons/repost.svg',
-                            colorFilter: ColorFilter.mode(appTheme.gray600, BlendMode.srcIn),
-                          ),
-                          onTap: () {
-                            final box = context.findRenderObject() as RenderBox?;
-                            SharePlus.instance.share(
-                              ShareParams(
-                                uri: Uri.parse('${sl<AppConfig>().baseUrl}/ru/blog_post/${state.feedBlogPostList[widget.index].id}'),
-                                sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
-                              ),
-                            );
-                          },
-                        ),
-                        const Spacer(),
-                        Icon(Icons.visibility_rounded, size: 16, color: appTheme.gray500),
-                        const SizedBox(width: 4),
-                        Text(
-                          state.feedBlogPostList[widget.index].totalViews.toString(),
-                          style: TextStyle(fontSize: 12, color: appTheme.gray500, fontWeight: FontWeight.w400),
-                        ),
-                      ],
-                    ),
-                  ),
-                  const SizedBox(height: 8),
-                ],
-              ),
+    return InkWell(
+      borderRadius: BorderRadius.circular(12),
+      onTap: () => GoRouter.of(context).pushNamed('blogPostScreen', extra: post.id),
+      child: Material(
+        borderRadius: BorderRadius.circular(12),
+        color: Colors.white,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            const SizedBox(height: 12),
+            _BlogPostHeader(post: post),
+            _BlogPostTextContent(post: post),
+            _BlogPostMediaContent(
+              galleryUrls: galleryUrls,
+              imageUrl: imageUrl,
+              videoEmbedUrl: embedUrl != null && embedUrl.isNotEmpty ? embedUrl : null,
+              videoUrlThumb: post.videoUrlThumb,
+              currentGalleryIndex: currentGalleryIndex,
+              onOpenGallery: _openGallery,
+              onGalleryChanged: (index) {
+                setState(() {
+                  currentGalleryIndex = index;
+                });
+              },
             ),
-          );
-        }
-        return const SizedBox.shrink();
-      },
+            const SizedBox(height: 12),
+            _BlogPostActionsRow(post: post, isLiked: isLiked, totalLikes: totalLikes, onToggleLike: _toggleLike),
+            const SizedBox(height: 8),
+          ],
+        ),
+      ),
     );
   }
 }
+
+class _BlogPostHeader extends StatelessWidget {
+  const _BlogPostHeader({required this.post});
+
+  final FeedBlogPostModel post;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 12),
+      child: Row(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          GestureDetector(
+            onTap: () => GoRouter.of(context).pushNamed('profileScreen', extra: post.author.authorSlug),
+            child: CircleAvatar(
+              radius: 20,
+              backgroundColor: Colors.black12,
+              foregroundImage: post.author.authorProfileIcon.isNotEmpty ? NetworkImage(PostFeedMapper.resolveMediaUrl(post.author.authorProfileIcon)) : null,
+              backgroundImage: const AssetImage('assets/images/no_avatar.png'),
+            ),
+          ),
+          const SizedBox(width: 8),
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  post.author.authorName,
+                  overflow: TextOverflow.ellipsis,
+                  style: const TextStyle(height: 1, color: Colors.black87, fontWeight: FontWeight.w500, fontSize: 16),
+                ),
+                const SizedBox(height: 4),
+                Text(
+                  '${calculateDifference(post.createdAt)} в ${post.createdAt.hour.toString().padLeft(2, '0')}:${post.createdAt.minute.toString().padLeft(2, '0')}',
+                  style: const TextStyle(height: 1, color: Colors.black45, fontSize: 14),
+                ),
+              ],
+            ),
+          ),
+          if (!(post.author.isEntitySubscribedByMe ?? false) && !post.author.authorIsMe)
+            Padding(
+              padding: const EdgeInsets.only(right: 8),
+              child: SubscribeButtonWidget(slug: post.author.authorSlug),
+            ),
+          CustomPopup(
+            isAuthor: post.author.authorIsMe,
+            complainedContentType: ComplainedContent.posts,
+            path: 'blog_post/${post.id}',
+            id: post.id,
+            feedBlogPostModel: post,
+            userSlug: post.author.authorSlug,
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _BlogPostTextContent extends StatelessWidget {
+  const _BlogPostTextContent({required this.post});
+
+  final FeedBlogPostModel post;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        if (post.title.isNotEmpty) ...[
+          const SizedBox(height: 12),
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 12),
+            child: Text(
+              post.title,
+              style: const TextStyle(fontSize: 18, fontWeight: FontWeight.w600, color: Colors.black87),
+            ),
+          ),
+        ],
+        if (post.title.isEmpty) const SizedBox(height: 8),
+        if (post.title.isNotEmpty && post.description.isNotEmpty) const SizedBox(height: 8),
+        if (post.description.isNotEmpty)
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 12),
+            child: MarkdownHtmlWidget(markdownText: _truncateDescription(post.description)),
+          ),
+        if (post.description.length > 200)
+          const Padding(
+            padding: EdgeInsets.symmetric(horizontal: 12),
+            child: Text(
+              'Показать ещё',
+              style: TextStyle(height: 1, color: Color(0xFF8B8B8B), fontSize: 14, fontWeight: FontWeight.w600),
+            ),
+          ),
+        if (post.title.isNotEmpty || post.description.isNotEmpty) const SizedBox(height: 8),
+      ],
+    );
+  }
+}
+
+class _BlogPostMediaContent extends StatefulWidget {
+  const _BlogPostMediaContent({
+    required this.galleryUrls,
+    required this.imageUrl,
+    required this.videoEmbedUrl,
+    required this.currentGalleryIndex,
+    required this.onOpenGallery,
+    required this.onGalleryChanged,
+    required this.videoUrlThumb,
+  });
+
+  final List<String> galleryUrls;
+  final String imageUrl;
+  final String? videoEmbedUrl;
+  final String? videoUrlThumb;
+  final int currentGalleryIndex;
+  final void Function(List<String> urls, int index) onOpenGallery;
+  final ValueChanged<int> onGalleryChanged;
+
+  @override
+  State<_BlogPostMediaContent> createState() => _BlogPostMediaContentState();
+}
+
+class _BlogPostMediaContentState extends State<_BlogPostMediaContent> {
+  static const _counterDisplayDuration = Duration(seconds: 1);
+
+  bool _isCounterVisible = false;
+  Timer? _counterHideTimer;
+
+  bool get _isCurrentSlideVideo =>
+      widget.videoEmbedUrl != null && widget.currentGalleryIndex == widget.galleryUrls.length;
+
+  bool get _shouldShowCounter => !_isCurrentSlideVideo || _isCounterVisible;
+
+  @override
+  void dispose() {
+    _counterHideTimer?.cancel();
+    super.dispose();
+  }
+
+  @override
+  void didUpdateWidget(covariant _BlogPostMediaContent oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.currentGalleryIndex != widget.currentGalleryIndex) {
+      _scheduleCounterHideOnVideo();
+    }
+  }
+
+  void _scheduleCounterHideOnVideo() {
+    _counterHideTimer?.cancel();
+    if (!_isCurrentSlideVideo) return;
+
+    _counterHideTimer = Timer(_counterDisplayDuration, () {
+      if (mounted && _isCurrentSlideVideo) {
+        setState(() => _isCounterVisible = false);
+      }
+    });
+  }
+
+  bool _handleCarouselScroll(ScrollNotification notification) {
+    if (notification is ScrollStartNotification || notification is ScrollUpdateNotification) {
+      _counterHideTimer?.cancel();
+      if (!_isCounterVisible) {
+        setState(() => _isCounterVisible = true);
+      }
+    } else if (notification is ScrollEndNotification && _isCounterVisible && _isCurrentSlideVideo) {
+      _scheduleCounterHideOnVideo();
+    }
+    return false;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final hasVideo = widget.videoEmbedUrl != null;
+    final mediaContentCount = hasVideo ? widget.galleryUrls.length + 1 : widget.galleryUrls.length;
+    final showCarousel = mediaContentCount > 1;
+    return Column(
+      children: [
+        if (showCarousel) ...[
+          Stack(
+            children: [
+              NotificationListener<ScrollNotification>(
+                onNotification: _handleCarouselScroll,
+                child: CarouselSlider.builder(
+                  itemCount: mediaContentCount,
+                  itemBuilder: (context, itemIndex, _) {
+                    if (itemIndex == widget.galleryUrls.length) {
+                      if (widget.videoEmbedUrl != null) {
+                        return FeedVideoPlayer(embedUrl: widget.videoEmbedUrl!, videoUrlThumb: widget.videoUrlThumb);
+                      }
+                      return const SizedBox.shrink();
+                    }
+                    final itemUrl = widget.galleryUrls[itemIndex];
+                    return GestureDetector(
+                      onTap: () => widget.onOpenGallery(widget.galleryUrls, itemIndex),
+                      child: CachedNetworkImage(
+                        fit: BoxFit.cover,
+                        width: MediaQuery.of(context).size.width,
+                        imageUrl: itemUrl,
+                        errorWidget: (context, str, object) => const SizedBox.shrink(),
+                      ),
+                    );
+                  },
+                  options: CarouselOptions(
+                    viewportFraction: 1,
+                    height: 260,
+                    enableInfiniteScroll: false,
+                    onPageChanged: (index, _) => widget.onGalleryChanged(index),
+                  ),
+                ),
+              ),
+              Positioned(
+                top: 12,
+                right: 12,
+                child: IgnorePointer(
+                  child: AnimatedOpacity(
+                    opacity: _shouldShowCounter ? 1 : 0,
+                    duration: const Duration(milliseconds: 150),
+                    child: _GalleryPhotoCounter(currentIndex: widget.currentGalleryIndex, total: mediaContentCount),
+                  ),
+                ),
+              ),
+            ],
+          ),
+        ] else if (widget.galleryUrls.length == 1) ...[
+          GestureDetector(
+            onTap: () => widget.onOpenGallery(widget.galleryUrls, 0),
+            child: CachedNetworkImage(
+              fit: BoxFit.cover,
+              width: MediaQuery.of(context).size.width,
+              height: 260,
+              imageUrl: widget.galleryUrls.first,
+              errorWidget: (context, str, object) => const SizedBox.shrink(),
+            ),
+          ),
+        ] else if (widget.imageUrl.isNotEmpty) ...[
+          GestureDetector(
+            onTap: () => widget.onOpenGallery([widget.imageUrl], 0),
+            child: Hero(
+              tag: widget.imageUrl,
+              child: CachedNetworkImage(
+                fit: BoxFit.fitWidth,
+                width: MediaQuery.of(context).size.width,
+                imageUrl: widget.imageUrl,
+                errorWidget: (context, str, object) => const SizedBox.shrink(),
+              ),
+            ),
+          ),
+        ],
+      ],
+    );
+  }
+}
+
+class _GalleryPhotoCounter extends StatelessWidget {
+  const _GalleryPhotoCounter({required this.currentIndex, required this.total});
+
+  final int currentIndex;
+  final int total;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+      decoration: BoxDecoration(color: Colors.black.withValues(alpha: 0.5), borderRadius: BorderRadius.circular(999)),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          const Icon(Icons.photo_library_outlined, size: 14, color: Colors.white),
+          const SizedBox(width: 8),
+          Text(
+            '${currentIndex + 1} / $total',
+            style: const TextStyle(color: Colors.white, fontSize: 14, fontWeight: FontWeight.w500, height: 1.2),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _BlogPostActionsRow extends StatelessWidget {
+  const _BlogPostActionsRow({required this.post, required this.isLiked, required this.totalLikes, required this.onToggleLike});
+
+  final FeedBlogPostModel post;
+  final bool isLiked;
+  final int totalLikes;
+  final Future<void> Function() onToggleLike;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 12),
+      child: Row(
+        children: [
+          FeedIconButton(
+            icon: isLiked ? Icons.favorite_rounded : Icons.favorite_border_rounded,
+            text: totalLikes.toString(),
+            iconColor: isLiked ? Colors.red.withValues(alpha: 0.8) : null,
+            backgroundColor: isLiked ? Colors.red.withValues(alpha: 0.1) : null,
+            textColor: isLiked ? Colors.red.withValues(alpha: 0.8) : null,
+            onTap: onToggleLike,
+          ),
+          const SizedBox(width: 8),
+          FeedIconButton(
+            svgIcon: SvgPicture.asset('assets/icons/comment.svg', height: 20, width: 20, colorFilter: ColorFilter.mode(appTheme.gray600, BlendMode.srcIn)),
+            text: post.totalComments.toString(),
+            onTap: () => GoRouter.of(context).pushNamed('blogPostScreen', extra: post.id),
+          ),
+          const SizedBox(width: 8),
+          FeedIconButton(
+            svgIcon: SvgPicture.asset(height: 15, width: 12, 'assets/icons/repost.svg', colorFilter: ColorFilter.mode(appTheme.gray600, BlendMode.srcIn)),
+            onTap: () {
+              final box = context.findRenderObject() as RenderBox?;
+              SharePlus.instance.share(
+                ShareParams(
+                  uri: Uri.parse('${sl<AppConfig>().baseUrl}/ru/blog_post/${post.id}'),
+                  sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
+                ),
+              );
+            },
+          ),
+          const Spacer(),
+          Icon(Icons.visibility_rounded, size: 16, color: appTheme.gray500),
+          const SizedBox(width: 4),
+          Text(
+            post.totalViews.toString(),
+            style: TextStyle(fontSize: 12, color: appTheme.gray500, fontWeight: FontWeight.w400),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+String _truncateDescription(String description) {
+  final isLong = description.length > 200;
+  if (!isLong) return description;
+
+  var cutPoint = 200;
+  final preview = description.substring(0, cutPoint);
+  final boldOpen = (preview.split('**').length - 1) ~/ 2;
+  final boldClose = preview.split('**').length - 1 - boldOpen * 2;
+  final hasUnclosedBold = boldOpen > boldClose;
+
+  if (hasUnclosedBold) {
+    final searchEnd = (cutPoint + 100).clamp(0, description.length);
+    final boldClosePos = description.indexOf('**', cutPoint);
+    if (boldClosePos != -1 && boldClosePos < searchEnd) {
+      cutPoint = boldClosePos + 2;
+    } else {
+      cutPoint = description.lastIndexOf(' ', 200);
+      if (cutPoint == -1 || cutPoint < 150) cutPoint = 200;
+    }
+  } else {
+    cutPoint = description.lastIndexOf(' ', cutPoint);
+    if (cutPoint == -1 || cutPoint < 150) cutPoint = 200;
+  }
+
+  return description.substring(0, cutPoint);
+}

lib/features/feed/presentation/widgets/blog_posts.dart

@@ -3,6 +3,7 @@ import 'package:eatvio_app/core/widgets/data_error_widget.dart';
 import 'package:eatvio_app/core/widgets/loader.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_state.dart';
+import 'package:eatvio_app/features/feed/presentation/bloc/profile_cubit/profile_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/pages/feed_screen.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/blog_post_widget.dart';
 import 'package:flutter/material.dart';
@@ -11,18 +12,18 @@ import 'package:visibility_detector/visibility_detector.dart';
 
 class BlogPosts extends StatelessWidget {
   const BlogPosts({super.key, required this.handleVisibility});
-  final Function({required double visibleFraction,required int id, required ViewableContentType type}) handleVisibility;
-  
+  final Function({required double visibleFraction, required int id, required ViewableContentType type}) handleVisibility;
+
   @override
   Widget build(BuildContext context) {
     return RefreshIndicator(
-      onRefresh: () => context.read<FeedCubit>().loadFeedBlogPostList(),
+      onRefresh: () => context.read<FeedCubit>().loadFeedBlogPostList(currentUserId: context.read<FeedProfileCubit>().state.profile?.id),
       child: BlocBuilder<FeedCubit, FeedState>(
         builder: (BuildContext context, FeedState state) {
           if (state is FeedStateLoaded) {
             return NotificationListener<ScrollNotification>(
               onNotification: (notification) {
-                loadNewContent(notification, context.read<FeedCubit>().loadNextPage);
+                loadNewContent(notification, () => context.read<FeedCubit>().loadNextPage(currentUserId: context.read<FeedProfileCubit>().state.profile?.id));
                 return false;
               },
               child: ListView.separated(
@@ -32,13 +33,13 @@ class BlogPosts extends StatelessWidget {
                   if (index == state.feedBlogPostList.length) {
                     return const Loader();
                   }
+                  final post = state.feedBlogPostList[index];
                   return VisibilityDetector(
+                    key: ValueKey(post.id),
                     onVisibilityChanged: (info) {
-                      final id = state.feedBlogPostList[index].id;
-                      handleVisibility(visibleFraction: info.visibleFraction, id: id, type: ViewableContentType.posts);
+                      handleVisibility(visibleFraction: info.visibleFraction, id: post.id, type: ViewableContentType.posts);
                     },
-                    key: ValueKey(index),
-                    child: BlogPostWidget(index: index),
+                    child: BlogPostWidget(post: post),
                   );
                 },
                 separatorBuilder: (context, index) => const SizedBox(height: 8),
@@ -46,7 +47,9 @@ class BlogPosts extends StatelessWidget {
               ),
             );
           } else if (state is FeedStateError) {
-            return DataErrorWidget(onReload: () => context.read<FeedCubit>().loadFeedBlogPostList());
+            return DataErrorWidget(
+              onReload: () => context.read<FeedCubit>().loadFeedBlogPostList(currentUserId: context.read<FeedProfileCubit>().state.profile?.id),
+            );
           } else {
             return Scaffold(backgroundColor: Colors.grey.shade200, body: const Loader());
           }

lib/features/feed/presentation/widgets/feed_video_player/feed_video_embed.dart

@@ -0,0 +1,70 @@
+import 'dart:convert';
+
+import 'package:eatvio_app/features/feed/presentation/widgets/feed_video_player/feed_video_embed_scripts.dart';
+
+enum FeedVideoEmbedProvider { vk, other }
+
+/// Сборка URL и HTML для embed-плеера ленты.
+abstract final class FeedVideoEmbed {
+  static FeedVideoEmbedProvider detectProvider(Uri uri) {
+    final host = uri.host.toLowerCase();
+    final isVk = host == 'vk.com' ||
+        host.endsWith('.vk.com') ||
+        host == 'vk.ru' ||
+        host.endsWith('.vk.ru') ||
+        host == 'vkvideo.ru' ||
+        host.endsWith('.vkvideo.ru');
+    return isVk ? FeedVideoEmbedProvider.vk : FeedVideoEmbedProvider.other;
+  }
+
+  /// После жеста пользователя включаем autoplay, чтобы стартнуть сразу после загрузки.
+  static Uri uriForPlayback(String url) {
+    final uri = Uri.parse(url);
+    final params = Map<String, String>.from(uri.queryParameters);
+    params['autoplay'] = '1';
+    params['mute'] = '1';
+    params.putIfAbsent('playsinline', () => '1');
+
+    // VK Video JS API: без js_api=1 события/методы плеера недоступны.
+    if (detectProvider(uri) == FeedVideoEmbedProvider.vk) {
+      params['js_api'] = '1';
+    }
+
+    return uri.replace(queryParameters: params);
+  }
+
+  static String buildHtml(String embedUrl) {
+    final uri = Uri.parse(embedUrl);
+    final isVk = detectProvider(uri) == FeedVideoEmbedProvider.vk;
+    final src = const HtmlEscape(HtmlEscapeMode.attribute).convert(embedUrl);
+    final headScripts = isVk ? '<script src="${FeedVideoEmbedScripts.vkVideoPlayerApiSrc}"></script>' : '';
+    final bootstrap = FeedVideoEmbedScripts.bootstrap(includeVk: isVk);
+
+    return '''
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+  <style>
+    html, body { margin: 0; padding: 0; width: 100%; height: 100%; background: #000; overflow: hidden; }
+    iframe { position: absolute; inset: 0; width: 100%; height: 100%; border: 0; }
+  </style>
+  $headScripts
+</head>
+<body>
+  <iframe
+    id="player"
+    src="$src"
+    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; fullscreen;"
+    allowfullscreen
+    referrerpolicy="strict-origin-when-cross-origin"
+  ></iframe>
+  <script>
+$bootstrap
+  </script>
+</body>
+</html>
+''';
+  }
+}

lib/features/feed/presentation/widgets/feed_video_player/feed_video_embed_scripts.dart

@@ -0,0 +1,70 @@
+/// JS-фрагменты для embed-плеера ленты.
+///
+/// Канал связи с Flutter: [readyChannel] через `flutter_inappwebview.callHandler`.
+abstract final class FeedVideoEmbedScripts {
+  static const readyChannel = 'EmbedReady';
+
+  /// Уведомляет Flutter, что embed готов к показу.
+  static String get notifyReady =>
+      '''
+    function notifyReady() {
+      try {
+        window.flutter_inappwebview.callHandler('$readyChannel', 'ready');
+      } catch (e) {}
+    }
+  ''';
+
+  /// Уведомляет Flutter об ошибке воспроизведения.
+  static String get notifyError =>
+      '''
+    function notifyError() {
+      try {
+        window.flutter_inappwebview.callHandler('$readyChannel', 'error');
+      } catch (e) {}
+    }
+  ''';
+
+  /// Rutube: готовность через postMessage `player:canPlay`.
+  static String get rutubeCanPlayListener => '''
+    window.addEventListener('message', function (event) {
+      try {
+        var type = JSON.parse(event.data).type;
+        if (type === 'player:canPlay') {
+          notifyReady();
+        }
+      } catch (e) {}
+    });
+  ''';
+
+  /// VK Video JS API: воспроизведение началось на событии `started`.
+  /// Требует `js_api=1` в URL iframe и скрипт `videoplayer.js`.
+  static String get vkPlayerReadyHandler => '''
+    try {
+      if (typeof VK !== 'undefined' && VK.VideoPlayer) {
+        var vkPlayer = VK.VideoPlayer(document.getElementById('player'));
+        vkPlayer.on('started', function () {
+          notifyReady();
+        });
+        vkPlayer.on('error', function () {
+          notifyError();
+        });
+      }
+    } catch (e) {}
+  ''';
+
+  /// Внешний скрипт VK VideoPlayer API.
+  static const vkVideoPlayerApiSrc = 'https://vk.ru/js/api/videoplayer.js';
+
+  /// Собирает inline `<script>` с общим bootstrap + опциональным VK-хендлером.
+  static String bootstrap({required bool includeVk}) {
+    final vkPart = includeVk ? vkPlayerReadyHandler : '';
+    return '''
+      (function () {
+      $notifyReady
+      $notifyError
+      $rutubeCanPlayListener
+      $vkPart
+      })();
+    ''';
+  }
+}

lib/features/feed/presentation/widgets/feed_video_player/feed_video_player_widget.dart

@@ -0,0 +1,213 @@
+import 'dart:async';
+import 'dart:developer';
+
+import 'package:eatvio_app/features/feed/presentation/widgets/feed_video_player/feed_video_embed.dart';
+import 'package:eatvio_app/features/feed/presentation/widgets/feed_video_player/feed_video_embed_scripts.dart';
+import 'package:eatvio_app/features/feed/presentation/widgets/feed_video_player/feed_video_preview_placeholder.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
+
+/// Embed-видео в ленте.
+///
+/// 1) Пока пользователь не нажал play — только превью (без WebView).
+/// 2) После play — превью + лоадер, WebView грузится скрыто.
+/// 3) Когда embed готов — показываем WebView и запускаем воспроизведение.
+///
+/// Реализовано на `flutter_inappwebview` — в отличие от `webview_flutter` v4
+/// нативно поддерживает fullscreen внутри embed-плеера (Rutube/VK/YouTube):
+/// Android `WebChromeClient.onShowCustomView/onHideCustomView`.
+class FeedVideoPlayer extends StatefulWidget {
+  const FeedVideoPlayer({super.key, required this.embedUrl, this.videoUrlThumb});
+
+  final String embedUrl;
+
+  /// Пока бэкенд не отдаёт превью — null, показывается серая заглушка.
+  final String? videoUrlThumb;
+
+  @override
+  State<FeedVideoPlayer> createState() => _FeedVideoPlayerState();
+}
+
+class _FeedVideoPlayerState extends State<FeedVideoPlayer> {
+  static const Duration _readyFallbackDelay = Duration(seconds: 4);
+
+  /// Пока null — WebView не рендерится. Заполняется по жесту play.
+  InAppWebViewInitialData? _initialData;
+  bool _isLoading = false;
+  bool _isReady = false;
+  bool _hasError = false;
+
+  /// Страховка готовности для провайдеров без сигнала ready (Rutube/VK).
+  Timer? _readyFallback;
+
+  @override
+  void didUpdateWidget(covariant FeedVideoPlayer oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.embedUrl != widget.embedUrl || oldWidget.videoUrlThumb != widget.videoUrlThumb) {
+      _reset();
+    }
+  }
+
+  @override
+  void dispose() {
+    _readyFallback?.cancel();
+    super.dispose();
+  }
+
+  void _reset() {
+    _readyFallback?.cancel();
+    _readyFallback = null;
+    _initialData = null;
+    _isLoading = false;
+    _isReady = false;
+    _hasError = false;
+  }
+
+  void _markReady() {
+    if (!mounted || _isReady || _hasError) return;
+    _readyFallback?.cancel();
+    _readyFallback = null;
+    setState(() {
+      _isReady = true;
+      _isLoading = false;
+    });
+  }
+
+  void _markError() {
+    if (!mounted || _isReady) return;
+    _readyFallback?.cancel();
+    _readyFallback = null;
+    setState(() {
+      _hasError = true;
+      _isLoading = false;
+      _initialData = null;
+    });
+  }
+
+  Future<void> _onPlayPressed() async {
+    if (_isLoading || _isReady || !mounted) return;
+
+    setState(() {
+      _isLoading = true;
+      _hasError = false;
+    });
+
+    try {
+      final embedUri = FeedVideoEmbed.uriForPlayback(widget.embedUrl);
+      final baseUrl = '${embedUri.scheme}://${embedUri.host}/';
+
+      if (!mounted) return;
+      setState(() {
+        _initialData = InAppWebViewInitialData(
+          data: FeedVideoEmbed.buildHtml(embedUri.toString()),
+          mimeType: 'text/html',
+          encoding: 'utf8',
+          baseUrl: WebUri(baseUrl),
+        );
+      });
+    } catch (e, st) {
+      if (kDebugMode) {
+        debugPrint('FeedVideoPlayer load failed: $e\n$st');
+      }
+      _markError();
+    }
+  }
+
+  InAppWebViewSettings get _settings => InAppWebViewSettings(
+        // Жест play уже был на кнопке — разрешаем старта без доп. тапа.
+        mediaPlaybackRequiresUserGesture: false,
+        allowsInlineMediaPlayback: true,
+        iframeAllow: 'accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; fullscreen',
+        iframeAllowFullscreen: true,
+        transparentBackground: false,
+      );
+
+  void _onWebViewCreated(InAppWebViewController controller) {
+    controller.addJavaScriptHandler(
+      handlerName: FeedVideoEmbedScripts.readyChannel,
+      callback: (args) {
+        final status = args.isNotEmpty ? args.first?.toString() : 'ready';
+        if (status == 'error') {
+          _markError();
+        } else {
+          _markReady();
+        }
+      },
+    );
+  }
+
+  void _onLoadStop(InAppWebViewController _, WebUri? _) {
+    // Если провайдер не шлёт сигнал готовности (Rutube `player:canPlay` / VK `started`),
+    // покажем WebView по таймауту после полной загрузки (напр. YouTube / OK).
+    if (_isReady || _hasError || !mounted) return;
+    _readyFallback?.cancel();
+    _readyFallback = Timer(_readyFallbackDelay, () {
+      if (mounted && !_isReady && !_hasError) _markReady();
+    });
+  }
+
+  void _onReceivedError(InAppWebViewController _, WebResourceRequest request, WebResourceError error) {
+    if (!mounted) return;
+    if (request.isForMainFrame != true) return;
+    // ERR_BLOCKED_BY_ORB — cross-origin блокировки subframe, не реальная ошибка плеера.
+    if (error.description.contains('ERR_BLOCKED_BY_ORB')) return;
+    if (_isReady) return;
+    if (kDebugMode) debugPrint('FeedVideoPlayer error: ${error.description}');
+    _markError();
+  }
+
+  void _onEnterFullscreen(InAppWebViewController _) {
+    SystemChrome.setPreferredOrientations([DeviceOrientation.landscapeLeft, DeviceOrientation.landscapeRight]);
+  }
+
+  void _onExitFullscreen(InAppWebViewController _) {
+    // Возвращаем системный набор ориентаций (не блокируем глобально в portrait).
+    SystemChrome.setPreferredOrientations([]);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final player = SizedBox(
+      height: 220,
+      width: MediaQuery.sizeOf(context).width,
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          // WebView создаётся только после play и до ready остаётся скрытым под превью.
+          if (_initialData != null)
+            Opacity(
+              opacity: _isReady ? 1 : 0,
+              child: IgnorePointer(
+                ignoring: !_isReady,
+                child: InAppWebView(
+                  key: ValueKey('feed-inappwebview-${widget.embedUrl}'),
+                  initialData: _initialData,
+                  initialSettings: _settings,
+                  onWebViewCreated: _onWebViewCreated,
+                  onConsoleMessage: (_, message) => log('FeedVideoPlayer console message: ${message.message}'),
+                  onLoadStop: _onLoadStop,
+                  onReceivedError: _onReceivedError,
+                  onEnterFullscreen: _onEnterFullscreen,
+                  onExitFullscreen: _onExitFullscreen,
+                ),
+              ),
+            ),
+          if (!_isReady)
+            FeedVideoPreviewPlaceholder(
+              previewUrl: widget.videoUrlThumb,
+              isLoading: _isLoading,
+              hasError: _hasError,
+              onPlay: _onPlayPressed,
+              onRetry: _onPlayPressed,
+            ),
+        ],
+      ),
+    );
+
+    // Пока превью/лоадер — не даём InkWell карточки перехватывать тап.
+    if (_isReady) return player;
+    return GestureDetector(onTap: () {}, behavior: HitTestBehavior.opaque, child: player);
+  }
+}

lib/features/feed/presentation/widgets/feed_video_player/feed_video_preview_placeholder.dart

@@ -0,0 +1,63 @@
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:flutter/material.dart';
+
+class FeedVideoPreviewPlaceholder extends StatelessWidget {
+  const FeedVideoPreviewPlaceholder({
+    super.key,
+    required this.previewUrl,
+    required this.isLoading,
+    required this.hasError,
+    required this.onPlay,
+    required this.onRetry,
+  });
+
+  final String? previewUrl;
+  final bool isLoading;
+  final bool hasError;
+  final VoidCallback onPlay;
+  final VoidCallback onRetry;
+
+  @override
+  Widget build(BuildContext context) {
+    return Stack(
+      fit: StackFit.expand,
+      children: [
+        if (previewUrl != null && previewUrl!.isNotEmpty)
+          CachedNetworkImage(
+            imageUrl: previewUrl!,
+            fit: BoxFit.cover,
+            errorWidget: (_, _, _) => const ColoredBox(color: Color(0xFF2C2C2C)),
+          )
+        else
+          const ColoredBox(color: Color(0xFF2C2C2C)),
+        if (hasError)
+          Center(
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                const Icon(Icons.error_outline, size: 40, color: Colors.white54),
+                const SizedBox(height: 8),
+                TextButton(
+                  onPressed: onRetry,
+                  child: const Text('Повторить', style: TextStyle(color: Colors.white70)),
+                ),
+              ],
+            ),
+          )
+        else if (isLoading)
+          const Center(child: CircularProgressIndicator(color: Colors.white))
+        else
+          Center(
+            child: GestureDetector(
+              onTap: onPlay,
+              child: Container(
+                decoration: BoxDecoration(color: Colors.black.withValues(alpha: 0.45), shape: BoxShape.circle),
+                padding: const EdgeInsets.all(12),
+                child: const Icon(Icons.play_arrow_rounded, color: Colors.white, size: 40),
+              ),
+            ),
+          ),
+      ],
+    );
+  }
+}

lib/features/feed/presentation/widgets/feed_video_player_widget.dart

@@ -0,0 +1 @@
+export 'package:eatvio_app/features/feed/presentation/widgets/feed_video_player/feed_video_player_widget.dart';

lib/features/feed/repositories/feed_repository.dart

@@ -1,9 +1,9 @@
 import 'package:eatvio_app/features/feed/models/comment_model.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
-import 'package:eatvio_app/features/feed/models/feed_blog_post_settings_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_consultant_model.dart';
 import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_mapper.dart';
 import 'package:eatvio_app/features/feed/models/recipes_model.dart';
 import 'package:eatvio_app/features/feed/models/view_model.dart';
 import 'package:eatvio_app/features/feed/services/feed_service.dart';
@@ -13,9 +13,12 @@ class FeedRepository {
 
   FeedRepository({required this.feedService});
 
-  Future<FeedBlogPostSettingsModel> getFeedBlogPosts({String? query, int page = 1}) async {
-    return (await feedService.getBlogPostList(page: page, query: query));
-
+  Future<({List<FeedBlogPostModel> posts, String? nextCursor})> getFeed({String? search, String? cursor, int? currentUserId}) async {
+    final response = await feedService.getFeed(search: search, cursor: cursor);
+    return (
+      posts: response.data.map((item) => PostFeedMapper.fromPostFeedItem(item, currentUserId: currentUserId)).toList(),
+      nextCursor: response.meta.nextCursor,
+    );
   }
 
   Future<FeedBlogPostModel> getBlogPost({required int id}) async {

lib/features/feed/services/feed_service.dart

@@ -5,6 +5,7 @@ import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_settings_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_consultant_model.dart';
 import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/recipes_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/view_model.dart';
 import 'package:retrofit/retrofit.dart';
@@ -18,6 +19,12 @@ abstract class FeedService {
   @GET('/api/blogPosts/index')
   Future<FeedBlogPostSettingsModel> getBlogPostList({@Query('page') required int page, @Query('query_search') String? query});
 
+  @GET('/api/feed')
+  Future<PostFeedPaginationModel> getFeed({
+    @Query('search') String? search,
+    @Query('cursor') String? cursor,
+  });
+
   @GET('/api/blogPosts/show/{postId}')
   Future<FeedBlogPostModel> getBlogPost({@Path('postId') required int postId});
 

lib/features/order_info/cubit/order_info_cubit.dart

@@ -14,7 +14,7 @@ class OrderInfoCubit extends Cubit<OrderInfoState> {
     try {
       final plan = state.chosenPlan;
       if (plan == null) return null;
-      final paymentModel = await chatRepository.getPaymentLink(id: plan.id);
+      final paymentModel = await chatRepository.getPaymentLink(id: plan.id, paymentProvider: 'alfa-bank');
       return paymentModel.paymentUrl;
     } catch (e, st) {
       await reportFrom(e, st, this);

lib/features/payment/presentation/cubit/consultation_payment_cubit/consultation_payment_cubit.dart

@@ -0,0 +1,98 @@
+import 'dart:developer';
+
+import 'package:eatvio_app/core/error_reporting/report_from.dart';
+import 'package:eatvio_app/features/payment/presentation/cubit/consultation_payment_cubit/consultation_payment_state.dart';
+import 'package:eatvio_app/features/payment/repositories/payment_repository.dart';
+import 'package:eatvio_app/features/payment/repositories/sbp_repository.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:sbp/models/c2bmembers_model.dart';
+
+/// Cubit оплаты консультации через СБП: старт оплаты, список банков, редирект в банк.
+///
+/// Не хранит [planId] как поле — он передаётся в [startPayment].
+/// Polling статуса оплаты остаётся в ChatRoomCubit.
+class ConsultationPaymentCubit extends Cubit<ConsultationPaymentState> {
+  final PaymentRepository paymentRepository;
+  final SbpRepository sbpRepository;
+
+  ConsultationPaymentCubit({
+    required this.paymentRepository,
+    required this.sbpRepository,
+  }) : super(ConsultationPaymentState());
+
+  /// Запускает оплату для [planId], сохраняет checkout_url и загружает банки СБП.
+  Future<void> startPayment({required int planId}) async {
+    try {
+      emit(
+        state.copyWith(
+          isLoading: true,
+          errorMessage: null,
+          banks: const [],
+          checkoutUrl: null,
+          orderId: null,
+        ),
+      );
+
+      final payment = await paymentRepository.startPaymentProcess(planId: planId);
+
+      emit(
+        state.copyWith(
+          checkoutUrl: payment.paymentUrl,
+          orderId: payment.orderId,
+        ),
+      );
+
+      try {
+        final banks = await sbpRepository.getInstalledBanks();
+        if (isClosed) return;
+        emit(
+          state.copyWith(
+            banks: banks,
+            isLoading: false,
+            errorMessage: null,
+          ),
+        );
+      } catch (e, st) {
+        await reportFrom(e, st, this);
+        log(e.toString(), stackTrace: st);
+        if (isClosed) return;
+        emit(
+          state.copyWith(
+            isLoading: false,
+            banks: const [],
+            errorMessage: e.toString(),
+          ),
+        );
+      }
+    } catch (e, st) {
+      await reportFrom(e, st, this);
+      log(e.toString(), stackTrace: st);
+      if (isClosed) return;
+      emit(
+        state.copyWith(
+          isLoading: false,
+          banks: const [],
+          checkoutUrl: null,
+          orderId: null,
+          errorMessage: e.toString(),
+        ),
+      );
+    }
+  }
+
+  /// Открывает банковское приложение [bank] с текущим [ConsultationPaymentState.checkoutUrl].
+  Future<bool> openBank({required C2bmemberModel bank}) async {
+    final checkoutUrl = state.checkoutUrl;
+    if (checkoutUrl == null || checkoutUrl.isEmpty) {
+      return false;
+    }
+
+    try {
+      return await sbpRepository.openBank(url: checkoutUrl, bank: bank);
+    } catch (e, st) {
+      await reportFrom(e, st, this);
+      log(e.toString(), stackTrace: st);
+      return false;
+    }
+  }
+}

lib/features/payment/presentation/cubit/consultation_payment_cubit/consultation_payment_state.dart

@@ -0,0 +1,15 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:sbp/models/c2bmembers_model.dart';
+
+part 'consultation_payment_state.freezed.dart';
+
+@freezed
+abstract class ConsultationPaymentState with _$ConsultationPaymentState {
+  factory ConsultationPaymentState({
+    @Default(false) bool isLoading,
+    @Default([]) List<C2bmemberModel> banks,
+    String? checkoutUrl,
+    String? orderId,
+    String? errorMessage,
+  }) = _ConsultationPaymentState;
+}

lib/features/payment/presentation/payment_flow.dart

@@ -0,0 +1,49 @@
+import 'package:eatvio_app/features/payment/presentation/widgets/promo_code_gate_bottom_sheet.dart';
+import 'package:eatvio_app/features/payment/presentation/widgets/promo_code_modal.dart';
+import 'package:eatvio_app/features/payment/presentation/widgets/sbp_banks_bottom_sheet.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+
+/// Оркестрирует флоу оплаты консультации:
+/// гейт «У вас есть промокод?» → (Да → форма промокода) → SbpBanks.
+Future<void> showConsultationPaymentFlow(
+  BuildContext context, {
+  required int planId,
+  Future<bool?> Function(BuildContext)? showGate,
+  Future<PromoCodeResult?> Function(BuildContext, {Future<PromoValidation> Function(String)? onValidate})? showForm,
+  Future<void> Function(BuildContext, {required int planId})? showSbp,
+}) async {
+  final gate = showGate ?? _showGate;
+  final form = showForm ?? _showForm;
+  final sbp = showSbp ?? _showSbp;
+  final s = S.of(context);
+
+  final gateChoice = await gate(context);
+  if (gateChoice == null || !context.mounted) return;
+
+  if (gateChoice) {
+    final formResult = await form(
+      context,
+      onValidate: (_) async => PromoValidation.failure(s.promo_invalid),
+    );
+    if (formResult == null || !context.mounted) return;
+  }
+
+  if (!context.mounted) return;
+  await sbp(context, planId: planId);
+}
+
+Future<bool?> _showGate(BuildContext context) {
+  return showPromoCodeGateBottomSheet(context);
+}
+
+Future<PromoCodeResult?> _showForm(
+  BuildContext context, {
+  Future<PromoValidation> Function(String)? onValidate,
+}) {
+  return ItvioPromoCodeModal.show(context, onValidate: onValidate);
+}
+
+Future<void> _showSbp(BuildContext context, {required int planId}) {
+  return showSbpBanksBottomSheet(context, planId: planId);
+}

lib/features/payment/presentation/widgets/promo_code_gate_bottom_sheet.dart

@@ -0,0 +1,97 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+
+/// Показывает bottom sheet «У вас есть промокод?» с кнопками Да/Нет.
+///
+/// Возвращает `true` если пользователь нажал «Да», `false` если «Нет»,
+/// `null` если закрыл шторку (бекдроп/крестик).
+Future<bool?> showPromoCodeGateBottomSheet(BuildContext context) {
+  return showModalBottomSheet<bool?>(
+    context: context,
+    isScrollControlled: true,
+    barrierColor: appTheme.transparentBlack,
+    backgroundColor: Colors.transparent,
+    elevation: 0,
+    useSafeArea: true,
+    builder: (_) => Container(
+      decoration: const BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
+      ),
+      child: _PromoCodeGateSheet(),
+    ),
+  );
+}
+
+/// Виджет-гейт выбора промокода.
+class PromoCodeGateBottomSheet extends StatelessWidget {
+  const PromoCodeGateBottomSheet({super.key, required this.onResult});
+
+  final ValueChanged<bool?> onResult;
+
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    return Padding(
+      padding: const EdgeInsets.fromLTRB(16, 8, 16, 20),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: [
+          const Center(child: BottomSheetHandlerBar()),
+          const SizedBox(height: 24),
+          Text(
+            s.have_promo_code,
+            style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+            textAlign: TextAlign.center,
+          ),
+          const SizedBox(height: 24),
+          SizedBox(
+            height: 50,
+            child: FilledButton(
+              onPressed: () => onResult(true),
+              style: FilledButton.styleFrom(
+                backgroundColor: appTheme.blueA400,
+                foregroundColor: appTheme.whiteA700,
+                shape: const StadiumBorder(),
+              ),
+              child: Text(
+                s.yes,
+                style: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
+              ),
+            ),
+          ),
+          const SizedBox(height: 8),
+          SizedBox(
+            height: 50,
+            child: OutlinedButton(
+              onPressed: () => onResult(false),
+              style: OutlinedButton.styleFrom(
+                foregroundColor: appTheme.blueA400,
+                side: BorderSide(color: appTheme.blueA400),
+                shape: const StadiumBorder(),
+              ),
+              child: Text(
+                s.no,
+                style: TextStyles.textMSemibold.copyWith(color: appTheme.blueA400),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+/// Внутренняя реализация модалки — обёртка над [PromoCodeGateBottomSheet].
+class _PromoCodeGateSheet extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return PromoCodeGateBottomSheet(
+      onResult: (result) => Navigator.of(context).pop(result),
+    );
+  }
+}

lib/features/payment/presentation/widgets/promo_code_modal.dart

@@ -0,0 +1,281 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+
+/// Результат работы модалки промокода.
+class PromoCodeResult {
+  const PromoCodeResult({this.code});
+
+  /// Применённый промокод или null, если пользователь продолжил без него.
+  final String? code;
+
+  bool get hasPromoCode => code != null;
+}
+
+/// Ответ проверки промокода.
+class PromoValidation {
+  const PromoValidation.success() : error = null;
+  const PromoValidation.failure(this.error);
+
+  final String? error;
+
+  bool get isValid => error == null;
+}
+
+/// Модальное окно ввода промокода.
+class ItvioPromoCodeModal extends StatefulWidget {
+  const ItvioPromoCodeModal({super.key, this.onValidate});
+
+  final Future<PromoValidation> Function(String code)? onValidate;
+
+  static Future<PromoCodeResult?> show(
+    BuildContext context, {
+    Future<PromoValidation> Function(String code)? onValidate,
+  }) {
+    return showModalBottomSheet<PromoCodeResult>(
+      context: context,
+      isScrollControlled: true,
+      useSafeArea: true,
+      backgroundColor: Colors.transparent,
+      builder: (_) => ItvioPromoCodeModal(onValidate: onValidate),
+    );
+  }
+
+  @override
+  State<ItvioPromoCodeModal> createState() => _ItvioPromoCodeModalState();
+}
+
+enum _ModalState { input, loading }
+
+class _ItvioPromoCodeModalState extends State<ItvioPromoCodeModal> {
+  final _controller = TextEditingController();
+  final _focusNode = FocusNode();
+
+  _ModalState _state = _ModalState.input;
+  String? _errorText;
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    _focusNode.dispose();
+    super.dispose();
+  }
+
+  Future<void> _apply() async {
+    final code = _controller.text.trim().toUpperCase();
+
+    if (code.isEmpty) {
+      setState(() => _errorText = S.of(context).enter_promo_code);
+      return;
+    }
+
+    setState(() {
+      _state = _ModalState.loading;
+      _errorText = null;
+    });
+
+    PromoValidation validation;
+    try {
+      validation = widget.onValidate != null
+          ? await widget.onValidate!(code)
+          : const PromoValidation.success();
+    } catch (_) {
+      validation = const PromoValidation.failure(
+        'Не удалось проверить промокод. Попробуйте позже',
+      );
+    }
+
+    if (!mounted) return;
+
+    if (!validation.isValid) {
+      setState(() {
+        _state = _ModalState.input;
+        _errorText = validation.error;
+      });
+      _focusNode.requestFocus();
+      return;
+    }
+
+    Navigator.of(context).pop(PromoCodeResult(code: code));
+  }
+
+  void _onSkip() {
+    Navigator.of(context).pop(const PromoCodeResult());
+  }
+
+  bool get _isLoading => _state == _ModalState.loading;
+
+  @override
+  Widget build(BuildContext context) {
+    final bottomInset = MediaQuery.of(context).viewInsets.bottom;
+    final s = S.of(context);
+
+    return Padding(
+      padding: EdgeInsets.only(bottom: bottomInset),
+      child: Container(
+        width: double.infinity,
+        decoration: const BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
+        ),
+        padding: const EdgeInsets.fromLTRB(20, 8, 20, 20),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            const Center(child: BottomSheetHandlerBar()),
+            const SizedBox(height: 16),
+            _buildHeader(),
+            const SizedBox(height: 16),
+            const Text(
+              'Промокод',
+              style: TextStyle(
+                fontSize: 13,
+                color: Color(0xFF6B7684),
+              ),
+            ),
+            const SizedBox(height: 8),
+            _buildField(),
+            const SizedBox(height: 8),
+            _buildHint(),
+            const SizedBox(height: 12),
+            _buildApplyButton(s),
+            const SizedBox(height: 6),
+            _buildSkipButton(s),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildHeader() {
+    final s = S.of(context);
+    return Text(
+      s.have_promo_code_form,
+      style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+    );
+  }
+
+  Widget _buildField() {
+    final hasError = _errorText != null;
+    final s = S.of(context);
+
+    return AnimatedContainer(
+      duration: const Duration(milliseconds: 150),
+      decoration: BoxDecoration(
+        color: appTheme.gray100,
+        borderRadius: BorderRadius.circular(12),
+        border: Border.all(
+          width: 2,
+          color: hasError
+              ? appTheme.red
+              : (_focusNode.hasFocus
+                  ? appTheme.blueA400
+                  : Colors.transparent),
+        ),
+      ),
+      child: Row(
+        children: [
+          Expanded(
+            child: TextField(
+              controller: _controller,
+              focusNode: _focusNode,
+              enabled: !_isLoading,
+              textCapitalization: TextCapitalization.characters,
+              onChanged: (_) {
+                if (_errorText != null) {
+                  setState(() => _errorText = null);
+                }
+              },
+              onSubmitted: (_) => _apply(),
+              decoration: InputDecoration(
+                hintText: s.enter_promo_code,
+                hintStyle: const TextStyle(
+                  color: Color(0xFF9AA3AF),
+                ),
+                border: InputBorder.none,
+                isDense: true,
+                contentPadding: const EdgeInsets.symmetric(
+                  horizontal: 16,
+                  vertical: 14,
+                ),
+              ),
+              style: const TextStyle(
+                fontSize: 15,
+                color: Color(0xFF24303F),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildHint() {
+    final String text;
+    final Color color;
+
+    if (_errorText != null) {
+      text = _errorText!;
+      color = appTheme.red;
+    } else {
+      text = '';
+      color = Colors.transparent;
+    }
+
+    return SizedBox(
+      height: 19,
+      child: Text(
+        text,
+        style: TextStyle(fontSize: 13, color: color),
+        overflow: TextOverflow.ellipsis,
+      ),
+    );
+  }
+
+  Widget _buildApplyButton(S s) {
+    return SizedBox(
+      height: 50,
+      child: FilledButton(
+        onPressed: _isLoading ? null : _apply,
+        style: FilledButton.styleFrom(
+          backgroundColor: appTheme.blueA400,
+          foregroundColor: appTheme.whiteA700,
+          disabledBackgroundColor: appTheme.blueA400.withValues(alpha: 0.55),
+          shape: const StadiumBorder(),
+          textStyle: const TextStyle(
+            fontSize: 15,
+            fontWeight: FontWeight.w600,
+          ),
+        ),
+        child: _isLoading
+            ? const SizedBox(
+                width: 20,
+                height: 20,
+                child: CircularProgressIndicator(
+                  strokeWidth: 2.5,
+                  color: Colors.white,
+                ),
+              )
+            : Text(s.apply),
+      ),
+    );
+  }
+
+  Widget _buildSkipButton(S s) {
+    return SizedBox(
+      height: 46,
+      child: TextButton(
+        onPressed: _isLoading ? null : _onSkip,
+        style: TextButton.styleFrom(
+          foregroundColor: appTheme.blueA400,
+          shape: const StadiumBorder(),
+          textStyle: const TextStyle(fontSize: 14),
+        ),
+        child: Text(s.skip),
+      ),
+    );
+  }
+}

lib/features/payment/presentation/widgets/sbp_banks_bottom_sheet.dart

@@ -0,0 +1,224 @@
+import 'package:cached_network_image/cached_network_image.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
+import 'package:eatvio_app/core/widgets/bottom_sheet_with_blur.dart';
+import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
+import 'package:eatvio_app/core/widgets/loader.dart';
+import 'package:eatvio_app/features/payment/presentation/cubit/consultation_payment_cubit/consultation_payment_cubit.dart';
+import 'package:eatvio_app/features/payment/presentation/cubit/consultation_payment_cubit/consultation_payment_state.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:sbp/models/c2bmembers_model.dart';
+
+/// Показывает bottom sheet выбора банка СБП для оплаты консультации.
+Future<void> showSbpBanksBottomSheet(BuildContext context, {required int planId}) {
+  final height = MediaQuery.sizeOf(context).height * 0.55;
+  return showBottomSheetWithBlur(
+    context: context,
+    height: height,
+    child: SbpBanksBottomSheet(planId: planId),
+  );
+}
+
+/// Bottom sheet со списком установленных банков СБП.
+///
+/// При открытии вызывает [ConsultationPaymentCubit.startPayment] с [planId]
+/// и показывает [Loader], пока загружаются checkout_url и список банков.
+class SbpBanksBottomSheet extends StatefulWidget {
+  const SbpBanksBottomSheet({super.key, required this.planId, this.cubit});
+
+  final int planId;
+  final ConsultationPaymentCubit? cubit;
+
+  @override
+  State<SbpBanksBottomSheet> createState() => _SbpBanksBottomSheetState();
+}
+
+class _SbpBanksBottomSheetState extends State<SbpBanksBottomSheet> {
+  late final ConsultationPaymentCubit _cubit;
+  late final bool _ownsCubit;
+
+  @override
+  void initState() {
+    super.initState();
+    _ownsCubit = widget.cubit == null;
+    _cubit = widget.cubit ?? sl<ConsultationPaymentCubit>();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _cubit.startPayment(planId: widget.planId);
+    });
+  }
+
+  @override
+  void dispose() {
+    if (_ownsCubit) {
+      _cubit.close();
+    }
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    return BlocProvider<ConsultationPaymentCubit>.value(
+      value: _cubit,
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            const SizedBox(height: 8),
+            const BottomSheetHandlerBar(),
+            const SizedBox(height: 20),
+            Text(
+              s.choose_bank_for_payment,
+              style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+              textAlign: TextAlign.center,
+            ),
+            const SizedBox(height: 16),
+            Expanded(
+              child: BlocBuilder<ConsultationPaymentCubit, ConsultationPaymentState>(
+                builder: (context, state) {
+                  if (state.isLoading) {
+                    return const Loader();
+                  }
+                  if (state.errorMessage != null) {
+                    return _ErrorContent(
+                      message: s.sbp_payment_error,
+                      onOk: () {
+                        final navigator = Navigator.of(context);
+                        if (navigator.canPop()) {
+                          navigator.pop();
+                        }
+                      },
+                    );
+                  }
+                  if (state.banks.isEmpty) {
+                    return Center(
+                      child: Text(
+                        s.no_installed_banks,
+                        style: TextStyles.textMMedium.copyWith(color: appTheme.black),
+                        textAlign: TextAlign.center,
+                      ),
+                    );
+                  }
+                  return ListView.separated(
+                    itemCount: state.banks.length,
+                    separatorBuilder: (_, _) => const SizedBox(height: 8),
+                    itemBuilder: (context, index) {
+                      final bank = state.banks[index];
+                      return _BankTile(bank: bank, onTap: () => _onBankTap(bank));
+                    },
+                  );
+                },
+              ),
+            ),
+            const SizedBox(height: 16),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Future<void> _onBankTap(C2bmemberModel bank) async {
+    final opened = await _cubit.openBank(bank: bank);
+    if (opened && mounted) {
+      final navigator = Navigator.of(context);
+      if (navigator.canPop()) {
+        navigator.pop();
+      }
+    }
+  }
+}
+
+class _BankTile extends StatelessWidget {
+  const _BankTile({required this.bank, required this.onTap});
+
+  final C2bmemberModel bank;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    final name = bank.localName ?? bank.bankName;
+    return InkWell(
+      onTap: onTap,
+      borderRadius: BorderRadius.circular(12),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(vertical: 10, horizontal: 4),
+        child: Row(
+          children: [
+            _BankIcon(bank: bank),
+            const SizedBox(width: 12),
+            Expanded(
+              child: Text(name, style: TextStyles.textLSemibold.copyWith(color: appTheme.black)),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _BankIcon extends StatelessWidget {
+  const _BankIcon({required this.bank});
+
+  final C2bmemberModel bank;
+
+  @override
+  Widget build(BuildContext context) {
+    if (bank.icon.isNotEmpty) {
+      return ClipRRect(
+        borderRadius: BorderRadius.circular(8),
+        child: CachedNetworkImage(
+          imageUrl: bank.logoURL,
+          width: 40,
+          height: 40,
+          placeholder: (context, url) => _placeholder(),
+          errorWidget: (context, url, error) => _placeholder(),
+        ),
+      );
+    }
+    return _placeholder();
+  }
+
+  Widget _placeholder() {
+    return Container(
+      width: 40,
+      height: 40,
+      decoration: BoxDecoration(color: appTheme.blueA400.withValues(alpha: 0.12), borderRadius: BorderRadius.circular(8)),
+      child: Icon(Icons.account_balance, color: appTheme.blueA400, size: 22),
+    );
+  }
+}
+
+class _ErrorContent extends StatelessWidget {
+  const _ErrorContent({required this.message, required this.onOk});
+
+  final String message;
+  final VoidCallback onOk;
+
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        Text(
+          message,
+          style: TextStyles.textMMedium.copyWith(color: appTheme.black),
+          textAlign: TextAlign.center,
+        ),
+        const SizedBox(height: 16),
+        CustomOutlinedButton(
+          text: s.ok,
+          height: 52,
+          buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
+          buttonStyle: ButtonStyle(side: const WidgetStatePropertyAll(BorderSide.none), backgroundColor: WidgetStatePropertyAll(appTheme.blueA400)),
+          onPressed: onOk,
+        ),
+      ],
+    );
+  }
+}

lib/features/payment/repositories/payment_repository.dart

@@ -0,0 +1,18 @@
+import 'package:eatvio_app/features/chat/models/payment_model.dart';
+import 'package:eatvio_app/features/chat/services/chat_service.dart';
+
+/// Репозиторий оплаты консультаций (chosen_plan) через Alfa Bank / СБП.
+class PaymentRepository {
+  final ChatService chatService;
+
+  PaymentRepository({required this.chatService});
+
+  /// Запускает процесс оплаты: POST `/api/chosen_plans/{id}/start_payment_process`
+  /// с `payment_provider: alfa-bank`.
+  Future<PaymentModel> startPaymentProcess({required int planId}) async {
+    return chatService.getPaymentLink(
+      id: planId,
+      body: const {'payment_provider': 'alfa-bank'},
+    );
+  }
+}

lib/features/payment/repositories/sbp_repository.dart

@@ -0,0 +1,27 @@
+import 'package:eatvio_app/features/payment/services/sbp_service.dart';
+import 'package:sbp/models/c2bmembers_model.dart';
+
+/// Репозиторий оплаты по СБП: обёртка над [SbpService] с graceful-обработкой
+/// ошибок нативного плагина (отсутствие установленных банков, недоступность
+/// сервисов на устройстве, в т.ч. на Huawei HMS и т.п.).
+///
+/// Возвращает управляемые значения вместо проброса исключений, чтобы UI мог
+/// показать fallback (например, открыть checkout_url в браузере/WebView).
+class SbpRepository {
+  final SbpService sbpService;
+
+  SbpRepository({required this.sbpService});
+
+  /// Возвращает установленные банки СБП либо пустой список при ошибке плагина.
+  Future<List<C2bmemberModel>> getInstalledBanks() async {
+    return await sbpService.getInstalledBanks();
+  }
+
+  /// Открывает банк для оплаты. Возвращает `false` при ошибке плагина.
+  Future<bool> openBank({
+    required String url,
+    required C2bmemberModel bank,
+  }) async {
+    return await sbpService.openBank(url: url, bank: bank);
+  }
+}

lib/features/payment/services/sbp_service.dart

@@ -0,0 +1,43 @@
+import 'package:sbp/data/c2bmembers_data.dart';
+import 'package:sbp/models/c2bmembers_model.dart';
+import 'package:sbp/sbp.dart' as sbp;
+
+/// Контракт обёртки над нативным плагином СБП (Система Быстрых Платежей).
+///
+/// Статичные методы класса [Sbp] из пакета `sbp` работают через MethodChannel,
+/// поэтому не поддаются прямому мокированию в тестах. Этот интерфейс вводится
+/// для тестируемости и возможности подмены реализации (см. [SbpServiceImpl]).
+abstract class SbpService {
+  /// Возвращает список банков, установленных на устройстве пользователя
+  /// и поддерживающих оплату по СБП.
+  Future<List<C2bmemberModel>> getInstalledBanks();
+
+  /// Открывает банковское приложение [bank] для оплаты по ссылке [url]
+  /// (checkout_url вида `https://qr.nspk.ru/...`).
+  ///
+  /// Возвращает `true`, если приложение банка успешно запущено.
+  Future<bool> openBank({required String url, required C2bmemberModel bank});
+}
+
+/// Реализация [SbpService], делегирующая вызовы в статичные методы пакета `sbp`.
+class SbpServiceImpl implements SbpService {
+  const SbpServiceImpl();
+
+  @override
+  Future<List<C2bmemberModel>> getInstalledBanks() {
+    // Используем встроенный справочник банков c2bmembersData (получаемый с
+    // https://qr.nspk.ru/proxyapp/c2bmembers.json) и фильтруем только те, что
+    // установлены на устройстве. Локальные иконки/названия включены, чтобы UI
+    // не зависел от сетевой загрузки логотипов.
+    return sbp.Sbp.getInstalledBanks(
+      C2bmembersModel.fromJson(c2bmembersData),
+      useAndroidLocalIcons: true,
+      useAndroidLocalNames: true,
+    );
+  }
+
+  @override
+  Future<bool> openBank({required String url, required C2bmemberModel bank}) {
+    return sbp.Sbp.openBank(url, bank);
+  }
+}

lib/features/plans/enums/chosen_plan_state_enum.dart

@@ -30,7 +30,9 @@ enum ChosenPlanStateEnum {
   @JsonValue('personal_diet_setted')
   personalDietSet,
   @JsonValue('charge_was_collected')
-  stateChargeWasCollected;
+  stateChargeWasCollected,
+  @JsonValue('payment_failed')
+  statePaymentFailed;
 
   static List<ChosenPlanStateEnum> getShowableChatBadgeStates() {
     return [
@@ -53,6 +55,7 @@ enum ChosenPlanStateEnum {
       case ChosenPlanStateEnum.stateInCoordination:
       case ChosenPlanStateEnum.stateStartDateHasBeenSet:
       case ChosenPlanStateEnum.statePendingPayment:
+      case ChosenPlanStateEnum.statePaymentFailed:
         return false;
       default:
         return true;
@@ -68,7 +71,7 @@ enum ChosenPlanStateEnum {
       ChosenPlanStateEnum.stateLastDayFinished,
       ChosenPlanStateEnum.stateComplained,
       ChosenPlanStateEnum.stateDone,
-      ChosenPlanStateEnum.personalDietSet
+      ChosenPlanStateEnum.personalDietSet,
     ];
   }
 }

lib/generated/intl/messages_en.dart

@@ -123,6 +123,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "another_form_of_minute": MessageLookupByLibrary.simpleMessage("минут"),
     "another_form_of_stage": MessageLookupByLibrary.simpleMessage("этапа"),
     "answer": MessageLookupByLibrary.simpleMessage("Ответить"),
+    "apply": MessageLookupByLibrary.simpleMessage("Apply"),
     "archived": MessageLookupByLibrary.simpleMessage("В архиве"),
     "atLeast3Symbols": MessageLookupByLibrary.simpleMessage(
       "Минимум 3 символа",
@@ -173,6 +174,9 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "chest": MessageLookupByLibrary.simpleMessage("Грудь"),
     "chest_circumference": MessageLookupByLibrary.simpleMessage("Обхват груди"),
+    "choose_bank_for_payment": MessageLookupByLibrary.simpleMessage(
+      "Выберите банк",
+    ),
     "choose_date": MessageLookupByLibrary.simpleMessage("Выбрать дату"),
     "choose_diet_duration": MessageLookupByLibrary.simpleMessage(
       "Выберите срок диеты",
@@ -378,6 +382,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "enter_information": MessageLookupByLibrary.simpleMessage(
       "Введите информацию...",
     ),
+    "enter_promo_code": MessageLookupByLibrary.simpleMessage(
+      "Enter promo code",
+    ),
     "error_desc": MessageLookupByLibrary.simpleMessage(
       "Произошла ошибка. Мы уже работаем над её устранением. Попробуйте позже",
     ),
@@ -463,6 +470,12 @@ class MessageLookup extends MessageLookupByLibrary {
     "hatred_description": MessageLookupByLibrary.simpleMessage(
       "Враждебные высказывания",
     ),
+    "have_promo_code": MessageLookupByLibrary.simpleMessage(
+      "Do you have a promo code?",
+    ),
+    "have_promo_code_form": MessageLookupByLibrary.simpleMessage(
+      "Have a promo code?",
+    ),
     "height": MessageLookupByLibrary.simpleMessage("Рост"),
     "height_error": MessageLookupByLibrary.simpleMessage("Введите рост"),
     "height_measurements": MessageLookupByLibrary.simpleMessage("Замер роста"),
@@ -588,6 +601,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "no_default_cards": MessageLookupByLibrary.simpleMessage(
       "У вас нет привязанных карт. Что бы начать работу, привяжите карту",
     ),
+    "no_installed_banks": MessageLookupByLibrary.simpleMessage(
+      "Нет установленных банков",
+    ),
     "not_liked_groceries": MessageLookupByLibrary.simpleMessage(
       "Не любимые продукты",
     ),
@@ -699,6 +715,10 @@ class MessageLookup extends MessageLookupByLibrary {
       "Разница в ценах, это комиссия Итвио",
     ),
     "profile": MessageLookupByLibrary.simpleMessage("Профиль"),
+    "promo_code": MessageLookupByLibrary.simpleMessage("Promo code"),
+    "promo_invalid": MessageLookupByLibrary.simpleMessage(
+      "Promo code not found or expired",
+    ),
     "prostitution": MessageLookupByLibrary.simpleMessage("Проституция"),
     "proteins": MessageLookupByLibrary.simpleMessage("Белки"),
     "public_diet_state": MessageLookupByLibrary.simpleMessage("Публичная"),
@@ -737,6 +757,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "reply": MessageLookupByLibrary.simpleMessage("Ответить"),
     "resend": MessageLookupByLibrary.simpleMessage("Отправить повторно"),
     "save": MessageLookupByLibrary.simpleMessage("Сохранить"),
+    "sbp_payment_error": MessageLookupByLibrary.simpleMessage(
+      "Не удалось начать оплату. Попробуйте позже",
+    ),
     "send": MessageLookupByLibrary.simpleMessage("Отправить"),
     "send_complain": MessageLookupByLibrary.simpleMessage("Отправить жалобу"),
     "services": MessageLookupByLibrary.simpleMessage("Оказание услуг"),
@@ -944,6 +967,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "wrong_credentials": MessageLookupByLibrary.simpleMessage(
       "Неверные данные пользователя",
     ),
+    "yes": MessageLookupByLibrary.simpleMessage("Yes"),
     "youCanComplain": MessageLookupByLibrary.simpleMessage(
       "Если вас что-то не устроило, вы можете подать жалобу",
     ),

lib/generated/intl/messages_ru.dart

@@ -45,6 +45,7 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "another_form_of_day": MessageLookupByLibrary.simpleMessage("дня"),
     "answer": MessageLookupByLibrary.simpleMessage("Ответить"),
+    "apply": MessageLookupByLibrary.simpleMessage("Применить"),
     "archived": MessageLookupByLibrary.simpleMessage("В архиве"),
     "authentificate": MessageLookupByLibrary.simpleMessage("Войти"),
     "authorization": MessageLookupByLibrary.simpleMessage("Авторизация"),
@@ -62,6 +63,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "chat": MessageLookupByLibrary.simpleMessage("Чат"),
     "chest": MessageLookupByLibrary.simpleMessage("Грудь"),
     "chest_circumference": MessageLookupByLibrary.simpleMessage("Обхват груди"),
+    "choose_bank_for_payment": MessageLookupByLibrary.simpleMessage(
+      "Выберите банк",
+    ),
     "choose_diet_duration": MessageLookupByLibrary.simpleMessage(
       "Выберите срок диеты",
     ),
@@ -151,6 +155,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "enter_information": MessageLookupByLibrary.simpleMessage(
       "Введите информацию...",
     ),
+    "enter_promo_code": MessageLookupByLibrary.simpleMessage(
+      "Введите промокод",
+    ),
     "exit": MessageLookupByLibrary.simpleMessage("Выйти"),
     "expand": MessageLookupByLibrary.simpleMessage("Показать полностью"),
     "fats": MessageLookupByLibrary.simpleMessage("Жиры"),
@@ -181,6 +188,12 @@ class MessageLookup extends MessageLookupByLibrary {
     "gallery": MessageLookupByLibrary.simpleMessage("Галерея"),
     "gr": MessageLookupByLibrary.simpleMessage("гр"),
     "grams": MessageLookupByLibrary.simpleMessage("гр"),
+    "have_promo_code": MessageLookupByLibrary.simpleMessage(
+      "У вас есть промокод?",
+    ),
+    "have_promo_code_form": MessageLookupByLibrary.simpleMessage(
+      "Есть промокод?",
+    ),
     "height_measurements": MessageLookupByLibrary.simpleMessage("Замер роста"),
     "hide": MessageLookupByLibrary.simpleMessage("Свернуть"),
     "hip_circumference": MessageLookupByLibrary.simpleMessage("Обхват бедер"),
@@ -243,6 +256,9 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "no": MessageLookupByLibrary.simpleMessage("Нет"),
     "no_account": MessageLookupByLibrary.simpleMessage("У меня нет аккаунта"),
+    "no_installed_banks": MessageLookupByLibrary.simpleMessage(
+      "Нет установленных банков",
+    ),
     "notifications": MessageLookupByLibrary.simpleMessage("Уведомления"),
     "one_option": MessageLookupByLibrary.simpleMessage("1 опция"),
     "option": MessageLookupByLibrary.simpleMessage("Опция"),
@@ -306,6 +322,10 @@ class MessageLookup extends MessageLookupByLibrary {
       "Разница в ценах, это комиссия Итвио",
     ),
     "profile": MessageLookupByLibrary.simpleMessage("Профиль"),
+    "promo_code": MessageLookupByLibrary.simpleMessage("Промокод"),
+    "promo_invalid": MessageLookupByLibrary.simpleMessage(
+      "Промокод не найден или истёк",
+    ),
     "proteins": MessageLookupByLibrary.simpleMessage("Белки"),
     "public_diet_state": MessageLookupByLibrary.simpleMessage("Публичная"),
     "publish": MessageLookupByLibrary.simpleMessage("Опубликовать"),
@@ -314,6 +334,9 @@ class MessageLookup extends MessageLookupByLibrary {
       "Снять с публикации",
     ),
     "save": MessageLookupByLibrary.simpleMessage("Сохранить"),
+    "sbp_payment_error": MessageLookupByLibrary.simpleMessage(
+      "Не удалось начать оплату. Попробуйте позже",
+    ),
     "services": MessageLookupByLibrary.simpleMessage("Оказание услуг"),
     "settings": MessageLookupByLibrary.simpleMessage("Настройки"),
     "share": MessageLookupByLibrary.simpleMessage("Поделиться"),
@@ -404,6 +427,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "wrong_credentials": MessageLookupByLibrary.simpleMessage(
       "Неверные данные пользователя",
     ),
+    "yes": MessageLookupByLibrary.simpleMessage("Да"),
     "you_will_get": MessageLookupByLibrary.simpleMessage("Вы получите"),
     "your_blood_pressure": MessageLookupByLibrary.simpleMessage(
       "Ваше артериальное давление?",

lib/generated/l10n.dart

@@ -2649,6 +2649,36 @@ class S {
     return Intl.message('Оплатить', name: 'pay', desc: '', args: []);
   }
 
+  /// `Выберите банк`
+  String get choose_bank_for_payment {
+    return Intl.message(
+      'Выберите банк',
+      name: 'choose_bank_for_payment',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Нет установленных банков`
+  String get no_installed_banks {
+    return Intl.message(
+      'Нет установленных банков',
+      name: 'no_installed_banks',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Не удалось начать оплату. Попробуйте позже`
+  String get sbp_payment_error {
+    return Intl.message(
+      'Не удалось начать оплату. Попробуйте позже',
+      name: 'sbp_payment_error',
+      desc: '',
+      args: [],
+    );
+  }
+
   /// `Подробнее о заказе`
   String get more_about_order {
     return Intl.message(
@@ -4148,6 +4178,61 @@ class S {
       args: [],
     );
   }
+
+  /// `Yes`
+  String get yes {
+    return Intl.message('Yes', name: 'yes', desc: '', args: []);
+  }
+
+  /// `Apply`
+  String get apply {
+    return Intl.message('Apply', name: 'apply', desc: '', args: []);
+  }
+
+  /// `Do you have a promo code?`
+  String get have_promo_code {
+    return Intl.message(
+      'Do you have a promo code?',
+      name: 'have_promo_code',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Have a promo code?`
+  String get have_promo_code_form {
+    return Intl.message(
+      'Have a promo code?',
+      name: 'have_promo_code_form',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Promo code`
+  String get promo_code {
+    return Intl.message('Promo code', name: 'promo_code', desc: '', args: []);
+  }
+
+  /// `Enter promo code`
+  String get enter_promo_code {
+    return Intl.message(
+      'Enter promo code',
+      name: 'enter_promo_code',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Promo code not found or expired`
+  String get promo_invalid {
+    return Intl.message(
+      'Promo code not found or expired',
+      name: 'promo_invalid',
+      desc: '',
+      args: [],
+    );
+  }
 }
 
 class AppLocalizationDelegate extends LocalizationsDelegate<S> {

lib/l10n/intl_en.arb

@@ -326,6 +326,9 @@
   "date_has_ben_set": "Дата старта начала консультации установлена", 
   "tap_on_link_to_pay": "Перейдите по ссылке для оплаты консультации",
   "pay": "Оплатить",
+  "choose_bank_for_payment": "Выберите банк",
+  "no_installed_banks": "Нет установленных банков",
+  "sbp_payment_error": "Не удалось начать оплату. Попробуйте позже",
   "more_about_order": "Подробнее о заказе",
   "cancel_order": "Отменить заказ",
   "refuse_order":"Отказаться от заказа",
@@ -488,6 +491,13 @@
   "video_call_permission_camera_title": "Camera access",
   "video_call_permission_camera_description": "Allow camera access so others can see you during the video call. If you declined, you can enable it in system settings.",
   "video_call_permission_microphone_title": "Microphone access",
-  "video_call_permission_microphone_description": "Allow microphone access so others can hear you during the video call. If you declined, you can enable it in system settings."
+  "video_call_permission_microphone_description": "Allow microphone access so others can hear you during the video call. If you declined, you can enable it in system settings.",
+  "yes": "Yes",
+  "apply": "Apply",
+  "have_promo_code": "Do you have a promo code?",
+  "have_promo_code_form": "Have a promo code?",
+  "promo_code": "Promo code",
+  "enter_promo_code": "Enter promo code",
+  "promo_invalid": "Promo code not found or expired"
 }
 

lib/l10n/intl_ru.arb

@@ -233,5 +233,15 @@
   "video_call_permission_camera_title": "Доступ к камере",
   "video_call_permission_camera_description": "Чтобы вас видели во время видеозвонка, разрешите доступ к камере. При отказе можно включить доступ в настройках устройства.",
   "video_call_permission_microphone_title": "Доступ к микрофону",
-  "video_call_permission_microphone_description": "Чтобы вас слышали во время видеозвонка, разрешите доступ к микрофону. При отказе можно включить доступ в настройках устройства."
+  "video_call_permission_microphone_description": "Чтобы вас слышали во время видеозвонка, разрешите доступ к микрофону. При отказе можно включить доступ в настройках устройства.",
+  "choose_bank_for_payment": "Выберите банк",
+  "no_installed_banks": "Нет установленных банков",
+  "sbp_payment_error": "Не удалось начать оплату. Попробуйте позже",
+  "yes": "Да",
+  "apply": "Применить",
+  "have_promo_code": "У вас есть промокод?",
+  "have_promo_code_form": "Есть промокод?",
+  "promo_code": "Промокод",
+  "enter_promo_code": "Введите промокод",
+  "promo_invalid": "Промокод не найден или истёк"
 }

pubspec.yaml

@@ -1,7 +1,7 @@
 name: eatvio_app
 description: A new Flutter project.
-version: 1.3.23+105
-publish_to: 'none'
+version: 1.3.24+106
+publish_to: "none"
 
 environment:
   sdk: ^3.10.4
@@ -82,9 +82,11 @@ dependencies:
   rxdart: ^0.27.7
   gpassword: ^1.0.0
   webview_flutter_platform_interface: ^2.14.0
+  flutter_inappwebview: ^6.1.5
   intl_utils: ^2.8.13
   sentry_dio: ^9.10.0
   livekit_client: ^2.6.1
+  sbp: 0.1.0
 
 dev_dependencies:
   build_runner: ^2.10.4
@@ -164,14 +166,14 @@ flutter_intl:
 flutter_native_splash:
   android: true
   ios: true
-  color: '#FFFFFF'
-  image_android: 'assets/splash/splash.png'
-  image_dark_android: 'assets/splash/splash.png'
-  image_ios: 'assets/splash/splash.png'
-  image_dark_ios: 'assets/splash/splash.png'
-  branding_android: 'assets/splash/branding.png'
-  branding_dark_android: 'assets/splash/branding.png'
+  color: "#FFFFFF"
+  image_android: "assets/splash/splash.png"
+  image_dark_android: "assets/splash/splash.png"
+  image_ios: "assets/splash/splash.png"
+  image_dark_ios: "assets/splash/splash.png"
+  branding_android: "assets/splash/branding.png"
+  branding_dark_android: "assets/splash/branding.png"
   android_12:
-    image: 'assets/splash/splash.png'
-    image_dark: 'assets/splash/splash.png'
-    branding: 'assets/splash/branding.png'
+    image: "assets/splash/splash.png"
+    image_dark: "assets/splash/splash.png"
+    branding: "assets/splash/branding.png"

test/core/app_router_test.dart

@@ -1,4 +1,5 @@
 import 'package:eatvio_app/core/app_router.dart';
+import 'package:eatvio_app/core/routing/route_constants.dart';
 import 'package:eatvio_app/features/auth/entities/auth_result_entity.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -6,6 +7,50 @@ import 'package:go_router/go_router.dart';
 
 void main() {
   group('AppRouter', () {
+    group('resolveDeepLinkTarget - finance/alfa/return', () {
+      const orderId = 'alfa_c29_k15138_t1712345678_r1234';
+
+      test('finance/alfa/return/{orderId} → chat-screen?orderId=', () {
+        final target = AppRouter.resolveDeepLinkTarget(
+          Uri.parse('https://eatvio.ru/finance/alfa/return/$orderId'),
+        );
+
+        expect(target, '${RouteConstants.chatScreen}?orderId=$orderId');
+      });
+
+      test('ru/finance/alfa/return/{orderId} → chat-screen?orderId= (metaSegments)', () {
+        final target = AppRouter.resolveDeepLinkTarget(
+          Uri.parse('https://eatvio.ru/ru/finance/alfa/return/$orderId'),
+        );
+
+        expect(target, '${RouteConstants.chatScreen}?orderId=$orderId');
+      });
+
+      test('неполный path /finance/alfa → feed', () {
+        final target = AppRouter.resolveDeepLinkTarget(
+          Uri.parse('https://eatvio.ru/finance/alfa'),
+        );
+
+        expect(target, RouteConstants.feedScreen);
+      });
+
+      test('неполный path /finance → feed', () {
+        final target = AppRouter.resolveDeepLinkTarget(
+          Uri.parse('https://eatvio.ru/finance'),
+        );
+
+        expect(target, RouteConstants.feedScreen);
+      });
+
+      test('регресс: chat/{uuid} → chat-screen?uuid=', () {
+        final target = AppRouter.resolveDeepLinkTarget(
+          Uri.parse('https://eatvio.ru/ru/chat/uuid-1'),
+        );
+
+        expect(target, '${RouteConstants.chatScreen}?uuid=uuid-1');
+      });
+    });
+
     test('navigatorKey инициализирован', () {
       expect(AppRouter.navigatorKey, isNotNull);
       expect(AppRouter.navigatorKey, isA<GlobalKey<NavigatorState>>());

test/features/chat/models/order_id_to_conversation_model_test.dart

@@ -0,0 +1,22 @@
+import 'package:eatvio_app/features/chat/models/order_id_to_conversation_model.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import '../../../fixtures/fixture_reader.dart';
+
+void main() {
+  group('OrderIdToConversationModel', () {
+    test('fromJson создаёт модель из JSON фикстуры', () {
+      final json = FixtureReader.readAsMap(
+        'chat/payments/order_id_to_chat_uuid_response.json',
+      );
+
+      final model = OrderIdToConversationModel.fromJson(json);
+
+      expect(model.chosenPlanId, 12);
+      expect(
+        model.conversationUuid,
+        'fbd81429-8019-499a-80e8-e3933cc4d872',
+      );
+    });
+  });
+}

test/features/chat/models/payment_model_test.dart

@@ -1,25 +1,47 @@
 import 'package:eatvio_app/features/chat/models/payment_model.dart';
 import 'package:flutter_test/flutter_test.dart';
 
+import '../../../fixtures/fixture_reader.dart';
+
 void main() {
   group('PaymentModel', () {
     test('создает PaymentModel с правильными значениями', () {
-      final model = PaymentModel(
-        paymentUrl: 'https://example.com/payment',
-      );
+      final model = PaymentModel(paymentUrl: 'https://example.com/payment');
 
       expect(model.paymentUrl, 'https://example.com/payment');
     });
 
     test('fromJson создает PaymentModel из JSON', () {
-      final json = {
-        'checkout_url': 'https://example.com/payment',
-      };
+      final json = {'checkout_url': 'https://example.com/payment'};
 
       final model = PaymentModel.fromJson(json);
 
       expect(model.paymentUrl, 'https://example.com/payment');
     });
+
+    test(
+      'fromJson парсит ответ alfa-bank (checkout_url, order_id, payment_provider)',
+      () {
+        final json = FixtureReader.readAsMap(
+          'chat/payments/payment_response_alfa_bank.json',
+        );
+
+        final model = PaymentModel.fromJson(json);
+
+        expect(model.paymentUrl, 'https://qr.nspk.ru/ASDFASDFASDFASDF');
+        expect(model.orderId, 'alfa_c29_k15138_t1712345678_r1234');
+        expect(model.paymentProvider, 'alfa-bank');
+      },
+    );
+
+    test('fromJson парсит mock-ответ (checkout_url без order_id)', () {
+      final json = FixtureReader.readAsMap('chat/payments/payment_response.json');
+
+      final model = PaymentModel.fromJson(json);
+
+      expect(model.paymentUrl, 'https://example.com/checkout/payment-123');
+      expect(model.orderId, isNull);
+      expect(model.paymentProvider, isNull);
+    });
   });
 }
-

test/features/chat/presentation/bloc/chat_room_cubit_test.dart

@@ -11,6 +11,7 @@ import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_
 import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
 import 'package:eatvio_app/features/my_finance/repositories/cards_repository.dart';
 import 'package:eatvio_app/features/my_finance/models/card_model.dart';
+import 'package:eatvio_app/features/chat/models/order_id_to_conversation_model.dart';
 import 'package:eatvio_app/features/chat/models/payment_model.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
@@ -102,6 +103,89 @@ void main() {
       // Let's check that at least the repository methods were called
       verify(mockChatRepository.getChatRoom(uuid)).called(1);
       verify(mockChatRepository.getChatMessages(uuid, 1)).called(1);
+      verifyNever(
+        mockChatRepository.resolveOrderIdToConversation(orderId: anyNamed('orderId')),
+      );
+    });
+
+    test('initChat - с orderId резолвит conversation и инициализирует чат', () async {
+      const orderId = 'alfa_c29_k15138_t1712345678_r1234';
+      const conversationUuid = 'fbd81429-8019-499a-80e8-e3933cc4d872';
+      const chosenPlanId = 12;
+      final resolved = OrderIdToConversationModel(
+        chosenPlanId: chosenPlanId,
+        conversationUuid: conversationUuid,
+      );
+      final chatRoomWithPlan = testChatRoom.copyWith(chosenPlanId: chosenPlanId);
+      const testPlan = PlanModel(
+        id: 1,
+        slug: 'test-plan',
+        name: 'Test Plan',
+        image: 'https://example.com/image.jpg',
+        duration: 7,
+        state: 'active',
+        type: PlanType(fit: true, slim: false, behavior: false, wellness: false),
+        details: 'Test details',
+        packetsCount: 3,
+        author: Author(
+          authorSlug: 'author',
+          authorName: 'Author Name',
+          authorProfileIcon: 'https://example.com/icon.jpg',
+          authorIsMe: false,
+        ),
+        totalLikes: 10,
+        totalViews: 100,
+        totalComments: 5,
+        isFavorite: false,
+        minPriceOfOptions: 1000,
+        maxPriceOfOptions: 2000,
+        wasLikedByMe: false,
+      );
+      final chosenPlan = ChosenPlanModel(
+        id: chosenPlanId,
+        optionType: 'options1',
+        startDate: DateTime.now(),
+        chosenPlanState: ChosenPlanStateEnum.statePendingPayment,
+        chatId: 'chat-1',
+        consultantId: 2,
+        plan: testPlan,
+      );
+
+      when(
+        mockChatRepository.resolveOrderIdToConversation(orderId: orderId),
+      ).thenAnswer((_) async => resolved);
+      when(mockChatRepository.getChatRoom(conversationUuid)).thenAnswer((_) async => chatRoomWithPlan);
+      when(mockChatRepository.getChatMessages(conversationUuid, 1)).thenAnswer((_) async => testChatMessages);
+      when(mockChatRepository.getChosenPlan(id: chosenPlanId)).thenAnswer((_) async => chosenPlan);
+      when(mockWsManager.client).thenReturn(null);
+      when(mockWsManager.initPrivateDirectChatChannel(any)).thenAnswer((_) async => Future.value());
+      when(mockWsManager.subscribeDirectChatChannel()).thenReturn(null);
+      when(mockWsManager.directChatStream).thenReturn(null);
+      when(mockWsManager.clientTypingStream).thenReturn(null);
+
+      await chatRoomCubit.initChat(null, orderId: orderId);
+      await Future.delayed(const Duration(milliseconds: 200));
+
+      verify(mockChatRepository.resolveOrderIdToConversation(orderId: orderId)).called(1);
+      verify(mockChatRepository.getChatRoom(conversationUuid)).called(1);
+      verify(mockChatRepository.getChosenPlan(id: chosenPlanId)).called(1);
+      verify(mockChatRepository.getChatMessages(conversationUuid, 1)).called(1);
+      expect(chatRoomCubit.state, isA<ChatRoomStateLoaded>());
+      final loaded = chatRoomCubit.state as ChatRoomStateLoaded;
+      expect(loaded.chatRoom.chosenPlan?.id, chosenPlanId);
+    });
+
+    test('initChat - при ошибке resolve не вызывает getChatRoom', () async {
+      const orderId = 'alfa_c29_k15138_t1712345678_r1234';
+      when(
+        mockChatRepository.resolveOrderIdToConversation(orderId: orderId),
+      ).thenThrow(Exception('Resolve failed'));
+
+      await chatRoomCubit.initChat(null, orderId: orderId);
+      await Future.delayed(const Duration(milliseconds: 100));
+
+      expect(chatRoomCubit.state, isA<ChatRoomStateError>());
+      verifyNever(mockChatRepository.getChatRoom(any));
     });
 
     test('initChat - обрабатывает ошибку', () async {
@@ -678,7 +762,7 @@ void main() {
       when(mockChatRepository.getChatRoom(uuid)).thenAnswer((_) async => chatRoomWithPlan);
       when(mockChatRepository.getChatMessages(uuid, 1)).thenAnswer((_) async => testChatMessages);
       when(mockChatRepository.getChosenPlan(id: planId)).thenAnswer((_) async => chosenPlan);
-      when(mockChatRepository.getPaymentLink(id: planId)).thenAnswer((_) async => PaymentModel(paymentUrl: paymentUrl));
+      when(mockChatRepository.getPaymentLink(id: planId, paymentProvider: 'alfa-bank')).thenAnswer((_) async => PaymentModel(paymentUrl: paymentUrl));
       when(mockWsManager.client).thenReturn(null);
       when(mockWsManager.initPrivateDirectChatChannel(any)).thenAnswer((_) async => Future.value());
       when(mockWsManager.subscribeDirectChatChannel()).thenReturn(null);
@@ -691,7 +775,7 @@ void main() {
       final result = await chatRoomCubit.getPaymentLink();
 
       expect(result, paymentUrl);
-      verify(mockChatRepository.getPaymentLink(id: planId)).called(1);
+      verify(mockChatRepository.getPaymentLink(id: planId, paymentProvider: 'alfa-bank')).called(1);
     });
 
     test('getPaymentLink - обрабатывает ошибку', () async {
@@ -730,7 +814,7 @@ void main() {
       when(mockChatRepository.getChatRoom(uuid)).thenAnswer((_) async => chatRoomWithPlan);
       when(mockChatRepository.getChatMessages(uuid, 1)).thenAnswer((_) async => testChatMessages);
       when(mockChatRepository.getChosenPlan(id: planId)).thenAnswer((_) async => chosenPlan);
-      when(mockChatRepository.getPaymentLink(id: planId)).thenThrow(Exception('Payment error'));
+      when(mockChatRepository.getPaymentLink(id: planId, paymentProvider: 'alfa-bank')).thenThrow(Exception('Payment error'));
       when(mockWsManager.client).thenReturn(null);
       when(mockWsManager.initPrivateDirectChatChannel(any)).thenAnswer((_) async => Future.value());
       when(mockWsManager.subscribeDirectChatChannel()).thenReturn(null);

test/features/chat/presentation/pages/chat_screen_loaded_smoke_test.dart

@@ -147,7 +147,8 @@ void main() {
       when(chatRoomCubit.state).thenReturn(state);
       when(chatRoomCubit.stream).thenAnswer((_) => const Stream<ChatRoomState>.empty());
       when(chatRoomCubit.close()).thenAnswer((_) async => Future<void>.value());
-      when(chatRoomCubit.initChat(any, sendInitialMessage: anyNamed('sendInitialMessage'))).thenAnswer((_) async => Future<void>.value());
+      when(chatRoomCubit.initChat(any, sendInitialMessage: anyNamed('sendInitialMessage'), orderId: anyNamed('orderId')))
+          .thenAnswer((_) async => 'uuid');
       when(chatRoomCubit.setTimer()).thenReturn(null);
 
 

test/features/chat/presentation/pages/chat_screen_loading_smoke_test.dart

@@ -33,7 +33,8 @@ void main() {
       when(cubit.state).thenReturn(const ChatRoomState.loading());
       when(cubit.stream).thenAnswer((_) => const Stream<ChatRoomState>.empty());
       when(cubit.close()).thenAnswer((_) async => Future<void>.value());
-      when(cubit.initChat(any, sendInitialMessage: anyNamed('sendInitialMessage'))).thenAnswer((_) async => Future<void>.value());
+      when(cubit.initChat(any, sendInitialMessage: anyNamed('sendInitialMessage'), orderId: anyNamed('orderId')))
+          .thenAnswer((_) async => 'uuid');
       when(cubit.setTimer()).thenReturn(null);
       sl.registerFactory<ChatRoomCubit>(() => cubit);
 

test/features/chat/repositories/chat_repository_test.dart

@@ -5,12 +5,15 @@ import 'package:dio/dio.dart';
 import 'package:eatvio_app/core/models/pagination_model.dart';
 import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
 import 'package:eatvio_app/features/chat/models/chat_messages_model.dart';
-import 'package:eatvio_app/features/chat/models/chat_room_model.dart' as chat_room;
+import 'package:eatvio_app/features/chat/models/chat_room_model.dart'
+    as chat_room;
 import 'package:eatvio_app/features/chat/models/chat_room_pagination_model.dart';
+import 'package:eatvio_app/features/chat/models/order_id_to_conversation_model.dart';
 import 'package:eatvio_app/features/chat/models/payment_model.dart';
 import 'package:eatvio_app/features/chat/models/plan_complain_model.dart';
 import 'package:eatvio_app/features/chat/repositories/chat_repository.dart';
 import 'package:eatvio_app/features/chat/services/chat_service.dart';
+import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
 import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
@@ -32,7 +35,9 @@ void main() {
     });
 
     test('emitNewMessageToChats - эмитит новое сообщение в поток', () async {
-      final messageFixture = FixtureReader.readAsMap('chat/chat_message_response.json');
+      final messageFixture = FixtureReader.readAsMap(
+        'chat/chat_message_response.json',
+      );
       final message = ChatMessageModel.fromJson(messageFixture);
 
       chatRepository.emitNewMessageToChats(message);
@@ -45,12 +50,14 @@ void main() {
       const data = 'Test message';
       const socketId = 'socket-id-123';
 
-      when(mockChatService.sendMessage(
-        slug: slug,
-        data: data,
-        mediaData: null,
-        socketId: socketId,
-      )).thenAnswer((_) async => Future.value());
+      when(
+        mockChatService.sendMessage(
+          slug: slug,
+          data: data,
+          mediaData: null,
+          socketId: socketId,
+        ),
+      ).thenAnswer((_) async => Future.value());
 
       // Note: SocketIdStorage is static and can't be easily mocked
       // This test verifies the repository calls the service correctly
@@ -68,12 +75,14 @@ void main() {
       const data = 'Test message with files';
       const socketId = 'socket-id-123';
 
-      when(mockChatService.sendMessage(
-        slug: slug,
-        data: data,
-        mediaData: anyNamed('mediaData'),
-        socketId: socketId,
-      )).thenAnswer((_) async => Future.value());
+      when(
+        mockChatService.sendMessage(
+          slug: slug,
+          data: data,
+          mediaData: anyNamed('mediaData'),
+          socketId: socketId,
+        ),
+      ).thenAnswer((_) async => Future.value());
 
       // Создаем временные файлы для теста
       final tempFile1 = File('test1.jpg');
@@ -113,11 +122,14 @@ void main() {
 
     test('getChatRoom - получает комнату чата по UUID', () async {
       const uuid = 'chat-1';
-      final roomFixture = FixtureReader.readAsMap('chat/chat_room_response.json');
+      final roomFixture = FixtureReader.readAsMap(
+        'chat/chat_room_response.json',
+      );
       final expectedRoom = chat_room.ChatRoomModel.fromJson(roomFixture);
 
-      when(mockChatService.getChatRoom(uuid: uuid))
-          .thenAnswer((_) async => expectedRoom);
+      when(
+        mockChatService.getChatRoom(uuid: uuid),
+      ).thenAnswer((_) async => expectedRoom);
 
       final result = await chatRepository.getChatRoom(uuid);
 
@@ -132,18 +144,20 @@ void main() {
 
       when(mockChatService.getChatRoom(uuid: uuid)).thenThrow(error);
 
-      expect(
-        () => chatRepository.getChatRoom(uuid),
-        throwsException,
-      );
+      expect(() => chatRepository.getChatRoom(uuid), throwsException);
     });
 
     test('getChatRooms - получает список комнат чата', () async {
-      final paginationFixture = FixtureReader.readAsMap('chat/chat_room_pagination_response.json');
-      final expectedPagination = ChatRoomPaginationModel.fromJson(paginationFixture);
+      final paginationFixture = FixtureReader.readAsMap(
+        'chat/chat_room_pagination_response.json',
+      );
+      final expectedPagination = ChatRoomPaginationModel.fromJson(
+        paginationFixture,
+      );
 
-      when(mockChatService.getChatRooms(query: null, page: 1))
-          .thenAnswer((_) async => expectedPagination);
+      when(
+        mockChatService.getChatRooms(query: null, page: 1),
+      ).thenAnswer((_) async => expectedPagination);
 
       final result = await chatRepository.getChatRooms();
 
@@ -154,11 +168,16 @@ void main() {
 
     test('getChatRooms - получает список комнат с запросом', () async {
       const query = 'test query';
-      final paginationFixture = FixtureReader.readAsMap('chat/chat_room_pagination_response.json');
-      final expectedPagination = ChatRoomPaginationModel.fromJson(paginationFixture);
+      final paginationFixture = FixtureReader.readAsMap(
+        'chat/chat_room_pagination_response.json',
+      );
+      final expectedPagination = ChatRoomPaginationModel.fromJson(
+        paginationFixture,
+      );
 
-      when(mockChatService.getChatRooms(query: query, page: 1))
-          .thenAnswer((_) async => expectedPagination);
+      when(
+        mockChatService.getChatRooms(query: query, page: 1),
+      ).thenAnswer((_) async => expectedPagination);
 
       final result = await chatRepository.getChatRooms(query: query);
 
@@ -181,8 +200,9 @@ void main() {
         ),
       );
 
-      when(mockChatService.getChatRooms(query: null, page: 2))
-          .thenAnswer((_) async => expectedPagination);
+      when(
+        mockChatService.getChatRooms(query: null, page: 2),
+      ).thenAnswer((_) async => expectedPagination);
 
       final result = await chatRepository.getChatRooms(page: 2);
 
@@ -193,11 +213,14 @@ void main() {
     test('getChatMessages - получает сообщения чата', () async {
       const chatId = 'chat-1';
       const page = 1;
-      final messagesFixture = FixtureReader.readAsMap('chat/chat_messages_response.json');
+      final messagesFixture = FixtureReader.readAsMap(
+        'chat/chat_messages_response.json',
+      );
       final expectedMessages = ChatMessagesModel.fromJson(messagesFixture);
 
-      when(mockChatService.getChatMessages(id: chatId, page: page))
-          .thenAnswer((_) async => expectedMessages);
+      when(
+        mockChatService.getChatMessages(id: chatId, page: page),
+      ).thenAnswer((_) async => expectedMessages);
 
       final result = await chatRepository.getChatMessages(chatId, page);
 
@@ -206,42 +229,53 @@ void main() {
       verify(mockChatService.getChatMessages(id: chatId, page: page)).called(1);
     });
 
-    test('getChatRoomIdByUserSlug - получает комнату по slug пользователя', () async {
-      const slug = 'user-1';
-      final roomFixture = FixtureReader.readAsMap('chat/chat_room_response.json');
-      final expectedRoom = chat_room.ChatRoomModel.fromJson(roomFixture);
+    test(
+      'getChatRoomIdByUserSlug - получает комнату по slug пользователя',
+      () async {
+        const slug = 'user-1';
+        final roomFixture = FixtureReader.readAsMap(
+          'chat/chat_room_response.json',
+        );
+        final expectedRoom = chat_room.ChatRoomModel.fromJson(roomFixture);
 
-      when(mockChatService.getChatRoomIdByUserSlug(user: slug))
-          .thenAnswer((_) async => expectedRoom);
+        when(
+          mockChatService.getChatRoomIdByUserSlug(user: slug),
+        ).thenAnswer((_) async => expectedRoom);
 
-      final result = await chatRepository.getChatRoomIdByUserSlug(slug: slug);
+        final result = await chatRepository.getChatRoomIdByUserSlug(slug: slug);
 
-      expect(result, isA<chat_room.ChatRoomModel>());
-      verify(mockChatService.getChatRoomIdByUserSlug(user: slug)).called(1);
-    });
+        expect(result, isA<chat_room.ChatRoomModel>());
+        verify(mockChatService.getChatRoomIdByUserSlug(user: slug)).called(1);
+      },
+    );
 
     test('markMessagesAsRead - отмечает сообщения как прочитанные', () async {
       const chatId = 'chat-id-123';
       final messageIds = [1, 2, 3];
 
-      when(mockChatService.markMessagesAsRead(
-        id: chatId,
-        body: {'messages_ids': messageIds},
-      )).thenAnswer((_) async => Future.value());
+      when(
+        mockChatService.markMessagesAsRead(
+          id: chatId,
+          body: {'messages_ids': messageIds},
+        ),
+      ).thenAnswer((_) async => Future.value());
 
       await chatRepository.markMessagesAsRead(chatId, messageIds);
 
-      verify(mockChatService.markMessagesAsRead(
-        id: chatId,
-        body: {'messages_ids': messageIds},
-      )).called(1);
+      verify(
+        mockChatService.markMessagesAsRead(
+          id: chatId,
+          body: {'messages_ids': messageIds},
+        ),
+      ).called(1);
     });
 
     test('cancelChosenPlan - отменяет выбранный план', () async {
       const planId = 123;
 
-      when(mockChatService.cancelChosenPlan(id: planId))
-          .thenAnswer((_) async => Future.value());
+      when(
+        mockChatService.cancelChosenPlan(id: planId),
+      ).thenAnswer((_) async => Future.value());
 
       await chatRepository.cancelChosenPlan(id: planId);
 
@@ -252,36 +286,114 @@ void main() {
       const planId = 123;
       final date = {'start_date': '2024-01-15'};
 
-      when(mockChatService.choseStartPlanDate(id: planId, date: date))
-          .thenAnswer((_) async => Future.value());
+      when(
+        mockChatService.choseStartPlanDate(id: planId, date: date),
+      ).thenAnswer((_) async => Future.value());
 
       await chatRepository.choseStartPlanDate(id: planId, date: date);
 
-      verify(mockChatService.choseStartPlanDate(id: planId, date: date)).called(1);
+      verify(
+        mockChatService.choseStartPlanDate(id: planId, date: date),
+      ).called(1);
     });
 
     test('getPaymentLink - получает ссылку на оплату', () async {
       const planId = 123;
-      final paymentFixture = FixtureReader.readAsMap('chat/payment_response.json');
+      final paymentFixture = FixtureReader.readAsMap(
+        'chat/payments/payment_response.json',
+      );
       final expectedPayment = PaymentModel.fromJson(paymentFixture);
 
-      when(mockChatService.getPaymentLink(id: planId))
-          .thenAnswer((_) async => expectedPayment);
+      when(
+        mockChatService.getPaymentLink(
+          id: planId,
+          body: {'payment_provider': 'mock'},
+        ),
+      ).thenAnswer((_) async => expectedPayment);
 
-      final result = await chatRepository.getPaymentLink(id: planId);
+      final result = await chatRepository.getPaymentLink(
+        id: planId,
+        paymentProvider: 'mock',
+      );
 
       expect(result, isA<PaymentModel>());
       expect(result.paymentUrl, 'https://example.com/checkout/payment-123');
-      verify(mockChatService.getPaymentLink(id: planId)).called(1);
+      verify(
+        mockChatService.getPaymentLink(
+          id: planId,
+          body: {'payment_provider': 'mock'},
+        ),
+      ).called(1);
+    });
+
+    test(
+      'getPaymentLink - передаёт payment_provider в тело запроса alfa-bank',
+      () async {
+        const planId = 123;
+        final paymentFixture = FixtureReader.readAsMap(
+          'chat/payments/payment_response_alfa_bank.json',
+        );
+        final expectedPayment = PaymentModel.fromJson(paymentFixture);
+
+        when(
+          mockChatService.getPaymentLink(
+            id: planId,
+            body: {'payment_provider': 'alfa-bank'},
+          ),
+        ).thenAnswer((_) async => expectedPayment);
+
+        final result = await chatRepository.getPaymentLink(
+          id: planId,
+          paymentProvider: 'alfa-bank',
+        );
+
+        expect(result, isA<PaymentModel>());
+        expect(result.paymentUrl, 'https://qr.nspk.ru/ASDFASDFASDFASDF');
+        expect(result.orderId, 'alfa_c29_k15138_t1712345678_r1234');
+        expect(result.paymentProvider, 'alfa-bank');
+        verify(
+          mockChatService.getPaymentLink(
+            id: planId,
+            body: {'payment_provider': 'alfa-bank'},
+          ),
+        ).called(1);
+      },
+    );
+
+    test('resolveOrderIdToConversation - получает модель по orderId', () async {
+      const orderId = 'alfa_c29_k15138_t1712345678_r1234';
+      final fixture = FixtureReader.readAsMap(
+        'chat/payments/order_id_to_chat_uuid_response.json',
+      );
+      final expected = OrderIdToConversationModel.fromJson(fixture);
+
+      when(
+        mockChatService.resolveOrderIdToConversation(orderId: orderId),
+      ).thenAnswer((_) async => expected);
+
+      final result = await chatRepository.resolveOrderIdToConversation(
+        orderId: orderId,
+      );
+
+      expect(result, isA<OrderIdToConversationModel>());
+      expect(result.chosenPlanId, 12);
+      expect(result.conversationUuid, "fbd81429-8019-499a-80e8-e3933cc4d872");
+
+      verify(
+        mockChatService.resolveOrderIdToConversation(orderId: orderId),
+      ).called(1);
     });
 
     test('getChosenPlan - получает выбранный план', () async {
       const planId = 1;
-      final chosenPlanFixture = FixtureReader.readAsMap('chat/chosen_plan_response.json');
+      final chosenPlanFixture = FixtureReader.readAsMap(
+        'chat/chosen_plan/chosen_plan_in_progress_response.json',
+      );
       final expectedPlan = ChosenPlanModel.fromJson(chosenPlanFixture);
 
-      when(mockChatService.getChosenPlan(id: planId))
-          .thenAnswer((_) async => expectedPlan);
+      when(
+        mockChatService.getChosenPlan(id: planId),
+      ).thenAnswer((_) async => expectedPlan);
 
       final result = await chatRepository.getChosenPlan(id: planId);
 
@@ -290,66 +402,140 @@ void main() {
       verify(mockChatService.getChosenPlan(id: planId)).called(1);
     });
 
+    group('getChosenPlan payment polling statuses', () {
+      test('getChosenPlan - возвращает план в статусе pending_payment', () async {
+        const planId = 1;
+        final fixture = FixtureReader.readAsMap(
+          'chat/chosen_plan/chosen_plan_pending_payment_response.json',
+        );
+        final expectedPlan = ChosenPlanModel.fromJson(fixture);
+
+        when(mockChatService.getChosenPlan(id: planId)).thenAnswer((_) async => expectedPlan);
+
+        final result = await chatRepository.getChosenPlan(id: planId);
+
+        expect(result.chosenPlanState, ChosenPlanStateEnum.statePendingPayment);
+        verify(mockChatService.getChosenPlan(id: planId)).called(1);
+      });
+
+      test('getChosenPlan - возвращает план в статусе paid', () async {
+        const planId = 1;
+        final fixture = FixtureReader.readAsMap(
+          'chat/chosen_plan/chosen_plan_paid_response.json',
+        );
+        final expectedPlan = ChosenPlanModel.fromJson(fixture);
+
+        when(mockChatService.getChosenPlan(id: planId)).thenAnswer((_) async => expectedPlan);
+
+        final result = await chatRepository.getChosenPlan(id: planId);
+
+        expect(result.chosenPlanState, ChosenPlanStateEnum.statePaid);
+        verify(mockChatService.getChosenPlan(id: planId)).called(1);
+      });
+
+      test('getChosenPlan - возвращает план в статусе payment_failed', () async {
+        const planId = 1;
+        final fixture = FixtureReader.readAsMap(
+          'chat/chosen_plan/chosen_plan_payment_failed_response.json',
+        );
+        final expectedPlan = ChosenPlanModel.fromJson(fixture);
+
+        when(mockChatService.getChosenPlan(id: planId)).thenAnswer((_) async => expectedPlan);
+
+        final result = await chatRepository.getChosenPlan(id: planId);
+
+        expect(result.chosenPlanState, ChosenPlanStateEnum.statePaymentFailed);
+        verify(mockChatService.getChosenPlan(id: planId)).called(1);
+      });
+
+      test('getChosenPlan - возвращает план в статусе canceled_by_the_initiator', () async {
+        const planId = 1;
+        final fixture = FixtureReader.readAsMap(
+          'chat/chosen_plan/chosen_plan_canceled_by_the_initiator_response.json',
+        );
+        final expectedPlan = ChosenPlanModel.fromJson(fixture);
+
+        when(mockChatService.getChosenPlan(id: planId)).thenAnswer((_) async => expectedPlan);
+
+        final result = await chatRepository.getChosenPlan(id: planId);
+
+        expect(result.chosenPlanState, ChosenPlanStateEnum.stateCanceledByTheInitiator);
+        verify(mockChatService.getChosenPlan(id: planId)).called(1);
+      });
+    });
+
     test('finishChosenPlan - завершает выбранный план', () async {
       const planId = 123;
 
-      when(mockChatService.finishChosenPlan(id: planId))
-          .thenAnswer((_) async => Future.value());
+      when(
+        mockChatService.finishChosenPlan(id: planId),
+      ).thenAnswer((_) async => Future.value());
 
       await chatRepository.finishChosenPlan(id: planId);
 
       verify(mockChatService.finishChosenPlan(id: planId)).called(1);
     });
 
-    test('complainAboutConsultation - отправляет жалобу на консультацию', () async {
-      const planId = 123;
-      final complainFixture = FixtureReader.readAsMap('chat/plan_complain_response.json');
-      final complainModel = PlanComplainModel.fromJson(complainFixture);
+    test(
+      'complainAboutConsultation - отправляет жалобу на консультацию',
+      () async {
+        const planId = 123;
+        final complainFixture = FixtureReader.readAsMap(
+          'chat/plan_complain_response.json',
+        );
+        final complainModel = PlanComplainModel.fromJson(complainFixture);
 
-      when(mockChatService.complainAboutConsultation(id: planId, body: complainModel))
-          .thenAnswer((_) async => Future.value());
+        when(
+          mockChatService.complainAboutConsultation(
+            id: planId,
+            body: complainModel,
+          ),
+        ).thenAnswer((_) async => Future.value());
 
-      await chatRepository.complainAboutConsultation(
-        id: planId,
-        body: complainModel,
-      );
+        await chatRepository.complainAboutConsultation(
+          id: planId,
+          body: complainModel,
+        );
 
-      verify(mockChatService.complainAboutConsultation(id: planId, body: complainModel))
-          .called(1);
-    });
+        verify(
+          mockChatService.complainAboutConsultation(
+            id: planId,
+            body: complainModel,
+          ),
+        ).called(1);
+      },
+    );
 
-    test('getChatByUserSlug - возвращает ID чата при успешном ответе', () async {
-      const slug = 'user-slug';
-      const chatId = 'chat-id-123';
-      final response = HttpResponse(
-        {'id': chatId},
-        Response(
-          requestOptions: RequestOptions(path: ''),
-          statusCode: 200,
-        ),
-      );
+    test(
+      'getChatByUserSlug - возвращает ID чата при успешном ответе',
+      () async {
+        const slug = 'user-slug';
+        const chatId = 'chat-id-123';
+        final response = HttpResponse({
+          'id': chatId,
+        }, Response(requestOptions: RequestOptions(path: ''), statusCode: 200));
 
-      when(mockChatService.getChatByUserSlug(slug: slug))
-          .thenAnswer((_) async => response);
+        when(
+          mockChatService.getChatByUserSlug(slug: slug),
+        ).thenAnswer((_) async => response);
 
-      final result = await chatRepository.getChatByUserSlug(slug);
+        final result = await chatRepository.getChatByUserSlug(slug);
 
-      expect(result, chatId);
-      verify(mockChatService.getChatByUserSlug(slug: slug)).called(1);
-    });
+        expect(result, chatId);
+        verify(mockChatService.getChatByUserSlug(slug: slug)).called(1);
+      },
+    );
 
     test('getChatByUserSlug - возвращает 404 при отсутствии чата', () async {
       const slug = 'user-slug';
       final response = HttpResponse(
         {},
-        Response(
-          requestOptions: RequestOptions(path: ''),
-          statusCode: 404,
-        ),
+        Response(requestOptions: RequestOptions(path: ''), statusCode: 404),
       );
 
-      when(mockChatService.getChatByUserSlug(slug: slug))
-          .thenAnswer((_) async => response);
+      when(
+        mockChatService.getChatByUserSlug(slug: slug),
+      ).thenAnswer((_) async => response);
 
       final result = await chatRepository.getChatByUserSlug(slug);
 
@@ -357,17 +543,20 @@ void main() {
       verify(mockChatService.getChatByUserSlug(slug: slug)).called(1);
     });
 
-    test('getChatByUserSlug - пробрасывает исключение при ошибке сети', () async {
-      const slug = 'user-slug';
+    test(
+      'getChatByUserSlug - пробрасывает исключение при ошибке сети',
+      () async {
+        const slug = 'user-slug';
 
-      when(mockChatService.getChatByUserSlug(slug: slug))
-          .thenThrow(Exception('Network error'));
+        when(
+          mockChatService.getChatByUserSlug(slug: slug),
+        ).thenThrow(Exception('Network error'));
 
-      await expectLater(
-        chatRepository.getChatByUserSlug(slug),
-        throwsA(isA<Exception>()),
-      );
-    });
+        await expectLater(
+          chatRepository.getChatByUserSlug(slug),
+          throwsA(isA<Exception>()),
+        );
+      },
+    );
   });
 }
-

test/features/chat/services/chat_service_test.dart

@@ -1,8 +1,10 @@
 import 'package:dio/dio.dart';
 import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
 import 'package:eatvio_app/features/chat/models/chat_messages_model.dart';
-import 'package:eatvio_app/features/chat/models/chat_room_model.dart' as chat_room;
+import 'package:eatvio_app/features/chat/models/chat_room_model.dart'
+    as chat_room;
 import 'package:eatvio_app/features/chat/models/chat_room_pagination_model.dart';
+import 'package:eatvio_app/features/chat/models/order_id_to_conversation_model.dart';
 import 'package:eatvio_app/features/chat/models/payment_model.dart';
 import 'package:eatvio_app/features/chat/models/plan_complain_model.dart';
 import 'package:eatvio_app/features/chat/services/chat_service.dart';
@@ -24,10 +26,16 @@ void main() {
     });
 
     test('getChatRooms - возвращает список комнат чата', () async {
-      final paginationFixture = FixtureReader.readAsMap('chat/chat_room_pagination_response.json');
-      final expectedPagination = ChatRoomPaginationModel.fromJson(paginationFixture);
+      final paginationFixture = FixtureReader.readAsMap(
+        'chat/chat_room_pagination_response.json',
+      );
+      final expectedPagination = ChatRoomPaginationModel.fromJson(
+        paginationFixture,
+      );
 
-      when(mockChatService.getChatRooms(query: null, page: 1)).thenAnswer((_) async => expectedPagination);
+      when(
+        mockChatService.getChatRooms(query: null, page: 1),
+      ).thenAnswer((_) async => expectedPagination);
 
       final result = await mockChatService.getChatRooms(query: null, page: 1);
 
@@ -38,10 +46,16 @@ void main() {
 
     test('getChatRooms - возвращает список комнат с запросом', () async {
       const query = 'test query';
-      final paginationFixture = FixtureReader.readAsMap('chat/chat_room_pagination_response.json');
-      final expectedPagination = ChatRoomPaginationModel.fromJson(paginationFixture);
+      final paginationFixture = FixtureReader.readAsMap(
+        'chat/chat_room_pagination_response.json',
+      );
+      final expectedPagination = ChatRoomPaginationModel.fromJson(
+        paginationFixture,
+      );
 
-      when(mockChatService.getChatRooms(query: query, page: 1)).thenAnswer((_) async => expectedPagination);
+      when(
+        mockChatService.getChatRooms(query: query, page: 1),
+      ).thenAnswer((_) async => expectedPagination);
 
       final result = await mockChatService.getChatRooms(query: query, page: 1);
 
@@ -51,10 +65,14 @@ void main() {
 
     test('getChatRoom - возвращает комнату чата по UUID', () async {
       const uuid = 'chat-1';
-      final roomFixture = FixtureReader.readAsMap('chat/chat_room_response.json');
+      final roomFixture = FixtureReader.readAsMap(
+        'chat/chat_room_response.json',
+      );
       final expectedRoom = chat_room.ChatRoomModel.fromJson(roomFixture);
 
-      when(mockChatService.getChatRoom(uuid: uuid)).thenAnswer((_) async => expectedRoom);
+      when(
+        mockChatService.getChatRoom(uuid: uuid),
+      ).thenAnswer((_) async => expectedRoom);
 
       final result = await mockChatService.getChatRoom(uuid: uuid);
 
@@ -67,62 +85,114 @@ void main() {
       const slug = 'user-slug';
       const data = 'Test message';
       const socketId = 'socket-id-123';
-      final messageFixture = FixtureReader.readAsMap('chat/chat_message_response.json');
+      final messageFixture = FixtureReader.readAsMap(
+        'chat/chat_message_response.json',
+      );
       final expectedMessage = ChatMessageModel.fromJson(messageFixture);
 
       // ignore: null_argument_to_non_null_type
-      when(mockChatService.sendMessage(slug: slug, data: data, mediaData: null, socketId: socketId)).thenAnswer((_) async => expectedMessage);
+      when(
+        mockChatService.sendMessage(
+          slug: slug,
+          data: data,
+          mediaData: null,
+          socketId: socketId,
+        ),
+      ).thenAnswer((_) async => expectedMessage);
 
-      final result = await mockChatService.sendMessage(slug: slug, data: data, mediaData: null, socketId: socketId);
+      final result = await mockChatService.sendMessage(
+        slug: slug,
+        data: data,
+        mediaData: null,
+        socketId: socketId,
+      );
 
       expect(result, isA<ChatMessageModel>());
       expect(result.data, data);
-      verify(mockChatService.sendMessage(slug: slug, data: data, mediaData: null, socketId: socketId)).called(1);
+      verify(
+        mockChatService.sendMessage(
+          slug: slug,
+          data: data,
+          mediaData: null,
+          socketId: socketId,
+        ),
+      ).called(1);
     });
 
     test('getChatMessages - возвращает сообщения чата', () async {
       const chatId = 'chat-1';
       const page = 1;
-      final messagesFixture = FixtureReader.readAsMap('chat/chat_messages_response.json');
+      final messagesFixture = FixtureReader.readAsMap(
+        'chat/chat_messages_response.json',
+      );
       final expectedMessages = ChatMessagesModel.fromJson(messagesFixture);
 
-      when(mockChatService.getChatMessages(id: chatId, page: page)).thenAnswer((_) async => expectedMessages);
+      when(
+        mockChatService.getChatMessages(id: chatId, page: page),
+      ).thenAnswer((_) async => expectedMessages);
 
-      final result = await mockChatService.getChatMessages(id: chatId, page: page);
+      final result = await mockChatService.getChatMessages(
+        id: chatId,
+        page: page,
+      );
 
       expect(result, isA<ChatMessagesModel>());
       expect(result.messagesList.length, 2);
       verify(mockChatService.getChatMessages(id: chatId, page: page)).called(1);
     });
 
-    test('getChatRoomIdByUserSlug - возвращает комнату по slug пользователя', () async {
-      const slug = 'user-1';
-      final roomFixture = FixtureReader.readAsMap('chat/chat_room_response.json');
-      final expectedRoom = chat_room.ChatRoomModel.fromJson(roomFixture);
+    test(
+      'getChatRoomIdByUserSlug - возвращает комнату по slug пользователя',
+      () async {
+        const slug = 'user-1';
+        final roomFixture = FixtureReader.readAsMap(
+          'chat/chat_room_response.json',
+        );
+        final expectedRoom = chat_room.ChatRoomModel.fromJson(roomFixture);
 
-      when(mockChatService.getChatRoomIdByUserSlug(user: slug)).thenAnswer((_) async => expectedRoom);
+        when(
+          mockChatService.getChatRoomIdByUserSlug(user: slug),
+        ).thenAnswer((_) async => expectedRoom);
 
-      final result = await mockChatService.getChatRoomIdByUserSlug(user: slug);
+        final result = await mockChatService.getChatRoomIdByUserSlug(
+          user: slug,
+        );
 
-      expect(result, isA<chat_room.ChatRoomModel>());
-      verify(mockChatService.getChatRoomIdByUserSlug(user: slug)).called(1);
-    });
+        expect(result, isA<chat_room.ChatRoomModel>());
+        verify(mockChatService.getChatRoomIdByUserSlug(user: slug)).called(1);
+      },
+    );
 
     test('markMessagesAsRead - отмечает сообщения как прочитанные', () async {
       const chatId = 'chat-id-123';
       final messageIds = [1, 2, 3];
 
-      when(mockChatService.markMessagesAsRead(id: chatId, body: {'messages_ids': messageIds})).thenAnswer((_) async => Future.value());
+      when(
+        mockChatService.markMessagesAsRead(
+          id: chatId,
+          body: {'messages_ids': messageIds},
+        ),
+      ).thenAnswer((_) async => Future.value());
 
-      await mockChatService.markMessagesAsRead(id: chatId, body: {'messages_ids': messageIds});
+      await mockChatService.markMessagesAsRead(
+        id: chatId,
+        body: {'messages_ids': messageIds},
+      );
 
-      verify(mockChatService.markMessagesAsRead(id: chatId, body: {'messages_ids': messageIds})).called(1);
+      verify(
+        mockChatService.markMessagesAsRead(
+          id: chatId,
+          body: {'messages_ids': messageIds},
+        ),
+      ).called(1);
     });
 
     test('cancelChosenPlan - отменяет выбранный план', () async {
       const planId = 123;
 
-      when(mockChatService.cancelChosenPlan(id: planId)).thenAnswer((_) async => Future.value());
+      when(
+        mockChatService.cancelChosenPlan(id: planId),
+      ).thenAnswer((_) async => Future.value());
 
       await mockChatService.cancelChosenPlan(id: planId);
 
@@ -133,33 +203,80 @@ void main() {
       const planId = 123;
       final date = {'start_date': '2024-01-15'};
 
-      when(mockChatService.choseStartPlanDate(id: planId, date: date)).thenAnswer((_) async => Future.value());
+      when(
+        mockChatService.choseStartPlanDate(id: planId, date: date),
+      ).thenAnswer((_) async => Future.value());
 
       await mockChatService.choseStartPlanDate(id: planId, date: date);
 
-      verify(mockChatService.choseStartPlanDate(id: planId, date: date)).called(1);
+      verify(
+        mockChatService.choseStartPlanDate(id: planId, date: date),
+      ).called(1);
     });
 
     test('getPaymentLink - возвращает ссылку на оплату', () async {
       const planId = 123;
-      final paymentFixture = FixtureReader.readAsMap('chat/payment_response.json');
+      final paymentFixture = FixtureReader.readAsMap(
+        'chat/payments/payment_response.json',
+      );
       final expectedPayment = PaymentModel.fromJson(paymentFixture);
 
-      when(mockChatService.getPaymentLink(id: planId)).thenAnswer((_) async => expectedPayment);
+      when(
+        mockChatService.getPaymentLink(id: planId, body: {'payment_provider': 'mock'}),
+      ).thenAnswer((_) async => expectedPayment);
 
-      final result = await mockChatService.getPaymentLink(id: planId);
+      final result = await mockChatService.getPaymentLink(
+        id: planId,
+        body: {'payment_provider': 'mock'},
+      );
 
       expect(result, isA<PaymentModel>());
       expect(result.paymentUrl, 'https://example.com/checkout/payment-123');
-      verify(mockChatService.getPaymentLink(id: planId)).called(1);
+      verify(mockChatService.getPaymentLink(id: planId, body: {'payment_provider': 'mock'})).called(1);
     });
 
+    test(
+      'getPaymentLink - возвращает ссылку на оплату alfa-bank',
+      () async {
+        const planId = 123;
+        final requestFixture = FixtureReader.readAsMap(
+          'chat/payments/payment_alfabank_request.json',
+        );
+        final requestBody = Map<String, String>.from(requestFixture);
+        final paymentFixture = FixtureReader.readAsMap(
+          'chat/payments/payment_response_alfa_bank.json',
+        );
+        final expectedPayment = PaymentModel.fromJson(paymentFixture);
+
+        when(
+          mockChatService.getPaymentLink(id: planId, body: requestBody),
+        ).thenAnswer((_) async => expectedPayment);
+
+        final result = await mockChatService.getPaymentLink(
+          id: planId,
+          body: requestBody,
+        );
+
+        expect(result, isA<PaymentModel>());
+        expect(result.paymentUrl, 'https://qr.nspk.ru/ASDFASDFASDFASDF');
+        expect(result.orderId, 'alfa_c29_k15138_t1712345678_r1234');
+        expect(result.paymentProvider, 'alfa-bank');
+        verify(
+          mockChatService.getPaymentLink(id: planId, body: requestBody),
+        ).called(1);
+      },
+    );
+
     test('getChosenPlan - возвращает выбранный план', () async {
       const planId = 1;
-      final chosenPlanFixture = FixtureReader.readAsMap('chat/chosen_plan_response.json');
+      final chosenPlanFixture = FixtureReader.readAsMap(
+        'chat/chosen_plan/chosen_plan_in_progress_response.json',
+      );
       final expectedPlan = ChosenPlanModel.fromJson(chosenPlanFixture);
 
-      when(mockChatService.getChosenPlan(id: planId)).thenAnswer((_) async => expectedPlan);
+      when(
+        mockChatService.getChosenPlan(id: planId),
+      ).thenAnswer((_) async => expectedPlan);
 
       final result = await mockChatService.getChosenPlan(id: planId);
 
@@ -171,31 +288,80 @@ void main() {
     test('finishChosenPlan - завершает выбранный план', () async {
       const planId = 123;
 
-      when(mockChatService.finishChosenPlan(id: planId)).thenAnswer((_) async => Future.value());
+      when(
+        mockChatService.finishChosenPlan(id: planId),
+      ).thenAnswer((_) async => Future.value());
 
       await mockChatService.finishChosenPlan(id: planId);
 
       verify(mockChatService.finishChosenPlan(id: planId)).called(1);
     });
 
-    test('complainAboutConsultation - отправляет жалобу на консультацию', () async {
-      const planId = 123;
-      final complainFixture = FixtureReader.readAsMap('chat/plan_complain_response.json');
-      final complainModel = PlanComplainModel.fromJson(complainFixture);
+    test(
+      'complainAboutConsultation - отправляет жалобу на консультацию',
+      () async {
+        const planId = 123;
+        final complainFixture = FixtureReader.readAsMap(
+          'chat/plan_complain_response.json',
+        );
+        final complainModel = PlanComplainModel.fromJson(complainFixture);
 
-      when(mockChatService.complainAboutConsultation(id: planId, body: complainModel)).thenAnswer((_) async => Future.value());
+        when(
+          mockChatService.complainAboutConsultation(
+            id: planId,
+            body: complainModel,
+          ),
+        ).thenAnswer((_) async => Future.value());
 
-      await mockChatService.complainAboutConsultation(id: planId, body: complainModel);
+        await mockChatService.complainAboutConsultation(
+          id: planId,
+          body: complainModel,
+        );
 
-      verify(mockChatService.complainAboutConsultation(id: planId, body: complainModel)).called(1);
-    });
+        verify(
+          mockChatService.complainAboutConsultation(
+            id: planId,
+            body: complainModel,
+          ),
+        ).called(1);
+      },
+    );
+
+    test(
+      'resolveOrderIdToConversation - возвращает модель по orderId',
+      () async {
+        const orderId = 'alfa_c29_k15138_t1712345678_r1234';
+        final fixture = FixtureReader.readAsMap(
+          'chat/payments/order_id_to_chat_uuid_response.json',
+        );
+        final expected = OrderIdToConversationModel.fromJson(fixture);
+
+        when(
+          mockChatService.resolveOrderIdToConversation(orderId: orderId),
+        ).thenAnswer((_) async => expected);
+
+        final result = await mockChatService.resolveOrderIdToConversation(
+          orderId: orderId,
+        );
+
+        expect(result, isA<OrderIdToConversationModel>());
+        expect(result.chosenPlanId, 12);
+        verify(
+          mockChatService.resolveOrderIdToConversation(orderId: orderId),
+        ).called(1);
+      },
+    );
 
     test('getChatByUserSlug - возвращает HttpResponse', () async {
       const slug = 'user-slug';
       const chatId = 'chat-id-123';
-      final response = HttpResponse({'id': chatId}, Response(requestOptions: RequestOptions(path: ''), statusCode: 200));
+      final response = HttpResponse({
+        'id': chatId,
+      }, Response(requestOptions: RequestOptions(path: ''), statusCode: 200));
 
-      when(mockChatService.getChatByUserSlug(slug: slug)).thenAnswer((_) async => response);
+      when(
+        mockChatService.getChatByUserSlug(slug: slug),
+      ).thenAnswer((_) async => response);
 
       final result = await mockChatService.getChatByUserSlug(slug: slug);
 

test/features/feed/models/post_feed_mapper_test.dart

@@ -0,0 +1,56 @@
+import 'package:eatvio_app/core/app_config.dart';
+import 'package:eatvio_app/core/app_initializer.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/features/feed/models/post_feed_mapper.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import '../../../fixtures/feed_fixtures.dart';
+
+void main() {
+  group('PostFeedMapper', () {
+    setUpAll(() async {
+      await sl.reset();
+      dotenv.loadFromString(envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost');
+      sl.registerLazySingleton<AppConfig>(() => AppConfig(buildType: AppBuildType.tests)..setBaseUrl('http://localhost'));
+    });
+
+    test('maps fixture item post_id to FeedBlogPostModel.id', () {
+      final item = FeedFixtures.postFeedItem();
+      final model = PostFeedMapper.fromPostFeedItem(item, currentUserId: 10);
+
+      expect(model.id, 1);
+      expect(model.author.authorIsMe, isTrue);
+      expect(model.author.authorSlug, 'anna-ivanova');
+      expect(model.images, hasLength(2));
+      expect(model.videoUrl, isEmpty);
+      expect(model.videoEmbedUrl, isNull);
+      expect(model.title, 'Завтрак с овсянкой');
+      expect(model.image, 'http://localhost/storage/posts/oatmeal.jpg');
+      expect(model.author.isEntitySubscribedByMe, isFalse);
+    });
+
+    test('maps fixture embed video post and likes', () {
+      final item = FeedFixtures.postFeedItem(index: 1);
+      final model = PostFeedMapper.fromPostFeedItem(item);
+
+      expect(model.id, 2);
+      expect(model.videoUrl, isEmpty);
+      expect(model.videoEmbedUrl, 'https://www.youtube.com/embed/dQw4w9WgXcQ');
+      expect(model.wasLikedByMe, isTrue);
+      expect(model.totalLikes, 42);
+      expect(model.author.authorIsMe, isFalse);
+      expect(model.author.isEntitySubscribedByMe, isTrue);
+    });
+
+    test('maps all fixture posts', () {
+      final posts = FeedFixtures.mappedFeedPosts(currentUserId: 11);
+
+      expect(posts, hasLength(3));
+      expect(posts[1].author.authorIsMe, isTrue);
+      expect(posts[1].author.isEntitySubscribedByMe, isTrue);
+      expect(posts[2].videoEmbedUrl, contains('rutube.ru/play/embed'));
+      expect(posts[2].author.isEntitySubscribedByMe, isNull);
+    });
+  });
+}

test/features/feed/models/post_feed_pagination_model_test.dart

@@ -0,0 +1,57 @@
+import 'package:flutter_test/flutter_test.dart';
+
+import '../../../fixtures/feed_fixtures.dart';
+
+void main() {
+  group('PostFeedPaginationModel fixtures', () {
+    test('parses first page with gallery, video and next_cursor', () {
+      final model = FeedFixtures.postFeedPaginationModel();
+
+      expect(model.data, hasLength(3));
+      expect(model.meta.perPage, 20);
+      expect(model.meta.nextCursor, 'eyJpZCI6MTAzfQ');
+      expect(model.meta.prevCursor, isNull);
+      expect(model.links.next, contains('cursor=eyJpZCI6MTAzfQ'));
+
+      final withGallery = model.data[0];
+      expect(withGallery.postId, 1);
+      expect(withGallery.images, hasLength(2));
+      expect(withGallery.images.first.orientation, 'horizontal');
+      expect(withGallery.videoEmbedUrl, isNull);
+      expect(withGallery.isEntitySubscribedByMe, isFalse);
+      expect(withGallery.postAuthorDetails?.slug, 'anna-ivanova');
+      expect(withGallery.postAuthorDetails?.isConsultant, isTrue);
+
+      final withYoutubeEmbed = model.data[1];
+      expect(withYoutubeEmbed.postId, 2);
+      expect(withYoutubeEmbed.videoEmbedUrl, 'https://www.youtube.com/embed/dQw4w9WgXcQ');
+      expect(withYoutubeEmbed.postIsLikedByUser, isTrue);
+      expect(withYoutubeEmbed.isEntitySubscribedByMe, isTrue);
+      expect(withYoutubeEmbed.images, isEmpty);
+
+      final withRutubeEmbed = model.data[2];
+      expect(withRutubeEmbed.postId, 3);
+      expect(withRutubeEmbed.postImageUrl, isNull);
+      expect(withRutubeEmbed.images, hasLength(1));
+      expect(withRutubeEmbed.videoEmbedUrl, contains('rutube.ru/play/embed'));
+      expect(withRutubeEmbed.isEntitySubscribedByMe, isNull);    });
+
+    test('parses next page without next_cursor', () {
+      final model = FeedFixtures.postFeedNextPagePaginationModel();
+
+      expect(model.data, hasLength(1));
+      expect(model.data.first.postId, 4);
+      expect(model.meta.nextCursor, isNull);
+      expect(model.meta.prevCursor, 'eyJpZCI6MTAzfQ');
+      expect(model.links.next, isNull);
+    });
+
+    test('parses empty feed', () {
+      final model = FeedFixtures.postFeedEmptyPaginationModel();
+
+      expect(model.data, isEmpty);
+      expect(model.meta.nextCursor, isNull);
+      expect(model.links.next, isNull);
+    });
+  });
+}

test/features/feed/presentation/bloc/feed_cubit/feed_cubit_test.dart

@@ -1,7 +1,5 @@
-import 'package:eatvio_app/core/models/pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
-import 'package:eatvio_app/features/feed/models/feed_blog_post_settings_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_state.dart';
 import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
@@ -13,211 +11,52 @@ import 'feed_cubit_test.mocks.dart';
 
 @GenerateNiceMocks([MockSpec<FeedRepository>()])
 void main() {
-  group('FeedCubit', () {
-    FeedCubit? feedCubit;
-    late MockFeedRepository mockFeedRepository;
-    late FeedBlogPostSettingsModel feedBlogPostsFixture;
+  group('FeedCubit cursor flow', () {
+    late FeedCubit cubit;
+    late MockFeedRepository repository;
+
+    final post = FeedBlogPostModel(
+      id: 10,
+      state: 'active',
+      image: '',
+      description: 'description',
+      author: const Author(authorSlug: 'slug', authorName: 'name', authorProfileIcon: '', authorIsMe: false),
+      videoUrl: '',
+      createdAt: DateTime(2024, 1, 1),
+      updatedAt: DateTime(2024, 1, 1),
+      title: 'title',
+      totalLikes: 1,
+      totalViews: 1,
+      totalComments: 1,
+      wasLikedByMe: false,
+    );
 
     setUp(() {
-      mockFeedRepository = MockFeedRepository();
-      
-      // Создаём тестовые данные
-      final testPosts = [
-        FeedBlogPostModel(
-          id: 1,
-          state: 'published',
-          image: 'https://example.com/image1.jpg',
-          description: 'Описание поста 1',
-          author: const Author(
-            authorSlug: 'author-1',
-            authorName: 'Автор 1',
-            authorProfileIcon: 'https://example.com/photo1.jpg',
-            authorIsMe: false,
-            isEntitySubscribedByMe: null,
-            authorPlaceInRating: null,
-          ),
-          videoUrl: '',
-          createdAt: DateTime.now(),
-          updatedAt: DateTime.now(),
-          title: 'Тестовый пост 1',
-          totalLikes: 10,
-          totalViews: 100,
-          totalComments: 5,
-          wasLikedByMe: false,
-        ),
-        FeedBlogPostModel(
-          id: 2,
-          state: 'published',
-          image: 'https://example.com/image2.jpg',
-          description: 'Описание поста 2',
-          author: const Author(
-            authorSlug: 'author-2',
-            authorName: 'Автор 2',
-            authorProfileIcon: 'https://example.com/photo2.jpg',
-            authorIsMe: false,
-            isEntitySubscribedByMe: null,
-            authorPlaceInRating: null,
-          ),
-          videoUrl: '',
-          createdAt: DateTime.now(),
-          updatedAt: DateTime.now(),
-          title: 'Тестовый пост 2',
-          totalLikes: 20,
-          totalViews: 200,
-          totalComments: 10,
-          wasLikedByMe: true,
-        ),
-      ];
-      
-      feedBlogPostsFixture = FeedBlogPostSettingsModel(
-        feedBlogPostList: testPosts,
-        meta: const Meta(
-          currentPage: 1,
-          from: null,
-          lastPage: 3,
-          links: [],
-          path: null,
-          perPage: 10,
-          to: null,
-          total: 25,
-          totalMinPrice: null,
-          totalMaxPrice: null,
-        ),
-      );
+      repository = MockFeedRepository();
+      cubit = FeedCubit(feedRepository: repository);
     });
 
     tearDown(() async {
-      if (feedCubit != null && !feedCubit!.isClosed) {
-        await Future.delayed(const Duration(milliseconds: 100));
-        feedCubit!.close();
-        feedCubit = null;
-      }
+      await cubit.close();
     });
 
-    test('начальное состояние - FeedStateLoading', () {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      expect(feedCubit!.state, const FeedState.loading());
+    test('error state on load failure', () async {
+      when(repository.getFeed(search: null, cursor: null, currentUserId: null)).thenThrow(Exception('boom'));
+
+      await cubit.loadFeedBlogPostList();
+
+      expect(cubit.state, isA<FeedStateError>());
     });
 
-    test('loadFeedBlogPostList - успешная загрузка постов', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
+    test('updateFeedBlogPostList updates likes in loaded state', () async {
+      when(repository.getFeed(search: null, cursor: null, currentUserId: null)).thenAnswer((_) async => (posts: [post], nextCursor: null));
+      await cubit.loadFeedBlogPostList();
 
-      when(mockFeedRepository.getFeedBlogPosts(query: null))
-          .thenAnswer((_) async => feedBlogPostsFixture);
+      cubit.updateFeedBlogPostList(post, true);
 
-      await feedCubit!.loadFeedBlogPostList();
-
-      await Future.delayed(const Duration(milliseconds: 100));
-      expect(feedCubit!.state, isA<FeedStateLoaded>());
-      final loadedState = feedCubit!.state as FeedStateLoaded;
-      expect(loadedState.feedBlogPostList.length, 2);
-      expect(loadedState.isLoading, false);
-      expect(feedCubit!.lastPage, 3);
-    });
-
-    test('loadFeedBlogPostList - загрузка с запросом', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      const query = 'тест';
-
-      when(mockFeedRepository.getFeedBlogPosts(query: query))
-          .thenAnswer((_) async => feedBlogPostsFixture);
-
-      await feedCubit!.loadFeedBlogPostList(query: query);
-
-      await Future.delayed(const Duration(milliseconds: 100));
-      expect(feedCubit!.state, isA<FeedStateLoaded>());
-      verify(mockFeedRepository.getFeedBlogPosts(query: query)).called(1);
-    });
-
-    test('loadFeedBlogPostList - обработка ошибки', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-
-      when(mockFeedRepository.getFeedBlogPosts(query: anyNamed('query')))
-          .thenThrow(Exception('Ошибка загрузки'));
-
-      await feedCubit!.loadFeedBlogPostList();
-
-      await Future.delayed(const Duration(milliseconds: 100));
-      expect(feedCubit!.state, isA<FeedStateError>());
-      final errorState = feedCubit!.state as FeedStateError;
-      expect(errorState.errorMessage, contains('Exception'));
-    });
-
-    test('updateFeedBlogPostList - обновление лайка поста', () {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      
-      // Сначала загружаем посты
-      when(mockFeedRepository.getFeedBlogPosts(query: anyNamed('query')))
-          .thenAnswer((_) async => feedBlogPostsFixture);
-
-      // Устанавливаем состояние loaded вручную для теста
-      feedCubit!.emit(FeedState.loaded(
-        feedBlogPostList: feedBlogPostsFixture.feedBlogPostList,
-        isLoading: false,
-      ));
-      feedCubit!.lastPage = 3;
-
-      final postToUpdate = feedBlogPostsFixture.feedBlogPostList.first;
-      feedCubit!.updateFeedBlogPostList(postToUpdate, true);
-
-      expect(feedCubit!.state, isA<FeedStateLoaded>());
-      final loadedState = feedCubit!.state as FeedStateLoaded;
-      final updatedPost = loadedState.feedBlogPostList.firstWhere((p) => p.id == postToUpdate.id);
-      expect(updatedPost.wasLikedByMe, true);
-      expect(updatedPost.totalLikes, postToUpdate.totalLikes + 1);
-    });
-
-    test('updateFeedBlogPostList - снятие лайка', () {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      
-      feedCubit!.emit(FeedState.loaded(
-        feedBlogPostList: feedBlogPostsFixture.feedBlogPostList,
-        isLoading: false,
-      ));
-      feedCubit!.lastPage = 3;
-
-      final postToUpdate = feedBlogPostsFixture.feedBlogPostList[1]; // У этого wasLikedByMe = true
-      final initialLikes = postToUpdate.totalLikes;
-      
-      feedCubit!.updateFeedBlogPostList(postToUpdate, false);
-
-      expect(feedCubit!.state, isA<FeedStateLoaded>());
-      final loadedState = feedCubit!.state as FeedStateLoaded;
-      final updatedPost = loadedState.feedBlogPostList.firstWhere((p) => p.id == postToUpdate.id);
-      expect(updatedPost.wasLikedByMe, false);
-      expect(updatedPost.totalLikes, initialLikes - 1);
-    });
-
-    test('updateFeedBlogPostList - игнорирует обновление если состояние не loaded', () {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      
-      // Состояние loading
-      feedCubit!.emit(const FeedState.loading());
-      
-      final postToUpdate = feedBlogPostsFixture.feedBlogPostList.first;
-      feedCubit!.updateFeedBlogPostList(postToUpdate, true);
-
-      // Состояние не должно измениться
-      expect(feedCubit!.state, const FeedState.loading());
-    });
-
-    test('updateFeedBlogPostList - игнорирует обновление если пост не найден', () {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      
-      feedCubit!.emit(FeedState.loaded(
-        feedBlogPostList: feedBlogPostsFixture.feedBlogPostList,
-        isLoading: false,
-      ));
-      feedCubit!.lastPage = 3;
-
-      // Создаём пост с несуществующим ID
-      final nonExistentPost = feedBlogPostsFixture.feedBlogPostList.first.copyWith(id: 999);
-      feedCubit!.updateFeedBlogPostList(nonExistentPost, true);
-
-      // Список не должен измениться
-      final loadedState = feedCubit!.state as FeedStateLoaded;
-      expect(loadedState.feedBlogPostList.length, 2);
+      final loaded = cubit.state as FeedStateLoaded;
+      expect(loaded.feedBlogPostList.first.wasLikedByMe, true);
+      expect(loaded.feedBlogPostList.first.totalLikes, 2);
     });
   });
 }
-

test/features/feed/presentation/bloc/feed_cubit_test.dart

@@ -1,404 +1,66 @@
-import 'package:eatvio_app/core/models/pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
-import 'package:eatvio_app/features/feed/models/feed_blog_post_settings_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_state.dart';
 import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
+
 import 'feed_cubit_test.mocks.dart';
 
 @GenerateNiceMocks([MockSpec<FeedRepository>()])
 void main() {
   group('FeedCubit', () {
-    FeedCubit? feedCubit;
-    late MockFeedRepository mockFeedRepository;
+    late MockFeedRepository repository;
+    late FeedCubit cubit;
 
-    final testBlogPost = FeedBlogPostModel(
+    final post = FeedBlogPostModel(
       id: 1,
-      title: 'Test Post',
-      description: 'Test description',
-      image: 'https://example.com/image.jpg',
-      state: 'published',
-      author: const Author(authorSlug: 'author-1', authorName: 'Author Name', authorProfileIcon: 'https://example.com/icon.jpg', authorIsMe: false),
-      videoUrl: 'https://example.com/video.mp4',
-      createdAt: DateTime(2024, 1, 15),
-      updatedAt: DateTime(2024, 1, 15),
-      totalLikes: 10,
-      totalViews: 100,
-      totalComments: 5,
+      state: 'active',
+      image: 'https://example.com/image.png',
+      description: 'text',
+      author: const Author(authorSlug: 'a', authorName: 'Author', authorProfileIcon: 'https://example.com/avatar.png', authorIsMe: false),
+      videoUrl: '',
+      createdAt: DateTime(2024, 1, 1),
+      updatedAt: DateTime(2024, 1, 1),
+      title: 'Title',
+      totalLikes: 1,
+      totalViews: 2,
+      totalComments: 3,
       wasLikedByMe: false,
     );
 
-    final testBlogPost2 = FeedBlogPostModel(
-      id: 2,
-      title: 'Test Post 2',
-      description: 'Test description 2',
-      image: 'https://example.com/image2.jpg',
-      state: 'published',
-      author: const Author(authorSlug: 'author-2', authorName: 'Author Name 2', authorProfileIcon: 'https://example.com/icon2.jpg', authorIsMe: false),
-      videoUrl: 'https://example.com/video2.mp4',
-      createdAt: DateTime(2024, 1, 16),
-      updatedAt: DateTime(2024, 1, 16),
-      totalLikes: 20,
-      totalViews: 200,
-      totalComments: 10,
-      wasLikedByMe: true,
-    );
-
     setUp(() {
-      mockFeedRepository = MockFeedRepository();
+      repository = MockFeedRepository();
+      cubit = FeedCubit(feedRepository: repository);
     });
 
     tearDown(() async {
-      if (feedCubit != null && !feedCubit!.isClosed) {
-        await Future.delayed(const Duration(milliseconds: 100));
-        feedCubit!.close();
-        feedCubit = null;
-      }
+      await cubit.close();
     });
 
-    test('начальное состояние - loading', () {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      expect(feedCubit!.state, const FeedState.loading());
+    test('loadFeedBlogPostList emits loaded from getFeed', () async {
+      when(repository.getFeed(search: null, cursor: null, currentUserId: null)).thenAnswer((_) async => (posts: [post], nextCursor: 'next'));
+
+      await cubit.loadFeedBlogPostList();
+
+      expect(cubit.state, isA<FeedStateLoaded>());
+      final loaded = cubit.state as FeedStateLoaded;
+      expect(loaded.feedBlogPostList, hasLength(1));
+      verify(repository.getFeed(search: null, cursor: null, currentUserId: null)).called(1);
     });
 
-    test('loadFeedBlogPostList - успешно загружает список постов', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      final expectedSettings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost],
-        meta: const Meta(currentPage: 1, lastPage: 3, total: 3, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
+    test('loadNextPage appends posts', () async {
+      when(repository.getFeed(search: null, cursor: null, currentUserId: null)).thenAnswer((_) async => (posts: [post], nextCursor: 'next'));
+      when(repository.getFeed(search: null, cursor: 'next', currentUserId: null)).thenAnswer((_) async => (posts: [post.copyWith(id: 2)], nextCursor: null));
 
-      when(mockFeedRepository.getFeedBlogPosts(query: null)).thenAnswer((_) async => expectedSettings);
+      await cubit.loadFeedBlogPostList();
+      await cubit.loadNextPage();
 
-      await feedCubit!.loadFeedBlogPostList();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      expect(feedCubit!.state, isA<FeedStateLoaded>());
-      final loadedState = feedCubit!.state as FeedStateLoaded;
-      expect(loadedState.feedBlogPostList.length, 1);
-      expect(loadedState.feedBlogPostList.first.id, 1);
-      expect(loadedState.isLoading, false);
-      expect(feedCubit!.lastPage, 3);
-      verify(mockFeedRepository.getFeedBlogPosts(query: null)).called(1);
-    });
-
-    test('loadFeedBlogPostList - загружает список постов с query', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      const query = 'test query';
-      final expectedSettings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost, testBlogPost2],
-        meta: const Meta(currentPage: 1, lastPage: 1, total: 2, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      when(mockFeedRepository.getFeedBlogPosts(query: query)).thenAnswer((_) async => expectedSettings);
-
-      await feedCubit!.loadFeedBlogPostList(query: query);
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      expect(feedCubit!.state, isA<FeedStateLoaded>());
-      final loadedState = feedCubit!.state as FeedStateLoaded;
-      expect(loadedState.feedBlogPostList.length, 2);
-      verify(mockFeedRepository.getFeedBlogPosts(query: query)).called(1);
-    });
-
-    test('loadFeedBlogPostList - обрабатывает ошибку', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      final exception = Exception('Network error');
-
-      when(mockFeedRepository.getFeedBlogPosts(query: null)).thenThrow(exception);
-
-      await feedCubit!.loadFeedBlogPostList();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      expect(feedCubit!.state, isA<FeedStateError>());
-      final errorState = feedCubit!.state as FeedStateError;
-      expect(errorState.errorMessage, contains('Exception: Network error'));
-    });
-
-    test('loadNextPage - загружает следующую страницу', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      final firstPageSettings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost],
-        meta: const Meta(currentPage: 1, lastPage: 3, total: 3, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      final secondPageSettings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost2],
-        meta: const Meta(currentPage: 2, lastPage: 3, total: 3, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      when(mockFeedRepository.getFeedBlogPosts(query: null)).thenAnswer((_) async => firstPageSettings);
-
-      await feedCubit!.loadFeedBlogPostList();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      when(mockFeedRepository.getFeedBlogPosts(page: 2, query: null)).thenAnswer((_) async => secondPageSettings);
-
-      await feedCubit!.loadNextPage();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      expect(feedCubit!.state, isA<FeedStateLoaded>());
-      final loadedState = feedCubit!.state as FeedStateLoaded;
-      expect(loadedState.feedBlogPostList.length, 2);
-      expect(feedCubit!.currentPage, 2);
-      expect(loadedState.isLoading, false);
-      verify(mockFeedRepository.getFeedBlogPosts(page: 2, query: null)).called(1);
-    });
-
-    test('loadNextPage - не загружает если уже на последней странице', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      final settings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost],
-        meta: const Meta(currentPage: 1, lastPage: 1, total: 1, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      when(mockFeedRepository.getFeedBlogPosts(query: null)).thenAnswer((_) async => settings);
-
-      await feedCubit!.loadFeedBlogPostList();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      await feedCubit!.loadNextPage();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      verifyNever(mockFeedRepository.getFeedBlogPosts(page: 2, query: anyNamed('query')));
-    });
-
-    test('loadNextPage - не загружает если уже загружается', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      final settings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost],
-        meta: const Meta(currentPage: 1, lastPage: 3, total: 3, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      when(mockFeedRepository.getFeedBlogPosts(query: null)).thenAnswer((_) async => settings);
-
-      await feedCubit!.loadFeedBlogPostList();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      feedCubit!.isLoading = true;
-
-      await feedCubit!.loadNextPage();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      verifyNever(mockFeedRepository.getFeedBlogPosts(page: 2, query: anyNamed('query')));
-    });
-
-    test('loadNextPage - обрабатывает ошибку при загрузке следующей страницы', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      final firstPageSettings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost],
-        meta: const Meta(currentPage: 1, lastPage: 3, total: 3, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      when(mockFeedRepository.getFeedBlogPosts(query: null)).thenAnswer((_) async => firstPageSettings);
-
-      await feedCubit!.loadFeedBlogPostList();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      final exception = Exception('Network error');
-      when(mockFeedRepository.getFeedBlogPosts(page: 2, query: null)).thenThrow(exception);
-
-      await feedCubit!.loadNextPage();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      expect(feedCubit!.state, isA<FeedStateError>());
-      final errorState = feedCubit!.state as FeedStateError;
-      expect(errorState.errorMessage, contains('Exception: Network error'));
-    });
-
-    test('loadNextPage - сохраняет query при загрузке следующей страницы', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      const query = 'test query';
-      final firstPageSettings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost],
-        meta: const Meta(currentPage: 1, lastPage: 3, total: 3, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      final secondPageSettings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost2],
-        meta: const Meta(currentPage: 2, lastPage: 3, total: 3, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      when(mockFeedRepository.getFeedBlogPosts(query: query)).thenAnswer((_) async => firstPageSettings);
-
-      await feedCubit!.loadFeedBlogPostList(query: query);
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      when(mockFeedRepository.getFeedBlogPosts(page: 2, query: query)).thenAnswer((_) async => secondPageSettings);
-
-      await feedCubit!.loadNextPage();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      verify(mockFeedRepository.getFeedBlogPosts(page: 2, query: query)).called(1);
-    });
-
-    test('updateFeedBlogPostList - обновляет лайк поста', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      final settings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost],
-        meta: const Meta(currentPage: 1, lastPage: 1, total: 1, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      when(mockFeedRepository.getFeedBlogPosts(query: null)).thenAnswer((_) async => settings);
-
-      await feedCubit!.loadFeedBlogPostList();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      feedCubit!.updateFeedBlogPostList(testBlogPost, true);
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      expect(feedCubit!.state, isA<FeedStateLoaded>());
-      final loadedState = feedCubit!.state as FeedStateLoaded;
-      expect(loadedState.feedBlogPostList.first.wasLikedByMe, true);
-      expect(loadedState.feedBlogPostList.first.totalLikes, 11);
-    });
-
-    test('updateFeedBlogPostList - убирает лайк поста', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      final settings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost2],
-        meta: const Meta(currentPage: 1, lastPage: 1, total: 1, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      when(mockFeedRepository.getFeedBlogPosts(query: null)).thenAnswer((_) async => settings);
-
-      await feedCubit!.loadFeedBlogPostList();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      feedCubit!.updateFeedBlogPostList(testBlogPost2, false);
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      expect(feedCubit!.state, isA<FeedStateLoaded>());
-      final loadedState = feedCubit!.state as FeedStateLoaded;
-      expect(loadedState.feedBlogPostList.first.wasLikedByMe, false);
-      expect(loadedState.feedBlogPostList.first.totalLikes, 19);
-    });
-
-    test('updateFeedBlogPostList - не обновляет если пост не найден', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      final settings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost],
-        meta: const Meta(currentPage: 1, lastPage: 1, total: 1, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      when(mockFeedRepository.getFeedBlogPosts(query: null)).thenAnswer((_) async => settings);
-
-      await feedCubit!.loadFeedBlogPostList();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      final nonExistentPost = testBlogPost.copyWith(id: 999);
-      final initialState = feedCubit!.state;
-      feedCubit!.updateFeedBlogPostList(nonExistentPost, true);
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      expect(feedCubit!.state, initialState);
-    });
-
-    test('updateFeedBlogPostList - не обновляет если state не loaded', () {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      feedCubit!.updateFeedBlogPostList(testBlogPost, true);
-      expect(feedCubit!.state, const FeedState.loading());
-    });
-
-    test('updateFeedBlogPostList - не обновляет если post null', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      final settings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [testBlogPost],
-        meta: const Meta(currentPage: 1, lastPage: 1, total: 1, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
-
-      when(mockFeedRepository.getFeedBlogPosts(query: null)).thenAnswer((_) async => settings);
-
-      await feedCubit!.loadFeedBlogPostList();
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      final initialState = feedCubit!.state;
-      feedCubit!.updateFeedBlogPostList(null, true);
-      await Future.delayed(const Duration(milliseconds: 100));
-
-      expect(feedCubit!.state, initialState);
-    });
-
-    test('likePost - лайкает пост', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      const postId = 1;
-
-      when(mockFeedRepository.likeBlogPost(id: postId)).thenAnswer((_) async => Future.value());
-
-      await feedCubit!.likePost(postId);
-
-      verify(mockFeedRepository.likeBlogPost(id: postId)).called(1);
-    });
-
-    test('likePost - обрабатывает ошибку без выбрасывания', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      const postId = 1;
-      final exception = Exception('Network error');
-
-      when(mockFeedRepository.likeBlogPost(id: postId)).thenThrow(exception);
-
-      await feedCubit!.likePost(postId);
-
-      verify(mockFeedRepository.likeBlogPost(id: postId)).called(1);
-    });
-
-    test('unlikedPost - убирает лайк с поста', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      const postId = 1;
-
-      when(mockFeedRepository.unlikedBlogPost(id: postId)).thenAnswer((_) async => Future.value());
-
-      await feedCubit!.unlikedPost(postId);
-
-      verify(mockFeedRepository.unlikedBlogPost(id: postId)).called(1);
-    });
-
-    test('viewPost - отправляет просмотр поста', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      const postId = 1;
-
-      when(mockFeedRepository.viewPost(postId)).thenAnswer((_) async => Future.value());
-
-      await feedCubit!.viewPost(postId);
-
-      verify(mockFeedRepository.viewPost(postId)).called(1);
-    });
-
-    test('viewRecipe - отправляет просмотр рецепта', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      const slug = 'recipe-1';
-
-      when(mockFeedRepository.viewRecipe(slug)).thenAnswer((_) async => Future.value());
-
-      await feedCubit!.viewRecipe(slug);
-
-      verify(mockFeedRepository.viewRecipe(slug)).called(1);
-    });
-
-    test('viewDiet - отправляет просмотр диеты', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      const dietId = 2;
-
-      when(mockFeedRepository.viewDiet(dietId)).thenAnswer((_) async => Future.value());
-
-      await feedCubit!.viewDiet(dietId);
-
-      verify(mockFeedRepository.viewDiet(dietId)).called(1);
-    });
-
-    test('viewPlan - отправляет просмотр плана', () async {
-      feedCubit = FeedCubit(feedRepository: mockFeedRepository);
-      const slug = 'plan-1';
-
-      when(mockFeedRepository.viewPlan(slug)).thenAnswer((_) async => Future.value());
-
-      await feedCubit!.viewPlan(slug);
-
-      verify(mockFeedRepository.viewPlan(slug)).called(1);
+      final loaded = cubit.state as FeedStateLoaded;
+      expect(loaded.feedBlogPostList, hasLength(2));
+      verify(repository.getFeed(search: null, cursor: 'next', currentUserId: null)).called(1);
     });
   });
 }

test/features/feed/presentation/widgets/basic_widget_test.dart

@@ -1,12 +1,10 @@
 import 'package:eatvio_app/core/app_config.dart';
 import 'package:eatvio_app/core/app_initializer.dart';
 import 'package:eatvio_app/core/locator_service.dart';
-import 'package:eatvio_app/core/models/pagination_model.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/core/routing/route_constants.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
-import 'package:eatvio_app/features/feed/models/feed_blog_post_settings_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_state.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/blog_posts.dart';
@@ -378,12 +376,8 @@ void main() {
         // Arrange
         feedCubit.emit(FeedState.loaded(feedBlogPostList: [testBlogPost], isLoading: false));
 
-        when(mockFeedRepository.getFeedBlogPosts(query: null)).thenAnswer(
-          (_) async => FeedBlogPostSettingsModel(
-            feedBlogPostList: [testBlogPost, testBlogPost2],
-            meta: const Meta(currentPage: 1, lastPage: 1, total: 2, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-          ),
-        );
+        when(mockFeedRepository.getFeed(search: null, cursor: null, currentUserId: null))
+            .thenAnswer((_) async => (posts: [testBlogPost, testBlogPost2], nextCursor: null));
 
         final widget = BlogPosts(handleVisibility: ({required visibleFraction, required id, required type}) {});
 

test/features/feed/presentation/widgets/blog_post_widget_test.dart

@@ -81,7 +81,7 @@ void main() {
         when(cubit.stream).thenAnswer((_) => Stream.value(state));
         when(cubit.close()).thenAnswer((_) async => Future<void>.value());
 
-        await tester.pumpWidget(BlocProvider<FeedCubit>.value(value: cubit, child: wrap(const BlogPostWidget(index: 0))));
+        await tester.pumpWidget(BlocProvider<FeedCubit>.value(value: cubit, child: wrap(BlogPostWidget(post: mockBlogPost))));
         await tester.pump();
         await tester.pump(const Duration(milliseconds: 100));
 

test/features/feed/repositories/feed_repository_test.dart

@@ -1,8 +1,10 @@
 import 'package:eatvio_app/core/models/pagination_model.dart';
+import 'package:eatvio_app/core/app_config.dart';
+import 'package:eatvio_app/core/app_initializer.dart';
+import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/features/feed/models/comment_model.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
-import 'package:eatvio_app/features/feed/models/feed_blog_post_settings_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_consultant_model.dart';
 import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/recipes_model.dart';
@@ -11,9 +13,11 @@ import 'package:eatvio_app/features/feed/models/view_model.dart';
 import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
 import 'package:eatvio_app/features/feed/services/feed_service.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 
+import '../../../fixtures/feed_fixtures.dart';
 import '../../../fixtures/fixture_reader.dart';
 import 'feed_repository_test.mocks.dart';
 
@@ -23,72 +27,57 @@ void main() {
     late FeedRepository feedRepository;
     late MockFeedService mockFeedService;
 
-    setUp(() {
+    setUp(() async {
+      dotenv.loadFromString(envString: 'DEV_BASE_URL=http://localhost\nBASE_URL=http://localhost');
+      await sl.reset();
+      sl.registerLazySingleton<AppConfig>(() => AppConfig(buildType: AppBuildType.tests)..setBaseUrl('http://localhost'));
       mockFeedService = MockFeedService();
       feedRepository = FeedRepository(feedService: mockFeedService);
     });
 
-    test('getFeedBlogPosts - успешное получение постов', () async {
-      const expectedModel = FeedBlogPostSettingsModel(
-        feedBlogPostList: [],
-        meta: Meta(currentPage: 1, from: null, lastPage: 1, links: [], path: null, perPage: 10, to: null, total: 0, totalMinPrice: null, totalMaxPrice: null),
-      );
+    test('getFeed - успешное получение постов', () async {
+      final expectedModel = FeedFixtures.postFeedPaginationModel();
 
-      when(mockFeedService.getBlogPostList(page: 1, query: null)).thenAnswer((_) async => expectedModel);
+      when(mockFeedService.getFeed(search: null, cursor: null)).thenAnswer((_) async => expectedModel);
 
-      final result = await feedRepository.getFeedBlogPosts();
+      final result = await feedRepository.getFeed();
 
-      expect(result, isA<FeedBlogPostSettingsModel>());
-      verify(mockFeedService.getBlogPostList(page: 1, query: null)).called(1);
+      expect(result.posts, hasLength(3));
+      expect(result.posts.first.id, 1);
+      expect(result.posts[1].videoEmbedUrl, 'https://www.youtube.com/embed/dQw4w9WgXcQ');
+      expect(result.nextCursor, 'eyJpZCI6MTAzfQ');
+      verify(mockFeedService.getFeed(search: null, cursor: null)).called(1);
     });
 
-    test('getFeedBlogPosts - с запросом и страницей', () async {
+    test('getFeed - с запросом и курсором', () async {
       const query = 'тест';
-      const page = 2;
-      const expectedModel = FeedBlogPostSettingsModel(
-        feedBlogPostList: [],
-        meta: Meta(
-          currentPage: page,
-          from: null,
-          lastPage: 2,
-          links: [],
-          path: null,
-          perPage: 10,
-          to: null,
-          total: 15,
-          totalMinPrice: null,
-          totalMaxPrice: null,
-        ),
-      );
+      const cursor = 'eyJpZCI6MTAzfQ';
+      final expectedModel = FeedFixtures.postFeedNextPagePaginationModel();
 
-      when(mockFeedService.getBlogPostList(page: page, query: query)).thenAnswer((_) async => expectedModel);
+      when(mockFeedService.getFeed(search: query, cursor: cursor)).thenAnswer((_) async => expectedModel);
 
-      final result = await feedRepository.getFeedBlogPosts(query: query, page: page);
+      final result = await feedRepository.getFeed(search: query, cursor: cursor);
 
-      expect(result, isA<FeedBlogPostSettingsModel>());
-      verify(mockFeedService.getBlogPostList(page: page, query: query)).called(1);
+      expect(result.posts, hasLength(1));
+      expect(result.posts.first.id, 4);
+      expect(result.nextCursor, isNull);
+      verify(mockFeedService.getFeed(search: query, cursor: cursor)).called(1);
     });
 
-    test('getFeedBlogPosts - возвращает список постов без query', () async {
-      const page = 1;
-      const expectedSettings = FeedBlogPostSettingsModel(
-        feedBlogPostList: [],
-        meta: Meta(currentPage: 1, lastPage: 1, total: 0, perPage: 10, from: null, links: [Link(url: null, label: null, active: null)], to: null),
-      );
+    test('getFeed - пустая лента', () async {
+      final expectedModel = FeedFixtures.postFeedEmptyPaginationModel();
 
-      when(mockFeedService.getBlogPostList(page: page, query: null)).thenAnswer((_) async => expectedSettings);
+      when(mockFeedService.getFeed(search: null, cursor: null)).thenAnswer((_) async => expectedModel);
 
-      final result = await feedRepository.getFeedBlogPosts(page: page);
+      final result = await feedRepository.getFeed();
 
-      expect(result, isA<FeedBlogPostSettingsModel>());
-      expect(result.feedBlogPostList.isEmpty, true);
-      verify(mockFeedService.getBlogPostList(page: page, query: null)).called(1);
+      expect(result.posts, isEmpty);
+      expect(result.nextCursor, isNull);
     });
 
     test('getBlogPost - успешное получение поста', () async {
       const postId = 1;
-      final json = FixtureReader.readAsMap('feed/feed_blog_post_response.json');
-      final expectedPost = FeedBlogPostModel.fromJson(json);
+      final expectedPost = FeedFixtures.feedBlogPostModel();
 
       when(mockFeedService.getBlogPost(postId: postId)).thenAnswer((_) async => expectedPost);
 
@@ -529,10 +518,10 @@ void main() {
       verify(mockFeedService.viewContent(viewModel: viewModel)).called(1);
     });
 
-    test('getFeedBlogPosts - пробрасывает исключение', () async {
-      when(mockFeedService.getBlogPostList(page: 1, query: null)).thenThrow(Exception('Ошибка сети'));
+    test('getFeed - пробрасывает исключение', () async {
+      when(mockFeedService.getFeed(search: null, cursor: null)).thenThrow(Exception('Ошибка сети'));
 
-      expect(() => feedRepository.getFeedBlogPosts(), throwsException);
+      expect(() => feedRepository.getFeed(), throwsException);
     });
   });
 }

test/features/feed/services/feed_service_test.dart

@@ -13,6 +13,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/annotations.dart';
 import 'package:mockito/mockito.dart';
 
+import '../../../fixtures/feed_fixtures.dart';
 import 'feed_service_test.mocks.dart';
 
 @GenerateNiceMocks([MockSpec<FeedService>()])
@@ -55,6 +56,32 @@ void main() {
       verify(mockFeedService.getBlogPostList(page: page, query: null)).called(1);
     });
 
+    test('getFeed returns cursor response', () async {
+      final expected = FeedFixtures.postFeedPaginationModel();
+
+      when(mockFeedService.getFeed(search: null, cursor: null)).thenAnswer((_) async => expected);
+
+      final result = await mockFeedService.getFeed(search: null, cursor: null);
+
+      expect(result.data, hasLength(3));
+      expect(result.meta.perPage, 20);
+      expect(result.meta.nextCursor, 'eyJpZCI6MTAzfQ');
+      verify(mockFeedService.getFeed(search: null, cursor: null)).called(1);
+    });
+
+    test('getFeed returns next page without cursor', () async {
+      const cursor = 'eyJpZCI6MTAzfQ';
+      final expected = FeedFixtures.postFeedNextPagePaginationModel();
+
+      when(mockFeedService.getFeed(search: null, cursor: cursor)).thenAnswer((_) async => expected);
+
+      final result = await mockFeedService.getFeed(search: null, cursor: cursor);
+
+      expect(result.data, hasLength(1));
+      expect(result.meta.nextCursor, isNull);
+      verify(mockFeedService.getFeed(search: null, cursor: cursor)).called(1);
+    });
+
     test('getBlogPost returns post', () async {
       const id = 10;
       final expected = FeedBlogPostModel(

test/features/order_info/cubit/order_info_cubit_test.dart

@@ -200,20 +200,20 @@ void main() {
           .thenAnswer((_) async => chosenPlan);
       await cubit.getChosenPlan(id: 1);
 
-      when(mockChatRepository.getPaymentLink(id: 1))
+      when(mockChatRepository.getPaymentLink(id: 1, paymentProvider: 'alfa-bank'))
           .thenAnswer((_) async => paymentModel);
 
       final result = await cubit.getPaymentLink();
 
       expect(result, equals('https://payment.url'));
-      verify(mockChatRepository.getPaymentLink(id: 1)).called(1);
+      verify(mockChatRepository.getPaymentLink(id: 1, paymentProvider: 'alfa-bank')).called(1);
     });
 
     test('getPaymentLink - возвращает null, если план не выбран', () async {
       final result = await cubit.getPaymentLink();
 
       expect(result, isNull);
-      verifyNever(mockChatRepository.getPaymentLink(id: anyNamed('id')));
+      verifyNever(mockChatRepository.getPaymentLink(id: anyNamed('id'), paymentProvider: anyNamed('paymentProvider')));
     });
 
     test('getPaymentLink - обработка ошибки', () async {
@@ -254,7 +254,7 @@ void main() {
           .thenAnswer((_) async => chosenPlan);
       await cubit.getChosenPlan(id: 1);
 
-      when(mockChatRepository.getPaymentLink(id: 1))
+      when(mockChatRepository.getPaymentLink(id: 1, paymentProvider: 'alfa-bank'))
           .thenThrow(Exception('Ошибка'));
 
       final result = await cubit.getPaymentLink();

test/features/payment/consultation_payment_flow_test.dart

@@ -0,0 +1,131 @@
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:eatvio_app/features/payment/presentation/payment_flow.dart';
+import 'package:eatvio_app/features/payment/presentation/widgets/promo_code_modal.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  Widget createTestApp() {
+    return const MaterialApp(
+      localizationsDelegates: [
+        S.delegate,
+        GlobalMaterialLocalizations.delegate,
+        GlobalWidgetsLocalizations.delegate,
+        GlobalCupertinoLocalizations.delegate,
+      ],
+      supportedLocales: [Locale('ru')],
+      home: Scaffold(body: SizedBox()),
+    );
+  }
+
+  group('showConsultationPaymentFlow', () {
+    late bool gateCalled;
+    late bool? gateResult;
+    late bool formCalled;
+    late PromoCodeResult? formResult;
+    late bool sbpCalled;
+    late int sbpPlanId;
+
+    Future<bool?> mockGate(BuildContext context) async {
+      gateCalled = true;
+      return gateResult;
+    }
+
+    Future<PromoCodeResult?> mockForm(
+      BuildContext context, {
+      Future<PromoValidation> Function(String)? onValidate,
+    }) async {
+      formCalled = true;
+      return formResult;
+    }
+
+    Future<void> mockSbp(BuildContext context, {required int planId}) async {
+      sbpCalled = true;
+      sbpPlanId = planId;
+    }
+
+    setUp(() {
+      gateCalled = false;
+      gateResult = null;
+      formCalled = false;
+      formResult = null;
+      sbpCalled = false;
+      sbpPlanId = 0;
+    });
+
+    testWidgets('Нет → вызывает SbpBanks (не форму)', (tester) async {
+      gateResult = false;
+      await tester.pumpWidget(createTestApp());
+
+      await showConsultationPaymentFlow(
+        tester.element(find.byType(SizedBox)),
+        planId: 42,
+        showGate: mockGate,
+        showForm: mockForm,
+        showSbp: mockSbp,
+      );
+
+      expect(gateCalled, isTrue);
+      expect(formCalled, isFalse);
+      expect(sbpCalled, isTrue);
+      expect(sbpPlanId, 42);
+    });
+
+    testWidgets('Да → форма → Пропустить → вызывает SbpBanks', (tester) async {
+      gateResult = true;
+      formResult = const PromoCodeResult();
+      await tester.pumpWidget(createTestApp());
+
+      await showConsultationPaymentFlow(
+        tester.element(find.byType(SizedBox)),
+        planId: 42,
+        showGate: mockGate,
+        showForm: mockForm,
+        showSbp: mockSbp,
+      );
+
+      expect(gateCalled, isTrue);
+      expect(formCalled, isTrue);
+      expect(sbpCalled, isTrue);
+      expect(sbpPlanId, 42);
+    });
+
+    testWidgets('Да → форма отменена (null) → Sbp не вызывается', (tester) async {
+      gateResult = true;
+      formResult = null;
+      await tester.pumpWidget(createTestApp());
+
+      await showConsultationPaymentFlow(
+        tester.element(find.byType(SizedBox)),
+        planId: 42,
+        showGate: mockGate,
+        showForm: mockForm,
+        showSbp: mockSbp,
+      );
+
+      expect(gateCalled, isTrue);
+      expect(formCalled, isTrue);
+      expect(sbpCalled, isFalse);
+    });
+
+    testWidgets('гейт отменён (null) → ничего не вызывается', (tester) async {
+      gateResult = null;
+      await tester.pumpWidget(createTestApp());
+
+      await showConsultationPaymentFlow(
+        tester.element(find.byType(SizedBox)),
+        planId: 42,
+        showGate: mockGate,
+        showForm: mockForm,
+        showSbp: mockSbp,
+      );
+
+      expect(gateCalled, isTrue);
+      expect(formCalled, isFalse);
+      expect(sbpCalled, isFalse);
+    });
+  });
+}

test/features/payment/presentation/cubit/consultation_payment_cubit_test.dart

@@ -0,0 +1,188 @@
+import 'package:eatvio_app/features/chat/models/payment_model.dart';
+import 'package:eatvio_app/features/payment/presentation/cubit/consultation_payment_cubit/consultation_payment_cubit.dart';
+import 'package:eatvio_app/features/payment/presentation/cubit/consultation_payment_cubit/consultation_payment_state.dart';
+import 'package:eatvio_app/features/payment/repositories/payment_repository.dart';
+import 'package:eatvio_app/features/payment/repositories/sbp_repository.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:sbp/models/c2bmembers_model.dart';
+
+import '../../../../fixtures/fixture_reader.dart';
+import 'consultation_payment_cubit_test.mocks.dart';
+
+@GenerateNiceMocks([
+  MockSpec<PaymentRepository>(),
+  MockSpec<SbpRepository>(),
+])
+void main() {
+  group('ConsultationPaymentCubit', () {
+    late ConsultationPaymentCubit cubit;
+    late MockPaymentRepository mockPaymentRepository;
+    late MockSbpRepository mockSbpRepository;
+
+    final installedBank = C2bmemberModel.fromJson(const {
+      'bankName': 'Сбербанк',
+      'logoURL': 'https://qr.nspk.ru/proxyapp/logo/bank100000000111.png',
+      'schema': 'bank100000000111',
+      'package_name': 'ru.sberbankmobile',
+      'icon': 'packages/sbp/assets/icons/sber.png',
+    });
+
+    late PaymentModel alfaPayment;
+
+    setUp(() {
+      mockPaymentRepository = MockPaymentRepository();
+      mockSbpRepository = MockSbpRepository();
+      cubit = ConsultationPaymentCubit(
+        paymentRepository: mockPaymentRepository,
+        sbpRepository: mockSbpRepository,
+      );
+      alfaPayment = PaymentModel.fromJson(
+        FixtureReader.readAsMap('chat/payments/payment_response_alfa_bank.json'),
+      );
+    });
+
+    tearDown(() {
+      cubit.close();
+    });
+
+    test('начальный state - isLoading=false, banks=[], checkoutUrl=null', () {
+      expect(cubit.state, isA<ConsultationPaymentState>());
+      expect(cubit.state.isLoading, isFalse);
+      expect(cubit.state.banks, isEmpty);
+      expect(cubit.state.checkoutUrl, isNull);
+      expect(cubit.state.orderId, isNull);
+      expect(cubit.state.errorMessage, isNull);
+    });
+
+    test(
+      'startPayment - успешно получает checkout_url и загружает банки',
+      () async {
+        const planId = 123;
+
+        when(
+          mockPaymentRepository.startPaymentProcess(planId: planId),
+        ).thenAnswer((_) async => alfaPayment);
+        when(
+          mockSbpRepository.getInstalledBanks(),
+        ).thenAnswer((_) async => [installedBank]);
+
+        await cubit.startPayment(planId: planId);
+
+        expect(cubit.state.isLoading, isFalse);
+        expect(cubit.state.checkoutUrl, alfaPayment.paymentUrl);
+        expect(cubit.state.orderId, alfaPayment.orderId);
+        expect(cubit.state.banks, [installedBank]);
+        expect(cubit.state.errorMessage, isNull);
+        verify(
+          mockPaymentRepository.startPaymentProcess(planId: planId),
+        ).called(1);
+        verify(mockSbpRepository.getInstalledBanks()).called(1);
+      },
+    );
+
+    test('startPayment - при ошибке API emit errorMessage', () async {
+      const planId = 123;
+
+      when(
+        mockPaymentRepository.startPaymentProcess(planId: planId),
+      ).thenThrow(Exception('Payment start failed'));
+
+      await cubit.startPayment(planId: planId);
+
+      expect(cubit.state.isLoading, isFalse);
+      expect(cubit.state.errorMessage, isNotNull);
+      expect(cubit.state.banks, isEmpty);
+      expect(cubit.state.checkoutUrl, isNull);
+      verifyNever(mockSbpRepository.getInstalledBanks());
+    });
+
+    test(
+      'startPayment - при ошибке SBP после успешного payment emit error',
+      () async {
+        const planId = 123;
+
+        when(
+          mockPaymentRepository.startPaymentProcess(planId: planId),
+        ).thenAnswer((_) async => alfaPayment);
+        when(
+          mockSbpRepository.getInstalledBanks(),
+        ).thenThrow(Exception('SBP plugin error'));
+
+        await cubit.startPayment(planId: planId);
+
+        expect(cubit.state.isLoading, isFalse);
+        expect(cubit.state.errorMessage, isNotNull);
+        expect(cubit.state.checkoutUrl, alfaPayment.paymentUrl);
+        expect(cubit.state.orderId, alfaPayment.orderId);
+        expect(cubit.state.banks, isEmpty);
+      },
+    );
+
+    test('openBank - успешно открывает банк после startPayment', () async {
+      const planId = 123;
+
+      when(
+        mockPaymentRepository.startPaymentProcess(planId: planId),
+      ).thenAnswer((_) async => alfaPayment);
+      when(
+        mockSbpRepository.getInstalledBanks(),
+      ).thenAnswer((_) async => [installedBank]);
+      when(
+        mockSbpRepository.openBank(
+          url: alfaPayment.paymentUrl,
+          bank: installedBank,
+        ),
+      ).thenAnswer((_) async => true);
+
+      await cubit.startPayment(planId: planId);
+      final result = await cubit.openBank(bank: installedBank);
+
+      expect(result, isTrue);
+      verify(
+        mockSbpRepository.openBank(
+          url: alfaPayment.paymentUrl,
+          bank: installedBank,
+        ),
+      ).called(1);
+    });
+
+    test(
+      'openBank - без checkoutUrl возвращает false и не вызывает SbpRepository',
+      () async {
+        final result = await cubit.openBank(bank: installedBank);
+
+        expect(result, isFalse);
+        verifyNever(
+          mockSbpRepository.openBank(
+            url: anyNamed('url'),
+            bank: anyNamed('bank'),
+          ),
+        );
+      },
+    );
+
+    test('openBank - возвращает false когда банк не открылся', () async {
+      const planId = 123;
+
+      when(
+        mockPaymentRepository.startPaymentProcess(planId: planId),
+      ).thenAnswer((_) async => alfaPayment);
+      when(
+        mockSbpRepository.getInstalledBanks(),
+      ).thenAnswer((_) async => [installedBank]);
+      when(
+        mockSbpRepository.openBank(
+          url: alfaPayment.paymentUrl,
+          bank: installedBank,
+        ),
+      ).thenAnswer((_) async => false);
+
+      await cubit.startPayment(planId: planId);
+      final result = await cubit.openBank(bank: installedBank);
+
+      expect(result, isFalse);
+    });
+  });
+}

test/features/payment/presentation/widgets/promo_code_gate_bottom_sheet_test.dart

@@ -0,0 +1,65 @@
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
+import 'package:eatvio_app/features/payment/presentation/widgets/promo_code_gate_bottom_sheet.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  group('PromoCodeGateBottomSheet', () {
+    Widget createTestWidget({required ValueChanged<bool?> onResult}) {
+      return MaterialApp(
+        theme: ThemeHelper().themeData(),
+        localizationsDelegates: const [
+          S.delegate,
+          GlobalMaterialLocalizations.delegate,
+          GlobalWidgetsLocalizations.delegate,
+          GlobalCupertinoLocalizations.delegate,
+        ],
+        supportedLocales: const [Locale('ru')],
+        home: Scaffold(
+          body: PromoCodeGateBottomSheet(onResult: onResult),
+        ),
+      );
+    }
+
+    testWidgets('показывает заголовок, BottomSheetHandlerBar и кнопки Да/Нет', (tester) async {
+      await tester.pumpWidget(createTestWidget(onResult: (_) {}));
+      await tester.pump();
+
+      expect(find.byType(BottomSheetHandlerBar), findsOneWidget);
+      expect(find.text('У вас есть промокод?'), findsOneWidget);
+      expect(find.text('Да'), findsOneWidget);
+      expect(find.text('Нет'), findsOneWidget);
+    });
+
+    testWidgets('tap Да вызывает onResult(true)', (tester) async {
+      bool? result;
+      await tester.pumpWidget(
+        createTestWidget(onResult: (v) => result = v),
+      );
+      await tester.pump();
+
+      await tester.tap(find.text('Да'));
+      await tester.pump();
+
+      expect(result, isTrue);
+    });
+
+    testWidgets('tap Нет вызывает onResult(false)', (tester) async {
+      bool? result;
+      await tester.pumpWidget(
+        createTestWidget(onResult: (v) => result = v),
+      );
+      await tester.pump();
+
+      await tester.tap(find.text('Нет'));
+      await tester.pump();
+
+      expect(result, isFalse);
+    });
+  });
+}

test/features/payment/presentation/widgets/promo_code_modal_test.dart

@@ -0,0 +1,101 @@
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/features/payment/presentation/widgets/promo_code_modal.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  group('ItvioPromoCodeModal', () {
+    Widget createTestWidget({
+      Future<PromoValidation> Function(String)? onValidate,
+    }) {
+      return MaterialApp(
+        theme: ThemeHelper().themeData(),
+        localizationsDelegates: const [
+          S.delegate,
+          GlobalMaterialLocalizations.delegate,
+          GlobalWidgetsLocalizations.delegate,
+          GlobalCupertinoLocalizations.delegate,
+        ],
+        supportedLocales: const [Locale('ru')],
+        home: Builder(
+          builder: (context) => ElevatedButton(
+            onPressed: () => ItvioPromoCodeModal.show(
+              context,
+              onValidate: onValidate,
+            ),
+            child: const Text('Open'),
+          ),
+        ),
+      );
+    }
+
+    testWidgets('показывает заголовок Есть промокод? и кнопки Применить/Пропустить', (tester) async {
+      await tester.pumpWidget(createTestWidget());
+      await tester.tap(find.text('Open'));
+      await tester.pumpAndSettle();
+
+      expect(find.text('Есть промокод?'), findsOneWidget);
+      expect(find.text('Применить'), findsOneWidget);
+      expect(find.text('Пропустить'), findsOneWidget);
+    });
+
+    testWidgets('Применить с пустым полем показывает ошибку и не закрывает', (tester) async {
+      await tester.pumpWidget(createTestWidget());
+      await tester.tap(find.text('Open'));
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.text('Применить'));
+      await tester.pump();
+
+      expect(find.text('Введите промокод'), findsAtLeast(1));
+      expect(find.text('Применить'), findsOneWidget);
+    });
+
+    testWidgets('Применить с вводом вызывает onValidate и показывает ошибку', (tester) async {
+      PromoValidation? captured;
+      await tester.pumpWidget(
+        createTestWidget(
+          onValidate: (code) async {
+            captured ??= const PromoValidation.failure('Промокод не найден или истёк');
+            return captured!;
+          },
+        ),
+      );
+      await tester.tap(find.text('Open'));
+      await tester.pumpAndSettle();
+
+      await tester.enterText(find.byType(TextField), 'TEST123');
+      await tester.tap(find.text('Применить'));
+      await tester.pump();
+
+      expect(captured, isNotNull);
+      expect(find.text('Промокод не найден или истёк'), findsOneWidget);
+      expect(find.text('Применить'), findsOneWidget);
+    });
+
+    testWidgets('Пропустить закрывает шторку', (tester) async {
+      await tester.pumpWidget(createTestWidget());
+      await tester.tap(find.text('Open'));
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.text('Пропустить'));
+      await tester.pumpAndSettle();
+
+      expect(find.text('Есть промокод?'), findsNothing);
+    });
+
+    testWidgets('отсутствует UI applied-состояния (Промокод применён)', (tester) async {
+      await tester.pumpWidget(createTestWidget());
+      await tester.tap(find.text('Open'));
+      await tester.pumpAndSettle();
+
+      expect(find.text('Промокод применён!'), findsNothing);
+      expect(find.text('Продолжить'), findsNothing);
+      expect(find.text('Убрать промокод'), findsNothing);
+    });
+  });
+}

test/features/payment/presentation/widgets/sbp_banks_bottom_sheet_test.dart

@@ -0,0 +1,187 @@
+import 'dart:async';
+
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/loader.dart';
+import 'package:eatvio_app/features/chat/models/payment_model.dart';
+import 'package:eatvio_app/features/payment/presentation/cubit/consultation_payment_cubit/consultation_payment_cubit.dart';
+import 'package:eatvio_app/features/payment/presentation/widgets/sbp_banks_bottom_sheet.dart';
+import 'package:eatvio_app/features/payment/repositories/payment_repository.dart';
+import 'package:eatvio_app/features/payment/repositories/sbp_repository.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:sbp/models/c2bmembers_model.dart';
+
+import '../../../../fixtures/fixture_reader.dart';
+import 'sbp_banks_bottom_sheet_test.mocks.dart';
+
+@GenerateNiceMocks([
+  MockSpec<PaymentRepository>(),
+  MockSpec<SbpRepository>(),
+])
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  group('SbpBanksBottomSheet', () {
+    late MockPaymentRepository mockPaymentRepository;
+    late MockSbpRepository mockSbpRepository;
+    late ConsultationPaymentCubit cubit;
+    late PaymentModel alfaPayment;
+
+    final installedBank = C2bmemberModel.fromJson(const {
+      'bankName': 'Сбербанк',
+      'logoURL': 'https://qr.nspk.ru/proxyapp/logo/bank100000000111.png',
+      'schema': 'bank100000000111',
+      'package_name': 'ru.sberbankmobile',
+      'icon': '',
+    });
+
+    setUp(() {
+      mockPaymentRepository = MockPaymentRepository();
+      mockSbpRepository = MockSbpRepository();
+      cubit = ConsultationPaymentCubit(
+        paymentRepository: mockPaymentRepository,
+        sbpRepository: mockSbpRepository,
+      );
+      alfaPayment = PaymentModel.fromJson(
+        FixtureReader.readAsMap('chat/payments/payment_response_alfa_bank.json'),
+      );
+    });
+
+    tearDown(() {
+      cubit.close();
+    });
+
+    Widget createTestWidget({required int planId}) {
+      return MaterialApp(
+        theme: ThemeHelper().themeData(),
+        localizationsDelegates: const [
+          S.delegate,
+          GlobalMaterialLocalizations.delegate,
+          GlobalWidgetsLocalizations.delegate,
+          GlobalCupertinoLocalizations.delegate,
+        ],
+        supportedLocales: const [Locale('ru')],
+        home: Scaffold(
+          body: SbpBanksBottomSheet(
+            planId: planId,
+            cubit: cubit,
+          ),
+        ),
+      );
+    }
+
+    testWidgets('показывает Loader пока идёт startPayment', (tester) async {
+      const planId = 12;
+      final completer = Completer<PaymentModel>();
+
+      when(
+        mockPaymentRepository.startPaymentProcess(planId: planId),
+      ).thenAnswer((_) => completer.future);
+
+      await tester.pumpWidget(createTestWidget(planId: planId));
+      await tester.pump();
+
+      expect(find.byType(Loader), findsOneWidget);
+      expect(find.text('Сбербанк'), findsNothing);
+
+      completer.complete(alfaPayment);
+      when(mockSbpRepository.getInstalledBanks()).thenAnswer((_) async => [installedBank]);
+      await tester.pumpAndSettle();
+    });
+
+    testWidgets('вызывает startPaymentProcess с переданным planId', (tester) async {
+      const planId = 12;
+
+      when(
+        mockPaymentRepository.startPaymentProcess(planId: planId),
+      ).thenAnswer((_) async => alfaPayment);
+      when(mockSbpRepository.getInstalledBanks()).thenAnswer((_) async => [installedBank]);
+
+      await tester.pumpWidget(createTestWidget(planId: planId));
+      await tester.pumpAndSettle();
+
+      verify(mockPaymentRepository.startPaymentProcess(planId: planId)).called(1);
+    });
+
+    testWidgets('после успеха показывает список банков и скрывает Loader', (tester) async {
+      const planId = 12;
+
+      when(
+        mockPaymentRepository.startPaymentProcess(planId: planId),
+      ).thenAnswer((_) async => alfaPayment);
+      when(mockSbpRepository.getInstalledBanks()).thenAnswer((_) async => [installedBank]);
+
+      await tester.pumpWidget(createTestWidget(planId: planId));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(Loader), findsNothing);
+      expect(find.text('Выберите банк'), findsOneWidget);
+      expect(find.text('Сбербанк'), findsOneWidget);
+    });
+
+    testWidgets('tap по банку вызывает openBank с checkout_url', (tester) async {
+      const planId = 12;
+
+      when(
+        mockPaymentRepository.startPaymentProcess(planId: planId),
+      ).thenAnswer((_) async => alfaPayment);
+      when(mockSbpRepository.getInstalledBanks()).thenAnswer((_) async => [installedBank]);
+      when(
+        mockSbpRepository.openBank(
+          url: alfaPayment.paymentUrl,
+          bank: installedBank,
+        ),
+      ).thenAnswer((_) async => true);
+
+      await tester.pumpWidget(createTestWidget(planId: planId));
+      await tester.pumpAndSettle();
+
+      await tester.tap(find.text('Сбербанк'));
+      await tester.pumpAndSettle();
+
+      verify(
+        mockSbpRepository.openBank(
+          url: alfaPayment.paymentUrl,
+          bank: installedBank,
+        ),
+      ).called(1);
+    });
+
+    testWidgets('при ошибке API показывает сообщение об ошибке', (tester) async {
+      const planId = 12;
+
+      when(
+        mockPaymentRepository.startPaymentProcess(planId: planId),
+      ).thenThrow(Exception('Payment start failed'));
+
+      await tester.pumpWidget(createTestWidget(planId: planId));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(Loader), findsNothing);
+      expect(find.text('Сбербанк'), findsNothing);
+      expect(
+        find.text('Не удалось начать оплату. Попробуйте позже'),
+        findsOneWidget,
+      );
+    });
+
+    testWidgets('при пустом списке банков показывает empty-сообщение', (tester) async {
+      const planId = 12;
+
+      when(
+        mockPaymentRepository.startPaymentProcess(planId: planId),
+      ).thenAnswer((_) async => alfaPayment);
+      when(mockSbpRepository.getInstalledBanks()).thenAnswer((_) async => []);
+
+      await tester.pumpWidget(createTestWidget(planId: planId));
+      await tester.pumpAndSettle();
+
+      expect(find.byType(Loader), findsNothing);
+      expect(find.text('Нет установленных банков'), findsOneWidget);
+    });
+  });
+}

test/features/payment/repositories/payment_repository_test.dart

@@ -0,0 +1,97 @@
+import 'package:eatvio_app/features/chat/models/payment_model.dart';
+import 'package:eatvio_app/features/chat/services/chat_service.dart';
+import 'package:eatvio_app/features/payment/repositories/payment_repository.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+
+import '../../../fixtures/fixture_reader.dart';
+import 'payment_repository_test.mocks.dart';
+
+@GenerateNiceMocks([MockSpec<ChatService>()])
+void main() {
+  group('PaymentRepository', () {
+    late PaymentRepository paymentRepository;
+    late MockChatService mockChatService;
+
+    setUp(() {
+      mockChatService = MockChatService();
+      paymentRepository = PaymentRepository(chatService: mockChatService);
+    });
+
+    test(
+      'startPaymentProcess - возвращает PaymentModel из ответа alfa-bank',
+      () async {
+        const planId = 123;
+        final paymentFixture = FixtureReader.readAsMap(
+          'chat/payments/payment_response_alfa_bank.json',
+        );
+        final expectedPayment = PaymentModel.fromJson(paymentFixture);
+        final requestBody = Map<String, String>.from(
+          FixtureReader.readAsMap('chat/payments/payment_alfabank_request.json'),
+        );
+
+        when(
+          mockChatService.getPaymentLink(id: planId, body: requestBody),
+        ).thenAnswer((_) async => expectedPayment);
+
+        final result = await paymentRepository.startPaymentProcess(planId: planId);
+
+        expect(result, isA<PaymentModel>());
+        expect(result.paymentUrl, 'https://qr.nspk.ru/ASDFASDFASDFASDF');
+        expect(result.orderId, 'alfa_c29_k15138_t1712345678_r1234');
+        expect(result.paymentProvider, 'alfa-bank');
+        verify(
+          mockChatService.getPaymentLink(
+            id: planId,
+            body: {'payment_provider': 'alfa-bank'},
+          ),
+        ).called(1);
+      },
+    );
+
+    test(
+      'startPaymentProcess - передаёт payment_provider alfa-bank в тело запроса',
+      () async {
+        const planId = 42;
+        final paymentFixture = FixtureReader.readAsMap(
+          'chat/payments/payment_response_alfa_bank.json',
+        );
+        final expectedPayment = PaymentModel.fromJson(paymentFixture);
+
+        when(
+          mockChatService.getPaymentLink(
+            id: planId,
+            body: {'payment_provider': 'alfa-bank'},
+          ),
+        ).thenAnswer((_) async => expectedPayment);
+
+        await paymentRepository.startPaymentProcess(planId: planId);
+
+        verify(
+          mockChatService.getPaymentLink(
+            id: planId,
+            body: {'payment_provider': 'alfa-bank'},
+          ),
+        ).called(1);
+      },
+    );
+
+    test('startPaymentProcess - пробрасывает ошибку сервиса', () async {
+      const planId = 123;
+      final error = Exception('Payment start failed');
+
+      when(
+        mockChatService.getPaymentLink(
+          id: planId,
+          body: {'payment_provider': 'alfa-bank'},
+        ),
+      ).thenThrow(error);
+
+      expect(
+        () => paymentRepository.startPaymentProcess(planId: planId),
+        throwsA(isA<Exception>()),
+      );
+    });
+  });
+}

test/features/payment/repositories/sbp_repository_test.dart

@@ -0,0 +1,118 @@
+import 'package:eatvio_app/features/payment/repositories/sbp_repository.dart';
+import 'package:eatvio_app/features/payment/services/sbp_service.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/annotations.dart';
+import 'package:mockito/mockito.dart';
+import 'package:sbp/models/c2bmembers_model.dart';
+
+import 'sbp_repository_test.mocks.dart';
+
+@GenerateNiceMocks([MockSpec<SbpService>()])
+void main() {
+  group('SbpRepository', () {
+    late SbpRepository sbpRepository;
+    late MockSbpService mockSbpService;
+
+    final installedBank = C2bmemberModel.fromJson(const {
+      'bankName': 'Сбербанк',
+      'logoURL': 'https://qr.nspk.ru/proxyapp/logo/bank100000000111.png',
+      'schema': 'bank100000000111',
+      'package_name': 'ru.sberbankmobile',
+      'icon': 'packages/sbp/assets/icons/sber.png',
+    });
+
+    setUp(() {
+      mockSbpService = MockSbpService();
+      sbpRepository = SbpRepository(sbpService: mockSbpService);
+    });
+
+    group('getInstalledBanks', () {
+      test(
+        'делегирует сервису и возвращает список установленных банков',
+        () async {
+          when(
+            mockSbpService.getInstalledBanks(),
+          ).thenAnswer((_) async => [installedBank]);
+
+          final result = await sbpRepository.getInstalledBanks();
+
+          expect(result, [installedBank]);
+          verify(mockSbpService.getInstalledBanks()).called(1);
+        },
+      );
+
+      test(
+        'возвращает пустой список, когда сервис вернул пустой список',
+        () async {
+          when(mockSbpService.getInstalledBanks()).thenAnswer((_) async => []);
+
+          final result = await sbpRepository.getInstalledBanks();
+
+          expect(result, isEmpty);
+        },
+      );
+
+      test(
+        'бросает exception при ошибке нативного плагина (graceful)',
+        () async {
+          when(
+            mockSbpService.getInstalledBanks(),
+          ).thenThrow(MissingPluginException('no sbp handler'));
+
+          expect(() => sbpRepository.getInstalledBanks(), throwsException);
+        },
+      );
+    });
+
+    group('openBank', () {
+      const checkoutUrl = 'https://qr.nspk.ru/ASDFASDFASDFASDF';
+
+      test(
+        'делегирует сервису и возвращает true при успешном запуске',
+        () async {
+          when(
+            mockSbpService.openBank(url: checkoutUrl, bank: installedBank),
+          ).thenAnswer((_) async => true);
+
+          final result = await sbpRepository.openBank(
+            url: checkoutUrl,
+            bank: installedBank,
+          );
+
+          expect(result, isTrue);
+          verify(
+            mockSbpService.openBank(url: checkoutUrl, bank: installedBank),
+          ).called(1);
+        },
+      );
+
+      test('возвращает false, когда сервис вернул false', () async {
+        when(
+          mockSbpService.openBank(url: checkoutUrl, bank: installedBank),
+        ).thenAnswer((_) async => false);
+
+        final result = await sbpRepository.openBank(
+          url: checkoutUrl,
+          bank: installedBank,
+        );
+
+        expect(result, isFalse);
+      });
+
+      test(
+        'возвращает false при ошибке нативного плагина (graceful)',
+        () async {
+          when(
+            mockSbpService.openBank(url: checkoutUrl, bank: installedBank),
+          ).thenThrow(MissingPluginException('no sbp handler'));
+
+          expect(
+            () => sbpRepository.openBank(url: checkoutUrl, bank: installedBank),
+            throwsException,
+          );
+        },
+      );
+    });
+  });
+}

test/features/payment/services/sbp_service_test.dart

@@ -0,0 +1,119 @@
+import 'package:eatvio_app/features/payment/services/sbp_service.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sbp/models/c2bmembers_model.dart';
+
+/// Тесты реализации [SbpServiceImpl] — обёртки над статичным классом [Sbp].
+///
+/// Поскольку unit-тесты исполняются на хост-машине (не iOS), срабатывает
+/// Android-ветка плагина: `getInstalledBanks` возвращает список банков через
+/// `package_name`, а `openBank` подставляет схему банка в начало checkout_url.
+void main() {
+  TestWidgetsFlutterBinding.ensureInitialized();
+
+  const channel = MethodChannel('sbp');
+
+  /// Банк-фикстура: Сбербанк (присутствует в справочнике c2bmembersData пакета).
+  final sberbank = C2bmemberModel.fromJson(const {
+    'bankName': 'Сбербанк',
+    'logoURL': 'https://qr.nspk.ru/proxyapp/logo/bank100000000111.png',
+    'schema': 'bank100000000111',
+    'package_name': 'ru.sberbankmobile',
+    'icon': 'packages/sbp/assets/icons/sber.png',
+  });
+
+  late SbpService sbpService;
+
+  setUp(() {
+    sbpService = const SbpServiceImpl();
+  });
+
+  tearDown(() {
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+        .setMockMethodCallHandler(channel, null);
+  });
+
+  group('SbpServiceImpl.getInstalledBanks', () {
+    test('возвращает список банков, установленных на устройстве (Android)', () async {
+      // Плагин (Android) возвращает список установленных банков в формате
+      // {name, bitmap, package_name}; обёртка сопоставляет со справочником.
+      TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+          .setMockMethodCallHandler(channel, (MethodCall call) async {
+        return [
+          {'name': 'Сбербанк', 'bitmap': null, 'package_name': 'ru.sberbankmobile'},
+        ];
+      });
+
+      final result = await sbpService.getInstalledBanks();
+
+      expect(result, isNotEmpty);
+      expect(
+        result.any(
+          (bank) =>
+              bank.bankName == 'Сбербанк' && bank.packageName == 'ru.sberbankmobile',
+        ),
+        isTrue,
+      );
+    });
+
+    test('возвращает пустой список, если нет установленных банков', () async {
+      TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+          .setMockMethodCallHandler(channel, (MethodCall call) async {
+        return <Map<String, dynamic>>[];
+      });
+
+      final result = await sbpService.getInstalledBanks();
+
+      expect(result, isEmpty);
+    });
+
+    test('пробрасывает ошибку плагина при отсутствии нативного обработчика', () async {
+      // Обработчик не зарегистрирован → invokeMethod выбрасывает
+      // MissingPluginException. Сервис должен пробросить её наверх.
+      expect(
+        sbpService.getInstalledBanks(),
+        throwsA(isA<MissingPluginException>()),
+      );
+    });
+  });
+
+  group('SbpServiceImpl.openBank', () {
+    test('вызывает нативный openBank с подстановкой схемы банка в url и возвращает true', () async {
+      const checkoutUrl = 'https://qr.nspk.ru/ASDFASDFASDFASDF';
+      String? receivedUrl;
+      String? receivedPackageName;
+
+      TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+          .setMockMethodCallHandler(channel, (MethodCall call) async {
+        if (call.method == 'openBank') {
+          final args = call.arguments as Map<dynamic, dynamic>;
+          receivedUrl = args['url'] as String?;
+          receivedPackageName = args['package_name'] as String?;
+          return true;
+        }
+        return null;
+      });
+
+      final result = await sbpService.openBank(url: checkoutUrl, bank: sberbank);
+
+      expect(result, isTrue);
+      // Android-ветка заменяет схему "https" на schema банка в начале url.
+      expect(receivedUrl, 'bank100000000111://qr.nspk.ru/ASDFASDFASDFASDF');
+      expect(receivedPackageName, 'ru.sberbankmobile');
+    });
+
+    test('возвращает false при неудачном запуске банковского приложения', () async {
+      TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+          .setMockMethodCallHandler(channel, (MethodCall call) async {
+        return false;
+      });
+
+      final result = await sbpService.openBank(
+        url: 'https://qr.nspk.ru/ASDFASDFASDFASDF',
+        bank: sberbank,
+      );
+
+      expect(result, isFalse);
+    });
+  });
+}

test/features/plans/enums/chosen_plan_state_enum_test.dart

@@ -4,7 +4,7 @@ import 'package:flutter_test/flutter_test.dart';
 void main() {
   group('ChosenPlanStateEnum', () {
     test('has all expected values', () {
-      expect(ChosenPlanStateEnum.values.length, 15);
+      expect(ChosenPlanStateEnum.values.length, 16);
       expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateInited));
       expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateStartDateHasBeenSet));
       expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateInCoordination));
@@ -20,6 +20,7 @@ void main() {
       expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateDone));
       expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.personalDietSet));
       expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.stateChargeWasCollected));
+      expect(ChosenPlanStateEnum.values, contains(ChosenPlanStateEnum.statePaymentFailed));
     });
 
     test('getShowableChatBadgeStates returns correct states', () {
@@ -35,6 +36,7 @@ void main() {
       expect(states, contains(ChosenPlanStateEnum.stateDone));
       expect(states, contains(ChosenPlanStateEnum.stateInProgress));
       expect(states, contains(ChosenPlanStateEnum.personalDietSet));
+      expect(states, isNot(contains(ChosenPlanStateEnum.statePaymentFailed)));
     });
 
     test('isStateAfterPaidState returns false for states before paid', () {
@@ -43,6 +45,7 @@ void main() {
       expect(ChosenPlanStateEnum.stateInCoordination.isStateAfterPaidState(), isFalse);
       expect(ChosenPlanStateEnum.stateStartDateHasBeenSet.isStateAfterPaidState(), isFalse);
       expect(ChosenPlanStateEnum.statePendingPayment.isStateAfterPaidState(), isFalse);
+      expect(ChosenPlanStateEnum.statePaymentFailed.isStateAfterPaidState(), isFalse);
     });
 
     test('isStateAfterPaidState returns true for states after paid', () {
@@ -70,6 +73,7 @@ void main() {
       expect(activeStates, contains(ChosenPlanStateEnum.stateComplained));
       expect(activeStates, contains(ChosenPlanStateEnum.stateDone));
       expect(activeStates, contains(ChosenPlanStateEnum.personalDietSet));
+      expect(activeStates, isNot(contains(ChosenPlanStateEnum.statePaymentFailed)));
     });
   });
 }

test/features/plans/models/chosen_plan_model_test.dart

@@ -4,6 +4,8 @@ import 'package:eatvio_app/features/plans/enums/chosen_plan_state_enum.dart';
 import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
 import 'package:flutter_test/flutter_test.dart';
 
+import '../../../fixtures/fixture_reader.dart';
+
 void main() {
   group('ChosenPlanModel', () {
     test('создает ChosenPlanModel с правильными значениями', () {
@@ -140,6 +142,60 @@ void main() {
       expect(json['consultant_id'], 1);
       expect(json.containsKey('plan'), isTrue);
     });
+
+    group('fromJson payment polling statuses', () {
+      test('fromJson парсит pending_payment из фикстуры', () {
+        final json = FixtureReader.readAsMap(
+          'chat/chosen_plan/chosen_plan_pending_payment_response.json',
+        );
+
+        final model = ChosenPlanModel.fromJson(json);
+
+        expect(model.id, 1);
+        expect(model.optionType, '1');
+        expect(model.chosenPlanState, ChosenPlanStateEnum.statePendingPayment);
+        expect(model.chatId, 'chat-1');
+      });
+
+      test('fromJson парсит paid из фикстуры', () {
+        final json = FixtureReader.readAsMap(
+          'chat/chosen_plan/chosen_plan_paid_response.json',
+        );
+
+        final model = ChosenPlanModel.fromJson(json);
+
+        expect(model.id, 1);
+        expect(model.optionType, '1');
+        expect(model.chosenPlanState, ChosenPlanStateEnum.statePaid);
+        expect(model.chatId, 'chat-1');
+      });
+
+      test('fromJson парсит payment_failed из фикстуры', () {
+        final json = FixtureReader.readAsMap(
+          'chat/chosen_plan/chosen_plan_payment_failed_response.json',
+        );
+
+        final model = ChosenPlanModel.fromJson(json);
+
+        expect(model.id, 1);
+        expect(model.optionType, '1');
+        expect(model.chosenPlanState, ChosenPlanStateEnum.statePaymentFailed);
+        expect(model.chatId, 'chat-1');
+      });
+
+      test('fromJson парсит canceled_by_the_initiator из фикстуры', () {
+        final json = FixtureReader.readAsMap(
+          'chat/chosen_plan/chosen_plan_canceled_by_the_initiator_response.json',
+        );
+
+        final model = ChosenPlanModel.fromJson(json);
+
+        expect(model.id, 1);
+        expect(model.optionType, '1');
+        expect(model.chosenPlanState, ChosenPlanStateEnum.stateCanceledByTheInitiator);
+        expect(model.chatId, 'chat-1');
+      });
+    });
   });
 
   group('parseChosenPlan', () {

test/fixtures/chat/chosen_plan/chosen_plan_canceled_by_the_initiator_response.json

@@ -0,0 +1,47 @@
+{
+  "id": 1,
+  "option_type": "1",
+  "start_date": "2024-01-01T00:00:00Z",
+  "last_state": "canceled_by_the_initiator",
+  "chat_id": "chat-1",
+  "consultant_id": 1,
+  "plan": {
+    "id": 1,
+    "slug": "test-plan",
+    "name": "Test Plan",
+    "image": "https://example.com/plan.jpg",
+    "duration": 30,
+    "state": "active",
+    "type": {
+      "fit": true,
+      "slim": false,
+      "behavior": false,
+      "wellness": false
+    },
+    "description_md": "Plan description",
+    "packets_count": 1,
+    "packet1_options": {
+      "items": ["Item 1", "Item 2"],
+      "price": 1500.0,
+      "short": "Option 1",
+      "description_md": "Description",
+      "has_personal_diet": false
+    },
+    "packet2_options": null,
+    "packet3_options": null,
+    "author": {
+      "author_slug": "author-1",
+      "author_name": "Author Name",
+      "author_profile_icon": "https://example.com/author.jpg",
+      "author_is_me": false
+    },
+    "total_likes": 10,
+    "total_views": 100,
+    "total_comments": 5,
+    "is_favorite": false,
+    "min_price_of_options": 1000.0,
+    "max_price_of_options": 2000.0,
+    "was_liked_by_me": false
+  }
+}
+

test/fixtures/chat/chosen_plan/chosen_plan_charge_was_callected_response.json

@@ -0,0 +1,47 @@
+{
+  "id": 1,
+  "option_type": "1",
+  "start_date": "2024-01-01T00:00:00Z",
+  "last_state": "charge_was_collected",
+  "chat_id": "chat-1",
+  "consultant_id": 1,
+  "plan": {
+    "id": 1,
+    "slug": "test-plan",
+    "name": "Test Plan",
+    "image": "https://example.com/plan.jpg",
+    "duration": 30,
+    "state": "active",
+    "type": {
+      "fit": true,
+      "slim": false,
+      "behavior": false,
+      "wellness": false
+    },
+    "description_md": "Plan description",
+    "packets_count": 1,
+    "packet1_options": {
+      "items": ["Item 1", "Item 2"],
+      "price": 1500.0,
+      "short": "Option 1",
+      "description_md": "Description",
+      "has_personal_diet": false
+    },
+    "packet2_options": null,
+    "packet3_options": null,
+    "author": {
+      "author_slug": "author-1",
+      "author_name": "Author Name",
+      "author_profile_icon": "https://example.com/author.jpg",
+      "author_is_me": false
+    },
+    "total_likes": 10,
+    "total_views": 100,
+    "total_comments": 5,
+    "is_favorite": false,
+    "min_price_of_options": 1000.0,
+    "max_price_of_options": 2000.0,
+    "was_liked_by_me": false
+  }
+}
+

test/fixtures/chat/chosen_plan/chosen_plan_complained_response.json

@@ -0,0 +1,47 @@
+{
+  "id": 1,
+  "option_type": "1",
+  "start_date": "2024-01-01T00:00:00Z",
+  "last_state": "complained",
+  "chat_id": "chat-1",
+  "consultant_id": 1,
+  "plan": {
+    "id": 1,
+    "slug": "test-plan",
+    "name": "Test Plan",
+    "image": "https://example.com/plan.jpg",
+    "duration": 30,
+    "state": "active",
+    "type": {
+      "fit": true,
+      "slim": false,
+      "behavior": false,
+      "wellness": false
+    },
+    "description_md": "Plan description",
+    "packets_count": 1,
+    "packet1_options": {
+      "items": ["Item 1", "Item 2"],
+      "price": 1500.0,
+      "short": "Option 1",
+      "description_md": "Description",
+      "has_personal_diet": false
+    },
+    "packet2_options": null,
+    "packet3_options": null,
+    "author": {
+      "author_slug": "author-1",
+      "author_name": "Author Name",
+      "author_profile_icon": "https://example.com/author.jpg",
+      "author_is_me": false
+    },
+    "total_likes": 10,
+    "total_views": 100,
+    "total_comments": 5,
+    "is_favorite": false,
+    "min_price_of_options": 1000.0,
+    "max_price_of_options": 2000.0,
+    "was_liked_by_me": false
+  }
+}
+

test/fixtures/chat/chosen_plan/chosen_plan_confirmed_by_consultant_response.json

@@ -0,0 +1,47 @@
+{
+  "id": 1,
+  "option_type": "1",
+  "start_date": "2024-01-01T00:00:00Z",
+  "last_state": "confirmed_by_consultant",
+  "chat_id": "chat-1",
+  "consultant_id": 1,
+  "plan": {
+    "id": 1,
+    "slug": "test-plan",
+    "name": "Test Plan",
+    "image": "https://example.com/plan.jpg",
+    "duration": 30,
+    "state": "active",
+    "type": {
+      "fit": true,
+      "slim": false,
+      "behavior": false,
+      "wellness": false
+    },
+    "description_md": "Plan description",
+    "packets_count": 1,
+    "packet1_options": {
+      "items": ["Item 1", "Item 2"],
+      "price": 1500.0,
+      "short": "Option 1",
+      "description_md": "Description",
+      "has_personal_diet": false
+    },
+    "packet2_options": null,
+    "packet3_options": null,
+    "author": {
+      "author_slug": "author-1",
+      "author_name": "Author Name",
+      "author_profile_icon": "https://example.com/author.jpg",
+      "author_is_me": false
+    },
+    "total_likes": 10,
+    "total_views": 100,
+    "total_comments": 5,
+    "is_favorite": false,
+    "min_price_of_options": 1000.0,
+    "max_price_of_options": 2000.0,
+    "was_liked_by_me": false
+  }
+}
+

test/fixtures/chat/chosen_plan/chosen_plan_done_response.json

@@ -0,0 +1,47 @@
+{
+  "id": 1,
+  "option_type": "1",
+  "start_date": "2024-01-01T00:00:00Z",
+  "last_state": "done",
+  "chat_id": "chat-1",
+  "consultant_id": 1,
+  "plan": {
+    "id": 1,
+    "slug": "test-plan",
+    "name": "Test Plan",
+    "image": "https://example.com/plan.jpg",
+    "duration": 30,
+    "state": "active",
+    "type": {
+      "fit": true,
+      "slim": false,
+      "behavior": false,
+      "wellness": false
+    },
+    "description_md": "Plan description",
+    "packets_count": 1,
+    "packet1_options": {
+      "items": ["Item 1", "Item 2"],
+      "price": 1500.0,
+      "short": "Option 1",
+      "description_md": "Description",
+      "has_personal_diet": false
+    },
+    "packet2_options": null,
+    "packet3_options": null,
+    "author": {
+      "author_slug": "author-1",
+      "author_name": "Author Name",
+      "author_profile_icon": "https://example.com/author.jpg",
+      "author_is_me": false
+    },
+    "total_likes": 10,
+    "total_views": 100,
+    "total_comments": 5,
+    "is_favorite": false,
+    "min_price_of_options": 1000.0,
+    "max_price_of_options": 2000.0,
+    "was_liked_by_me": false
+  }
+}
+

test/fixtures/chat/chosen_plan/chosen_plan_in_progress_response.json

@@ -0,0 +1,47 @@
+{
+  "id": 1,
+  "option_type": "1",
+  "start_date": "2024-01-01T00:00:00Z",
+  "last_state": "in_progress",
+  "chat_id": "chat-1",
+  "consultant_id": 1,
+  "plan": {
+    "id": 1,
+    "slug": "test-plan",
+    "name": "Test Plan",
+    "image": "https://example.com/plan.jpg",
+    "duration": 30,
+    "state": "active",
+    "type": {
+      "fit": true,
+      "slim": false,
+      "behavior": false,
+      "wellness": false
+    },
+    "description_md": "Plan description",
+    "packets_count": 1,
+    "packet1_options": {
+      "items": ["Item 1", "Item 2"],
+      "price": 1500.0,
+      "short": "Option 1",
+      "description_md": "Description",
+      "has_personal_diet": false
+    },
+    "packet2_options": null,
+    "packet3_options": null,
+    "author": {
+      "author_slug": "author-1",
+      "author_name": "Author Name",
+      "author_profile_icon": "https://example.com/author.jpg",
+      "author_is_me": false
+    },
+    "total_likes": 10,
+    "total_views": 100,
+    "total_comments": 5,
+    "is_favorite": false,
+    "min_price_of_options": 1000.0,
+    "max_price_of_options": 2000.0,
+    "was_liked_by_me": false
+  }
+}
+

test/fixtures/chat/chosen_plan/chosen_plan_initied_response.json

@@ -0,0 +1,47 @@
+{
+  "id": 1,
+  "option_type": "1",
+  "start_date": "2024-01-01T00:00:00Z",
+  "last_state": "initied",
+  "chat_id": "chat-1",
+  "consultant_id": 1,
+  "plan": {
+    "id": 1,
+    "slug": "test-plan",
+    "name": "Test Plan",
+    "image": "https://example.com/plan.jpg",
+    "duration": 30,
+    "state": "active",
+    "type": {
+      "fit": true,
+      "slim": false,
+      "behavior": false,
+      "wellness": false
+    },
+    "description_md": "Plan description",
+    "packets_count": 1,
+    "packet1_options": {
+      "items": ["Item 1", "Item 2"],
+      "price": 1500.0,
+      "short": "Option 1",
+      "description_md": "Description",
+      "has_personal_diet": false
+    },
+    "packet2_options": null,
+    "packet3_options": null,
+    "author": {
+      "author_slug": "author-1",
+      "author_name": "Author Name",
+      "author_profile_icon": "https://example.com/author.jpg",
+      "author_is_me": false
+    },
+    "total_likes": 10,
+    "total_views": 100,
+    "total_comments": 5,
+    "is_favorite": false,
+    "min_price_of_options": 1000.0,
+    "max_price_of_options": 2000.0,
+    "was_liked_by_me": false
+  }
+}
+

test/fixtures/chat/chosen_plan/chosen_plan_last_day_finished_response.json

@@ -0,0 +1,47 @@
+{
+  "id": 1,
+  "option_type": "1",
+  "start_date": "2024-01-01T00:00:00Z",
+  "last_state": "last_day_finished",
+  "chat_id": "chat-1",
+  "consultant_id": 1,
+  "plan": {
+    "id": 1,
+    "slug": "test-plan",
+    "name": "Test Plan",
+    "image": "https://example.com/plan.jpg",
+    "duration": 30,
+    "state": "active",
+    "type": {
+      "fit": true,
+      "slim": false,
+      "behavior": false,
+      "wellness": false
+    },
+    "description_md": "Plan description",
+    "packets_count": 1,
+    "packet1_options": {
+      "items": ["Item 1", "Item 2"],
+      "price": 1500.0,
+      "short": "Option 1",
+      "description_md": "Description",
+      "has_personal_diet": false
+    },
+    "packet2_options": null,
+    "packet3_options": null,
+    "author": {
+      "author_slug": "author-1",
+      "author_name": "Author Name",
+      "author_profile_icon": "https://example.com/author.jpg",
+      "author_is_me": false
+    },
+    "total_likes": 10,
+    "total_views": 100,
+    "total_comments": 5,
+    "is_favorite": false,
+    "min_price_of_options": 1000.0,
+    "max_price_of_options": 2000.0,
+    "was_liked_by_me": false
+  }
+}
+

test/fixtures/chat/chosen_plan/chosen_plan_last_day_started_response.json

@@ -0,0 +1,47 @@
+{
+  "id": 1,
+  "option_type": "1",
+  "start_date": "2024-01-01T00:00:00Z",
+  "last_state": "last_day_started",
+  "chat_id": "chat-1",
+  "consultant_id": 1,
+  "plan": {
+    "id": 1,
+    "slug": "test-plan",
+    "name": "Test Plan",
+    "image": "https://example.com/plan.jpg",
+    "duration": 30,
+    "state": "active",
+    "type": {
+      "fit": true,
+      "slim": false,
+      "behavior": false,
+      "wellness": false
+    },
+    "description_md": "Plan description",
+    "packets_count": 1,
+    "packet1_options": {
+      "items": ["Item 1", "Item 2"],
+      "price": 1500.0,
+      "short": "Option 1",
+      "description_md": "Description",
+      "has_personal_diet": false
+    },
+    "packet2_options": null,
+    "packet3_options": null,
+    "author": {
+      "author_slug": "author-1",
+      "author_name": "Author Name",
+      "author_profile_icon": "https://example.com/author.jpg",
+      "author_is_me": false
+    },
+    "total_likes": 10,
+    "total_views": 100,
+    "total_comments": 5,
+    "is_favorite": false,
+    "min_price_of_options": 1000.0,
+    "max_price_of_options": 2000.0,
+    "was_liked_by_me": false
+  }
+}
+

test/fixtures/chat/chosen_plan/chosen_plan_paid_response.json

@@ -0,0 +1,47 @@
+{
+  "id": 1,
+  "option_type": "1",
+  "start_date": "2024-01-01T00:00:00Z",
+  "last_state": "paid",
+  "chat_id": "chat-1",  
+  "consultant_id": 1,
+  "plan": {
+    "id": 1,
+    "slug": "test-plan",
+    "name": "Test Plan",
+    "image": "https://example.com/plan.jpg",
+    "duration": 30,
+    "state": "active",
+    "type": {
+      "fit": true,
+      "slim": false,
+      "behavior": false,
+      "wellness": false
+    },
+    "description_md": "Plan description",
+    "packets_count": 1,
+    "packet1_options": {
+      "items": ["Item 1", "Item 2"],
+      "price": 1500.0,
+      "short": "Option 1",
+      "description_md": "Description",
+      "has_personal_diet": false
+    },
+    "packet2_options": null,
+    "packet3_options": null,
+    "author": {
+      "author_slug": "author-1",
+      "author_name": "Author Name",
+      "author_profile_icon": "https://example.com/author.jpg",
+      "author_is_me": false
+    },
+    "total_likes": 10,
+    "total_views": 100,
+    "total_comments": 5,
+    "is_favorite": false,
+    "min_price_of_options": 1000.0,
+    "max_price_of_options": 2000.0,
+    "was_liked_by_me": false
+  }
+}
+

test/fixtures/chat/chosen_plan/chosen_plan_payment_failed_response.json

@@ -0,0 +1,47 @@
+{
+  "id": 1,
+  "option_type": "1",
+  "start_date": "2024-01-01T00:00:00Z",
+  "last_state": "payment_failed",
+  "chat_id": "chat-1",
+  "consultant_id": 1,
+  "plan": {
+    "id": 1,
+    "slug": "test-plan",
+    "name": "Test Plan",
+    "image": "https://example.com/plan.jpg",
+    "duration": 30,
+    "state": "active",
+    "type": {
+      "fit": true,
+      "slim": false,
+      "behavior": false,
+      "wellness": false
+    },
+    "description_md": "Plan description",
+    "packets_count": 1,
+    "packet1_options": {
+      "items": ["Item 1", "Item 2"],
+      "price": 1500.0,
+      "short": "Option 1",
+      "description_md": "Description",
+      "has_personal_diet": false
+    },
+    "packet2_options": null,
+    "packet3_options": null,
+    "author": {
+      "author_slug": "author-1",
+      "author_name": "Author Name",
+      "author_profile_icon": "https://example.com/author.jpg",
+      "author_is_me": false
+    },
+    "total_likes": 10,
+    "total_views": 100,
+    "total_comments": 5,
+    "is_favorite": false,
+    "min_price_of_options": 1000.0,
+    "max_price_of_options": 2000.0,
+    "was_liked_by_me": false
+  }
+}
+

test/fixtures/chat/chosen_plan/chosen_plan_pending_payment_response.json

@@ -0,0 +1,47 @@
+{
+  "id": 1,
+  "option_type": "1",
+  "start_date": "2024-01-01T00:00:00Z",
+  "last_state": "pending_payment",
+  "chat_id": "chat-1",
+  "consultant_id": 1,
+  "plan": {
+    "id": 1,
+    "slug": "test-plan",
+    "name": "Test Plan",
+    "image": "https://example.com/plan.jpg",
+    "duration": 30,
+    "state": "active",
+    "type": {
+      "fit": true,
+      "slim": false,
+      "behavior": false,
+      "wellness": false
+    },
+    "description_md": "Plan description",
+    "packets_count": 1,
+    "packet1_options": {
+      "items": ["Item 1", "Item 2"],
+      "price": 1500.0,
+      "short": "Option 1",
+      "description_md": "Description",
+      "has_personal_diet": false
+    },
+    "packet2_options": null,
+    "packet3_options": null,
+    "author": {
+      "author_slug": "author-1",
+      "author_name": "Author Name",
+      "author_profile_icon": "https://example.com/author.jpg",
+      "author_is_me": false
+    },
+    "total_likes": 10,
+    "total_views": 100,
+    "total_comments": 5,
+    "is_favorite": false,
+    "min_price_of_options": 1000.0,
+    "max_price_of_options": 2000.0,
+    "was_liked_by_me": false
+  }
+}
+

test/fixtures/chat/chosen_plan/chosen_plan_presonal_diet_set_response.json

@@ -0,0 +1,47 @@
+{
+  "id": 1,
+  "option_type": "1",
+  "start_date": "2024-01-01T00:00:00Z",
+  "last_state": "personal_diet_setted",
+  "chat_id": "chat-1",
+  "consultant_id": 1,
+  "plan": {
+    "id": 1,
+    "slug": "test-plan",
+    "name": "Test Plan",
+    "image": "https://example.com/plan.jpg",
+    "duration": 30,
+    "state": "active",
+    "type": {
+      "fit": true,
+      "slim": false,
+      "behavior": false,
+      "wellness": false
+    },
+    "description_md": "Plan description",
+    "packets_count": 1,
+    "packet1_options": {
+      "items": ["Item 1", "Item 2"],
+      "price": 1500.0,
+      "short": "Option 1",
+      "description_md": "Description",
+      "has_personal_diet": false
+    },
+    "packet2_options": null,
+    "packet3_options": null,
+    "author": {
+      "author_slug": "author-1",
+      "author_name": "Author Name",
+      "author_profile_icon": "https://example.com/author.jpg",
+      "author_is_me": false
+    },
+    "total_likes": 10,
+    "total_views": 100,
+    "total_comments": 5,
+    "is_favorite": false,
+    "min_price_of_options": 1000.0,
+    "max_price_of_options": 2000.0,
+    "was_liked_by_me": false
+  }
+}
+

test/fixtures/chat/chosen_plan/chosen_plan_start_date_has_been_set_response.json

@@ -0,0 +1,47 @@
+{
+  "id": 1,
+  "option_type": "1",
+  "start_date": "2024-01-01T00:00:00Z",
+  "last_state": "start_date_has_been_set",
+  "chat_id": "chat-1",
+  "consultant_id": 1,
+  "plan": {
+    "id": 1,
+    "slug": "test-plan",
+    "name": "Test Plan",
+    "image": "https://example.com/plan.jpg",
+    "duration": 30,
+    "state": "active",
+    "type": {
+      "fit": true,
+      "slim": false,
+      "behavior": false,
+      "wellness": false
+    },
+    "description_md": "Plan description",
+    "packets_count": 1,
+    "packet1_options": {
+      "items": ["Item 1", "Item 2"],
+      "price": 1500.0,
+      "short": "Option 1",
+      "description_md": "Description",
+      "has_personal_diet": false
+    },
+    "packet2_options": null,
+    "packet3_options": null,
+    "author": {
+      "author_slug": "author-1",
+      "author_name": "Author Name",
+      "author_profile_icon": "https://example.com/author.jpg",
+      "author_is_me": false
+    },
+    "total_likes": 10,
+    "total_views": 100,
+    "total_comments": 5,
+    "is_favorite": false,
+    "min_price_of_options": 1000.0,
+    "max_price_of_options": 2000.0,
+    "was_liked_by_me": false
+  }
+}
+

test/fixtures/chat/chosen_plan/chosen_plan_started_response.json

@@ -0,0 +1,47 @@
+{
+  "id": 1,
+  "option_type": "1",
+  "start_date": "2024-01-01T00:00:00Z",
+  "last_state": "started",
+  "chat_id": "chat-1",
+  "consultant_id": 1,
+  "plan": {
+    "id": 1,
+    "slug": "test-plan",
+    "name": "Test Plan",
+    "image": "https://example.com/plan.jpg",
+    "duration": 30,
+    "state": "active",
+    "type": {
+      "fit": true,
+      "slim": false,
+      "behavior": false,
+      "wellness": false
+    },
+    "description_md": "Plan description",
+    "packets_count": 1,
+    "packet1_options": {
+      "items": ["Item 1", "Item 2"],
+      "price": 1500.0,
+      "short": "Option 1",
+      "description_md": "Description",
+      "has_personal_diet": false
+    },
+    "packet2_options": null,
+    "packet3_options": null,
+    "author": {
+      "author_slug": "author-1",
+      "author_name": "Author Name",
+      "author_profile_icon": "https://example.com/author.jpg",
+      "author_is_me": false
+    },
+    "total_likes": 10,
+    "total_views": 100,
+    "total_comments": 5,
+    "is_favorite": false,
+    "min_price_of_options": 1000.0,
+    "max_price_of_options": 2000.0,
+    "was_liked_by_me": false
+  }
+}
+

test/fixtures/chat/payments/order_id_to_chat_uuid_response.json

@@ -0,0 +1,5 @@
+
+{ 
+    "chosen_plan_id": 12,
+    "conversation_uuid": "fbd81429-8019-499a-80e8-e3933cc4d872" 
+}

test/fixtures/chat/payments/payment_alfabank_request.json

@@ -0,0 +1,3 @@
+{
+    "payment_provider": "alfa-bank"
+}

test/fixtures/chat/payments/payment_mock_requeste.json

@@ -0,0 +1,3 @@
+{
+    "payment_provider": "mock"
+}

test/fixtures/chat/payments/payment_response_alfa_bank.json

@@ -0,0 +1,5 @@
+{
+  "checkout_url": "https://qr.nspk.ru/ASDFASDFASDFASDF",
+  "payment_provider": "alfa-bank",
+  "order_id": "alfa_c29_k15138_t1712345678_r1234"
+}

test/fixtures/feed/post_feed_empty_response.json

@@ -0,0 +1,15 @@
+{
+  "data": [],
+  "links": {
+    "first": null,
+    "last": null,
+    "prev": null,
+    "next": null
+  },
+  "meta": {
+    "path": "/api/feed",
+    "per_page": 20,
+    "next_cursor": null,
+    "prev_cursor": null
+  }
+}

test/fixtures/feed/post_feed_next_page_response.json

@@ -0,0 +1,45 @@
+{
+  "data": [
+    {
+      "id": 104,
+      "post_id": 4,
+      "post_author_id": 13,
+      "post_author_name": "Олег Кузнецов",
+      "post_author_image_url": "/storage/avatars/oleg.png",
+      "post_author_profile_url": "/ru/profiles/oleg-kuznetsov",
+      "post_created_at": "2024-06-04T11:00:00.000000Z",
+      "post_title": "Ужин за 20 минут",
+      "post_short_description": "Быстрый ужин после работы",
+      "post_text_md": "Курица с овощами на сковороде.",
+      "post_image_url": "/storage/posts/dinner.jpg",
+      "images": [],
+      "video_embed_url": null,
+      "post_views_count": 88,
+      "post_likes_count": 7,
+      "post_comments_count": 2,
+      "post_is_liked_by_user": false,
+      "is_entity_subscribed_by_me": false,
+      "post_url": "/ru/blog_post/4",
+      "video_url_thumb": null,
+      "post_state": "active",
+      "post_author_detailz": {
+        "slug": "oleg-kuznetsov",
+        "is_consultant": false
+      },
+      "created_at": "2024-06-04T11:05:00.000000Z",
+      "updated_at": "2024-06-04T11:05:00.000000Z"
+    }
+  ],
+  "links": {
+    "first": null,
+    "last": null,
+    "prev": "https://example.com/api/feed?cursor=eyJpZCI6MTAzfQ",
+    "next": null
+  },
+  "meta": {
+    "path": "/api/feed",
+    "per_page": 20,
+    "next_cursor": null,
+    "prev_cursor": "eyJpZCI6MTAzfQ"
+  }
+}

test/fixtures/feed/post_feed_response.json

@@ -0,0 +1,115 @@
+{
+  "data": [
+    {
+      "id": 101, 
+      "post_id": 1,
+      "post_author_id": 10,
+      "post_author_name": "Анна Иванова",
+      "post_author_image_url": "/storage/avatars/anna.png",
+      "post_author_profile_url": "/ru/profiles/anna-ivanova",
+      "post_created_at": "2024-06-01T10:00:00.000000Z",
+      "post_title": "Завтрак с овсянкой",
+      "post_short_description": "Простой и полезный завтрак",
+      "post_text_md": "Сегодня приготовила **овсянку** с ягодами.",
+      "post_image_url": "/storage/posts/oatmeal.jpg",
+      "images": [
+        {
+          "url": "/storage/posts/oatmeal-1.jpg",
+          "orientation": "horizontal"
+        },
+        {
+          "url": "/storage/posts/oatmeal-2.jpg",
+          "orientation": "vertical"
+        }
+      ],
+      "video_embed_url": null,
+      "post_views_count": 120,
+      "post_likes_count": 15,
+      "post_comments_count": 4,
+      "post_is_liked_by_user": false,
+      "is_entity_subscribed_by_me": false,
+      "post_url": "/ru/blog_post/1",
+      "post_state": "active",
+      "video_url_thumb": null,
+      "post_author_detailz": {
+        "slug": "anna-ivanova",
+        "is_consultant": true
+      },
+      "created_at": "2024-06-01T10:05:00.000000Z",
+      "updated_at": "2024-06-01T10:05:00.000000Z"
+    },
+    {
+      "id": 102,
+      "post_id": 2,
+      "post_author_id": 11,
+      "post_author_name": "Игорь Петров",
+      "post_author_image_url": "/storage/avatars/igor.png",
+      "post_author_profile_url": "/ru/profiles/igor-petrov",
+      "post_created_at": "2024-06-02T08:30:00.000000Z",
+      "post_title": "Тренировка дома",
+      "post_short_description": "Короткая тренировка без оборудования",
+      "post_text_md": "15 минут кардио и растяжка.",
+      "post_image_url": "/storage/posts/workout.jpg",
+      "images": [],
+      "video_embed_url": "https://www.youtube.com/embed/dQw4w9WgXcQ",
+      "post_views_count": 340,
+      "post_likes_count": 42,
+      "post_comments_count": 9,
+      "post_is_liked_by_user": true,
+      "is_entity_subscribed_by_me": true,
+      "post_url": "/ru/blog_post/2",
+      "post_state": "active",
+      "post_author_detailz": {
+        "slug": "igor-petrov",
+        "is_consultant": false
+      },
+      "created_at": "2024-06-02T08:35:00.000000Z",
+      "updated_at": "2024-06-02T09:00:00.000000Z"
+    },
+    {
+      "id": 103,
+      "post_id": 3,
+      "post_author_id": 12,
+      "post_author_name": "Мария Смирнова",
+      "post_author_image_url": null,
+      "post_author_profile_url": "/ru/profiles/maria-smirnova",
+      "post_created_at": "2024-06-03T14:15:00.000000Z",
+      "post_title": "Рецепт смузи",
+      "post_short_description": null,
+      "post_text_md": null,
+      "post_image_url": null,
+      "images": [
+        {
+          "url": "/storage/posts/smoothie.jpg",
+          "orientation": "horizontal"
+        }
+      ],
+      "video_embed_url": "https://rutube.ru/play/embed/6a62f217aa99daf00af8fa6cebebf218/",
+      "post_views_count": 50,
+      "post_likes_count": 3,
+      "post_comments_count": 1,
+      "post_is_liked_by_user": false,
+      "is_entity_subscribed_by_me": null,
+      "post_url": "/ru/blog_post/3",
+      "post_state": "active",
+      "post_author_detailz": {
+        "slug": "maria-smirnova",
+        "is_consultant": false
+      },
+      "created_at": "2024-06-03T14:20:00.000000Z",
+      "updated_at": "2024-06-03T14:20:00.000000Z"
+    }
+  ],
+  "links": {
+    "first": null,
+    "last": null,
+    "prev": null,
+    "next": "https://example.com/api/feed?cursor=eyJpZCI6MTAzfQ"
+  },
+  "meta": {
+    "path": "/api/feed", 
+    "per_page": 20,
+    "next_cursor": "eyJpZCI6MTAzfQ",
+    "prev_cursor": null
+  }
+}