Merge pull request 'main' (#237) from BLoC/eatvio_app:main into main

Reviewed-on: eatvio/eatvio_app#237

android/app/.cxx/Debug/5y6c3x6h/arm64-v8a/configure_fingerprint.bin

@@ -2,27 +2,27 @@ C/C++ Structured Logc
 a
 _C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	Ó½ùêÑ2

 <20>õ‘×Ñ2`
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	<EFBFBD>³üâÔ2

 <20>õ‘×Ñ2`
 ^
-\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\android_gradle_build.json	Ó½ùêÑ2
¡ “õ‘×Ñ2e
+\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\android_gradle_build.json	<EFBFBD>³üâÔ2
¡ “õ‘×Ñ2e
 c
-aC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\android_gradle_build_mini.json	Ó½ùêÑ2
€ ¤õ‘×Ñ2R
+aC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\android_gradle_build_mini.json	<EFBFBD>³üâÔ2
€ ¤õ‘×Ñ2R
 P
-NC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\build.ninja	Ó½ùêÑ2
¥Ò
 †ô‘×Ñ2V
+NC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\build.ninja	<EFBFBD>³üâÔ2
¥Ò
 †ô‘×Ñ2V
 T
-RC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\build.ninja.txt	Ó½ùêÑ2[
+RC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\build.ninja.txt	<EFBFBD>³üâÔ2[
 Y
-WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\build_file_index.txt	Ó½ùêÑ2
+WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\build_file_index.txt	<EFBFBD>³üâÔ2
 
R ¬õ‘×Ñ2\
-Z
+Z
 XC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\compile_commands.json	<08>³üâÔ2`
-^
+^
 \C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\compile_commands.json.bin	<08>³üâÔ2	f
-d
+d
 bC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\metadata_generation_command.txt	<08>³üâÔ2
 
« ¨õ‘×Ñ2Y
-W
+W
 UC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\prefab_config.json	<08>³üâÔ2
-
( ©õ‘×Ñ2^
+
( ©õ‘×Ñ2^
 \
-ZC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\symbol_folder_index.txt	Ó½ùêÑ2
+ZC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\arm64-v8a\symbol_folder_index.txt	<EFBFBD>³üâÔ2

android/app/.cxx/Debug/5y6c3x6h/armeabi-v7a/configure_fingerprint.bin

@@ -2,27 +2,27 @@ C/C++ Structured Loge
 c
 aC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	¥¾ùêÑ2

 ·É“×Ñ2b
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	Ÿ³üâÔ2

 ·É“×Ñ2b
 `
-^C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\android_gradle_build.json	¦¾ùêÑ2
¥ ¿É“×Ñ2g
+^C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\android_gradle_build.json	Ÿ³üâÔ2
¥ ¿É“×Ñ2g
 e
-cC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\android_gradle_build_mini.json	¦¾ùêÑ2
„ ÆÉ“×Ñ2T
+cC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\android_gradle_build_mini.json	Ÿ³üâÔ2
„ ÆÉ“×Ñ2T
 R
-PC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\build.ninja	¦¾ùêÑ2
¯Ò
 ´È“×Ñ2X
+PC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\build.ninja	Ÿ³üâÔ2
¯Ò
 ´È“×Ñ2X
 V
-TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\build.ninja.txt	¦¾ùêÑ2]
+TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\build.ninja.txt	Ÿ³üâÔ2]
 [
-YC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\build_file_index.txt	¦¾ùêÑ2
+YC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\build_file_index.txt	Ÿ³üâÔ2
 
R ÊÉ“×Ñ2^
-\
+\
 ZC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\compile_commands.json	Ÿ³üâÔ2b
-`
+`
 ^C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\compile_commands.json.bin	 ³üâÔ2	h
-f
+f
 dC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\metadata_generation_command.txt	 ³üâÔ2
 
µ ÇÉ“×Ñ2[
-Y
+Y
 WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\prefab_config.json	 ³üâÔ2
-
( ÈÉ“×Ñ2`
+
( ÈÉ“×Ñ2`
 ^
-\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\symbol_folder_index.txt	§¾ùêÑ2
+\C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\armeabi-v7a\symbol_folder_index.txt	 ³üâÔ2

android/app/.cxx/Debug/5y6c3x6h/x86/configure_fingerprint.bin

@@ -2,27 +2,27 @@ C/C++ Structured Log]
 [
 YC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	â¾ùêÑ2

 “‚”×Ñ2Z
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	±³üâÔ2

 “‚”×Ñ2Z
 X
-VC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\android_gradle_build.json	â¾ùêÑ2
• ™‚”×Ñ2_
+VC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\android_gradle_build.json	±³üâÔ2
• ™‚”×Ñ2_
 ]
-[C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\android_gradle_build_mini.json	â¾ùêÑ2
ô Ÿ‚”×Ñ2L
+[C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\android_gradle_build_mini.json	²³üâÔ2
ô Ÿ‚”×Ñ2L
 J
-HC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\build.ninja	â¾ùêÑ2
‡Ò
 ¾<>”×Ñ2P
+HC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\build.ninja	²³üâÔ2
‡Ò
 ¾<>”×Ñ2P
 N
-LC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\build.ninja.txt	â¾ùêÑ2U
+LC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\build.ninja.txt	²³üâÔ2U
 S
-QC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\build_file_index.txt	â¾ùêÑ2
+QC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\build_file_index.txt	²³üâÔ2
 
R §‚”×Ñ2V
-T
+T
 RC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\compile_commands.json	²³üâÔ2Z
-X
+X
 VC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\compile_commands.json.bin	²³üâÔ2	`
-^
+^
 \C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\metadata_generation_command.txt	²³üâÔ2
 
<18>  ‚”×Ñ2S
-Q
+Q
 OC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\prefab_config.json	²³üâÔ2
-
( £‚”×Ñ2X
+
( £‚”×Ñ2X
 V
-TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\symbol_folder_index.txt	â¾ùêÑ2
+TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86\symbol_folder_index.txt	²³üâÔ2

android/app/.cxx/Debug/5y6c3x6h/x86_64/configure_fingerprint.bin

@@ -2,27 +2,27 @@ C/C++ Structured Log`
 ^
 \C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	˜¿ùêÑ2

  <>”×Ñ2]
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	³üâÔ2

  <>”×Ñ2]
 [
-YC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\android_gradle_build.json	˜¿ùêÑ2
› ¥<>”×Ñ2b
+YC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\android_gradle_build.json	³üâÔ2
› ¥<>”×Ñ2b
 `
-^C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\android_gradle_build_mini.json	˜¿ùêÑ2
ú ¬<>”×Ñ2O
+^C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\android_gradle_build_mini.json	³üâÔ2
ú ¬<>”×Ñ2O
 M
-KC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\build.ninja	˜¿ùêÑ2
–Ò
 ÈŒ”×Ñ2S
+KC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\build.ninja	³üâÔ2
–Ò
 ÈŒ”×Ñ2S
 Q
-OC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\build.ninja.txt	˜¿ùêÑ2X
+OC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\build.ninja.txt	³üâÔ2X
 V
-TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\build_file_index.txt	˜¿ùêÑ2
+TC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\build_file_index.txt	³üâÔ2
 
R ¹<>”×Ñ2Y
-W
+W
 UC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\compile_commands.json	³üâÔ2]
-[
+[
 YC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\compile_commands.json.bin	³üâÔ2	c
-a
+a
 _C:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\metadata_generation_command.txt	³üâÔ2
 
œ ®<>”×Ñ2V
-T
+T
 RC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\prefab_config.json	³üâÔ2
-
( °<>”×Ñ2[
+
( °<>”×Ñ2[
 Y
-WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\symbol_folder_index.txt	˜¿ùêÑ2
+WC:\Users\Alex\eatvio_app\android\app\.cxx\Debug\5y6c3x6h\x86_64\symbol_folder_index.txt	³üâÔ2

assets/icons/mir.svg

@@ -0,0 +1,17 @@
+<svg width="62" height="17" viewBox="0 0 62 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3015_18047)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.707 3.2344e-07V0.0074239C16.6994 0.0074239 14.2853 2.83187e-07 13.6415 2.2345C13.0514 4.28341 11.3884 9.94017 11.3424 10.0961H10.8826C10.8826 10.0961 9.18121 4.3131 8.58344 2.22707C7.93968 -0.00742333 5.51792 3.2344e-07 5.51792 3.2344e-07H0V17H5.51792V6.90393H5.74784H5.97775L9.19654 17H13.0284L16.2472 6.91135H16.707V17H22.225V3.2344e-07H16.707Z" fill="#4DB45E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M36.8626 0C36.8626 0 35.2456 0.141048 34.4869 1.78166L30.5783 10.0961H30.1185V0H24.6006V17H29.812C29.812 17 31.5057 16.8515 32.2644 15.2183L36.0963 6.90393H36.5561V17H42.074V0H36.8626Z" fill="#4DB45E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M44.5264 7.72052V17H50.0443V11.5808H56.022C58.6277 11.5808 60.8349 9.96987 61.6549 7.72052H44.5264Z" fill="#4DB45E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M56.0226 0H43.7529C44.366 3.23668 46.8721 5.83493 50.1139 6.68122C50.8496 6.87424 51.6236 6.97817 52.4207 6.97817H61.8778C61.9621 6.59214 62.0004 6.19869 62.0004 5.79039C62.0004 2.59083 59.3257 0 56.0226 0Z" fill="url(#paint0_linear_3015_18047)"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_3015_18047" x1="43.7544" y1="3.48908" x2="62.0004" y2="3.48908" gradientUnits="userSpaceOnUse">
+<stop offset="0.3" stop-color="#00B4E6"/>
+<stop offset="1" stop-color="#088CCB"/>
+</linearGradient>
+<clipPath id="clip0_3015_18047">
+<rect width="62" height="17" fill="white"/>
+</clipPath>
+</defs>
+</svg>

lib/core/app_router.dart

@@ -29,6 +29,9 @@ import 'package:eatvio_app/features/feed/presentation/pages/feed_screen.dart';
 import 'package:eatvio_app/features/glossary/presentation/pages/glossary_screen.dart';
 import 'package:eatvio_app/features/menu/presentation/pages/menu_screen.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/my_finance/presentation/pages/consultant_finance_screen.dart';
+import 'package:eatvio_app/features/my_finance/presentation/pages/user_finance_screen.dart';
 import 'package:eatvio_app/features/my_plans/presentation/my_plans_screen.dart';
 import 'package:eatvio_app/features/notifications/presentation/pages/notifications_screen.dart';
 import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
@@ -138,10 +141,34 @@ class AppRouter {
           GoRoute(
             path: '/menu-screen',
             name: 'menuScreen',
-            pageBuilder: (context, state) => NoTransitionPage(child: MenuScreen()),
+            pageBuilder: (context, state) => NoTransitionPage(
+              child: BlocBuilder<ProfileAvatarCubit, ProfileAvatarState>(
+                builder: (BuildContext context, ProfileAvatarState state) {
+                  if (state is ProfileAvatarStateLoaded) {
+                    return MenuScreen(profileModel: state.profile);
+                  }
+                  return SizedBox.shrink();
+                },
+              ),
+            ),
           ),
         ],
       ),
+      GoRoute(
+        path: '/consultant-finance-screen',
+        name: 'consultantFinanceScreen',
+        builder: (context, state) => ConsultantFinanceScreen(),
+      ),
+      GoRoute(
+        path: '/user-finance-screen',
+        name: 'userFinanceScreen',
+        builder: (context, state) => UserFinanceScreen(),
+      ),
+      GoRoute(
+        path: '/card-settings-screen',
+        name: 'cardSettingsScreen',
+        builder: (context, state) => CardSettingsScreen(),
+      ),
       GoRoute(
         path: '/about-plan-screen',
         name: 'aboutPlanScreen',
@@ -156,7 +183,7 @@ class AppRouter {
       ),
       GoRoute(
         path: '/glossary-screen',
-        name: '/glossaryScreen',
+        name: 'glossaryScreen',
         builder: (context, state) => GlossaryScreen(),
       ),
       GoRoute(

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

@@ -12,6 +12,11 @@ class ConsultationsScreen extends StatelessWidget {
       appBar: AppBar(
         title: Text('Консультации'),
         centerTitle: true,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadiusDirectional.vertical(
+            bottom: Radius.circular(12),
+          ),
+        ),
       ),
       body: ListView.separated(
         padding: EdgeInsets.symmetric(vertical: 12),

lib/features/menu/presentation/pages/menu_screen.dart

@@ -7,12 +7,18 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/features/dev_tools/presentation/dev_tools_screen.dart';
 import 'package:eatvio_app/features/my_diets/presentation/my_diets_screen.dart';
 import 'package:eatvio_app/features/my_plans/presentation/my_plans_screen.dart';
+import 'package:eatvio_app/features/profile/models/profile_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
 
 class MenuScreen extends StatelessWidget {
-  MenuScreen({super.key});
+  final ProfileModel profileModel;
+
+  const MenuScreen({
+    super.key,
+    required this.profileModel,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -29,23 +35,38 @@ class MenuScreen extends StatelessWidget {
               leading: ImageConstant.icnProfileSettings,
               onTap: () => GoRouter.of(context).push('/settings-screen'),
             ),
+            if (profileModel.roles.contains('consultant')) _divider(context),
+            if (profileModel.roles.contains('consultant'))
+              _tile(
+                leading: ImageConstant.icnRecipes,
+                title: 'Мои рецепты',
+                onTap: () => GoRouter.of(context).push('/recipe-select-screen'),
+              ),
+            if (profileModel.roles.contains('consultant')) _divider(context),
+            if (profileModel.roles.contains('consultant'))
+              _tile(
+                leading: 'assets/icons/diets.svg',
+                title: 'Мои диеты',
+                onTap: () => GoRouter.of(context).push(MyDietsScreen.path),
+              ),
+            if (profileModel.roles.contains('consultant')) _divider(context),
+            if (profileModel.roles.contains('consultant'))
+              _tile(
+                leading: ImageConstant.icnPlans,
+                title: 'Мои планы',
+                onTap: () => GoRouter.of(context).push(MyPlansScreen.path),
+              ),
             _divider(context),
             _tile(
-              leading: ImageConstant.icnRecipes,
-              title: 'Мои рецепты',
-              onTap: () => GoRouter.of(context).push('/recipe-select-screen'),
-            ),
-            _divider(context),
-            _tile(
-              leading: 'assets/icons/diets.svg',
-              title: 'Мои диеты',
-              onTap: () => GoRouter.of(context).push(MyDietsScreen.path),
-            ),
-            _divider(context),
-            _tile(
-              leading: ImageConstant.icnPlans,
-              title: 'Мои планы',
-              onTap: () => GoRouter.of(context).push(MyPlansScreen.path),
+              leading: 'assets/icons/finance.svg',
+              title: 'Мои финансы',
+              onTap: () {
+                if (profileModel.roles.contains('consultant')) {
+                  GoRouter.of(context).pushNamed('consultantFinanceScreen');
+                } else {
+                  GoRouter.of(context).pushNamed('userFinanceScreen');
+                }
+              },
             ),
             _divider(context),
             _tile(

lib/features/my_finance/entities/consultant_finance_entity.dart

@@ -0,0 +1,80 @@
+enum ConsultationStatus {
+  Completed,
+  Canceled,
+  CanceledByInitiator,
+}
+
+class ConsultantFinanceEntity {
+  final int totalConsultationsCount;
+  final int completedCount;
+  final int canceledCount;
+  final int canceledByInitiatorCount;
+  final List<ConsultationFinanceCardEntity> consultationsList;
+
+  ConsultantFinanceEntity({
+    required this.totalConsultationsCount,
+    required this.completedCount,
+    required this.canceledCount,
+    required this.canceledByInitiatorCount,
+    required this.consultationsList,
+  });
+}
+
+class ConsultationFinanceCardEntity {
+  final String id;
+  final DateTime date;
+  final String title;
+  final String clientName;
+  final int planDuration;
+  final int price;
+  final ConsultationStatus status;
+
+  ConsultationFinanceCardEntity({
+    required this.id,
+    required this.date,
+    required this.title,
+    required this.clientName,
+    required this.planDuration,
+    required this.price,
+    required this.status,
+  });
+}
+
+// Test data
+final testConsultations = [
+  ConsultationFinanceCardEntity(
+    id: '1',
+    date: DateTime.now(),
+    title: 'Consultation A',
+    clientName: 'Alice',
+    planDuration: 30,
+    price: 100,
+    status: ConsultationStatus.Completed,
+  ),
+  ConsultationFinanceCardEntity(
+    id: '2',
+    date: DateTime.now().subtract(Duration(days: 1)),
+    title: 'Consultation B',
+    clientName: 'Bob',
+    planDuration: 45,
+    price: 150,
+    status: ConsultationStatus.Canceled,
+  ),
+  ConsultationFinanceCardEntity(
+    id: '3',
+    date: DateTime.now().subtract(Duration(days: 2)),
+    title: 'Consultation C',
+    clientName: 'Charlie',
+    planDuration: 60,
+    price: 200,
+    status: ConsultationStatus.CanceledByInitiator,
+  ),
+];
+
+final testFinanceEntity = ConsultantFinanceEntity(
+  totalConsultationsCount: testConsultations.length,
+  completedCount: testConsultations.where((c) => c.status == ConsultationStatus.Completed).length,
+  canceledCount: testConsultations.where((c) => c.status == ConsultationStatus.Canceled).length,
+  canceledByInitiatorCount: testConsultations.where((c) => c.status == ConsultationStatus.CanceledByInitiator).length,
+  consultationsList: testConsultations,
+);

lib/features/my_finance/presentation/pages/card_settings.dart

@@ -0,0 +1,114 @@
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+
+class CardSettingsScreen extends StatelessWidget {
+  const CardSettingsScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Color(0xFFF0F2F5),
+      appBar: AppBar(
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.vertical(
+            bottom: Radius.circular(12),
+          ),
+        ),
+        title: Text('Мои карты'),
+        centerTitle: true,
+      ),
+      body: Column(
+        children: [
+          const SizedBox(height: 16),
+          Material(
+            borderRadius: BorderRadius.circular(12),
+            color: Colors.white,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(height: 16),
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 16),
+                  child: Text(
+                    'Привязанные карты',
+                    style: TextStyle(
+                      color: Color(0xFF323F4B),
+                      fontSize: 18,
+                      fontWeight: FontWeight.w600,
+                      height: 1,
+                    ),
+                  ),
+                ),
+                const SizedBox(height: 8),
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 16),
+                  child: Text(
+                    'Выплату будут производиться\nна карту ** 0278',
+                    style: TextStyle(
+                      color: Color(0xFF323F4B),
+                      fontSize: 16,
+                      fontWeight: FontWeight.w500,
+                      height: 1,
+                    ),
+                  ),
+                ),
+                const SizedBox(height: 16),
+                SingleChildScrollView(
+                  padding: EdgeInsets.symmetric(horizontal: 16),
+                  scrollDirection: Axis.horizontal,
+                  child: Row(
+                    children: [
+                      _card(true),
+                      const SizedBox(width: 8),
+                      _card(),
+                      const SizedBox(width: 8),
+                      _card(),
+                    ],
+                  ),
+                ),
+                const SizedBox(height: 16),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  _card([bool isSelected = false]) {
+    return Container(
+      padding: EdgeInsets.all(4),
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.circular(8),
+        border: Border.all(
+          color: isSelected ? appTheme.blueA400 : Color(0xFFF1F2F6),
+          width: 2,
+        ),
+      ),
+      child: Container(
+        width: 148,
+        padding: EdgeInsets.all(10),
+        decoration: BoxDecoration(
+          color: Color(0xFFF1F2F6),
+          borderRadius: BorderRadius.circular(4),
+        ),
+        child: Column(
+          children: [
+            SvgPicture.asset('assets/icons/mir.svg'),
+            const SizedBox(height: 24),
+            Text(
+              '** 0278',
+              style: TextStyle(
+                color: Color(0xFF323F4B),
+                fontSize: 14,
+                height: 1,
+                fontWeight: FontWeight.w600,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/features/my_finance/presentation/pages/consultant_finance_screen.dart

@@ -0,0 +1,239 @@
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/utils/date_time_utils.dart';
+import 'package:eatvio_app/core/widgets/custom_drop_down_button.dart';
+import 'package:eatvio_app/features/my_finance/entities/consultant_finance_entity.dart';
+import 'package:flutter/material.dart';
+
+class ConsultantFinanceScreen extends StatelessWidget {
+  const ConsultantFinanceScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Color(0xFFF0F2F5),
+      appBar: AppBar(
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadiusDirectional.vertical(
+            bottom: Radius.circular(12),
+          ),
+        ),
+        title: Text('Архив консультаций'),
+        centerTitle: true,
+      ),
+      body: SingleChildScrollView(
+        padding: const EdgeInsets.symmetric(vertical: 8),
+        child: Column(
+          children: [
+            Material(
+              color: Colors.white,
+              borderRadius: BorderRadius.circular(12),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  const SizedBox(height: 16),
+                  Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 16),
+                    child: Text(
+                      'Всего консультаций: ${testFinanceEntity.totalConsultationsCount}',
+                      style: TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.w500,
+                        color: Color(0xFF6D6F71),
+                        height: 1,
+                      ),
+                    ),
+                  ),
+                  const SizedBox(height: 12),
+                  SingleChildScrollView(
+                    scrollDirection: Axis.horizontal,
+                    padding: const EdgeInsets.symmetric(horizontal: 16),
+                    child: Row(
+                      children: [
+                        Material(
+                          color: Color(0xFF0BB450).withAlpha(11),
+                          borderRadius: BorderRadius.circular(8),
+                          child: Padding(
+                            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+                            child: Text(
+                              'Завершено: ${testFinanceEntity.completedCount}',
+                              style: TextStyle(
+                                fontSize: 14,
+                                fontWeight: FontWeight.w400,
+                                color: Color(0xFF0BB450),
+                                height: 1,
+                              ),
+                            ),
+                          ),
+                        ),
+                        const SizedBox(width: 8),
+                        Material(
+                          color: Color(0xFFD01717).withAlpha(11),
+                          borderRadius: BorderRadius.circular(8),
+                          child: Padding(
+                            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+                            child: Text(
+                              'Отменено: ${testFinanceEntity.canceledCount}',
+                              style: TextStyle(
+                                fontSize: 14,
+                                fontWeight: FontWeight.w400,
+                                color: Color(0xFFD01717),
+                                height: 1,
+                              ),
+                            ),
+                          ),
+                        ),
+                        const SizedBox(width: 8),
+                        Material(
+                          color: Color(0xFFD07317).withAlpha(11),
+                          borderRadius: BorderRadius.circular(8),
+                          child: Padding(
+                            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+                            child: Text(
+                              'Отменено инициатором: ${testFinanceEntity.canceledByInitiatorCount}',
+                              style: TextStyle(
+                                fontSize: 14,
+                                fontWeight: FontWeight.w400,
+                                color: Color(0xFFD07317),
+                                height: 1,
+                              ),
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                  const SizedBox(height: 16),
+                ],
+              ),
+            ),
+            const SizedBox(height: 8),
+            Material(
+              color: Colors.white,
+              borderRadius: BorderRadius.circular(12),
+              child: Padding(
+                padding: const EdgeInsets.only(left: 16, right: 16, top: 16),
+                child: SingleChildScrollView(
+                  physics: const NeverScrollableScrollPhysics(),
+                  child: Column(
+                    children: [
+                      CustomDropDownButton(
+                        items: [],
+                        onChanged: (value) {},
+                      ),
+                      const SizedBox(height: 12),
+                      CustomDropDownButton(
+                        items: [],
+                        onChanged: (value) {},
+                      ),
+                      const SizedBox(height: 12),
+                      ListView.separated(
+                        shrinkWrap: true,
+                        physics: const NeverScrollableScrollPhysics(),
+                        itemBuilder: (context, index) => Material(
+                          color: Color(0xFFF6F6F6),
+                          borderRadius: BorderRadius.circular(20),
+                          child: Padding(
+                            padding: const EdgeInsets.all(12),
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Row(
+                                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                  children: [
+                                    Text(
+                                      testFinanceEntity.consultationsList[index].id,
+                                      style: TextStyle(
+                                        color: Color(0xFF323F4B),
+                                        height: 1,
+                                        fontWeight: FontWeight.w500,
+                                      ),
+                                    ),
+                                    Text(
+                                      testFinanceEntity.consultationsList[index].date.format('dd.MM.yyy', 'RU'),
+                                      style: TextStyle(
+                                        color: Color(0xFF6D6F71),
+                                        height: 1,
+                                        fontWeight: FontWeight.w500,
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                                const SizedBox(height: 8),
+                                Text(
+                                  testFinanceEntity.consultationsList[index].title,
+                                  style: TextStyle(
+                                    color: appTheme.blueA400,
+                                    height: 1,
+                                    fontSize: 18,
+                                    fontWeight: FontWeight.w600,
+                                  ),
+                                ),
+                                const SizedBox(height: 8),
+                                Text(
+                                  'Покупатель: ' + testFinanceEntity.consultationsList[index].clientName,
+                                  style: TextStyle(
+                                    color: Color(0xFF323F4B),
+                                    height: 1,
+                                    fontSize: 14,
+                                    fontWeight: FontWeight.w500,
+                                  ),
+                                ),
+                                const SizedBox(height: 8),
+                                Text(
+                                  testFinanceEntity.consultationsList[index].planDuration.toString() + ' дней',
+                                  style: TextStyle(
+                                    color: Color(0xFF323F4B),
+                                    height: 1,
+                                    fontSize: 14,
+                                    fontWeight: FontWeight.w500,
+                                  ),
+                                ),
+                                const SizedBox(height: 8),
+                                Row(
+                                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                  children: [
+                                    Text(
+                                      testFinanceEntity.consultationsList[index].price.toString() + ' ₽',
+                                      style: TextStyle(
+                                        color: Color(0xFF323F4B),
+                                        height: 1,
+                                        fontSize: 18,
+                                        fontWeight: FontWeight.w600,
+                                      ),
+                                    ),
+                                    Material(
+                                      color: Color(0xFF0BB450).withAlpha(11),
+                                      borderRadius: BorderRadius.circular(8),
+                                      child: Padding(
+                                        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+                                        child: Text(
+                                          testFinanceEntity.consultationsList[index].status.name,
+                                          style: TextStyle(
+                                            fontSize: 14,
+                                            fontWeight: FontWeight.w400,
+                                            color: Color(0xFF0BB450),
+                                            height: 1,
+                                          ),
+                                        ),
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                        separatorBuilder: (context, index) => const SizedBox(height: 12),
+                        itemCount: testFinanceEntity.consultationsList.length,
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/features/my_finance/presentation/pages/user_finance_screen.dart

@@ -0,0 +1,180 @@
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/utils/date_time_utils.dart';
+import 'package:eatvio_app/core/widgets/custom_drop_down_button.dart';
+import 'package:eatvio_app/features/my_finance/entities/consultant_finance_entity.dart';
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+
+class UserFinanceScreen extends StatelessWidget {
+  const UserFinanceScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Color(0xFFF0F2F5),
+      appBar: AppBar(
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadiusDirectional.vertical(
+            bottom: Radius.circular(12),
+          ),
+        ),
+        title: Text('История операций'),
+        centerTitle: true,
+      ),
+      body: SingleChildScrollView(
+        padding: const EdgeInsets.symmetric(vertical: 8),
+        child: Column(
+          children: [
+            const SizedBox(height: 8),
+            InkWell(
+              onTap: () {
+                GoRouter.of(context).pushNamed('cardSettingsScreen');
+              },
+              borderRadius: BorderRadius.circular(20),
+              child: Ink(
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(20),
+                  color: appTheme.blueA400,
+                ),
+                width: MediaQuery.of(context).size.width - 32,
+                child: Center(
+                  child: Padding(
+                    padding: const EdgeInsets.all(16),
+                    child: Text(
+                      'Управление картами',
+                      style: TextStyle(
+                        color: Colors.white,
+                        fontSize: 16,
+                        fontWeight: FontWeight.w600,
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+            const SizedBox(height: 16),
+            Material(
+              color: Colors.white,
+              borderRadius: BorderRadius.circular(12),
+              child: Padding(
+                padding: const EdgeInsets.only(left: 16, right: 16, top: 16),
+                child: SingleChildScrollView(
+                  physics: const NeverScrollableScrollPhysics(),
+                  child: Column(
+                    children: [
+                      CustomDropDownButton(
+                        items: [],
+                        onChanged: (value) {},
+                      ),
+                      const SizedBox(height: 12),
+                      ListView.separated(
+                        shrinkWrap: true,
+                        physics: const NeverScrollableScrollPhysics(),
+                        itemBuilder: (context, index) => Material(
+                          color: Color(0xFFF6F6F6),
+                          borderRadius: BorderRadius.circular(20),
+                          child: Padding(
+                            padding: const EdgeInsets.all(12),
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Row(
+                                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                  children: [
+                                    Text(
+                                      testFinanceEntity.consultationsList[index].id,
+                                      style: TextStyle(
+                                        color: Color(0xFF323F4B),
+                                        height: 1,
+                                        fontWeight: FontWeight.w500,
+                                      ),
+                                    ),
+                                    Text(
+                                      testFinanceEntity.consultationsList[index].date.format('dd.MM.yyy', 'RU'),
+                                      style: TextStyle(
+                                        color: Color(0xFF6D6F71),
+                                        height: 1,
+                                        fontWeight: FontWeight.w500,
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                                const SizedBox(height: 8),
+                                Text(
+                                  testFinanceEntity.consultationsList[index].title,
+                                  style: TextStyle(
+                                    color: appTheme.blueA400,
+                                    height: 1,
+                                    fontSize: 18,
+                                    fontWeight: FontWeight.w600,
+                                  ),
+                                ),
+                                const SizedBox(height: 8),
+                                Text(
+                                  'Покупатель: ' + testFinanceEntity.consultationsList[index].clientName,
+                                  style: TextStyle(
+                                    color: Color(0xFF323F4B),
+                                    height: 1,
+                                    fontSize: 14,
+                                    fontWeight: FontWeight.w500,
+                                  ),
+                                ),
+                                const SizedBox(height: 8),
+                                Text(
+                                  testFinanceEntity.consultationsList[index].planDuration.toString() + ' дней',
+                                  style: TextStyle(
+                                    color: Color(0xFF323F4B),
+                                    height: 1,
+                                    fontSize: 14,
+                                    fontWeight: FontWeight.w500,
+                                  ),
+                                ),
+                                const SizedBox(height: 8),
+                                Row(
+                                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                  children: [
+                                    Text(
+                                      testFinanceEntity.consultationsList[index].price.toString() + ' ₽',
+                                      style: TextStyle(
+                                        color: Color(0xFF323F4B),
+                                        height: 1,
+                                        fontSize: 18,
+                                        fontWeight: FontWeight.w600,
+                                      ),
+                                    ),
+                                    Material(
+                                      color: Color(0xFF0BB450).withAlpha(11),
+                                      borderRadius: BorderRadius.circular(8),
+                                      child: Padding(
+                                        padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+                                        child: Text(
+                                          testFinanceEntity.consultationsList[index].status.name,
+                                          style: TextStyle(
+                                            fontSize: 14,
+                                            fontWeight: FontWeight.w400,
+                                            color: Color(0xFF0BB450),
+                                            height: 1,
+                                          ),
+                                        ),
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                        separatorBuilder: (context, index) => const SizedBox(height: 12),
+                        itemCount: testFinanceEntity.consultationsList.length,
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}