diff --git a/.gitea/workflows/test-flight-cd.yaml b/.gitea/workflows/test-flight-cd.yaml
index 9d810d8e..ac54d483 100644
--- a/.gitea/workflows/test-flight-cd.yaml
+++ b/.gitea/workflows/test-flight-cd.yaml
@@ -11,6 +11,30 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       
+      - name: Checkout env repository
+        uses: actions/checkout@v2
+        with:
+          repository: mso7nueh/eatvio_app_env
+          path: env_repo
+          token: ${{ vars.MSO7NUEH_TOKEN }}
+          ref: main
+
+      - name: Copy .env file
+        run: |
+          mkdir -p env
+          cp env_repo/.env env/.env
+
+      - name: Load environment variables from .env
+        run: |
+          set -a
+          source env/.env
+          set +a
+          # Export all variables to GITHUB_ENV
+          while IFS= read -r line; do
+            if [[ $line =~ ^[A-Za-z_][A-Za-z0-9_]*= ]]; then
+              echo "$line" >> $GITHUB_ENV
+            fi
+          done < env/.env
 
       - name: Unlock login keychain
         run: |
@@ -18,6 +42,17 @@ jobs:
         env:
           KEYCHAIN_PASSWORD: ${{ vars.IOS_RUNNER_CI_PASSWORD }} 
           
+      - name: Setup API key
+        run: |
+          echo "${API_APPSTORE_KEY}" | tr -d '\n' | base64 --decode > ios/AuthKey.p8
+          chmod 600 ios/AuthKey.p8
+          ls -la ios/AuthKey.p8
+          echo "File size: $(wc -c < ios/AuthKey.p8) bytes"
+          echo "Contents of ios directory:"
+          ls -la ios/
+        env:
+          API_APPSTORE_KEY: ${{ vars.API_APPSTORE_KEY }}
+
       - name: Flutter build
         run: |
           flutter clean
@@ -31,6 +66,8 @@ jobs:
           LANG: en_US.UTF-8
           LC_ALL: en_US.UTF-8
           MATCH_PASSWORD: ${{ vars.IOS_RUNNER_CI_PASSWORD }} 
+          FASTLANE_PASSWORD: ${{ vars.FASTLANE_PASSWORD }} 
           MATCH_GIT_URL: http://gitea.office.local:3000/mso7nueh/fastlane
           FASTLANE_USER: eatvio2023@icloud.com
-          FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ vars.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }} 
\ No newline at end of file
+          FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ vars.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }} 
+          API_APPSTORE_KEY: ${{ vars.API_APPSTORE_KEY }}
diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 75372b09..d209778b 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -3,7 +3,7 @@ name: Eatvio App Android Test
 on: [ pull_request ]
 
 env:
-  flutter_version: "3.32.5"
+  flutter_version: "3.35.1"
   java_version: "21.x"
   flutter_channel: "stable"
   my_local_cache_dir: "/opt/hostedtoolcache/"
@@ -16,6 +16,31 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Checkout env repository
+        uses: actions/checkout@v3
+        with:
+          repository: mso7nueh/eatvio_app_env
+          path: env_repo
+          token: ${{ vars.MSO7NUEH_TOKEN }}
+          ref: main
+
+      - name: Copy .env file
+        run: |
+          mkdir -p env
+          cp env_repo/.env env/.env
+
+      - name: Load environment variables from .env
+        run: |
+          set -a
+          source env/.env
+          set +a
+          # Export all variables to GITHUB_ENV
+          while IFS= read -r line; do
+            if [[ $line =~ ^[A-Za-z_][A-Za-z0-9_]*= ]]; then
+              echo "$line" >> $GITHUB_ENV
+            fi
+          done < env/.env
+
       - name: Create key.properties file
         run: |
           cat > android/key.properties <<EOF
@@ -119,7 +144,11 @@ jobs:
         run: flutter test
 
       - name: Build apk
-        run: flutter build apk --release
+        run: |
+          BUILD_DATE=$(TZ=Europe/Moscow date +'%Y-%m-%d %H:%M:%S')
+          flutter build apk --release \
+            --dart-define=HIDE_PLANS=false \
+            --dart-define=BUILD_DATE="$BUILD_DATE"
 
       - name: Rename and move apk
         run: |
diff --git a/.gitignore b/.gitignore
index eaa965d0..4f05e3a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,9 @@
 /android/app/upload-keystore.jks
 /android/app/.cxx
 *.g.dart
-*.freezed.dart
\ No newline at end of file
+*.freezed.dart
+*.gr.dart
+*.mocks.dart
+android/build/
+ios/XCBuildData/
+env/.env
\ No newline at end of file
diff --git a/ENV_SETUP.md b/ENV_SETUP.md
new file mode 100644
index 00000000..0873fb1c
--- /dev/null
+++ b/ENV_SETUP.md
@@ -0,0 +1,84 @@
+# Настройка переменных окружения
+
+Этот проект использует переменные окружения для хранения секретных данных и конфигурации.
+
+## Установка
+
+1. Скопируйте файл `env.example` в `.env`:
+```bash
+cp env.example .env
+```
+
+2. Отредактируйте файл `.env` и замените значения на ваши собственные секреты.
+
+## Переменные окружения
+
+### API URLs
+- `BASE_URL` - основной URL API (по умолчанию: https://eatvio.ru)
+- `DEV_BASE_URL` - URL API для разработки (по умолчанию: https://dev2.eatvio.com)
+
+### Sentry Configuration
+- `SENTRY_DSN` - DSN для Sentry мониторинга
+
+### Firebase Configuration
+- `FIREBASE_PROJECT_ID` - ID проекта Firebase
+- `FIREBASE_DATABASE_URL` - URL базы данных Firebase
+- `FIREBASE_STORAGE_BUCKET` - bucket для хранения файлов
+- `FIREBASE_MESSAGING_SENDER_ID` - ID отправителя сообщений
+
+### Firebase Android Configuration
+- `FIREBASE_ANDROID_API_KEY` - API ключ для Android
+- `FIREBASE_ANDROID_APP_ID` - ID приложения для Android
+
+### Firebase iOS Configuration
+- `FIREBASE_IOS_API_KEY` - API ключ для iOS
+- `FIREBASE_IOS_APP_ID` - ID приложения для iOS
+- `FIREBASE_IOS_BUNDLE_ID` - Bundle ID для iOS
+
+### App Store URLs
+- `APP_STORE_URL` - URL App Store
+- `RUSTORE_URL` - URL RuStore
+
+### Support URLs
+- `TELEGRAM_SUPPORT_URL` - URL поддержки в Telegram
+- `SUPPORT_EMAIL` - email для поддержки
+
+### Test Credentials (только для разработки)
+- `TEST_EMAIL` - тестовый email
+- `TEST_PASSWORD` - тестовый пароль
+
+### Email Validation API
+- `EMAIL_VALIDATION_API_URL` - URL API для валидации email
+
+### Connection Check URLs
+- `GOOGLE_CHECK_URL` - URL для проверки соединения (Google)
+- `YANDEX_CHECK_URL` - URL для проверки соединения (Yandex)
+
+## Безопасность
+
+⚠️ **ВАЖНО**: Файл `.env` добавлен в `.gitignore` и не должен попадать в репозиторий. Все секретные данные должны храниться только в этом файле.
+
+## Использование в коде
+
+Для доступа к переменным окружения используйте класс `EnvConfig`:
+
+```dart
+import 'package:eatvio_app/core/env_config.dart';
+
+String baseUrl = EnvConfig.baseUrl;
+String sentryDsn = EnvConfig.sentryDsn;
+```
+
+## Миграция
+
+Все секреты были перенесены из кода в переменные окружения:
+
+1. **Sentry DSN** - из `main.dart`
+2. **Firebase конфигурация** - из `firebase_options.dart`
+3. **API URLs** - из `const.dart`
+4. **URL для проверки соединения** - из `internet_connection_checker_screen.dart`
+5. **URL для обновления приложения** - из `update_screen.dart`
+6. **URL поддержки Telegram** - из `support_screen.dart`
+7. **API для валидации email** - из `registration_repository.dart`
+8. **Тестовые учетные данные** - из `test_cases.dart`
+9. **Email поддержки** - из `support_screen.dart` 
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index a5377cc6..9ffa87c4 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -19,17 +19,17 @@ android {
     ndkVersion = "27.0.12077973"
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = 21
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
 
     defaultConfig {
         applicationId = "com.eatvioapp.app"
-        minSdk = flutter.minSdkVersion
+        minSdkVersion flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index d8c4ec86..0d239126 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -2,9 +2,12 @@
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
 
     <application
-        android:label="Eatvio"
+        android:label="Итвио"
         android:usesCleartextTraffic="true"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
@@ -26,8 +29,30 @@
               android:resource="@style/NormalTheme"
               />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <!-- Deep link intent -->
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="https" />
+                <data android:host="eatvio.ru" />
+                <data android:host="www.eatvio.ru" />
+
+                <data android:pathPattern="/ru/recipe/.*" />
+                <data android:pathPattern="/en/recipe/.*" />
+
+                <data android:pathPattern="/ru/blog_post/.*" />
+                <data android:pathPattern="/en/blog_post/.*" />
+
+                <data android:pathPattern="/ru/diet/.*" />
+                <data android:pathPattern="/en/diet/.*" />
+
+                <data android:pathPattern="/ru/plan/.*" />
+                <data android:pathPattern="/en/plan/.*" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
diff --git a/android/build/reports/problems/problems-report.html b/android/build/reports/problems/problems-report.html
index f21ab9cc..4921e6e4 100644
--- a/android/build/reports/problems/problems-report.html
+++ b/android/build/reports/problems/problems-report.html
@@ -650,12 +650,12 @@ code + .copy-button {
 <script type="text/javascript">
 function configurationCacheProblems() { return (
 // begin-report-data
-{"diagnostics":[{"locations":[{"pluginId":"dev.flutter.flutter-gradle-plugin"}],"problem":[{"text":"The CopyProcessingSpec.setFileMode(Integer) method has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 9.0."}],"contextualLabel":"The CopyProcessingSpec.setFileMode(Integer) method has been deprecated.","documentationLink":"https://docs.gradle.org/8.11.1/userguide/upgrading_version_8.html#unix_file_permissions_deprecated","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"the-copyprocessingspec-setfilemode-integer-method-has-been-deprecated","displayName":"The CopyProcessingSpec.setFileMode(Integer) method has been deprecated."}],"solutions":[[{"text":"Please use the filePermissions(Action) method instead."}]]},{"locations":[{"pluginId":"dev.flutter.flutter-gradle-plugin"}],"problem":[{"text":"The CopyProcessingSpec.setFileMode(Integer) method has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 9.0."}],"contextualLabel":"The CopyProcessingSpec.setFileMode(Integer) method has been deprecated.","documentationLink":"https://docs.gradle.org/8.11.1/userguide/upgrading_version_8.html#unix_file_permissions_deprecated","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"the-copyprocessingspec-setfilemode-integer-method-has-been-deprecated","displayName":"The CopyProcessingSpec.setFileMode(Integer) method has been deprecated."}],"solutions":[[{"text":"Please use the filePermissions(Action) method instead."}]]},{"locations":[{"pluginId":"dev.flutter.flutter-gradle-plugin"}],"problem":[{"text":"The CopyProcessingSpec.setFileMode(Integer) method has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 9.0."}],"contextualLabel":"The CopyProcessingSpec.setFileMode(Integer) method has been deprecated.","documentationLink":"https://docs.gradle.org/8.11.1/userguide/upgrading_version_8.html#unix_file_permissions_deprecated","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"the-copyprocessingspec-setfilemode-integer-method-has-been-deprecated","displayName":"The CopyProcessingSpec.setFileMode(Integer) method has been deprecated."}],"solutions":[[{"text":"Please use the filePermissions(Action) method instead."}]]}],"problemsReport":{"totalProblemCount":3,"buildName":"android","requestedTasks":"clean","documentationLink":"https://docs.gradle.org/8.11.1/userguide/problems-report.html","documentationLinkCaption":"Problem report"}}
+{"diagnostics":[{"locations":[{}],"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.14.1/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('signingConfig = <value>') instead."}]]},{"locations":[{}],"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.14.1/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('signingConfig = <value>') instead."}]]},{"locations":[{}],"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.14.1/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('signingConfig = <value>') instead."}]]},{"locations":[{},{"pluginId":"dev.flutter.flutter-gradle-plugin"}],"problem":[{"text":"The CopyProcessingSpec.setFileMode(Integer) method has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 9.0."}],"contextualLabel":"The CopyProcessingSpec.setFileMode(Integer) method has been deprecated.","documentationLink":"https://docs.gradle.org/8.14.1/userguide/upgrading_version_8.html#unix_file_permissions_deprecated","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"the-copyprocessingspec-setfilemode-integer-method-has-been-deprecated","displayName":"The CopyProcessingSpec.setFileMode(Integer) method has been deprecated."}],"solutions":[[{"text":"Please use the filePermissions(Action) method instead."}]]},{"locations":[{}],"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.14.1/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('group = <value>') instead."}]]},{"locations":[{}],"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.14.1/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('version = <value>') instead."}]]},{"locations":[{}],"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.14.1/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('compileSdk = <value>') instead."}]]},{"locations":[{}],"problem":[{"text":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"severity":"WARNING","problemDetails":[{"text":"This is scheduled to be removed in Gradle 10.0."}],"contextualLabel":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated.","documentationLink":"https://docs.gradle.org/8.14.1/userguide/upgrading_version_8.html#groovy_space_assignment_syntax","problemId":[{"name":"deprecation","displayName":"Deprecation"},{"name":"properties-should-be-assigned-using-the-propname-value-syntax-setting-a-property-via-the-gradle-generated-propname-value-or-propname-value-syntax-in-groovy-dsl","displayName":"Properties should be assigned using the 'propName = value' syntax. Setting a property via the Gradle-generated 'propName value' or 'propName(value)' syntax in Groovy DSL has been deprecated."}],"solutions":[[{"text":"Use assignment ('namespace = <value>') instead."}]]}],"problemsReport":{"totalProblemCount":8,"buildName":"android","requestedTasks":"assembleDebug","documentationLink":"https://docs.gradle.org/8.14.1/userguide/reporting_problems.html","documentationLinkCaption":"Problem report","summaries":[]}}
 // end-report-data
 );}
 </script>
                 <script type="text/javascript">
-                !function(n,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports["configuration-cache-report"]=t():n["configuration-cache-report"]=t()}(this,(()=>(({70:function(){void 0===ArrayBuffer.isView&&(ArrayBuffer.isView=function(n){return null!=n&&null!=n.__proto__&&n.__proto__.__proto__===Int8Array.prototype.__proto__}),void 0===Math.imul&&(Math.imul=function(n,t){return(4294901760&n)*(65535&t)+(65535&n)*(0|t)|0}),this["configuration-cache-report"]=function(n){"use strict";var t,r,i,e,u,o,f,s,c,a,h,l,_,v,d,g,w,b,p,m,k,q,y,B,C,x,j,P,I,S,z,E,T,L,N,A,M,F,D,O,R,H,$,G,U,V,Q,Z,Y,W,K,X,J,nn,tn,rn,en,un,on,fn,sn,cn,an,hn,ln,_n,vn,dn,gn,wn,bn,pn,mn,kn,qn,yn,Bn,Cn,xn,jn,Pn,In,Sn,zn=Math.imul,En=ArrayBuffer.isView;function Tn(n,t){if(!(t>=0))throw ou(re("Requested element count "+t+" is less than zero."));return function(n,t){if(!(t>=0))throw ou(re("Requested element count "+t+" is less than zero."));if(0===t)return bt();if(t>=n.length)return An(n);if(1===t)return dr(n[0]);var r=0,i=Lr(),e=0,u=n.length;n:for(;e<u;){var o=n[e];if(e=e+1|0,i.d(o),(r=r+1|0)===t)break n}return i}(n,Wn(n.length-t|0,0))}function Ln(n){return n.length-1|0}function Nn(n,t){if(null==t){var r=0,i=n.length-1|0;if(r<=i)do{var e=r;if(r=r+1|0,null==n[e])return e}while(r<=i)}else{var u=0,o=n.length-1|0;if(u<=o)do{var f=u;if(u=u+1|0,ue(t,n[f]))return f}while(u<=o)}return-1}function An(n){switch(n.length){case 0:return bt();case 1:return dr(n[0]);default:return function(n){return Nr(function(n){return new qt(n,!1)}(n))}(n)}}function Mn(n,t,r,i,e,u,o){return t=t===A?", ":t,r=r===A?"":r,i=i===A?"":i,e=e===A?-1:e,u=u===A?"...":u,o=o===A?null:o,Fn(n,wi(),t,r,i,e,u,o).toString()}function Fn(n,t,r,i,e,u,o,f){r=r===A?", ":r,i=i===A?"":i,e=e===A?"":e,u=u===A?-1:u,o=o===A?"...":o,f=f===A?null:f,t.e(i);var s=0,c=n.f();n:for(;c.g();){var a=c.h();if((s=s+1|0)>1&&t.e(r),!(u<0||s<=u))break n;Vt(t,a,f)}return u>=0&&s>u&&t.e(o),t.e(e),t}function Dn(n){if(n.i())throw pu("List is empty.");return n.j(0)}function On(n){return new Zn(n)}function Rn(n){if(Ge(n,Ei)){var t;switch(n.k()){case 0:t=bt();break;case 1:t=dr(Ge(n,zi)?n.j(0):n.f().h());break;default:t=$n(n)}return t}return pt(Un(n))}function Hn(n){if(Ge(n,Ei)&&n.k()<=1)return Rn(n);var t=Un(n);return function(n){var t=(n.k()/2|0)-1|0;if(t<0)return hr();var r=mt(n),i=0;if(i<=t)do{var e=i;i=i+1|0;var u=n.j(e);n.f4(e,n.j(r)),n.f4(r,u),r=r-1|0}while(e!==t)}(t),t}function $n(n){return Nr(n)}function Gn(n,t){if(!(t>=0))throw ou(re("Requested element count "+t+" is less than zero."));if(0===t)return bt();var r=n.k();if(t>=r)return Rn(n);if(1===t)return dr(Vn(n));var i=Lr();if(Ge(n,hi)){var e=r-t|0;if(e<r)do{var u=e;e=e+1|0,i.d(n.j(u))}while(e<r)}else for(var o=n.l(r-t|0);o.g();){var f=o.h();i.d(f)}return i}function Un(n){return Ge(n,Ei)?$n(n):Qn(n,Tr())}function Vn(n){if(n.i())throw pu("List is empty.");return n.j(mt(n))}function Qn(n,t){for(var r=n.f();r.g();){var i=r.h();t.d(i)}return t}function Zn(n){this.n_1=n}function Yn(n,t){return n>t?t:n}function Wn(n,t){return n<t?t:n}function Kn(n,t){return Gt().q(n,t,-1)}function Xn(n,t){return new zt(n,t)}function Jn(n){var t=n.f();if(!t.g())return bt();var r=t.h();if(!t.g())return dr(r);var i=Tr();for(i.d(r);t.g();)i.d(t.h());return i}function nt(n){this.r_1=n}function tt(n,t){this.s_1=n,this.t_1=t}function rt(){}function it(n){this.x_1=n,this.w_1=0}function et(n,t){this.a1_1=n,it.call(this,n),ot().b1(t,this.a1_1.k()),this.w_1=t}function ut(){t=this}function ot(){return null==t&&new ut,t}function ft(){ot(),rt.call(this)}function st(n){this.h1_1=n}function ct(n,t){return t===n?"(this Map)":Di(t)}function at(n,t){var r;n:{for(var i=n.o().f();i.g();){var e=i.h();if(ue(e.j1(),t)){r=e;break n}}r=null}return r}function ht(){r=this}function lt(){return null==r&&new ht,r}function _t(n){this.q1_1=n,rt.call(this)}function vt(){lt(),this.n1_1=null,this.o1_1=null}function dt(){i=this}function gt(){return null==i&&new dt,i}function wt(n){return n.length>0?Je(n):bt()}function bt(){return null==e&&new kt,e}function pt(n){switch(n.k()){case 0:return bt();case 1:return dr(n.j(0));default:return n}}function mt(n){return n.k()-1|0}function kt(){e=this,this.z1_1=new ve(-1478467534,-1720727600)}function qt(n,t){this.b2_1=n,this.c2_1=t}function yt(){u=this}function Bt(){return null==u&&new yt,u}function Ct(n,t){return Ge(n,Ei)?n.k():t}function xt(n,t){if(Ge(t,Ei))return n.m(t);for(var r=!1,i=t.f();i.g();){var e=i.h();n.d(e)&&(r=!0)}return r}function jt(){}function Pt(n,t){this.h2_1=n,this.g2_1=n.i2_1.l(function(n,t){if(!(0<=t&&t<=n.k()))throw su("Position index "+t+" must be in range ["+De(0,n.k())+"].");return n.k()-t|0}(n,t))}function It(n){ft.call(this),this.i2_1=n}function St(n){this.k2_1=n,this.j2_1=n.l2_1.f()}function zt(n,t){this.l2_1=n,this.m2_1=t}function Et(n){for(;n.n2_1.g();){var t=n.n2_1.h();if(n.q2_1.t2_1(t)===n.q2_1.s2_1)return n.p2_1=t,n.o2_1=1,hr()}n.o2_1=0}function Tt(n){this.q2_1=n,this.n2_1=n.r2_1.f(),this.o2_1=-1,this.p2_1=null}function Lt(n,t,r){t=t===A||t,this.r2_1=n,this.s2_1=t,this.t2_1=r}function Nt(){return null==o&&new At,o}function At(){o=this,this.u2_1=new ve(1993859828,793161749)}function Mt(n,t,r){return Ft(Ft(n,r)-Ft(t,r)|0,r)}function Ft(n,t){var r=n%t|0;return r>=0?r:r+t|0}function Dt(){f=this,this.p_1=new Rt(1,0)}function Ot(){return null==f&&new Dt,f}function Rt(n,t){Ot(),Ut.call(this,n,t,1)}function Ht(n,t,r){jt.call(this),this.d3_1=r,this.e3_1=t,this.f3_1=this.d3_1>0?n<=t:n>=t,this.g3_1=this.f3_1?n:this.e3_1}function $t(){s=this}function Gt(){return null==s&&new $t,s}function Ut(n,t,r){if(Gt(),0===r)throw ou("Step must be non-zero.");if(r===_r().MIN_VALUE)throw ou("Step must be greater than Int.MIN_VALUE to avoid overflow on negation.");this.z2_1=n,this.a3_1=function(n,t,r){var i;if(r>0)i=n>=t?t:t-Mt(t,n,r)|0;else{if(!(r<0))throw ou("Step is zero.");i=n<=t?t:t+Mt(n,t,0|-r)|0}return i}(n,t,r),this.b3_1=r}function Vt(n,t,r){null!=r?n.e(r(t)):null==t||Qe(t)?n.e(t):t instanceof Si?n.i3(t.h3_1):n.e(Di(t))}function Qt(n,t,r){if(n===t)return!0;if(!(r=r!==A&&r))return!1;var i=pi(n),e=pi(t);return i===e||ue(new Si(Qi(ji(i).toLowerCase(),0)),new Si(Qi(ji(e).toLowerCase(),0)))}function Zt(n){return Yi(n)-1|0}function Yt(n,t,r,i){return r=r===A?0:r,(i=i!==A&&i)||"string"!=typeof n?Wt(n,t,r,Yi(n),i):n.indexOf(t,r)}function Wt(n,t,r,i,e,u){var o=(u=u!==A&&u)?Kn(Yn(r,Zt(n)),Wn(i,0)):De(Wn(r,0),Yn(i,Yi(n)));if("string"==typeof n&&"string"==typeof t){var f=o.z2_1,s=o.a3_1,c=o.b3_1;if(c>0&&f<=s||c<0&&s<=f)do{var a=f;if(f=f+c|0,Ci(t,0,n,a,Yi(t),e))return a}while(a!==s)}else{var h=o.z2_1,l=o.a3_1,_=o.b3_1;if(_>0&&h<=l||_<0&&l<=h)do{var v=h;if(h=h+_|0,nr(t,0,n,v,Yi(t),e))return v}while(v!==l)}return-1}function Kt(n){var t=0,r=Yi(n)-1|0,i=!1;n:for(;t<=r;){var e=mi(Qi(n,i?r:t));if(i){if(!e)break n;r=r-1|0}else e?t=t+1|0:i=!0}return Wi(n,t,r+1|0)}function Xt(n,t){return re(Wi(n,t.y2(),t.c3()+1|0))}function Jt(n,t,r,i,e){r=r===A?0:r,i=i!==A&&i,tr(e=e===A?0:e);var u,o,f=Je(t);return new er(n,r,e,(u=f,o=i,function(n,t){var r=function(n,t,r,i){if(!i&&1===t.k()){var e=function(n){if(Ge(n,zi))return function(n){var t;switch(n.k()){case 0:throw pu("List is empty.");case 1:t=n.j(0);break;default:throw ou("List has more than one element.")}return t}(n);var t=n.f();if(!t.g())throw pu("Collection is empty.");var r=t.h();if(t.g())throw ou("Collection has more than one element.");return r}(t),u=Yt(n,e,r);return u<0?null:or(u,e)}var o=De(Wn(r,0),Yi(n));if("string"==typeof n){var f=o.z2_1,s=o.a3_1,c=o.b3_1;if(c>0&&f<=s||c<0&&s<=f)do{var a,h=f;f=f+c|0;n:{for(var l=t.f();l.g();){var _=l.h();if(Ci(_,0,n,h,_.length,i)){a=_;break n}}a=null}if(null!=a)return or(h,a)}while(h!==s)}else{var v=o.z2_1,d=o.a3_1,g=o.b3_1;if(g>0&&v<=d||g<0&&d<=v)do{var w,b=v;v=v+g|0;n:{for(var p=t.f();p.g();){var m=p.h();if(nr(m,0,n,b,m.length,i)){w=m;break n}}w=null}if(null!=w)return or(b,w)}while(b!==d)}return null}(n,u,t,o);return null==r?null:or(r.t3_1,r.u3_1.length)}))}function nr(n,t,r,i,e,u){if(i<0||t<0||t>(Yi(n)-e|0)||i>(Yi(r)-e|0))return!1;var o=0;if(o<e)do{var f=o;if(o=o+1|0,!Qt(Qi(n,t+f|0),Qi(r,i+f|0),u))return!1}while(o<e);return!0}function tr(n){if(!(n>=0))throw ou(re("Limit must be non-negative, but was "+n))}function rr(n){if(n.l3_1<0)n.j3_1=0,n.m3_1=null;else{var t;if(n.o3_1.r3_1>0?(n.n3_1=n.n3_1+1|0,t=n.n3_1>=n.o3_1.r3_1):t=!1,t||n.l3_1>Yi(n.o3_1.p3_1))n.m3_1=De(n.k3_1,Zt(n.o3_1.p3_1)),n.l3_1=-1;else{var r=n.o3_1.s3_1(n.o3_1.p3_1,n.l3_1);if(null==r)n.m3_1=De(n.k3_1,Zt(n.o3_1.p3_1)),n.l3_1=-1;else{var i=r.v3(),e=r.w3();n.m3_1=function(n,t){return t<=_r().MIN_VALUE?Ot().p_1:De(n,t-1|0)}(n.k3_1,i),n.k3_1=i+e|0,n.l3_1=n.k3_1+(0===e?1:0)|0}}n.j3_1=1}}function ir(n){this.o3_1=n,this.j3_1=-1,this.k3_1=function(n,t,r){if(0>r)throw ou("Cannot coerce value to an empty range: maximum "+r+" is less than minimum 0.");return n<0?0:n>r?r:n}(n.q3_1,0,Yi(n.p3_1)),this.l3_1=this.k3_1,this.m3_1=null,this.n3_1=0}function er(n,t,r,i){this.p3_1=n,this.q3_1=t,this.r3_1=r,this.s3_1=i}function ur(n,t){this.t3_1=n,this.u3_1=t}function or(n,t){return new ur(n,t)}function fr(){}function sr(){}function cr(){}function ar(){c=this}function hr(){return null==c&&new ar,c}function lr(){a=this,this.MIN_VALUE=-2147483648,this.MAX_VALUE=2147483647,this.SIZE_BYTES=4,this.SIZE_BITS=32}function _r(){return null==a&&new lr,a}function vr(n){for(var t=[],r=n.f();r.g();)t.push(r.h());return t}function dr(n){return 0===(t=[n]).length?Tr():Nr(new qt(t,!0));var t}function gr(n){return n<0&&function(){throw ku("Index overflow has happened.")}(),n}function wr(n){return void 0!==n.toArray?n.toArray():vr(n)}function br(n){return function(n,t){for(var r=0,i=n.length;r<i;){var e=n[r];r=r+1|0,t.d(e)}return t}(t=[n],(r=t.length,i=se(fe(Qr)),function(n,t,r){Sr.call(r),Qr.call(r),r.y5_1=function(n){return Gr(n,0,se(fe(Ur)))}(n)}(r,0,i),i));var t,r,i}function pr(){rt.call(this)}function mr(n){this.j4_1=n,this.h4_1=0,this.i4_1=-1}function kr(n,t){this.n4_1=n,mr.call(this,n),ot().b1(t,this.n4_1.k()),this.h4_1=t}function qr(){pr.call(this),this.o4_1=0}function yr(n){this.r4_1=n}function Br(n){this.s4_1=n}function Cr(n,t){this.t4_1=n,this.u4_1=t}function xr(){Sr.call(this)}function jr(n){this.x4_1=n,Sr.call(this)}function Pr(n){this.e5_1=n,pr.call(this)}function Ir(){vt.call(this),this.c5_1=null,this.d5_1=null}function Sr(){pr.call(this)}function zr(){h=this;var n=Lr();n.c_1=!0,this.i5_1=n}function Er(){return null==h&&new zr,h}function Tr(){return n=se(fe(Mr)),t=[],Mr.call(n,t),n;var n,t}function Lr(n){return t=se(fe(Mr)),r=[],Mr.call(t,r),t;var t,r}function Nr(n){return function(n,t){var r;return r=wr(n),Mr.call(t,r),t}(n,se(fe(Mr)))}function Ar(n,t){return ot().e1(t,n.k()),t}function Mr(n){Er(),qr.call(this),this.b_1=n,this.c_1=!1}function Fr(n,t,r,i,e){if(r===i)return n;var u=(r+i|0)/2|0,o=Fr(n,t,r,u,e),f=Fr(n,t,u+1|0,i,e),s=o===t?n:t,c=r,a=u+1|0,h=r;if(h<=i)do{var l=h;if(h=h+1|0,c<=u&&a<=i){var _=o[c],v=f[a];e.compare(_,v)<=0?(s[l]=_,c=c+1|0):(s[l]=v,a=a+1|0)}else c<=u?(s[l]=o[c],c=c+1|0):(s[l]=f[a],a=a+1|0)}while(l!==i);return s}function Dr(n,t){return(3&n)-(3&t)|0}function Or(){_=this}function Rr(n){this.n5_1=n,xr.call(this)}function Hr(n){return function(n,t){Ir.call(t),Ur.call(t),t.t5_1=n,t.u5_1=n.w5()}(new Xr((null==_&&new Or,_)),n),n}function $r(){return Hr(se(fe(Ur)))}function Gr(n,t,r){if(Hr(r),!(n>=0))throw ou(re("Negative initial capacity: "+n));if(!(t>=0))throw ou(re("Non-positive load factor: "+t));return r}function Ur(){this.v5_1=null}function Vr(n,t){return Sr.call(t),Qr.call(t),t.y5_1=n,t}function Qr(){}function Zr(n,t){var r=Wr(n,n.h6_1.m5(t));if(null==r)return null;var i=r;if(null!=i&&Ue(i))return Yr(i,n,t);var e=i;return n.h6_1.l5(e.j1(),t)?e:null}function Yr(n,t,r){var i;n:{for(var e=0,u=n.length;e<u;){var o=n[e];if(e=e+1|0,t.h6_1.l5(o.j1(),r)){i=o;break n}}i=null}return i}function Wr(n,t){var r=n.i6_1[t];return void 0===r?null:r}function Kr(n){this.g6_1=n,this.z5_1=-1,this.a6_1=Object.keys(n.i6_1),this.b6_1=-1,this.c6_1=null,this.d6_1=!1,this.e6_1=-1,this.f6_1=null}function Xr(n){this.h6_1=n,this.i6_1=this.k6(),this.j6_1=0}function Jr(){}function ni(n){this.n6_1=n,this.l6_1=null,this.m6_1=null,this.m6_1=this.n6_1.y6_1.v6_1}function ti(){v=this;var n,t=(oi(0,0,n=se(fe(fi))),n);t.x6_1=!0,this.e7_1=t}function ri(){return null==v&&new ti,v}function ii(n,t,r){this.d7_1=n,Cr.call(this,t,r),this.b7_1=null,this.c7_1=null}function ei(n){this.y6_1=n,xr.call(this)}function ui(){return Hr(n=se(fe(fi))),fi.call(n),n.w6_1=$r(),n;var n}function oi(n,t,r){return Gr(n,t,r),fi.call(r),r.w6_1=$r(),r}function fi(){ri(),this.v6_1=null,this.x6_1=!1}function si(){d=this;var n=ci(0),t=n.y5_1;(t instanceof fi?t:le()).j5(),this.f7_1=n}function ci(n){return function(n,t){return function(n,t,r){Vr(function(n,t){return oi(n,t,se(fe(fi)))}(n,t),r),ai.call(r)}(n,0,t),t}(n,se(fe(ai)))}function ai(){null==d&&new si}function hi(){}function li(){}function _i(n){li.call(this),this.k7_1=n}function vi(){di.call(this)}function di(){li.call(this),this.m7_1=""}function gi(){if(!w){w=!0;var n="undefined"!=typeof process&&process.versions&&!!process.versions.node;g=n?new _i(process.stdout):new vi}}function wi(){return n=se(fe(bi)),bi.call(n,""),n;var n}function bi(n){this.o7_1=void 0!==n?n:""}function pi(n){var t=ji(n).toUpperCase();return t.length>1?n:Qi(t,0)}function mi(n){return function(n){return 9<=n&&n<=13||28<=n&&n<=32||160===n||n>4096&&(5760===n||8192<=n&&n<=8202||8232===n||8233===n||8239===n||8287===n||12288===n)}(n)}function ki(){b=this,this.q7_1=new RegExp("[\\\\^$*+?.()|[\\]{}]","g"),this.r7_1=new RegExp("[\\\\$]","g"),this.s7_1=new RegExp("\\$","g")}function qi(){return null==b&&new ki,b}function yi(n,t){qi(),this.v7_1=n,this.w7_1=function(n){if(Ge(n,Ei)){var t;switch(n.k()){case 0:t=Nt();break;case 1:t=br(Ge(n,zi)?n.j(0):n.f().h());break;default:t=Qn(n,ci(n.k()))}return t}return function(n){switch(n.k()){case 0:return Nt();case 1:return br(n.f().h());default:return n}}(Qn(n,(r=se(fe(ai)),Vr(ui(),r),ai.call(r),r)));var r}(t),this.x7_1=new RegExp(n,Mn(t,"","gu",A,A,A,Bi)),this.y7_1=null,this.z7_1=null}function Bi(n){return n.d8_1}function Ci(n,t,r,i,e,u){return nr(n,t,r,i,e,u=u!==A&&u)}function xi(n,t){return n-t|0}function ji(n){return String.fromCharCode(n)}function Pi(){p=this,this.e8_1=0,this.f8_1=65535,this.g8_1=55296,this.h8_1=56319,this.i8_1=56320,this.j8_1=57343,this.k8_1=55296,this.l8_1=57343,this.m8_1=2,this.n8_1=16}function Ii(){return null==p&&new Pi,p}function Si(n){Ii(),this.h3_1=n}function zi(){}function Ei(){}function Ti(){}function Li(){}function Ni(){}function Ai(){}function Mi(){m=this}function Fi(n,t){null==m&&new Mi,this.p8_1=n,this.q8_1=t}function Di(n){var t=null==n?null:re(n);return null==t?"null":t}function Oi(n){return new Ri(n)}function Ri(n){this.t8_1=n,this.s8_1=0}function Hi(){return Vi(),k}function $i(){return Vi(),q}function Gi(){return Vi(),y}function Ui(){return Vi(),B}function Vi(){x||(x=!0,k=new ArrayBuffer(8),q=new Float64Array(Hi()),new Float32Array(Hi()),y=new Int32Array(Hi()),$i()[0]=-1,B=0!==Gi()[0]?1:0,C=1-Ui()|0)}function Qi(n,t){var r;if(Zi(n)){var i,e=n.charCodeAt(t);if(Ii(),e<0?i=!0:(Ii(),i=e>65535),i)throw ou("Invalid Char code: "+e);r=Fe(e)}else r=n.y3(t);return r}function Zi(n){return"string"==typeof n}function Yi(n){return Zi(n)?n.length:n.x3()}function Wi(n,t,r){return Zi(n)?n.substring(t,r):n.z3(t,r)}function Ki(n){return re(n)}function Xi(n,t){var r;switch(typeof n){case"number":r="number"==typeof t?Ji(n,t):t instanceof ve?Ji(n,t.w8()):ne(n,t);break;case"string":case"boolean":r=ne(n,t);break;default:r=function(n,t){return n.a4(t)}(n,t)}return r}function Ji(n,t){var r;if(n<t)r=-1;else if(n>t)r=1;else if(n===t){var i;if(0!==n)i=0;else{var e=1/n;i=e===1/t?0:e<0?-1:1}r=i}else r=n!=n?t!=t?0:1:-1;return r}function ne(n,t){return n<t?-1:n>t?1:0}function te(n){if(!("kotlinHashCodeValue$"in n)){var t=4294967296*Math.random()|0,r=new Object;r.value=t,r.enumerable=!1,Object.defineProperty(n,"kotlinHashCodeValue$",r)}return n.kotlinHashCodeValue$}function re(n){return null==n?"null":function(n){return!!He(n)||En(n)}(n)?"[...]":n.toString()}function ie(n){if(null==n)return 0;var t;switch(typeof n){case"object":t="function"==typeof n.hashCode?n.hashCode():te(n);break;case"function":t=te(n);break;case"number":t=function(n){return Vi(),(0|n)===n?Me(n):($i()[0]=n,zn(Gi()[(Vi(),C)],31)+Gi()[Ui()]|0)}(n);break;case"boolean":t=n?1:0;break;default:t=ee(String(n))}return t}function ee(n){var t=0,r=0,i=n.length-1|0;if(r<=i)do{var e=r;r=r+1|0;var u=n.charCodeAt(e);t=zn(t,31)+u|0}while(e!==i);return t}function ue(n,t){return null==n?null==t:null!=t&&("object"==typeof n&&"function"==typeof n.equals?n.equals(t):n!=n?t!=t:"number"==typeof n&&"number"==typeof t?n===t&&(0!==n||1/n==1/t):n===t)}function oe(n,t){null!=Error.captureStackTrace?Error.captureStackTrace(n,t):n.stack=(new Error).stack}function fe(n){return n.prototype}function se(n){return Object.create(n)}function ce(n,t,r){Error.call(n),function(n,t,r){var i=Ke(Object.getPrototypeOf(n));if(!(1&i)){var e;if(null==t){var u;if(null!==t){var o=null==r?null:r.toString();u=null==o?A:o}else u=A;e=u}else e=t;n.message=e}2&i||(n.cause=r),n.name=Object.getPrototypeOf(n).constructor.name}(n,t,r)}function ae(n){var t;return null==n?function(){throw xu()}():t=n,t}function he(){throw Pu()}function le(){throw Su()}function _e(){j=this,this.x8_1=new ve(0,-2147483648),this.y8_1=new ve(-1,2147483647),this.z8_1=8,this.a9_1=64}function ve(n,t){null==j&&new _e,cr.call(this),this.u8_1=n,this.v8_1=t}function de(){return Ae(),P}function ge(){return Ae(),I}function we(){return Ae(),S}function be(){return Ae(),E}function pe(){return Ae(),T}function me(n,t){if(Ae(),Ce(n,t))return 0;var r=Pe(n),i=Pe(t);return r&&!i?-1:!r&&i?1:Pe(qe(n,t))?-1:1}function ke(n,t){Ae();var r=n.v8_1>>>16|0,i=65535&n.v8_1,e=n.u8_1>>>16|0,u=65535&n.u8_1,o=t.v8_1>>>16|0,f=65535&t.v8_1,s=t.u8_1>>>16|0,c=0,a=0,h=0,l=0;return c=(c=c+((a=(a=a+((h=(h=h+((l=l+(u+(65535&t.u8_1)|0)|0)>>>16|0)|0)+(e+s|0)|0)>>>16|0)|0)+(i+f|0)|0)>>>16|0)|0)+(r+o|0)|0,new ve((h&=65535)<<16|(l&=65535),(c&=65535)<<16|(a&=65535))}function qe(n,t){return Ae(),ke(n,t.e9())}function ye(n,t){if(Ae(),Ie(n))return de();if(Ie(t))return de();if(Ce(n,be()))return Se(t)?be():de();if(Ce(t,be()))return Se(n)?be():de();if(Pe(n))return Pe(t)?ye(ze(n),ze(t)):ze(ye(ze(n),t));if(Pe(t))return ze(ye(n,ze(t)));if(Ee(n,pe())&&Ee(t,pe()))return Te(Be(n)*Be(t));var r=n.v8_1>>>16|0,i=65535&n.v8_1,e=n.u8_1>>>16|0,u=65535&n.u8_1,o=t.v8_1>>>16|0,f=65535&t.v8_1,s=t.u8_1>>>16|0,c=65535&t.u8_1,a=0,h=0,l=0,_=0;return l=l+((_=_+zn(u,c)|0)>>>16|0)|0,_&=65535,h=(h=h+((l=l+zn(e,c)|0)>>>16|0)|0)+((l=(l&=65535)+zn(u,s)|0)>>>16|0)|0,l&=65535,a=(a=(a=a+((h=h+zn(i,c)|0)>>>16|0)|0)+((h=(h&=65535)+zn(e,s)|0)>>>16|0)|0)+((h=(h&=65535)+zn(u,f)|0)>>>16|0)|0,h&=65535,a=a+(((zn(r,c)+zn(i,s)|0)+zn(e,f)|0)+zn(u,o)|0)|0,new ve(l<<16|_,(a&=65535)<<16|h)}function Be(n){return Ae(),4294967296*n.v8_1+function(n){return Ae(),n.u8_1>=0?n.u8_1:4294967296+n.u8_1}(n)}function Ce(n,t){return Ae(),n.v8_1===t.v8_1&&n.u8_1===t.u8_1}function xe(n,t){if(Ae(),t<2||36<t)throw _u("radix out of range: "+t);if(Ie(n))return"0";if(Pe(n)){if(Ce(n,be())){var r=je(t),i=n.d9(r),e=qe(ye(i,r),n).g9();return xe(i,t)+e.toString(t)}return"-"+xe(ze(n),t)}for(var u=2===t?31:t<=10?9:t<=21?7:t<=35?6:5,o=Te(Math.pow(t,u)),f=n,s="";;){var c=f.d9(o),a=qe(f,ye(c,o)).g9().toString(t);if(Ie(f=c))return a+s;for(;a.length<u;)a="0"+a;s=a+s}}function je(n){return Ae(),new ve(n,n<0?-1:0)}function Pe(n){return Ae(),n.v8_1<0}function Ie(n){return Ae(),0===n.v8_1&&0===n.u8_1}function Se(n){return Ae(),!(1&~n.u8_1)}function ze(n){return Ae(),n.e9()}function Ee(n,t){return Ae(),me(n,t)<0}function Te(n){if(Ae(),(t=n)!=t)return de();if(n<=-0x8000000000000000)return be();if(n+1>=0x8000000000000000)return Ae(),z;if(n<0)return ze(Te(-n));var t,r=4294967296;return new ve(n%r|0,n/r|0)}function Le(n,t){return Ae(),me(n,t)>0}function Ne(n,t){return Ae(),me(n,t)>=0}function Ae(){L||(L=!0,P=je(0),I=je(1),S=je(-1),z=new ve(-1,2147483647),E=new ve(0,-2147483648),T=je(16777216))}function Me(n){return n instanceof ve?n.g9():function(n){return n>2147483647?2147483647:n<-2147483648?-2147483648:0|n}(n)}function Fe(n){var t;return t=function(n){return n<<16>>16}(Me(n)),function(n){return 65535&n}(t)}function De(n,t){return new Rt(n,t)}function Oe(n,t,r,i){return Re("class",n,t,r,i,null)}function Re(n,t,r,i,e,u){return{kind:n,simpleName:t,associatedObjectKey:r,associatedObjects:i,suspendArity:e,$kClass$:A,iid:u}}function He(n){return Array.isArray(n)}function $e(n,t,r,i,e,u,o,f){null!=i&&(n.prototype=Object.create(i.prototype),n.prototype.constructor=n);var s=r(t,u,o,null==f?[]:f);n.$metadata$=s,null!=e&&((null!=s.iid?n:n.prototype).$imask$=function(n){for(var t=1,r=[],i=0,e=n.length;i<e;){var u=n[i];i=i+1|0;var o=t,f=u.prototype.$imask$,s=null==f?u.$imask$:f;null!=s&&(r.push(s),o=s.length);var c=u.$metadata$.iid,a=null==c?null:(l=void 0,v=1<<(31&(h=c)),(l=new Int32Array(1+(h>>5)|0))[_=h>>5]=l[_]|v,l);null!=a&&(r.push(a),o=Math.max(o,a.length)),o>t&&(t=o)}var h,l,_,v;return function(n,t){for(var r=0,i=new Int32Array(n);r<n;){for(var e=r,u=0,o=0,f=t.length;o<f;){var s=t[o];o=o+1|0,e<s.length&&(u|=s[e])}i[e]=u,r=r+1|0}return i}(t,r)}(e))}function Ge(n,t){return function(n,t){var r=n.$imask$;return null!=r&&function(n,t){var r=t>>5;if(r>n.length)return!1;var i=1<<(31&t);return!!(n[r]&i)}(r,t)}(n,t.$metadata$.iid)}function Ue(n){return!!He(n)&&!n.$type$}function Ve(n){var t;switch(typeof n){case"string":case"number":case"boolean":case"function":t=!0;break;default:t=n instanceof Object}return t}function Qe(n){return"string"==typeof n||Ge(n,fr)}function Ze(n,t,r,i){return Re("interface",n,t,r,i,(null==N&&(N=0),N=Ye()+1|0,Ye()))}function Ye(){if(null!=N)return N;!function(){throw Eu("lateinit property iid has not been initialized")}()}function We(n,t,r,i){return Re("object",n,t,r,i,null)}function Ke(n){var t=n.constructor,r=null==t?null:t.$metadata$,i=null==r?null:r.errorInfo;if(null!=i)return i;var e,u=0;if(Xe(n,"message")&&(u|=1),Xe(n,"cause")&&(u|=2),3!==u){var o=(e=n,Object.getPrototypeOf(e));o!=Error.prototype&&(u|=Ke(o))}return null!=r&&(r.errorInfo=u),u}function Xe(n,t){return n.hasOwnProperty(t)}function Je(n){return new Mr(n)}function nu(n,t,r){for(var i=new Int32Array(r),e=0,u=0,o=0,f=0,s=n.length;f<s;){var c=Qi(n,f);f=f+1|0;var a=t[c];if(u|=(31&a)<<o,a<32){var h=e;e=h+1|0,i[h]=u,u=0,o=0}else o=o+5|0}return i}function tu(n,t){for(var r=0,i=n.length-1|0,e=-1,u=0;r<=i;)if(t>(u=n[e=(r+i|0)/2|0]))r=e+1|0;else{if(t===u)return e;i=e-1|0}return e-(t<u?1:0)|0}function ru(){M=this;var n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",t=new Int32Array(128),r=0,i=Yi(n)-1|0;if(r<=i)do{var e=r;r=r+1|0,t[Qi(n,e)]=e}while(r<=i);var u=nu("hCgBpCQGYHZH5BRpBPPPPPPRMP5BPPlCPP6BkEPPPPcPXPzBvBrB3BOiDoBHwD+E3DauCnFmBmB2D6E1BlBTiBmBlBP5BhBiBrBvBjBqBnBPRtBiCmCtBlB0BmB5BiB7BmBgEmChBZgCoEoGVpBSfRhBPqKQ2BwBYoFgB4CJuTiEvBuCuDrF5DgEgFlJ1DgFmBQtBsBRGsB+BPiBlD1EIjDPRPPPQPPPPPGQSQS/DxENVNU+B9zCwBwBPPCkDPNnBPqDYY1R8B7FkFgTgwGgwUwmBgKwBuBScmEP/BPPPPPPrBP8B7F1B/ErBqC6B7BiBmBfQsBUwCw/KwqIwLwETPcPjQgJxFgBlBsD",t,222),o=new Int32Array(u.length),f=0,s=u.length-1|0;if(f<=s)do{var c=f;f=f+1|0,o[c]=0===c?u[c]:o[c-1|0]+u[c]|0}while(f<=s);this.h9_1=o,this.i9_1=nu("aaMBXHYH5BRpBPPPPPPRMP5BPPlCPPzBDOOPPcPXPzBvBjB3BOhDmBBpB7DoDYxB+EiBP1DoExBkBQhBekBPmBgBhBctBiBMWOOXhCsBpBkBUV3Ba4BkB0DlCgBXgBtD4FSdBfPhBPpKP0BvBXjEQ2CGsT8DhBtCqDpFvD1D3E0IrD2EkBJrBDOBsB+BPiBlB1EIjDPPPPPPPPPPPGPPMNLsBNPNPKCvBvBPPCkDPBmBPhDXXgD4B6FzEgDguG9vUtkB9JcuBSckEP/BPPPPPPBPf4FrBjEhBpC3B5BKaWPrBOwCk/KsCuLqDHPbPxPsFtEaaqDL",t,222),this.j9_1=nu("GFjgggUHGGFFZZZmzpz5qB6s6020B60ptltB6smt2sB60mz22B1+vv+8BZZ5s2850BW5q1ymtB506smzBF3q1q1qB1q1q1+Bgii4wDTm74g3KiggxqM60q1q1Bq1o1q1BF1qlrqrBZ2q5wprBGFZWWZGHFsjiooLowgmOowjkwCkgoiIk7ligGogiioBkwkiYkzj2oNoi+sbkwj04DghhkQ8wgiYkgoioDsgnkwC4gikQ//v+85BkwvoIsgoyI4yguI0whiwEowri4CoghsJowgqYowgm4DkwgsY/nwnzPowhmYkg6wI8yggZswikwHgxgmIoxgqYkwgk4DkxgmIkgoioBsgssoBgzgyI8g9gL8g9kI0wgwJoxgkoC0wgioFkw/wI0w53iF4gioYowjmgBHGq1qkgwBF1q1q8qBHwghuIwghyKk0goQkwgoQk3goQHGFHkyg0pBgxj6IoinkxDswno7Ikwhz9Bo0gioB8z48Rwli0xN0mpjoX8w78pDwltoqKHFGGwwgsIHFH3q1q16BFHWFZ1q10q1B2qlwq1B1q10q1B2q1yq1B6q1gq1Biq1qhxBir1qp1Bqt1q1qB1g1q1+B//3q16B///q1qBH/qlqq9Bholqq9B1i00a1q10qD1op1HkwmigEigiy6Cptogq1Bixo1kDq7/j00B2qgoBWGFm1lz50B6s5q1+BGWhggzhwBFFhgk4//Bo2jigE8wguI8wguI8wgugUog1qoB4qjmIwwi2KgkYHHH4lBgiFWkgIWoghssMmz5smrBZ3q1y50B5sm7gzBtz1smzB5smz50BqzqtmzB5sgzqzBF2/9//5BowgoIwmnkzPkwgk4C8ys65BkgoqI0wgy6FghquZo2giY0ghiIsgh24B4ghsQ8QF/v1q1OFs0O8iCHHF1qggz/B8wg6Iznv+//B08QgohsjK0QGFk7hsQ4gB",t,222)}function iu(){return null==M&&new ru,M}function eu(){F=this,this.k9_1=new Int32Array([170,186,688,704,736,837,890,7468,7544,7579,8305,8319,8336,8560,9424,11388,42652,42864,43e3,43868]),this.l9_1=new Int32Array([1,1,9,2,5,1,1,63,1,37,1,1,13,16,26,2,2,1,2,4])}function uu(){return null==F&&new eu,F}function ou(n){var t=function(n,t){return gu(n,t),fu.call(t),t}(n,se(fe(fu)));return oe(t,ou),t}function fu(){oe(this,fu)}function su(n){var t=function(n,t){return gu(n,t),cu.call(t),t}(n,se(fe(cu)));return oe(t,su),t}function cu(){oe(this,cu)}function au(n){var t=function(n,t){return gu(n,t),hu.call(t),t}(n,se(fe(hu)));return oe(t,au),t}function hu(){oe(this,hu)}function lu(n,t){return ce(t,n),vu.call(t),t}function _u(n){var t=lu(n,se(fe(vu)));return oe(t,_u),t}function vu(){oe(this,vu)}function du(n){return function(n){ce(n),vu.call(n)}(n),wu.call(n),n}function gu(n,t){return lu(n,t),wu.call(t),t}function wu(){oe(this,wu)}function bu(){var n,t=(du(n=se(fe(mu))),mu.call(n),n);return oe(t,bu),t}function pu(n){var t=function(n,t){return gu(n,t),mu.call(t),t}(n,se(fe(mu)));return oe(t,pu),t}function mu(){oe(this,mu)}function ku(n){var t=function(n,t){return gu(n,t),qu.call(t),t}(n,se(fe(qu)));return oe(t,ku),t}function qu(){oe(this,qu)}function yu(){var n,t=(du(n=se(fe(Cu))),Cu.call(n),n);return oe(t,yu),t}function Bu(n){var t=function(n,t){return gu(n,t),Cu.call(t),t}(n,se(fe(Cu)));return oe(t,Bu),t}function Cu(){oe(this,Cu)}function xu(){var n,t=(du(n=se(fe(ju))),ju.call(n),n);return oe(t,xu),t}function ju(){oe(this,ju)}function Pu(){var n,t=(du(n=se(fe(Iu))),Iu.call(n),n);return oe(t,Pu),t}function Iu(){oe(this,Iu)}function Su(){var n,t=(du(n=se(fe(zu))),zu.call(n),n);return oe(t,Su),t}function zu(){oe(this,zu)}function Eu(n){var t=function(n,t){return gu(n,t),Tu.call(t),t}(n,se(fe(Tu)));return oe(t,Eu),t}function Tu(){oe(this,Tu)}function Lu(n,t){var r,i=n.className;return(r="(^|.*\\s+)"+t+"($|\\s+.*)",function(n,t){return yi.call(t,n,Nt()),t}(r,se(fe(yi)))).a8(i)}function Nu(n,t){this.o9_1=n,this.p9_1=t}function Au(n){this.q9_1=n}function Mu(n,t,r){var i,e=Mf(),u=Yu(),o=Af().ga(t),f=Yu();if(0===Yi(r))i=Tf();else{var s=n.ia_1,c=null==s?null:new Au(s).v9(r,"Copy reference to the clipboard");i=null==c?Tf():c}return e.ja([u,o,f,i])}function Fu(n){n=n===A?null:n,this.ia_1=n}function Du(n,t,r){Zu.call(this),this.ma_1=n,this.na_1=t,this.oa_1=r}function Ou(n,t){this.ra_1=n,this.sa_1=t}function Ru(n,t){Zu.call(this),this.va_1=n,this.wa_1=t}function Hu(n,t){Zu.call(this),this.xa_1=n,this.ya_1=t}function $u(n){Zu.call(this),this.za_1=n}function Gu(n){Zu.call(this),this.ab_1=n}function Uu(n){Zu.call(this),this.bb_1=n}function Vu(n,t){Zu.call(this),this.cb_1=n,this.db_1=t}function Qu(n){Zu.call(this),this.eb_1=n}function Zu(){}function Yu(){return to(),D}function Wu(){return to(),O}function Ku(){return to(),R}function Xu(){return to(),H}function Ju(n){return to(),Mf().fb(Xf(no),n)}function no(n){return to(),n.gb(["invisible-text","text-for-copy"]),hr()}function to(){$||($=!0,D=Ju("`"),O=Ju(" "),R=Ju("("),H=Ju(")"))}function ro(n,t){Zu.call(this),this.hb_1=n,this.ib_1=t}function io(n){Zu.call(this),this.jb_1=n}function eo(n,t){Zu.call(this),this.kb_1=n,this.lb_1=t}function uo(n){Zu.call(this),this.mb_1=n}function oo(n){Zu.call(this),this.nb_1=n}function fo(n){Zu.call(this),this.ob_1=n}function so(n,t,r){Zu.call(this),this.pb_1=n,this.qb_1=t,this.rb_1=r}function co(n){Zu.call(this),this.sb_1=n}function ao(n){Zu.call(this),this.tb_1=n}function ho(n){return n.xb_1.vb_1.k()}function lo(){if(Z)return hr();Z=!0,G=new mo("Inputs",0,"Build configuration inputs"),U=new mo("ByMessage",1,"Problems grouped by message"),V=new mo("ByLocation",2,"Problems grouped by location"),Q=new mo("IncompatibleTasks",3,"Incompatible tasks")}function _o(n){bc.call(this),this.yb_1=n}function vo(n){bc.call(this),this.ac_1=n}function go(n){bc.call(this),this.bc_1=n}function wo(n){bc.call(this),this.cc_1=n}function bo(n){ko.call(this),this.dc_1=n}function po(n,t,r,i,e,u,o,f){this.ec_1=n,this.fc_1=t,this.gc_1=r,this.hc_1=i,this.ic_1=e,this.jc_1=u,this.kc_1=o,this.lc_1=f}function mo(n,t,r){Fi.call(this,n,t),this.qc_1=r}function ko(){mc.call(this)}function qo(n,t){var r=Nf(),i=Xf(To),e=Nf().y9(Xf(Lo),[]),u=function(n,t){var r,i=Nf(),e=Xf(Do),u=Mf().ga("Learn more about the "),o=Hf();return i.y9(e,[u,o.fb(Xf((r=t,function(n){return n.bd(r.tc_1),hr()})),t.sc_1),Mf().ga(".")])}(0,t.gc_1),o=Nf().y9(Xf(No),[Bo(0,t)]),f=Nf();return r.y9(i,[e,u,o,f.y9(Xf(Ao),[Po(0,Oo(),t.lc_1,ho(t.jc_1)),Po(0,Ro(),t.lc_1,ho(t.hc_1)),Po(0,Ho(),t.lc_1,ho(t.ic_1)),Po(0,$o(),t.lc_1,ho(t.kc_1))])])}function yo(n,t){var r,i,e=Nf(),u=Xf(Mo);switch(t.lc_1.q8_1){case 0:r=So(0,t.jc_1,((i=function(n){return new go(n)}).callableName="<init>",i));break;case 3:r=So(0,t.kc_1,function(){var n=function(n){return new wo(n)};return n.callableName="<init>",n}());break;case 1:r=So(0,t.hc_1,function(){var n=function(n){return new vo(n)};return n.callableName="<init>",n}());break;case 2:r=So(0,t.ic_1,function(){var n=function(n){return new _o(n)};return n.callableName="<init>",n}());break;default:he()}return e.y9(u,[r])}function Bo(n,t){return Nf().ja([jo(0,t),Co(0,t)])}function Co(n,t){for(var r=Nf(),i=t.fc_1,e=Tr(),u=0,o=i.f();o.g();){var f=o.h(),s=u;u=s+1|0,xt(e,0===gr(s)?dr(xo(Uo(),f)):wt([$f().ja([]),xo(Uo(),f)]))}return r.ha(e)}function xo(n,t){return Ff().ja([Cc(t)])}function jo(n,t){return Lf().ja([yc().ka(t.ec_1)])}function Po(n,t,r,i){var e,u,o;return Nf().y9(Xf((e=i,u=t,o=r,function(n){return n.t9("group-selector"),0===e?(n.t9("group-selector--disabled"),hr()):u.equals(o)?(n.t9("group-selector--active"),hr()):(n.u9(function(n){return function(t){return new bo(n)}}(u)),hr()),hr()})),[Mf().rc(t.qc_1,[Io(0,i)])])}function Io(n,t){return Mf().y9(Xf(Fo),[Wu(),Ku(),Mf().ga(""+t),Xu()])}function So(n,t,r){return function(n,t,r){var i,e=Nf(),u=Df();return e.ja([u.ha(ks(t,(i=r,function(n){var t,r=n.cd().ub_1;return r instanceof Ru?zc(i,(Uo(),(t=function(n){return zo(0,n)}).callableName="viewNode",t),n,r.va_1,r.wa_1,kc()):r instanceof Hu?zc(i,function(){var n=function(n){return zo(0,n)};return n.callableName="viewNode",n}(Uo()),n,r.xa_1,r.ya_1,qc()):r instanceof ro?zc(i,function(){var n=function(n){return zo(0,n)};return n.callableName="viewNode",n}(Uo()),n,r.hb_1,r.ib_1,A,Io(Uo(),n.cd().vb_1.k())):r instanceof Du?Sc(i,n,r):zc(i,function(){var n=function(n){return zo(0,n)};return n.callableName="viewNode",n}(Uo()),n,r)})))])}(0,t.xb_1.uc().vc(),r)}function zo(n,t){var r;return t instanceof io?xc((r=t,function(n){return n.ed("project "),n.fd(r.jb_1),hr()})):t instanceof so?xc(function(n){return function(t){return t.ed(n.pb_1+" "),t.fd(n.qb_1),t.ed(" of "),t.fd(n.rb_1),hr()}}(t)):t instanceof fo?xc(function(n){return function(t){return t.ed("system property "),t.fd(n.ob_1),hr()}}(t)):t instanceof eo?xc(function(n){return function(t){return t.ed("task "),t.fd(n.kb_1),t.ed(" of type "),t.fd(n.lb_1),hr()}}(t)):t instanceof oo?xc(function(n){return function(t){return t.ed("bean of type "),t.fd(n.nb_1),hr()}}(t)):t instanceof co?xc(function(n){return function(t){return t.ed(n.sb_1),hr()}}(t)):t instanceof ao?xc(function(n){return function(t){return t.ed("class "),t.fd(n.tb_1),hr()}}(t)):t instanceof Qu?xc(function(n){return function(t){return t.ed(n.eb_1),hr()}}(t)):t instanceof $u?Cc(t.za_1):t instanceof Vu?Vo(t):Mf().ga(re(t))}function Eo(n){return n.t9("report-wrapper"),hr()}function To(n){return n.t9("header"),hr()}function Lo(n){return n.t9("gradle-logo"),hr()}function No(n){return n.t9("title"),hr()}function Ao(n){return n.t9("groups"),hr()}function Mo(n){return n.t9("content"),hr()}function Fo(n){return n.t9("group-selector__count"),hr()}function Do(n){return n.t9("learn-more"),hr()}function Oo(){return lo(),G}function Ro(){return lo(),U}function Ho(){return lo(),V}function $o(){return lo(),Q}function Go(){Y=this}function Uo(){return null==Y&&new Go,Y}function Vo(n){var t;return Hf().fb(Xf((t=n,function(n){return n.t9("documentation-button"),n.bd(t.cb_1),hr()})),n.db_1)}function Qo(n,t,r){this.kd_1=n,this.ld_1=t,this.md_1=r}function Zo(n,t,r){this.nd_1=n,this.od_1=t,this.pd_1=r}function Yo(n,t){for(var r=_f(n),i=t.trace,e=Lr(i.length),u=0,o=i.length;u<o;){var f,s=i[u];u=u+1|0,f=Xo(s),e.d(f)}return new Qo(t,r,e)}function Wo(n,t){var r,i=null==(r=t.kd_1.error)?null:Jo(r);null==i||n.d(i)}function Ko(n){return function(n,t,r){var i=null==n.error?null:new Ru(t,r);return null==i?new Hu(t,r):i}(n.kd_1,new $u(n.ld_1),rf(n.kd_1))}function Xo(n){var t;switch(n.kind){case"Project":t=new io(n.path);break;case"Task":t=new eo(n.path,n.type);break;case"TaskPath":t=new uo(n.path);break;case"Bean":t=new oo(n.type);break;case"Field":t=new so("field",n.name,n.declaringType);break;case"InputProperty":t=new so("input property",n.name,n.task);break;case"OutputProperty":t=new so("output property",n.name,n.task);break;case"SystemProperty":t=new fo(n.name);break;case"PropertyUsage":t=new so("property",n.name,n.from);break;case"BuildLogic":t=new co(n.location);break;case"BuildLogicClass":t=new ao(n.type);break;default:t=new Qu("Gradle runtime")}return t}function Jo(n){var t=n.parts;if(null==t){var r=n.summary;return null==r?null:new $u(_f(r))}for(var i=n.summary,e=null==i?null:_f(i),u=Tr(),o=Oi(t);o.g();){var f=tf(o.h());null==f||u.d(f)}for(var s=Mn(u,"\n"),c=Tr(),a=Oi(t);a.g();){var h=nf(a.h());null==h||c.d(h)}return new Du(e,s,c)}function nf(n){var t=tf(n);if(null==t)return null;var r,i,e=Jn(new Lt(function(n,t,r,i){var e;return Xn(Jt(n,["\r\n","\n","\r"],A,r=r!==A&&r,i=i===A?0:i),(e=n,function(n){return Xt(e,n)}))}(t),!0,hf));return new Ou(e,(r=!(null==n.internalText),i=e.k(),r&&i>1?bs():null))}function tf(n){var t=n.text;return null==t?n.internalText:t}function rf(n){var t=n.documentationLink;return null==t?null:new Vu(t,"")}function ef(n,t){return new ss(uf(n,xf().sd(t),bs()))}function uf(n,t,r){return new ms(n,function(n,t){var r,i=Xn(On(n.o()),Pf);return Jn(Xn(new tt(i,new of(lf)),(r=t,function(n){return uf(n.v3(),n.w3().wd_1,r)})))}(t,1===jf(t)?ps():bs()),0===jf(t)?bs():r)}function of(n){this.td_1=n}function ff(n){var t=Tr(),r=n.ld_1,i=Dn(r.ca_1).fa_1,e=re(Kt(Qe(i)?i:le())),u=r.vd(function(n,t){var r;if(!(t>=0))throw ou(re("Requested element count "+t+" is less than zero."));if(0===t)return Rn(n);if(Ge(n,Ei)){var i=n.k()-t|0;if(i<=0)return bt();if(1===i)return dr(function(n){if(Ge(n,zi))return Vn(n);var t=n.f();if(!t.g())throw pu("Collection is empty.");for(var r=t.h();t.g();)r=t.h();return r}(n));if(r=Lr(),Ge(n,zi)){if(Ge(n,hi)){var e=t,u=n.k();if(e<u)do{var o=e;e=e+1|0,r.d(n.j(o))}while(e<u)}else for(var f=n.l(t);f.g();){var s=f.h();r.d(s)}return r}}else r=Tr();for(var c=0,a=n.f();a.g();){var h=a.h();c>=t?r.d(h):c=c+1|0}return pt(r)}(r.ca_1,1));return t.d(new ro(new Qu(e),rf(n.kd_1))),t.d(new $u(u)),t.m(n.md_1),t.j5()}function sf(n){var t=Tr(),r=n.ld_1,i=r.vd(r.ca_1);return t.d(new Hu(new $u(i),rf(n.kd_1))),t.j5()}function cf(n){var t=Tr();return t.d(Ko(n)),t.m(n.md_1),Wo(t,n),t.j5()}function af(n){var t=Tr();return t.m(new It(n.md_1)),t.d(Ko(n)),Wo(t,n),t.j5()}function hf(n){return Yi(n)>0}function lf(n,t){return function(n,t){return n===t?0:null==n?-1:null==t?1:Xi(null!=n&&("string"==(i=typeof(r=n))||"boolean"===i||function(n){return"number"==typeof n||n instanceof ve}(r)||Ge(r,sr))?n:le(),t);var r,i}(Di(n.v3()),Di(t.v3()))}function _f(n){var t;return yf().qd((t=n,function(n){for(var r=t,i=0,e=r.length;i<e;){var u=r[i];i=i+1|0;var o=u.text;null==o||n.ed(o);var f=u.name;null==f||(n.fd(f),hr())}return hr()}))}function vf(n,t){return(0!==(r=n)?r.toString():"No")+" "+df(t,n)+" "+gf(n)+" found";var r}function df(n,t){return t<2?n:n+"s"}function gf(n){return n<=1?"was":"were"}function wf(n,t){this.sc_1=n,this.tc_1=t}function bf(n){mf.call(this),this.fa_1=n}function pf(n,t){mf.call(this),this.da_1=n,this.ea_1=t}function mf(){}function kf(){this.dd_1=Tr()}function qf(){W=this}function yf(){return null==W&&new qf,W}function Bf(n){yf(),this.ca_1=n}function Cf(){K=this}function xf(){return null==K&&new Cf,K}function jf(n){return n.k()}function Pf(n){var t=n.j1(),r=n.i1();return or(t,new If(Ge(r,Li)?r:le()))}function If(n){xf(),this.wd_1=n}function Sf(n,t,r){var i;Ef(t,n,r),i="Component mounted at #"+n.id+".",gi(),(gi(),g).j7(i)}function zf(n){var t=document.getElementById(n);if(null==t)throw au("'"+n+"' element missing");return t}function Ef(n,t,r){var i,e,u;i=n.z9(r),e=t,u=function(n,t,r){return function(i){return Ef(n,r,n.ba(i,t)),hr()}}(n,r,t),os(),e.innerHTML="",es(e,i,u)}function Tf(){return os(),X}function Lf(){return os(),J}function Nf(){return os(),nn}function Af(){return os(),tn}function Mf(){return os(),rn}function Ff(){return os(),en}function Df(){return os(),un}function Of(){return os(),on}function Rf(){return os(),fn}function Hf(){return os(),sn}function $f(){return os(),cn}function Gf(n){this.x9_1=n}function Uf(){an=this}function Vf(){return null==an&&new Uf,an}function Qf(){hn=this,Kf.call(this)}function Zf(){return null==hn&&new Qf,hn}function Yf(n,t,r,i){t=t===A?bt():t,r=r===A?null:r,i=i===A?bt():i,Kf.call(this),this.be_1=n,this.ce_1=t,this.de_1=r,this.ee_1=i}function Wf(){}function Kf(){Vf()}function Xf(n){os();var t,r=Tr();return n(new Jf((t=r,function(n){return t.d(n),hr()}))),r}function Jf(n){this.r9_1=n}function ns(n,t){is.call(this),this.fe_1=n,this.ge_1=t}function ts(n){is.call(this),this.he_1=n}function rs(n,t){is.call(this),this.ie_1=n,this.je_1=t}function is(){}function es(n,t,r){if(os(),t instanceof Yf)!function(n,t,r){var i=function(n,t,r){var i=n.createElement(t);return r(i),i}(ae(n.ownerDocument),t,r);n.appendChild(i)}(n,t.be_1,(e=t,u=r,function(n){for(var t=e.ce_1.f();t.g();)us(n,t.h(),u);var r=e.de_1;null==r||function(n,t){n.appendChild(ae(n.ownerDocument).createTextNode(t))}(n,r);for(var i=e.ee_1.f();i.g();)es(n,i.h(),u);return hr()}));else if(t instanceof Wf){var i=t instanceof Wf?t:le();es(n,i.ke_1,function(n,t){return function(r){return n(t.le_1(r)),hr()}}(r,i))}else if(ue(t,Zf()))return hr();var e,u}function us(n,t,r){var i,e;os(),t instanceof rs?n.setAttribute(t.ie_1,t.je_1):t instanceof ts?function(n,t){for(var r=Tr(),i=0,e=t.length;i<e;){var u=t[i];i=i+1|0,Lu(n,u)||r.d(u)}var o=r;if(!o.i()){var f=n.className,s=re(Kt(Qe(f)?f:le())),c=wi();c.p7(s),0!==Yi(s)&&c.p7(" "),Fn(o,c," "),n.className=c.toString()}}(n,[t.he_1]):t instanceof ns&&n.addEventListener(t.fe_1,(i=r,e=t,function(n){return n.stopPropagation(),i(e.ge_1(n)),hr()}))}function os(){ln||(ln=!0,X=Zf(),new Gf("hr"),J=new Gf("h1"),new Gf("h2"),nn=new Gf("div"),new Gf("pre"),tn=new Gf("code"),rn=new Gf("span"),en=new Gf("small"),un=new Gf("ol"),on=new Gf("ul"),fn=new Gf("li"),sn=new Gf("a"),cn=new Gf("br"),new Gf("p"))}function fs(n){cs.call(this),this.ne_1=n}function ss(n){this.xb_1=n}function cs(){}function as(n){return n.me(A,A,n.wb_1.ad())}function hs(){_n=this}function ls(){return null==_n&&new hs,_n}function _s(){if(gn)return hr();gn=!0,vn=new gs("Collapsed",0),dn=new gs("Expanded",1)}function vs(n){ws.call(this),this.ve_1=n}function ds(n,t,r){ws.call(this),this.se_1=n,this.te_1=t,this.ue_1=r}function gs(n,t){Fi.call(this,n,t)}function ws(){}function bs(){return _s(),vn}function ps(){return _s(),dn}function ms(n,t,r){t=t===A?bt():t,r=r===A?bs():r,this.ub_1=n,this.vb_1=t,this.wb_1=r}function ks(n,t){return Jn(Xn(n,(r=t,function(n){return function(n,t){var r,i=n.cd(),e=Rf(),u=t(n),o=i.vb_1;r=null==(i.wb_1.equals(ps())&&!o.i()?o:null)?null:function(n,t){return Of().ha(function(n,t){return ks(n.vc(),t)}(n,t))}(n,t);var f=r;return e.ja([u,null==f?Tf():f])}(n,r)})));var r}function qs(){if(kn)return hr();kn=!0,bn=new ys("ByMessage",0,"Messages"),pn=new ys("ByGroup",1,"Group"),mn=new ys("ByFileLocation",2,"Locations")}function ys(n,t,r){Fi.call(this,n,t),this.cf_1=r}function Bs(n,t,r,i){var e,u,o=n.v1(t);if(null==o){var f=Tr(),s=or(new ms(new Hs(yf().qd((u=t,function(n){return n.fd(u),hr()}))),f,ps()),f);n.h5(t,s),e=s}else e=o;e.u3_1.d(Ps(r,i))}function Cs(n,t,r,i){var e;if(t=t===A?Tr():t,r=r===A?ui():r,i===A){var u=wn;wn=u+1|0,e=u}else e=i;i=e,this.df_1=n,this.ef_1=t,this.ff_1=r,this.gf_1=i}function xs(n,t){if(t.i())return null;for(var r,i=n,e=null,u=t.f();u.g();){var o=u.h();r=e;var f,s=i,c=o.displayName+" ("+o.name+")",a=s.v1(c);if(null==a){var h=Tr(),l=new Cs(new ms(new Hs(yf().qd(Ls(o))),h,ps()),h);s.h5(c,l),f=l}else f=a;e=f,null==r||ae(r).ef_1.u(ae(e).df_1)||ae(r).ef_1.d(ae(e).df_1),i=ae(e).ff_1}return e}function js(n){for(var t=n.problemId,r=Lr(t.length),i=0,e=t.length;i<e;){var u,o=t[i];i=i+1|0,u=o.name,r.d(u)}return Mn(r,":")}function Ps(n,t,r){var i=function(n,t,r){t=t===A?null:t;var i=zs(function(n,t){return n&&null!=t.contextualLabel?ae(t.contextualLabel):Is(t)}(r=r!==A&&r,n),t).j5();return Ss(n,new $u(i))}(n,t=t===A?null:t,r=r!==A&&r),e=function(n,t,r){r=r!==A&&r;var i,e=n.problemDetails;if(null==e)i=null;else{var u,o=e[0].text,f=null==o?null:function(n,t,r,i){if(r=r!==A&&r,i=i===A?0:i,1===t.length){var e=t[0];if(0!==Yi(e))return function(n,t,r,i){tr(i);var e=0,u=Yt(n,t,e,r);if(-1===u||1===i)return dr(re(n));var o,f=i>0,s=Lr(f&&Yn(i,10));n:do{var c;if(c=re(Wi(n,e,u)),s.d(c),e=u+t.length|0,f&&s.k()===(i-1|0))break n;u=Yt(n,t,e,r)}while(-1!==u);return o=re(Wi(n,e,Yi(n))),s.d(o),s}(n,e,r,i)}for(var u=function(n){return new nt(n)}(Jt(n,t,A,r,i)),o=Lr(Ct(u,10)),f=u.f();f.g();){var s;s=Xt(n,f.h()),o.d(s)}return o}(o,["\n"]);if(null==f)u=null;else{for(var s=Lr(Ct(f,10)),c=f.f();c.g();){var a,h=c.h();a=Ts(n)?yf().qd(Ns(h)):yf().rd(h),s.d(a)}u=s}var l,_=u;if(null==_)l=null;else{for(var v=Lr(Ct(_,10)),d=_.f();d.g();){var g;g=new ms(new $u(d.h())),v.d(g)}l=v}var w=null==l?null:$n(l);i=null==w?Tr():w}var b=i,p=null==b?Tr():b;r||null==n.contextualLabel||p.d(new ms(new $u(yf().rd(ae(n.contextualLabel)))));var m=function(n){var t=n.solutions;if(null==t||0===t.length)return null;for(var r=new Uu(yf().rd("Solutions")),i=ae(n.solutions),e=Lr(i.length),u=0,o=i.length;u<o;){var f,s=i[u];u=u+1|0,f=new ms(new Gu(_f(s))),e.d(f)}return new ms(r,e)}(n);null==m||p.d(m);var k=n.error,q=null==k?null:Jo(k);null==q||p.d(new ms(q));var y,B=function(n){for(var t=null,r=function(n,t){if(!(t>=0))throw ou(re("Requested element count "+t+" is less than zero."));return function(n,t){if(!(t>=0))throw ou(re("Requested element count "+t+" is less than zero."));if(0===t)return bt();var r=n.length;if(t>=r)return An(n);if(1===t)return dr(n[r-1|0]);var i=Lr(),e=r-t|0;if(e<r)do{var u=e;e=e+1|0,i.d(n[u])}while(e<r);return i}(n,Wn(n.length-t|0,0))}(n.problemId.slice(),1).f();r.g();){var i=r.h(),e=t,u=new Hs(yf().qd(Ms(i))),o=null==e?null:dr(e);t=new ms(u,null==o?bt():o)}return t}(n);if(null==B||p.d(B),t){var C=n.locations;y=!(null==C||0===C.length)}else y=!1;return y&&p.d(function(n){var t,r=n.locations;if(null==r)t=null;else{for(var i=Lr(r.length),e=Oi(r);e.g();){var u,o=e.h();u=new ms(new $u(yf().qd(As(o)))),i.d(u)}t=i}var f=t;return new ms(new Qu("Locations"),null==f?bt():f)}(n)),p}(n,null==t,r);return new ms(i,e)}function Is(n){return function(n){if(0===n.length)throw pu("Array is empty.");return n[Ln(n)]}(n.problemId).displayName}function Ss(n,t){var r;switch(n.severity){case"WARNING":var i=n.documentationLink;r=new Hu(t,null==i?null:new Vu(i,""));break;case"ERROR":var e=n.documentationLink;r=new Ru(t,null==e?null:new Vu(e,""));break;case"ADVICE":var u=n.documentationLink;r=new $s(t,null==u?null:new Vu(u,""));break;default:console.error("no severity "+n.severity),r=t}return r}function zs(n,t){t=t===A?null:t;var r,i=new kf;if(i.ed(n),null==t);else{if(null!=t.line){var e=Es(t);i.xd(e+(null==(r=t).line||null==r.length?"":"-"+r.length),""+t.path+e)}var u=t.taskPath;null==u||i.fd(u);var o=t.pluginId;null!=o&&i.fd(o)}return i}function Es(n){var t;if(null==n.line)t=null;else{var r,i=":"+n.line,e=n.column;t=i+(null==(r=null==e?null:":"+e)?"":r)}return null==t?"":t}function Ts(n){var t,r,i=n.problemId;n:{for(var e=0,u=i.length;e<u;){var o=i[e];if(e=e+1|0,"compilation"===o.name){r=o;break n}}r=null}if(null!=r){var f,s=n.problemId;n:{for(var c=0,a=s.length;c<a;){var h=s[c];if(c=c+1|0,"java"===h.name){f=h;break n}}f=null}t=!(null==f)}else t=!1;return t}function Ls(n){return function(t){return t.ed(n.displayName),t.fd(n.name),hr()}}function Ns(n){return function(t){return t.xd(function(n,t,r,i){i=i!==A&&i;var e=new RegExp(qi().t7(" "),i?"gui":"gu"),u=qi().u7(" ");return n.replace(e,u)}(n),""),hr()}}function As(n){return function(t){return t.ed("- "),t.fd(""+n.path+Es(n)),hr()}}function Ms(n){return function(t){return t.ed(n.displayName),t.fd(n.name),hr()}}function Fs(){return qs(),bn}function Ds(){return qs(),pn}function Os(){return qs(),mn}function Rs(n){Gs.call(this),this.hf_1=n}function Hs(n,t){t=t!==A&&t,Gs.call(this),this.if_1=n,this.jf_1=t}function $s(n,t){Zu.call(this),this.kf_1=n,this.lf_1=t}function Gs(){Zu.call(this)}function Us(n){bc.call(this),this.mf_1=n}function Vs(n){bc.call(this),this.nf_1=n}function Qs(n){bc.call(this),this.of_1=n}function Zs(n){Ws.call(this),this.pf_1=n}function Ys(n,t,r,i,e,u,o,f){this.qf_1=n,this.rf_1=t,this.sf_1=r,this.tf_1=i,this.uf_1=e,this.vf_1=u,this.wf_1=o,this.xf_1=f}function Ws(){mc.call(this)}function Ks(n,t){var r=Tr();ho(t.tf_1)>0&&r.d(ic(0,Fs(),t.xf_1,t.wf_1)),ho(t.uf_1)>0&&r.d(ic(0,Ds(),t.xf_1,t.wf_1)),ho(t.vf_1)>0&&r.d(ic(0,Os(),t.xf_1,t.wf_1));var i=Nf(),e=Xf(fc),u=Nf().y9(Xf(sc),[]),o=function(n,t){var r,i=Nf(),e=Xf(_c),u=Mf().ga("Learn more about "),o=Hf();return i.y9(e,[u,o.fb(Xf((r=t,function(n){return n.bd(r.tc_1),hr()})),t.sc_1),Mf().ga(".")])}(0,t.sf_1),f=Nf().y9(Xf(cc),[Js(0,t)]),s=Nf();return i.y9(e,[u,o,f,s.zd(Xf(ac),r)])}function Xs(n,t){var r,i,e=Nf(),u=Xf(hc);switch(t.xf_1.q8_1){case 0:r=ec(0,t.tf_1,((i=function(n){return new Us(n)}).callableName="<init>",i));break;case 1:r=ec(0,t.uf_1,function(){var n=function(n){return new Vs(n)};return n.callableName="<init>",n}());break;case 2:r=ec(0,t.vf_1,function(){var n=function(n){return new Qs(n)};return n.callableName="<init>",n}());break;default:he()}return e.y9(u,[r])}function Js(n,t){return Nf().ja([rc(0,t),nc(0,t)])}function nc(n,t){for(var r=Nf(),i=t.rf_1,e=Tr(),u=0,o=i.f();o.g();){var f=o.h(),s=u;u=s+1|0,xt(e,0===gr(s)?dr(tc(dc(),f)):wt([$f().ja([]),tc(dc(),f)]))}return r.ha(e)}function tc(n,t){return Ff().ja([Cc(t)])}function rc(n,t){return Lf().ja([yc().ka(t.qf_1)])}function ic(n,t,r,i){var e,u,o,f;return Nf().y9(Xf((e=i,u=t,o=r,function(n){return n.t9("group-selector"),0===e?(n.t9("group-selector--disabled"),hr()):u.equals(o)?(n.t9("group-selector--active"),hr()):(n.u9(function(n){return function(t){return new Zs(n)}}(u)),hr()),hr()})),[Mf().rc(t.cf_1,[(f=i,Mf().y9(Xf(lc),[Wu(),Ku(),Mf().ga(""+f),Xu()]))])])}function ec(n,t,r){return function(n,t,r){var i,e=Nf(),u=Df();return e.ja([u.ha(ks(t,(i=r,function(n){return function(n,t,r,i){var e,u;return t instanceof Rs?Cc(yf().rd(t.hf_1)):t instanceof Hs?Nf().y9(Xf((u=t,function(n){return u.jf_1&&(n.t9("uncategorized"),hr()),hr()})),[Nf().ja([jc(r,i),Cc(t.if_1)])]):t instanceof Du?Sc(i,r,t):t instanceof $u?Cc(t.za_1):t instanceof Gu?Nf().ja([(Hc(),xn),Cc(t.ab_1)]):t instanceof Uu?Nf().ja([jc(r,i),Cc(t.bb_1)]):t instanceof Ru?zc(i,((e=function(n){return uc(0,n)}).callableName="viewIt",e),r,t.va_1,t.wa_1,kc()):t instanceof $s?zc(i,function(){var n=function(n){return uc(0,n)};return n.callableName="viewIt",n}(),r,t.kf_1,t.lf_1,(Hc(),Bn)):t instanceof Hu?zc(i,function(){var n=function(n){return uc(0,n)};return n.callableName="viewIt",n}(),r,t.xa_1,t.ya_1,qc()):t instanceof Qu?Nf().ja([jc(r,i),Cc(yf().rd(t.eb_1))]):Mf().ga("Unknown node type viewNode: "+t)}(dc(),n.cd().ub_1,n,i)})))])}(0,t.xb_1.uc().vc(),r)}function uc(n,t){var r;if(t instanceof Vu)r=Vo(t);else if(t instanceof Qu)r=Cc(yf().rd(t.eb_1));else if(t instanceof $u)r=Cc(t.za_1);else{var i="Unknown node type viewIt: "+t;console.error(i),r=Mf().ga(i)}return r}function oc(n){return n.t9("report-wrapper"),hr()}function fc(n){return n.t9("header"),hr()}function sc(n){return n.t9("gradle-logo"),hr()}function cc(n){return n.t9("title"),hr()}function ac(n){return n.t9("groups"),hr()}function hc(n){return n.t9("content"),hr()}function lc(n){return n.t9("group-selector__count"),hr()}function _c(n){return n.t9("learn-more"),hr()}function vc(){qn=this,document.title="Gradle Problem Report"}function dc(){return null==qn&&new vc,qn}function gc(n,t,r){return n.pe(t.zb().oe(),r)}function wc(n){mc.call(this),this.hd_1=n}function bc(){mc.call(this)}function pc(n,t){mc.call(this),this.wc_1=n,this.xc_1=t}function mc(){}function kc(){return Hc(),yn}function qc(){return Hc(),Cn}function yc(){return Hc(),jn}function Bc(){return Hc(),Pn}function Cc(n){return Hc(),Bc().ka(n)}function xc(n){return Hc(),Bc().ka(yf().qd(n))}function jc(n,t){return Hc(),n.cd().ye()?Ec(n,t):function(n){return Hc(),Mf().fb(Xf(Oc),Tc(n))}(n)}function Pc(n,t,r,i){var e,u,o;return Hc(),Mf().fb(Xf((e=r,u=t,o=i,function(n){return n.t9("java-exception-part-toggle"),n.u9(function(n,t){return function(r){return new pc(n,t())}}(u,o)),n.s9("Click to "+function(n){var t;switch(Hc(),n.q8_1){case 0:t="show";break;case 1:t="hide";break;default:he()}return t}(e)),hr()})),"("+n+" internal "+df("line",n)+" "+function(n){var t;switch(Hc(),n.q8_1){case 0:t="hidden";break;case 1:t="shown";break;default:he()}return t}(r)+")")}function Ic(n,t){t=t===A?Tf():t,Hc();for(var r=Of(),i=Lr(Ct(n,10)),e=0,u=n.f();u.g();){var o,f=e;e=f+1|0,s=u.h(),c=(c=0===gr(f)?t:Tf())===A?Tf():c,Hc(),o=Rf().ja([Af().ga(s),c]),i.d(o)}var s,c;return r.ha(i)}function Sc(n,t,r){Hc();var i,e,u,o=Nf(),f=Ec(t,n),s=Mf().ga("Exception"),c=Mf().ja([(Hc(),In).v9(r.na_1,"Copy exception to the clipboard")]),a=null==r.ma_1?null:Mf().ga(" "),h=null==a?Tf():a,l=r.ma_1,_=null==l?null:Cc(l),v=null==_?Tf():_;switch(t.cd().wb_1.q8_1){case 0:i=Tf();break;case 1:i=function(n,t){Hc();for(var r=Nf(),i=Xf(Rc),e=n.oa_1,u=Lr(Ct(e,10)),o=0,f=e.f();f.g();){var s,c=f.h(),a=o;o=a+1|0;var h,l=gr(a);if(null!=c.sa_1){var _,v=Pc(c.ra_1.k(),l,c.sa_1,t),d=c.sa_1;switch(null==d?-1:d.q8_1){case 0:_=Ic(Gn(c.ra_1,1),v);break;case 1:_=Ic(c.ra_1,v);break;default:he()}h=_}else h=Ic(c.ra_1);s=h,u.d(s)}return r.zd(i,u)}(r,(e=n,u=t,function(){return e(new fs(u))}));break;default:he()}return o.ja([f,s,c,h,v,i])}function zc(n,t,r,i,e,u,o){e=e===A?null:e,u=u===A?Tf():u,o=o===A?Tf():o,Hc();var f=Nf(),s=jc(r,n),c=t(i),a=null==e?null:t(e);return f.ja([s,u,c,null==a?Tf():a,o])}function Ec(n,t){var r,i;return Hc(),Mf().fb(Xf((r=n,i=t,function(n){return n.gb(["invisible-text","tree-btn"]),r.cd().wb_1===bs()&&(n.t9("collapsed"),hr()),r.cd().wb_1===ps()&&(n.t9("expanded"),hr()),n.s9("Click to "+function(n){var t;switch(Hc(),n.q8_1){case 0:t="expand";break;case 1:t="collapse";break;default:he()}return t}(r.cd().wb_1)),n.u9(function(n,t){return function(r){return n(new fs(t))}}(i,r)),hr()})),Tc(n))}function Tc(n){return Hc(),function(n,t){var r;if(!(t>=0))throw ou(re("Count 'n' must be non-negative, but was "+t+"."));switch(t){case 0:r="";break;case 1:r=re(n);break;default:var i="";if(0!==Yi(n))for(var e=re(n),u=t;1&~u||(i+=e),0!=(u=u>>>1|0);)e+=e;return i}return r}("    ",n.we()-1|0)+"- "}function Lc(n){return Hc(),n.gb(["invisible-text","error-icon"]),hr()}function Nc(n){return Hc(),n.gb(["invisible-text","advice-icon"]),hr()}function Ac(n){return Hc(),n.gb(["invisible-text","warning-icon"]),hr()}function Mc(n){return Hc(),n.gb(["invisible-text","enum-icon"]),hr()}function Fc(n){return Hc(),new wc(n)}function Dc(n){return Hc(),new wc(n)}function Oc(n){return Hc(),n.gb(["invisible-text","leaf-icon"]),hr()}function Rc(n){return Hc(),n.t9("java-exception"),hr()}function Hc(){if(!Sn){Sn=!0;var n=Mf();yn=n.fb(Xf(Lc),"[error] ");var t=Mf();Bn=t.fb(Xf(Nc),"[advice] ");var r=Mf();Cn=r.fb(Xf(Ac),"[warn]  ");var i=Mf();xn=i.fb(Xf(Mc),"[enum]  "),jn=new Fu,Pn=new Fu(Fc),In=new Au(Dc)}}return $e(Zn,A,Oe),$e(nt,A,Oe),$e(tt,A,Oe),$e(Ei,"Collection",Ze),$e(rt,"AbstractCollection",Oe,A,[Ei]),$e(it,"IteratorImpl",Oe),$e(et,"ListIteratorImpl",Oe,it),$e(ut,"Companion",We),$e(zi,"List",Ze,A,[Ei]),$e(ft,"AbstractList",Oe,rt,[rt,zi]),$e(st,A,Oe),$e(ht,"Companion",We),$e(_t,A,Oe,rt),$e(Li,"Map",Ze),$e(vt,"AbstractMap",Oe,A,[Li]),$e(dt,"Companion",We),$e(hi,"RandomAccess",Ze),$e(kt,"EmptyList",We,A,[zi,hi]),$e(qt,"ArrayAsCollection",Oe,A,[Ei]),$e(yt,"EmptyIterator",We),$e(jt,"IntIterator",Oe),$e(Pt,A,Oe),$e(It,"ReversedListReadOnly",Oe,ft),$e(St,A,Oe),$e(zt,"TransformingSequence",Oe),$e(Tt,A,Oe),$e(Lt,"FilteringSequence",Oe),$e(Ai,"Set",Ze,A,[Ei]),$e(At,"EmptySet",We,A,[Ai]),$e(Dt,"Companion",We),$e(Ut,"IntProgression",Oe),$e(Rt,"IntRange",Oe,Ut),$e(Ht,"IntProgressionIterator",Oe,jt),$e($t,"Companion",We),$e(ir,A,Oe),$e(er,"DelimitedRangesSequence",Oe),$e(ur,"Pair",Oe),$e(fr,"CharSequence",Ze),$e(sr,"Comparable",Ze),$e(cr,"Number",Oe),$e(ar,"Unit",We),$e(lr,"IntCompanionObject",We),$e(pr,"AbstractMutableCollection",Oe,rt,[rt,Ei]),$e(mr,"IteratorImpl",Oe),$e(kr,"ListIteratorImpl",Oe,mr),$e(qr,"AbstractMutableList",Oe,pr,[pr,Ei,zi]),$e(yr,A,Oe),$e(Br,A,Oe),$e(Ti,"Entry",Ze),$e(Ni,"MutableEntry",Ze,A,[Ti]),$e(Cr,"SimpleEntry",Oe,A,[Ni]),$e(Sr,"AbstractMutableSet",Oe,pr,[pr,Ei,Ai]),$e(xr,"AbstractEntrySet",Oe,Sr),$e(jr,A,Oe,Sr),$e(Pr,A,Oe,pr),$e(Ir,"AbstractMutableMap",Oe,vt,[vt,Li]),$e(zr,"Companion",We),$e(Mr,"ArrayList",Oe,qr,[qr,Ei,zi,hi]),$e(Or,"HashCode",We),$e(Rr,"EntrySet",Oe,xr),$e(Ur,"HashMap",Oe,Ir,[Ir,Li]),$e(Qr,"HashSet",Oe,Sr,[Sr,Ei,Ai]),$e(Kr,A,Oe),$e(Jr,"InternalMap",Ze),$e(Xr,"InternalHashCodeMap",Oe,A,[Jr]),$e(ni,"EntryIterator",Oe),$e(ti,"Companion",We),$e(ii,"ChainEntry",Oe,Cr),$e(ei,"EntrySet",Oe,xr),$e(fi,"LinkedHashMap",Oe,Ur,[Ur,Li]),$e(si,"Companion",We),$e(ai,"LinkedHashSet",Oe,Qr,[Qr,Ei,Ai]),$e(li,"BaseOutput",Oe),$e(_i,"NodeJsOutput",Oe,li),$e(di,"BufferedOutput",Oe,li),$e(vi,"BufferedOutputToConsoleLog",Oe,di),$e(bi,"StringBuilder",Oe,A,[fr]),$e(ki,"Companion",We),$e(yi,"Regex",Oe),$e(Pi,"Companion",We),$e(Si,"Char",Oe,A,[sr]),$e(Mi,"Companion",We),$e(Fi,"Enum",Oe,A,[sr]),$e(Ri,A,Oe),$e(_e,"Companion",We),$e(ve,"Long",Oe,cr,[cr,sr]),$e(ru,"Letter",We),$e(eu,"OtherLowercase",We),$e(vu,"Exception",Oe,Error),$e(wu,"RuntimeException",Oe,vu),$e(fu,"IllegalArgumentException",Oe,wu),$e(cu,"IndexOutOfBoundsException",Oe,wu),$e(hu,"IllegalStateException",Oe,wu),$e(mu,"NoSuchElementException",Oe,wu),$e(qu,"ArithmeticException",Oe,wu),$e(Cu,"UnsupportedOperationException",Oe,wu),$e(ju,"NullPointerException",Oe,wu),$e(Iu,"NoWhenBranchMatchedException",Oe,wu),$e(zu,"ClassCastException",Oe,wu),$e(Tu,"UninitializedPropertyAccessException",Oe,wu),$e(Nu,"Model",Oe),$e(Au,"CopyButtonComponent",Oe),$e(Fu,"PrettyTextComponent",Oe),$e(Zu,"ProblemNode",Oe),$e(Du,"Exception",Oe,Zu),$e(Ou,"StackTracePart",Oe),$e(Ru,"Error",Oe,Zu),$e(Hu,"Warning",Oe,Zu),$e($u,"Message",Oe,Zu),$e(Gu,"ListElement",Oe,Zu),$e(Uu,"TreeNode",Oe,Zu),$e(Vu,"Link",Oe,Zu),$e(Qu,"Label",Oe,Zu),$e(ro,"Info",Oe,Zu),$e(io,"Project",Oe,Zu),$e(eo,"Task",Oe,Zu),$e(uo,"TaskPath",Oe,Zu),$e(oo,"Bean",Oe,Zu),$e(fo,"SystemProperty",Oe,Zu),$e(so,"Property",Oe,Zu),$e(co,"BuildLogic",Oe,Zu),$e(ao,"BuildLogicClass",Oe,Zu),$e(mc,"BaseIntent",Oe),$e(bc,"TreeIntent",Oe,mc),$e(_o,"TaskTreeIntent",Oe,bc),$e(vo,"MessageTreeIntent",Oe,bc),$e(go,"InputTreeIntent",Oe,bc),$e(wo,"IncompatibleTaskTreeIntent",Oe,bc),$e(ko,"Intent",Oe,mc),$e(bo,"SetTab",Oe,ko),$e(po,"Model",Oe),$e(mo,"Tab",Oe,Fi),$e(Go,"ConfigurationCacheReportPage",We),$e(Qo,"ImportedProblem",Oe),$e(Zo,"ImportedDiagnostics",Oe),$e(of,"sam$kotlin_Comparator$0",Oe),$e(wf,"LearnMore",Oe),$e(mf,"Fragment",Oe),$e(bf,"Text",Oe,mf),$e(pf,"Reference",Oe,mf),$e(kf,"Builder",Oe),$e(qf,"Companion",We),$e(Bf,"PrettyText",Oe),$e(Cf,"Companion",We),$e(If,"Trie",Oe),$e(Gf,"ViewFactory",Oe),$e(Uf,"Companion",We),$e(Kf,"View",Oe),$e(Qf,"Empty",We,Kf),$e(Yf,"Element",Oe,Kf),$e(Wf,"MappedView",Oe,Kf),$e(Jf,"Attributes",Oe),$e(is,"Attribute",Oe),$e(ns,"OnEvent",Oe,is),$e(ts,"ClassName",Oe,is),$e(rs,"Named",Oe,is),$e(cs,"Intent",Oe),$e(fs,"Toggle",Oe,cs),$e(ss,"Model",Oe),$e(hs,"TreeView",We),$e(ws,"Focus",Oe),$e(vs,"Original",Oe,ws),$e(ds,"Child",Oe,ws),$e(gs,"ViewState",Oe,Fi),$e(ms,"Tree",Oe),$e(ys,"Tab",Oe,Fi),$e(Cs,"ProblemNodeGroup",Oe),$e(Gs,"ProblemApiNode",Oe,Zu),$e(Rs,"Text",Oe,Gs),$e(Hs,"ProblemId",Oe,Gs),$e($s,"Advice",Oe,Zu),$e(Us,"MessageTreeIntent",Oe,bc),$e(Vs,"ProblemIdTreeIntent",Oe,bc),$e(Qs,"FileLocationTreeIntent",Oe,bc),$e(Ws,"Intent",Oe,mc),$e(Zs,"SetTab",Oe,Ws),$e(Ys,"Model",Oe),$e(vc,"ProblemsReportPage",We),$e(wc,"Copy",Oe,mc),$e(pc,"ToggleStackTracePart",Oe,mc),fe(Zn).f=function(){return this.n_1.f()},fe(nt).f=function(){return this.r_1.f()},fe(tt).f=function(){var n,t,r=function(n,t){for(var r=n.f();r.g();){var i=r.h();t.d(i)}return t}(this.s_1,Tr());return n=r,t=this.t_1,function(n,t){if(n.k()<=1)return hr();var r=wr(n);!function(n,t){if(function(){if(null!=l)return l;l=!1;var n=[],t=0;if(t<600)do{var r=t;t=t+1|0,n.push(r)}while(t<600);var i=Dr;n.sort(i);var e=1,u=n.length;if(e<u)do{var o=e;e=e+1|0;var f=n[o-1|0],s=n[o];if((3&f)==(3&s)&&f>=s)return!1}while(e<u);return l=!0,!0}()){var r=(i=t,function(n,t){return i.compare(n,t)});n.sort(r)}else!function(n,t,r,i){var e=n.length,u=function(n){var t=0,r=n.length-1|0;if(t<=r)do{var i=t;t=t+1|0,n[i]=null}while(i!==r);return n}(Array(e)),o=Fr(n,u,0,r,i);if(o!==n){var f=0;if(f<=r)do{var s=f;f=f+1|0,n[s]=o[s]}while(s!==r)}}(n,0,Ln(n),t);var i}(r,t);var i=0,e=r.length;if(i<e)do{var u=i;i=i+1|0,n.f4(u,r[u])}while(i<e)}(n,t),r.f()},fe(rt).u=function(n){var t;n:if(Ge(this,Ei)&&this.i())t=!1;else{for(var r=this.f();r.g();)if(ue(r.h(),n)){t=!0;break n}t=!1}return t},fe(rt).v=function(n){var t;n:if(Ge(n,Ei)&&n.i())t=!0;else{for(var r=n.f();r.g();){var i=r.h();if(!this.u(i)){t=!1;break n}}t=!0}return t},fe(rt).i=function(){return 0===this.k()},fe(rt).toString=function(){return Mn(this,", ","[","]",A,A,(n=this,function(t){return t===n?"(this Collection)":Di(t)}));var n},fe(rt).toArray=function(){return vr(this)},fe(it).g=function(){return this.w_1<this.x_1.k()},fe(it).h=function(){if(!this.g())throw bu();var n=this.w_1;return this.w_1=n+1|0,this.x_1.j(n)},fe(et).c1=function(){return this.w_1>0},fe(et).d1=function(){if(!this.c1())throw bu();return this.w_1=this.w_1-1|0,this.a1_1.j(this.w_1)},fe(ut).e1=function(n,t){if(n<0||n>=t)throw su("index: "+n+", size: "+t)},fe(ut).b1=function(n,t){if(n<0||n>t)throw su("index: "+n+", size: "+t)},fe(ut).f1=function(n){for(var t=1,r=n.f();r.g();){var i=r.h(),e=zn(31,t),u=null==i?null:ie(i);t=e+(null==u?0:u)|0}return t},fe(ut).g1=function(n,t){if(n.k()!==t.k())return!1;for(var r=t.f(),i=n.f();i.g();)if(!ue(i.h(),r.h()))return!1;return!0},fe(ft).f=function(){return new it(this)},fe(ft).l=function(n){return new et(this,n)},fe(ft).equals=function(n){return n===this||!(null==n||!Ge(n,zi))&&ot().g1(this,n)},fe(ft).hashCode=function(){return ot().f1(this)},fe(st).g=function(){return this.h1_1.g()},fe(st).h=function(){return this.h1_1.h().i1()},fe(ht).k1=function(n){var t=n.j1(),r=null==t?null:ie(t),i=null==r?0:r,e=n.i1(),u=null==e?null:ie(e);return i^(null==u?0:u)},fe(ht).l1=function(n){return Di(n.j1())+"="+Di(n.i1())},fe(ht).m1=function(n,t){return!(null==t||!Ge(t,Ti))&&!!ue(n.j1(),t.j1())&&ue(n.i1(),t.i1())},fe(_t).r1=function(n){return this.q1_1.s1(n)},fe(_t).u=function(n){return!(null!=n&&!Ve(n))&&this.r1(null==n||Ve(n)?n:le())},fe(_t).f=function(){return new st(this.q1_1.o().f())},fe(_t).k=function(){return this.q1_1.k()},fe(vt).t1=function(n){return!(null==at(this,n))},fe(vt).s1=function(n){var t;n:{var r=this.o();if(Ge(r,Ei)&&r.i())t=!1;else{for(var i=r.f();i.g();)if(ue(i.h().i1(),n)){t=!0;break n}t=!1}}return t},fe(vt).u1=function(n){if(null==n||!Ge(n,Ti))return!1;var t=n.j1(),r=n.i1(),i=(Ge(this,Li)?this:le()).v1(t);return!(!ue(r,i)||null==i&&!(Ge(this,Li)?this:le()).t1(t))},fe(vt).equals=function(n){if(n===this)return!0;if(null==n||!Ge(n,Li))return!1;if(this.k()!==n.k())return!1;var t;n:{var r=n.o();if(Ge(r,Ei)&&r.i())t=!0;else{for(var i=r.f();i.g();){var e=i.h();if(!this.u1(e)){t=!1;break n}}t=!0}}return t},fe(vt).v1=function(n){var t=at(this,n);return null==t?null:t.i1()},fe(vt).hashCode=function(){return ie(this.o())},fe(vt).i=function(){return 0===this.k()},fe(vt).k=function(){return this.o().k()},fe(vt).toString=function(){var n;return Mn(this.o(),", ","{","}",A,A,(n=this,function(t){return n.p1(t)}))},fe(vt).p1=function(n){return ct(this,n.j1())+"="+ct(this,n.i1())},fe(vt).w1=function(){return null==this.o1_1&&(this.o1_1=new _t(this)),ae(this.o1_1)},fe(dt).x1=function(n){for(var t=0,r=n.f();r.g();){var i=r.h(),e=t,u=null==i?null:ie(i);t=e+(null==u?0:u)|0}return t},fe(dt).y1=function(n,t){return n.k()===t.k()&&n.v(t)},fe(kt).equals=function(n){return!(null==n||!Ge(n,zi))&&n.i()},fe(kt).hashCode=function(){return 1},fe(kt).toString=function(){return"[]"},fe(kt).k=function(){return 0},fe(kt).i=function(){return!0},fe(kt).a2=function(n){return n.i()},fe(kt).v=function(n){return this.a2(n)},fe(kt).j=function(n){throw su("Empty list doesn't contain element at index "+n+".")},fe(kt).f=function(){return Bt()},fe(kt).l=function(n){if(0!==n)throw su("Index: "+n);return Bt()},fe(qt).k=function(){return this.b2_1.length},fe(qt).i=function(){return 0===this.b2_1.length},fe(qt).d2=function(n){return function(n,t){return Nn(n,t)>=0}(this.b2_1,n)},fe(qt).e2=function(n){var t;n:if(Ge(n,Ei)&&n.i())t=!0;else{for(var r=n.f();r.g();){var i=r.h();if(!this.d2(i)){t=!1;break n}}t=!0}return t},fe(qt).v=function(n){return this.e2(n)},fe(qt).f=function(){return Oi(this.b2_1)},fe(yt).g=function(){return!1},fe(yt).c1=function(){return!1},fe(yt).h=function(){throw bu()},fe(yt).d1=function(){throw bu()},fe(jt).h=function(){return this.f2()},fe(Pt).g=function(){return this.g2_1.c1()},fe(Pt).c1=function(){return this.g2_1.g()},fe(Pt).h=function(){return this.g2_1.d1()},fe(Pt).d1=function(){return this.g2_1.h()},fe(It).k=function(){return this.i2_1.k()},fe(It).j=function(n){return this.i2_1.j(function(n,t){if(!(0<=t&&t<=mt(n)))throw su("Element index "+t+" must be in range ["+De(0,mt(n))+"].");return mt(n)-t|0}(this,n))},fe(It).f=function(){return this.l(0)},fe(It).l=function(n){return new Pt(this,n)},fe(St).h=function(){return this.k2_1.m2_1(this.j2_1.h())},fe(St).g=function(){return this.j2_1.g()},fe(zt).f=function(){return new St(this)},fe(Tt).h=function(){if(-1===this.o2_1&&Et(this),0===this.o2_1)throw bu();var n=this.p2_1;return this.p2_1=null,this.o2_1=-1,null==n||Ve(n)?n:le()},fe(Tt).g=function(){return-1===this.o2_1&&Et(this),1===this.o2_1},fe(Lt).f=function(){return new Tt(this)},fe(At).equals=function(n){return!(null==n||!Ge(n,Ai))&&n.i()},fe(At).hashCode=function(){return 0},fe(At).toString=function(){return"[]"},fe(At).k=function(){return 0},fe(At).i=function(){return!0},fe(At).a2=function(n){return n.i()},fe(At).v=function(n){return this.a2(n)},fe(At).f=function(){return Bt()},fe(Rt).y2=function(){return this.z2_1},fe(Rt).c3=function(){return this.a3_1},fe(Rt).i=function(){return this.z2_1>this.a3_1},fe(Rt).equals=function(n){return n instanceof Rt&&(!(!this.i()||!n.i())||this.z2_1===n.z2_1&&this.a3_1===n.a3_1)},fe(Rt).hashCode=function(){return this.i()?-1:zn(31,this.z2_1)+this.a3_1|0},fe(Rt).toString=function(){return this.z2_1+".."+this.a3_1},fe(Ht).g=function(){return this.f3_1},fe(Ht).f2=function(){var n=this.g3_1;if(n===this.e3_1){if(!this.f3_1)throw bu();this.f3_1=!1}else this.g3_1=this.g3_1+this.d3_1|0;return n},fe($t).q=function(n,t,r){return new Ut(n,t,r)},fe(Ut).f=function(){return new Ht(this.z2_1,this.a3_1,this.b3_1)},fe(Ut).i=function(){return this.b3_1>0?this.z2_1>this.a3_1:this.z2_1<this.a3_1},fe(Ut).equals=function(n){return n instanceof Ut&&(!(!this.i()||!n.i())||this.z2_1===n.z2_1&&this.a3_1===n.a3_1&&this.b3_1===n.b3_1)},fe(Ut).hashCode=function(){return this.i()?-1:zn(31,zn(31,this.z2_1)+this.a3_1|0)+this.b3_1|0},fe(Ut).toString=function(){return this.b3_1>0?this.z2_1+".."+this.a3_1+" step "+this.b3_1:this.z2_1+" downTo "+this.a3_1+" step "+(0|-this.b3_1)},fe(ir).h=function(){if(-1===this.j3_1&&rr(this),0===this.j3_1)throw bu();var n=this.m3_1,t=n instanceof Rt?n:le();return this.m3_1=null,this.j3_1=-1,t},fe(ir).g=function(){return-1===this.j3_1&&rr(this),1===this.j3_1},fe(er).f=function(){return new ir(this)},fe(ur).toString=function(){return"("+this.t3_1+", "+this.u3_1+")"},fe(ur).v3=function(){return this.t3_1},fe(ur).w3=function(){return this.u3_1},fe(ur).hashCode=function(){var n=null==this.t3_1?0:ie(this.t3_1);return zn(n,31)+(null==this.u3_1?0:ie(this.u3_1))|0},fe(ur).equals=function(n){if(this===n)return!0;if(!(n instanceof ur))return!1;var t=n instanceof ur?n:le();return!!ue(this.t3_1,t.t3_1)&&!!ue(this.u3_1,t.u3_1)},fe(ar).toString=function(){return"kotlin.Unit"},fe(lr).b4=function(){return this.MIN_VALUE},fe(lr).c4=function(){return this.MAX_VALUE},fe(lr).d4=function(){return this.SIZE_BYTES},fe(lr).e4=function(){return this.SIZE_BITS},fe(pr).m=function(n){this.g4();for(var t=!1,r=n.f();r.g();){var i=r.h();this.d(i)&&(t=!0)}return t},fe(pr).toJSON=function(){return this.toArray()},fe(pr).g4=function(){},fe(mr).g=function(){return this.h4_1<this.j4_1.k()},fe(mr).h=function(){if(!this.g())throw bu();var n=this.h4_1;return this.h4_1=n+1|0,this.i4_1=n,this.j4_1.j(this.i4_1)},fe(kr).c1=function(){return this.h4_1>0},fe(kr).d1=function(){if(!this.c1())throw bu();return this.h4_1=this.h4_1-1|0,this.i4_1=this.h4_1,this.n4_1.j(this.i4_1)},fe(qr).d=function(n){return this.g4(),this.p4(this.k(),n),!0},fe(qr).f=function(){return new mr(this)},fe(qr).u=function(n){return this.q4(n)>=0},fe(qr).q4=function(n){var t=0,r=mt(this);if(t<=r)do{var i=t;if(t=t+1|0,ue(this.j(i),n))return i}while(i!==r);return-1},fe(qr).l=function(n){return new kr(this,n)},fe(qr).equals=function(n){return n===this||!(null==n||!Ge(n,zi))&&ot().g1(this,n)},fe(qr).hashCode=function(){return ot().f1(this)},fe(yr).g=function(){return this.r4_1.g()},fe(yr).h=function(){return this.r4_1.h().j1()},fe(Br).g=function(){return this.s4_1.g()},fe(Br).h=function(){return this.s4_1.h().i1()},fe(Cr).j1=function(){return this.t4_1},fe(Cr).i1=function(){return this.u4_1},fe(Cr).v4=function(n){var t=this.u4_1;return this.u4_1=n,t},fe(Cr).hashCode=function(){return lt().k1(this)},fe(Cr).toString=function(){return lt().l1(this)},fe(Cr).equals=function(n){return lt().m1(this,n)},fe(xr).u=function(n){return this.w4(n)},fe(jr).y4=function(n){throw Bu("Add is not supported on keys")},fe(jr).d=function(n){return this.y4(null==n||Ve(n)?n:le())},fe(jr).z4=function(n){return this.x4_1.t1(n)},fe(jr).u=function(n){return!(null!=n&&!Ve(n))&&this.z4(null==n||Ve(n)?n:le())},fe(jr).f=function(){return new yr(this.x4_1.o().f())},fe(jr).k=function(){return this.x4_1.k()},fe(jr).g4=function(){return this.x4_1.g4()},fe(Pr).f5=function(n){throw Bu("Add is not supported on values")},fe(Pr).d=function(n){return this.f5(null==n||Ve(n)?n:le())},fe(Pr).r1=function(n){return this.e5_1.s1(n)},fe(Pr).u=function(n){return!(null!=n&&!Ve(n))&&this.r1(null==n||Ve(n)?n:le())},fe(Pr).f=function(){return new Br(this.e5_1.o().f())},fe(Pr).k=function(){return this.e5_1.k()},fe(Pr).g4=function(){return this.e5_1.g4()},fe(Ir).g5=function(){return null==this.c5_1&&(this.c5_1=new jr(this)),ae(this.c5_1)},fe(Ir).w1=function(){return null==this.d5_1&&(this.d5_1=new Pr(this)),ae(this.d5_1)},fe(Ir).g4=function(){},fe(Sr).equals=function(n){return n===this||!(null==n||!Ge(n,Ai))&&gt().y1(this,n)},fe(Sr).hashCode=function(){return gt().x1(this)},fe(Mr).j5=function(){return this.g4(),this.c_1=!0,this.k()>0?this:Er().i5_1},fe(Mr).k=function(){return this.b_1.length},fe(Mr).j=function(n){var t=this.b_1[Ar(this,n)];return null==t||Ve(t)?t:le()},fe(Mr).f4=function(n,t){this.g4(),Ar(this,n);var r=this.b_1[n];this.b_1[n]=t;var i=r;return null==i||Ve(i)?i:le()},fe(Mr).d=function(n){return this.g4(),this.b_1.push(n),this.o4_1=this.o4_1+1|0,!0},fe(Mr).p4=function(n,t){this.g4(),this.b_1.splice(function(n,t){return ot().b1(t,n.k()),t}(this,n),0,t),this.o4_1=this.o4_1+1|0},fe(Mr).m=function(n){if(this.g4(),n.i())return!1;for(var t,r,i,e=(t=this,r=n.k(),i=t.k(),t.b_1.length=t.k()+r|0,i),u=0,o=n.f();o.g();){var f=o.h(),s=u;u=s+1|0;var c=gr(s);this.b_1[e+c|0]=f}return this.o4_1=this.o4_1+1|0,!0},fe(Mr).q4=function(n){return Nn(this.b_1,n)},fe(Mr).toString=function(){return n=this.b_1,t=(t=", ")===A?", ":t,r=(r="[")===A?"":r,i=(i="]")===A?"":i,e=(e=A)===A?-1:e,u=(u=A)===A?"...":u,o=(o=Ki)===A?null:o,function(n,t,r,i,e,u,o,f){r=r===A?", ":r,i=i===A?"":i,e=e===A?"":e,u=u===A?-1:u,o=o===A?"...":o,f=f===A?null:f,t.e(i);var s=0,c=0,a=n.length;n:for(;c<a;){var h=n[c];if(c=c+1|0,(s=s+1|0)>1&&t.e(r),!(u<0||s<=u))break n;Vt(t,h,f)}return u>=0&&s>u&&t.e(o),t.e(e),t}(n,wi(),t,r,i,e,u,o).toString();var n,t,r,i,e,u,o},fe(Mr).k5=function(){return[].slice.call(this.b_1)},fe(Mr).toArray=function(){return this.k5()},fe(Mr).g4=function(){if(this.c_1)throw yu()},fe(Or).l5=function(n,t){return ue(n,t)},fe(Or).m5=function(n){var t=null==n?null:ie(n);return null==t?0:t},fe(Rr).o5=function(n){throw Bu("Add is not supported on entries")},fe(Rr).d=function(n){return this.o5(null!=n&&Ge(n,Ni)?n:le())},fe(Rr).w4=function(n){return this.n5_1.u1(n)},fe(Rr).f=function(){return this.n5_1.t5_1.f()},fe(Rr).k=function(){return this.n5_1.k()},fe(Ur).t1=function(n){return this.t5_1.z4(n)},fe(Ur).s1=function(n){var t;n:{var r=this.t5_1;if(Ge(r,Ei)&&r.i())t=!1;else{for(var i=r.f();i.g();){var e=i.h();if(this.u5_1.l5(e.i1(),n)){t=!0;break n}}t=!1}}return t},fe(Ur).o=function(){return null==this.v5_1&&(this.v5_1=this.x5()),ae(this.v5_1)},fe(Ur).x5=function(){return new Rr(this)},fe(Ur).v1=function(n){return this.t5_1.v1(n)},fe(Ur).h5=function(n,t){return this.t5_1.h5(n,t)},fe(Ur).k=function(){return this.t5_1.k()},fe(Qr).d=function(n){return null==this.y5_1.h5(n,this)},fe(Qr).u=function(n){return this.y5_1.t1(n)},fe(Qr).i=function(){return this.y5_1.i()},fe(Qr).f=function(){return this.y5_1.g5().f()},fe(Qr).k=function(){return this.y5_1.k()},fe(Kr).g=function(){return-1===this.z5_1&&(this.z5_1=function(n){if(null!=n.c6_1&&n.d6_1){var t=n.c6_1.length;if(n.e6_1=n.e6_1+1|0,n.e6_1<t)return 0}if(n.b6_1=n.b6_1+1|0,n.b6_1<n.a6_1.length){n.c6_1=n.g6_1.i6_1[n.a6_1[n.b6_1]];var r=n,i=n.c6_1;return r.d6_1=null!=i&&Ue(i),n.e6_1=0,0}return n.c6_1=null,1}(this)),0===this.z5_1},fe(Kr).h=function(){if(!this.g())throw bu();var n=this.d6_1?this.c6_1[this.e6_1]:this.c6_1;return this.f6_1=n,this.z5_1=-1,n},fe(Xr).w5=function(){return this.h6_1},fe(Xr).k=function(){return this.j6_1},fe(Xr).h5=function(n,t){var r=this.h6_1.m5(n),i=Wr(this,r);if(null==i)this.i6_1[r]=new Cr(n,t);else{if(null==i||!Ue(i)){var e,u=i;return this.h6_1.l5(u.j1(),n)?u.v4(t):(e=[u,new Cr(n,t)],this.i6_1[r]=e,this.j6_1=this.j6_1+1|0,null)}var o=i,f=Yr(o,this,n);if(null!=f)return f.v4(t);o.push(new Cr(n,t))}return this.j6_1=this.j6_1+1|0,null},fe(Xr).z4=function(n){return!(null==Zr(this,n))},fe(Xr).v1=function(n){var t=Zr(this,n);return null==t?null:t.i1()},fe(Xr).f=function(){return new Kr(this)},fe(ni).g=function(){return!(null===this.m6_1)},fe(ni).h=function(){if(!this.g())throw bu();var n=ae(this.m6_1);this.l6_1=n;var t,r=n.b7_1;return t=r!==this.n6_1.y6_1.v6_1?r:null,this.m6_1=t,n},fe(ii).v4=function(n){return this.d7_1.g4(),fe(Cr).v4.call(this,n)},fe(ei).o5=function(n){throw Bu("Add is not supported on entries")},fe(ei).d=function(n){return this.o5(null!=n&&Ge(n,Ni)?n:le())},fe(ei).w4=function(n){return this.y6_1.u1(n)},fe(ei).f=function(){return new ni(this)},fe(ei).k=function(){return this.y6_1.k()},fe(ei).g4=function(){return this.y6_1.g4()},fe(fi).j5=function(){var n;if(this.g4(),this.x6_1=!0,this.k()>0)n=this;else{var t=ri().e7_1;n=Ge(t,Li)?t:le()}return n},fe(fi).t1=function(n){return this.w6_1.t1(n)},fe(fi).s1=function(n){var t=this.v6_1;if(null==t)return!1;var r=t;do{if(ue(r.i1(),n))return!0;r=ae(r.b7_1)}while(r!==this.v6_1);return!1},fe(fi).x5=function(){return new ei(this)},fe(fi).v1=function(n){var t=this.w6_1.v1(n);return null==t?null:t.i1()},fe(fi).h5=function(n,t){this.g4();var r=this.w6_1.v1(n);if(null==r){var i=new ii(this,n,t);return this.w6_1.h5(n,i),function(n,t){if(null!=n.b7_1||null!=n.c7_1)throw au(re("Check failed."));var r=t.v6_1;if(null==r)t.v6_1=n,n.b7_1=n,n.c7_1=n;else{var i=r.c7_1;if(null==i)throw au(re("Required value was null."));var e=i;n.c7_1=e,n.b7_1=r,r.c7_1=n,e.b7_1=n}}(i,this),null}return r.v4(t)},fe(fi).k=function(){return this.w6_1.k()},fe(fi).g4=function(){if(this.x6_1)throw yu()},fe(ai).g4=function(){return this.y5_1.g4()},fe(li).h7=function(){this.i7("\n")},fe(li).j7=function(n){this.i7(n),this.h7()},fe(_i).i7=function(n){var t=String(n);this.k7_1.write(t)},fe(vi).i7=function(n){var t=String(n),r=t.lastIndexOf("\n",0);if(r>=0){var i=this.m7_1;this.m7_1=i+t.substring(0,r),this.n7();var e=r+1|0;t=t.substring(e)}this.m7_1=this.m7_1+t},fe(vi).n7=function(){console.log(this.m7_1),this.m7_1=""},fe(di).i7=function(n){var t=this.m7_1;this.m7_1=t+String(n)},fe(bi).x3=function(){return this.o7_1.length},fe(bi).y3=function(n){var t=this.o7_1;if(!(n>=0&&n<=Zt(t)))throw su("index: "+n+", length: "+this.x3()+"}");return Qi(t,n)},fe(bi).z3=function(n,t){return this.o7_1.substring(n,t)},fe(bi).i3=function(n){return this.o7_1=this.o7_1+new Si(n),this},fe(bi).e=function(n){return this.o7_1=this.o7_1+Di(n),this},fe(bi).p7=function(n){var t=this.o7_1;return this.o7_1=t+(null==n?"null":n),this},fe(bi).toString=function(){return this.o7_1},fe(ki).t7=function(n){var t=this.q7_1;return n.replace(t,"\\$&")},fe(ki).u7=function(n){var t=this.s7_1;return n.replace(t,"$$$$")},fe(yi).a8=function(n){this.x7_1.lastIndex=0;var t=this.x7_1.exec(re(n));return null!=t&&0===t.index&&this.x7_1.lastIndex===Yi(n)},fe(yi).toString=function(){return this.x7_1.toString()},fe(Si).o8=function(n){return xi(this.h3_1,n)},fe(Si).a4=function(n){return function(n,t){return xi(n.h3_1,t instanceof Si?t.h3_1:le())}(this,n)},fe(Si).equals=function(n){return function(n,t){return t instanceof Si&&n===t.h3_1}(this.h3_1,n)},fe(Si).hashCode=function(){return this.h3_1},fe(Si).toString=function(){return ji(this.h3_1)},fe(Fi).r8=function(n){return Xi(this.q8_1,n.q8_1)},fe(Fi).a4=function(n){return this.r8(n instanceof Fi?n:le())},fe(Fi).equals=function(n){return this===n},fe(Fi).hashCode=function(){return te(this)},fe(Fi).toString=function(){return this.p8_1},fe(Ri).g=function(){return!(this.s8_1===this.t8_1.length)},fe(Ri).h=function(){if(this.s8_1===this.t8_1.length)throw pu(""+this.s8_1);var n=this.s8_1;return this.s8_1=n+1|0,this.t8_1[n]},fe(ve).b9=function(n){return me(this,n)},fe(ve).a4=function(n){return this.b9(n instanceof ve?n:le())},fe(ve).c9=function(n){return ke(this,n)},fe(ve).d9=function(n){return function(n,t){if(Ae(),Ie(t))throw _u("division by zero");if(Ie(n))return de();if(Ce(n,be())){if(Ce(t,ge())||Ce(t,we()))return be();if(Ce(t,be()))return ge();var r=function(n){Ae();return new ve(n.u8_1>>>1|n.v8_1<<31,n.v8_1>>1)}(n),i=function(n){Ae();return new ve(n.u8_1<<1,n.v8_1<<1|n.u8_1>>>31)}(r.d9(t));return Ce(i,de())?Pe(t)?ge():we():ke(i,qe(n,ye(t,i)).d9(t))}if(Ce(t,be()))return de();if(Pe(n))return Pe(t)?ze(n).d9(ze(t)):ze(ze(n).d9(t));if(Pe(t))return ze(n.d9(ze(t)));for(var e=de(),u=n;Ne(u,t);){for(var o=Be(u)/Be(t),f=Math.max(1,Math.floor(o)),s=Math.ceil(Math.log(f)/Math.LN2),c=s<=48?1:Math.pow(2,s-48),a=Te(f),h=ye(a,t);Pe(h)||Le(h,u);)h=ye(a=Te(f-=c),t);Ie(a)&&(a=ge()),e=ke(e,a),u=qe(u,h)}return e}(this,n)},fe(ve).e9=function(){return this.f9().c9(new ve(1,0))},fe(ve).f9=function(){return new ve(~this.u8_1,~this.v8_1)},fe(ve).g9=function(){return this.u8_1},fe(ve).w8=function(){return Be(this)},fe(ve).valueOf=function(){return this.w8()},fe(ve).equals=function(n){return n instanceof ve&&Ce(this,n)},fe(ve).hashCode=function(){return Ae(),this.u8_1^this.v8_1},fe(ve).toString=function(){return xe(this,10)},fe(Nu).toString=function(){return"Model(text="+this.o9_1+", tooltip="+this.p9_1+")"},fe(Nu).hashCode=function(){var n=ee(this.o9_1);return zn(n,31)+ee(this.p9_1)|0},fe(Nu).equals=function(n){if(this===n)return!0;if(!(n instanceof Nu))return!1;var t=n instanceof Nu?n:le();return this.o9_1===t.o9_1&&this.p9_1===t.p9_1},fe(Au).v9=function(n,t){return this.w9(new Nu(n,t))},fe(Au).w9=function(n){var t,r;return Ff().y9(Xf((t=n,r=this,function(n){return n.s9(t.p9_1),n.t9("copy-button"),n.u9(function(n,t){return function(r){return n.q9_1(t.o9_1)}}(r,t)),hr()})),[])},fe(Au).z9=function(n){return this.w9(n instanceof Nu?n:le())},fe(Au).aa=function(n,t){return t},fe(Au).ba=function(n,t){var r=null==n||Ve(n)?n:le();return this.aa(r,t instanceof Nu?t:le())},fe(Fu).ka=function(n){return function(n,t){for(var r=Mf(),i=t.ca_1,e=Lr(Ct(i,10)),u=i.f();u.g();){var o,f,s=u.h();s instanceof bf?f=Mf().ga(s.fa_1):s instanceof pf?f=Mu(n,s.da_1,s.ea_1):he(),o=f,e.d(o)}return r.ha(e)}(this,n)},fe(Fu).z9=function(n){return this.ka(n instanceof Bf?n:le())},fe(Fu).la=function(n,t){return t},fe(Fu).ba=function(n,t){var r=null==n||Ve(n)?n:le();return this.la(r,t instanceof Bf?t:le())},fe(Du).pa=function(n,t,r){return new Du(n,t,r)},fe(Du).qa=function(n,t,r,i){return n=n===A?this.ma_1:n,t=t===A?this.na_1:t,r=r===A?this.oa_1:r,i===A?this.pa(n,t,r):i.pa.call(this,n,t,r)},fe(Du).toString=function(){return"Exception(summary="+this.ma_1+", fullText="+this.na_1+", parts="+this.oa_1+")"},fe(Du).hashCode=function(){var n=null==this.ma_1?0:this.ma_1.hashCode();return n=zn(n,31)+ee(this.na_1)|0,zn(n,31)+ie(this.oa_1)|0},fe(Du).equals=function(n){if(this===n)return!0;if(!(n instanceof Du))return!1;var t=n instanceof Du?n:le();return!!ue(this.ma_1,t.ma_1)&&this.na_1===t.na_1&&!!ue(this.oa_1,t.oa_1)},fe(Ou).ta=function(n,t){return new Ou(n,t)},fe(Ou).ua=function(n,t,r){return n=n===A?this.ra_1:n,t=t===A?this.sa_1:t,r===A?this.ta(n,t):r.ta.call(this,n,t)},fe(Ou).toString=function(){return"StackTracePart(lines="+this.ra_1+", state="+this.sa_1+")"},fe(Ou).hashCode=function(){var n=ie(this.ra_1);return zn(n,31)+(null==this.sa_1?0:this.sa_1.hashCode())|0},fe(Ou).equals=function(n){if(this===n)return!0;if(!(n instanceof Ou))return!1;var t=n instanceof Ou?n:le();return!!ue(this.ra_1,t.ra_1)&&!!ue(this.sa_1,t.sa_1)},fe(Ru).toString=function(){return"Error(label="+this.va_1+", docLink="+this.wa_1+")"},fe(Ru).hashCode=function(){var n=ie(this.va_1);return zn(n,31)+(null==this.wa_1?0:ie(this.wa_1))|0},fe(Ru).equals=function(n){if(this===n)return!0;if(!(n instanceof Ru))return!1;var t=n instanceof Ru?n:le();return!!ue(this.va_1,t.va_1)&&!!ue(this.wa_1,t.wa_1)},fe(Hu).toString=function(){return"Warning(label="+this.xa_1+", docLink="+this.ya_1+")"},fe(Hu).hashCode=function(){var n=ie(this.xa_1);return zn(n,31)+(null==this.ya_1?0:ie(this.ya_1))|0},fe(Hu).equals=function(n){if(this===n)return!0;if(!(n instanceof Hu))return!1;var t=n instanceof Hu?n:le();return!!ue(this.xa_1,t.xa_1)&&!!ue(this.ya_1,t.ya_1)},fe($u).toString=function(){return"Message(prettyText="+this.za_1+")"},fe($u).hashCode=function(){return this.za_1.hashCode()},fe($u).equals=function(n){if(this===n)return!0;if(!(n instanceof $u))return!1;var t=n instanceof $u?n:le();return!!this.za_1.equals(t.za_1)},fe(Gu).toString=function(){return"ListElement(prettyText="+this.ab_1+")"},fe(Gu).hashCode=function(){return this.ab_1.hashCode()},fe(Gu).equals=function(n){if(this===n)return!0;if(!(n instanceof Gu))return!1;var t=n instanceof Gu?n:le();return!!this.ab_1.equals(t.ab_1)},fe(Uu).toString=function(){return"TreeNode(prettyText="+this.bb_1+")"},fe(Uu).hashCode=function(){return this.bb_1.hashCode()},fe(Uu).equals=function(n){if(this===n)return!0;if(!(n instanceof Uu))return!1;var t=n instanceof Uu?n:le();return!!this.bb_1.equals(t.bb_1)},fe(Vu).toString=function(){return"Link(href="+this.cb_1+", label="+this.db_1+")"},fe(Vu).hashCode=function(){var n=ee(this.cb_1);return zn(n,31)+ee(this.db_1)|0},fe(Vu).equals=function(n){if(this===n)return!0;if(!(n instanceof Vu))return!1;var t=n instanceof Vu?n:le();return this.cb_1===t.cb_1&&this.db_1===t.db_1},fe(Qu).toString=function(){return"Label(text="+this.eb_1+")"},fe(Qu).hashCode=function(){return ee(this.eb_1)},fe(Qu).equals=function(n){if(this===n)return!0;if(!(n instanceof Qu))return!1;var t=n instanceof Qu?n:le();return this.eb_1===t.eb_1},fe(ro).toString=function(){return"Info(label="+this.hb_1+", docLink="+this.ib_1+")"},fe(ro).hashCode=function(){var n=ie(this.hb_1);return zn(n,31)+(null==this.ib_1?0:ie(this.ib_1))|0},fe(ro).equals=function(n){if(this===n)return!0;if(!(n instanceof ro))return!1;var t=n instanceof ro?n:le();return!!ue(this.hb_1,t.hb_1)&&!!ue(this.ib_1,t.ib_1)},fe(io).toString=function(){return"Project(path="+this.jb_1+")"},fe(io).hashCode=function(){return ee(this.jb_1)},fe(io).equals=function(n){if(this===n)return!0;if(!(n instanceof io))return!1;var t=n instanceof io?n:le();return this.jb_1===t.jb_1},fe(eo).toString=function(){return"Task(path="+this.kb_1+", type="+this.lb_1+")"},fe(eo).hashCode=function(){var n=ee(this.kb_1);return zn(n,31)+ee(this.lb_1)|0},fe(eo).equals=function(n){if(this===n)return!0;if(!(n instanceof eo))return!1;var t=n instanceof eo?n:le();return this.kb_1===t.kb_1&&this.lb_1===t.lb_1},fe(uo).toString=function(){return"TaskPath(path="+this.mb_1+")"},fe(uo).hashCode=function(){return ee(this.mb_1)},fe(uo).equals=function(n){if(this===n)return!0;if(!(n instanceof uo))return!1;var t=n instanceof uo?n:le();return this.mb_1===t.mb_1},fe(oo).toString=function(){return"Bean(type="+this.nb_1+")"},fe(oo).hashCode=function(){return ee(this.nb_1)},fe(oo).equals=function(n){if(this===n)return!0;if(!(n instanceof oo))return!1;var t=n instanceof oo?n:le();return this.nb_1===t.nb_1},fe(fo).toString=function(){return"SystemProperty(name="+this.ob_1+")"},fe(fo).hashCode=function(){return ee(this.ob_1)},fe(fo).equals=function(n){if(this===n)return!0;if(!(n instanceof fo))return!1;var t=n instanceof fo?n:le();return this.ob_1===t.ob_1},fe(so).toString=function(){return"Property(kind="+this.pb_1+", name="+this.qb_1+", owner="+this.rb_1+")"},fe(so).hashCode=function(){var n=ee(this.pb_1);return n=zn(n,31)+ee(this.qb_1)|0,zn(n,31)+ee(this.rb_1)|0},fe(so).equals=function(n){if(this===n)return!0;if(!(n instanceof so))return!1;var t=n instanceof so?n:le();return this.pb_1===t.pb_1&&this.qb_1===t.qb_1&&this.rb_1===t.rb_1},fe(co).toString=function(){return"BuildLogic(location="+this.sb_1+")"},fe(co).hashCode=function(){return ee(this.sb_1)},fe(co).equals=function(n){if(this===n)return!0;if(!(n instanceof co))return!1;var t=n instanceof co?n:le();return this.sb_1===t.sb_1},fe(ao).toString=function(){return"BuildLogicClass(type="+this.tb_1+")"},fe(ao).hashCode=function(){return ee(this.tb_1)},fe(ao).equals=function(n){if(this===n)return!0;if(!(n instanceof ao))return!1;var t=n instanceof ao?n:le();return this.tb_1===t.tb_1},fe(_o).zb=function(){return this.yb_1},fe(_o).toString=function(){return"TaskTreeIntent(delegate="+this.yb_1+")"},fe(_o).hashCode=function(){return ie(this.yb_1)},fe(_o).equals=function(n){if(this===n)return!0;if(!(n instanceof _o))return!1;var t=n instanceof _o?n:le();return!!ue(this.yb_1,t.yb_1)},fe(vo).zb=function(){return this.ac_1},fe(vo).toString=function(){return"MessageTreeIntent(delegate="+this.ac_1+")"},fe(vo).hashCode=function(){return ie(this.ac_1)},fe(vo).equals=function(n){if(this===n)return!0;if(!(n instanceof vo))return!1;var t=n instanceof vo?n:le();return!!ue(this.ac_1,t.ac_1)},fe(go).zb=function(){return this.bc_1},fe(go).toString=function(){return"InputTreeIntent(delegate="+this.bc_1+")"},fe(go).hashCode=function(){return ie(this.bc_1)},fe(go).equals=function(n){if(this===n)return!0;if(!(n instanceof go))return!1;var t=n instanceof go?n:le();return!!ue(this.bc_1,t.bc_1)},fe(wo).zb=function(){return this.cc_1},fe(wo).toString=function(){return"IncompatibleTaskTreeIntent(delegate="+this.cc_1+")"},fe(wo).hashCode=function(){return ie(this.cc_1)},fe(wo).equals=function(n){if(this===n)return!0;if(!(n instanceof wo))return!1;var t=n instanceof wo?n:le();return!!ue(this.cc_1,t.cc_1)},fe(bo).toString=function(){return"SetTab(tab="+this.dc_1+")"},fe(bo).hashCode=function(){return this.dc_1.hashCode()},fe(bo).equals=function(n){if(this===n)return!0;if(!(n instanceof bo))return!1;var t=n instanceof bo?n:le();return!!this.dc_1.equals(t.dc_1)},fe(po).mc=function(n,t,r,i,e,u,o,f){return new po(n,t,r,i,e,u,o,f)},fe(po).nc=function(n,t,r,i,e,u,o,f,s){return n=n===A?this.ec_1:n,t=t===A?this.fc_1:t,r=r===A?this.gc_1:r,i=i===A?this.hc_1:i,e=e===A?this.ic_1:e,u=u===A?this.jc_1:u,o=o===A?this.kc_1:o,f=f===A?this.lc_1:f,s===A?this.mc(n,t,r,i,e,u,o,f):s.mc.call(this,n,t,r,i,e,u,o,f)},fe(po).toString=function(){return"Model(heading="+this.ec_1+", summary="+this.fc_1+", learnMore="+this.gc_1+", messageTree="+this.hc_1+", locationTree="+this.ic_1+", inputTree="+this.jc_1+", incompatibleTaskTree="+this.kc_1+", tab="+this.lc_1+")"},fe(po).hashCode=function(){var n=this.ec_1.hashCode();return n=zn(n,31)+ie(this.fc_1)|0,n=zn(n,31)+this.gc_1.hashCode()|0,n=zn(n,31)+this.hc_1.hashCode()|0,n=zn(n,31)+this.ic_1.hashCode()|0,n=zn(n,31)+this.jc_1.hashCode()|0,n=zn(n,31)+this.kc_1.hashCode()|0,zn(n,31)+this.lc_1.hashCode()|0},fe(po).equals=function(n){if(this===n)return!0;if(!(n instanceof po))return!1;var t=n instanceof po?n:le();return!!(this.ec_1.equals(t.ec_1)&&ue(this.fc_1,t.fc_1)&&this.gc_1.equals(t.gc_1)&&this.hc_1.equals(t.hc_1)&&this.ic_1.equals(t.ic_1)&&this.jc_1.equals(t.jc_1)&&this.kc_1.equals(t.kc_1)&&this.lc_1.equals(t.lc_1))},fe(Go).gd=function(n,t){var r,i;return n instanceof _o?r=t.nc(A,A,A,A,ls().id(n.yb_1,t.ic_1)):n instanceof vo?r=t.nc(A,A,A,ls().id(n.ac_1,t.hc_1)):n instanceof go?r=t.nc(A,A,A,A,A,ls().id(n.bc_1,t.jc_1)):n instanceof wo?r=t.nc(A,A,A,A,A,A,ls().id(n.cc_1,t.kc_1)):n instanceof pc?r=function(n,t,r,i){var e;return r instanceof vo?e=n.nc(A,A,A,gc(n.hc_1,r,i)):r instanceof _o?e=n.nc(A,A,A,A,gc(n.ic_1,r,i)):r instanceof go?e=n.nc(A,A,A,A,A,gc(n.jc_1,r,i)):r instanceof wo?e=n.nc(A,A,A,A,A,A,gc(n.kc_1,r,i)):(console.error("Unhandled tree intent: "+r),e=n),e}(t,0,n.xc_1,(i=n,function(n){var t;if(!(n instanceof Du))throw ou(re("Failed requirement."));for(var r=n.oa_1,e=i.wc_1,u=Lr(Ct(r,10)),o=0,f=r.f();f.g();){var s,c,a=f.h(),h=o;if(o=h+1|0,e===gr(h)){var l=a.sa_1;c=a.ua(A,null==l?null:l.ad())}else c=a;s=c,u.d(s)}return t=u,n.qa(A,A,t)})):n instanceof wc?(window.navigator.clipboard.writeText(n.hd_1),r=t):n instanceof bo?r=t.nc(A,A,A,A,A,A,A,n.dc_1):(console.error("Unhandled intent: "+n),r=t),r},fe(Go).ba=function(n,t){var r=n instanceof mc?n:le();return this.gd(r,t instanceof po?t:le())},fe(Go).jd=function(n){return Nf().y9(Xf(Eo),[qo(0,n),yo(0,n)])},fe(Go).z9=function(n){return this.jd(n instanceof po?n:le())},fe(Qo).toString=function(){return"ImportedProblem(problem="+this.kd_1+", message="+this.ld_1+", trace="+this.md_1+")"},fe(Qo).hashCode=function(){var n=ie(this.kd_1);return n=zn(n,31)+this.ld_1.hashCode()|0,zn(n,31)+ie(this.md_1)|0},fe(Qo).equals=function(n){if(this===n)return!0;if(!(n instanceof Qo))return!1;var t=n instanceof Qo?n:le();return!!ue(this.kd_1,t.kd_1)&&!!this.ld_1.equals(t.ld_1)&&!!ue(this.md_1,t.md_1)},fe(of).ud=function(n,t){return this.td_1(n,t)},fe(of).compare=function(n,t){return this.ud(n,t)},fe(wf).toString=function(){return"LearnMore(text="+this.sc_1+", documentationLink="+this.tc_1+")"},fe(wf).hashCode=function(){var n=ee(this.sc_1);return zn(n,31)+ee(this.tc_1)|0},fe(wf).equals=function(n){if(this===n)return!0;if(!(n instanceof wf))return!1;var t=n instanceof wf?n:le();return this.sc_1===t.sc_1&&this.tc_1===t.tc_1},fe(bf).toString=function(){return"Text(text="+this.fa_1+")"},fe(bf).hashCode=function(){return ee(this.fa_1)},fe(bf).equals=function(n){if(this===n)return!0;if(!(n instanceof bf))return!1;var t=n instanceof bf?n:le();return this.fa_1===t.fa_1},fe(pf).toString=function(){return"Reference(name="+this.da_1+", clipboardString="+this.ea_1+")"},fe(pf).hashCode=function(){var n=ee(this.da_1);return zn(n,31)+ee(this.ea_1)|0},fe(pf).equals=function(n){if(this===n)return!0;if(!(n instanceof pf))return!1;var t=n instanceof pf?n:le();return this.da_1===t.da_1&&this.ea_1===t.ea_1},fe(kf).ed=function(n){return this.dd_1.d(new bf(n)),this},fe(kf).xd=function(n,t){return this.dd_1.d(new pf(n,t)),this},fe(kf).fd=function(n,t,r){return t=t===A?n:t,r===A?this.xd(n,t):r.xd.call(this,n,t)},fe(kf).j5=function(){return new Bf(Rn(this.dd_1))},fe(qf).rd=function(n){return new Bf(dr(new bf(n)))},fe(qf).qd=function(n){var t=new kf;return n(t),t.j5()},fe(Bf).vd=function(n){return new Bf(n)},fe(Bf).toString=function(){return"PrettyText(fragments="+this.ca_1+")"},fe(Bf).hashCode=function(){return ie(this.ca_1)},fe(Bf).equals=function(n){if(this===n)return!0;if(!(n instanceof Bf))return!1;var t=n instanceof Bf?n:le();return!!ue(this.ca_1,t.ca_1)},fe(Cf).sd=function(n){return function(n){for(var t=$r(),r=n.f();r.g();)for(var i=t,e=r.h().f();e.g();){var u,o=e.h(),f=i,s=f.v1(o);if(null==s){var c=$r();f.h5(o,c),u=c}else u=s;i=u instanceof Ur?u:le()}return t}(n)},fe(If).toString=function(){return"Trie(nestedMaps="+this.wd_1+")"},fe(If).hashCode=function(){return ie(this.wd_1)},fe(If).equals=function(n){return function(n,t){return t instanceof If&&!!ue(n,t instanceof If?t.wd_1:le())}(this.wd_1,n)},fe(Gf).ga=function(n){return Vf().yd(this.x9_1,A,n)},fe(Gf).ha=function(n){return Vf().yd(this.x9_1,A,A,n)},fe(Gf).ja=function(n){return Vf().yd(this.x9_1,A,A,Je(n))},fe(Gf).y9=function(n,t){return Vf().yd(this.x9_1,n,A,Je(t))},fe(Gf).zd=function(n,t){return Vf().yd(this.x9_1,n,A,t)},fe(Gf).fb=function(n,t){return Vf().yd(this.x9_1,n,t)},fe(Gf).rc=function(n,t){return Vf().yd(this.x9_1,A,n,Je(t))},fe(Gf).toString=function(){return"ViewFactory(elementName="+this.x9_1+")"},fe(Gf).hashCode=function(){return ee(this.x9_1)},fe(Gf).equals=function(n){if(this===n)return!0;if(!(n instanceof Gf))return!1;var t=n instanceof Gf?n:le();return this.x9_1===t.x9_1},fe(Uf).ae=function(n,t,r,i){return new Yf(n,t,r,i)},fe(Uf).yd=function(n,t,r,i,e){return t=t===A?bt():t,r=r===A?null:r,i=i===A?bt():i,e===A?this.ae(n,t,r,i):e.ae.call(this,n,t,r,i)},fe(Yf).toString=function(){return"Element(elementName="+this.be_1+", attributes="+this.ce_1+", innerText="+this.de_1+", children="+this.ee_1+")"},fe(Yf).hashCode=function(){var n=ee(this.be_1);return n=zn(n,31)+ie(this.ce_1)|0,n=zn(n,31)+(null==this.de_1?0:ee(this.de_1))|0,zn(n,31)+ie(this.ee_1)|0},fe(Yf).equals=function(n){if(this===n)return!0;if(!(n instanceof Yf))return!1;var t=n instanceof Yf?n:le();return this.be_1===t.be_1&&!!ue(this.ce_1,t.ce_1)&&this.de_1==t.de_1&&!!ue(this.ee_1,t.ee_1)},fe(Jf).u9=function(n){return this.r9_1(new ns("click",n))},fe(Jf).t9=function(n){return this.r9_1(new ts(n))},fe(Jf).gb=function(n){for(var t=0,r=n.length;t<r;){var i=n[t];t=t+1|0,this.r9_1(new ts(i))}return hr()},fe(Jf).s9=function(n){return this.r9_1(new rs("title",n))},fe(Jf).bd=function(n){return this.r9_1(new rs("href",n))},fe(fs).oe=function(){return this.ne_1},fe(fs).toString=function(){return"Toggle(focus="+this.ne_1+")"},fe(fs).hashCode=function(){return ie(this.ne_1)},fe(fs).equals=function(n){if(this===n)return!0;if(!(n instanceof fs))return!1;var t=n instanceof fs?n:le();return!!ue(this.ne_1,t.ne_1)},fe(ss).pe=function(n,t){return this.re(n.qe((r=t,function(n){return n.me(r(n.ub_1))})));var r},fe(ss).re=function(n){return new ss(n)},fe(ss).toString=function(){return"Model(tree="+this.xb_1+")"},fe(ss).hashCode=function(){return this.xb_1.hashCode()},fe(ss).equals=function(n){if(this===n)return!0;if(!(n instanceof ss))return!1;var t=n instanceof ss?n:le();return!!this.xb_1.equals(t.xb_1)},fe(hs).id=function(n,t){var r;if(n instanceof fs){var i=n.oe();r=t.re(i.qe(as))}else he();return r},fe(vs).cd=function(){return this.ve_1},fe(vs).we=function(){return 0},fe(vs).qe=function(n){return n(this.ve_1)},fe(vs).toString=function(){return"Original(tree="+this.ve_1+")"},fe(vs).hashCode=function(){return this.ve_1.hashCode()},fe(vs).equals=function(n){if(this===n)return!0;if(!(n instanceof vs))return!1;var t=n instanceof vs?n:le();return!!this.ve_1.equals(t.ve_1)},fe(ds).cd=function(){return this.ue_1},fe(ds).we=function(){return this.se_1.we()+1|0},fe(ds).qe=function(n){return this.se_1.qe((t=this,r=n,function(n){for(var i,e=n.vb_1,u=t.te_1,o=Lr(Ct(e,10)),f=0,s=e.f();s.g();){var c,a=s.h(),h=f;f=h+1|0,c=u===gr(h)?r(a):a,o.d(c)}return i=o,n.me(A,i)}));var t,r},fe(ds).toString=function(){return"Child(parent="+this.se_1+", index="+this.te_1+", tree="+this.ue_1+")"},fe(ds).hashCode=function(){var n=ie(this.se_1);return n=zn(n,31)+this.te_1|0,zn(n,31)+this.ue_1.hashCode()|0},fe(ds).equals=function(n){if(this===n)return!0;if(!(n instanceof ds))return!1;var t=n instanceof ds?n:le();return!!ue(this.se_1,t.se_1)&&this.te_1===t.te_1&&!!this.ue_1.equals(t.ue_1)},fe(gs).ad=function(){var n;switch(this.q8_1){case 0:n=ps();break;case 1:n=bs();break;default:he()}return n},fe(ws).vc=function(){var n,t;return Xn(On(De(0,this.cd().vb_1.k()-1|0)),(n=this,(t=function(t){return n.xe(t)}).callableName="child",t))},fe(ws).xe=function(n){return new ds(this,n,this.cd().vb_1.j(n))},fe(ms).uc=function(){return new vs(this)},fe(ms).ye=function(){return!this.vb_1.i()},fe(ms).ze=function(n,t,r){return new ms(n,t,r)},fe(ms).me=function(n,t,r,i){return n=n===A?this.ub_1:n,t=t===A?this.vb_1:t,r=r===A?this.wb_1:r,i===A?this.ze(n,t,r):i.ze.call(this,n,t,r)},fe(ms).toString=function(){return"Tree(label="+this.ub_1+", children="+this.vb_1+", state="+this.wb_1+")"},fe(ms).hashCode=function(){var n=null==this.ub_1?0:ie(this.ub_1);return n=zn(n,31)+ie(this.vb_1)|0,zn(n,31)+this.wb_1.hashCode()|0},fe(ms).equals=function(n){if(this===n)return!0;if(!(n instanceof ms))return!1;var t=n instanceof ms?n:le();return!!ue(this.ub_1,t.ub_1)&&!!ue(this.vb_1,t.vb_1)&&!!this.wb_1.equals(t.wb_1)},fe(Cs).toString=function(){return"ProblemNodeGroup(tree="+this.df_1+", children="+this.ef_1+", childGroups="+this.ff_1+", id="+this.gf_1+")"},fe(Cs).hashCode=function(){var n=this.df_1.hashCode();return n=zn(n,31)+ie(this.ef_1)|0,n=zn(n,31)+ie(this.ff_1)|0,zn(n,31)+this.gf_1|0},fe(Cs).equals=function(n){if(this===n)return!0;if(!(n instanceof Cs))return!1;var t=n instanceof Cs?n:le();return!!this.df_1.equals(t.df_1)&&!!ue(this.ef_1,t.ef_1)&&!!ue(this.ff_1,t.ff_1)&&this.gf_1===t.gf_1},fe(Rs).toString=function(){return"Text(text="+this.hf_1+")"},fe(Rs).hashCode=function(){return ee(this.hf_1)},fe(Rs).equals=function(n){if(this===n)return!0;if(!(n instanceof Rs))return!1;var t=n instanceof Rs?n:le();return this.hf_1===t.hf_1},fe(Hs).toString=function(){return"ProblemId(prettyText="+this.if_1+", separator="+this.jf_1+")"},fe(Hs).hashCode=function(){var n=this.if_1.hashCode();return zn(n,31)+(0|this.jf_1)|0},fe(Hs).equals=function(n){if(this===n)return!0;if(!(n instanceof Hs))return!1;var t=n instanceof Hs?n:le();return!!this.if_1.equals(t.if_1)&&this.jf_1===t.jf_1},fe($s).toString=function(){return"Advice(label="+this.kf_1+", docLink="+this.lf_1+")"},fe($s).hashCode=function(){var n=ie(this.kf_1);return zn(n,31)+(null==this.lf_1?0:ie(this.lf_1))|0},fe($s).equals=function(n){if(this===n)return!0;if(!(n instanceof $s))return!1;var t=n instanceof $s?n:le();return!!ue(this.kf_1,t.kf_1)&&!!ue(this.lf_1,t.lf_1)},fe(Us).zb=function(){return this.mf_1},fe(Us).toString=function(){return"MessageTreeIntent(delegate="+this.mf_1+")"},fe(Us).hashCode=function(){return ie(this.mf_1)},fe(Us).equals=function(n){if(this===n)return!0;if(!(n instanceof Us))return!1;var t=n instanceof Us?n:le();return!!ue(this.mf_1,t.mf_1)},fe(Vs).zb=function(){return this.nf_1},fe(Vs).toString=function(){return"ProblemIdTreeIntent(delegate="+this.nf_1+")"},fe(Vs).hashCode=function(){return ie(this.nf_1)},fe(Vs).equals=function(n){if(this===n)return!0;if(!(n instanceof Vs))return!1;var t=n instanceof Vs?n:le();return!!ue(this.nf_1,t.nf_1)},fe(Qs).zb=function(){return this.of_1},fe(Qs).toString=function(){return"FileLocationTreeIntent(delegate="+this.of_1+")"},fe(Qs).hashCode=function(){return ie(this.of_1)},fe(Qs).equals=function(n){if(this===n)return!0;if(!(n instanceof Qs))return!1;var t=n instanceof Qs?n:le();return!!ue(this.of_1,t.of_1)},fe(Zs).toString=function(){return"SetTab(tab="+this.pf_1+")"},fe(Zs).hashCode=function(){return this.pf_1.hashCode()},fe(Zs).equals=function(n){if(this===n)return!0;if(!(n instanceof Zs))return!1;var t=n instanceof Zs?n:le();return!!this.pf_1.equals(t.pf_1)},fe(Ys).yf=function(n,t,r,i,e,u,o,f){return new Ys(n,t,r,i,e,u,o,f)},fe(Ys).zf=function(n,t,r,i,e,u,o,f,s){return n=n===A?this.qf_1:n,t=t===A?this.rf_1:t,r=r===A?this.sf_1:r,i=i===A?this.tf_1:i,e=e===A?this.uf_1:e,u=u===A?this.vf_1:u,o=o===A?this.wf_1:o,f=f===A?this.xf_1:f,s===A?this.yf(n,t,r,i,e,u,o,f):s.yf.call(this,n,t,r,i,e,u,o,f)},fe(Ys).toString=function(){return"Model(heading="+this.qf_1+", summary="+this.rf_1+", learnMore="+this.sf_1+", messageTree="+this.tf_1+", problemIdTree="+this.uf_1+", fileLocationTree="+this.vf_1+", problemCount="+this.wf_1+", tab="+this.xf_1+")"},fe(Ys).hashCode=function(){var n=this.qf_1.hashCode();return n=zn(n,31)+ie(this.rf_1)|0,n=zn(n,31)+this.sf_1.hashCode()|0,n=zn(n,31)+this.tf_1.hashCode()|0,n=zn(n,31)+this.uf_1.hashCode()|0,n=zn(n,31)+this.vf_1.hashCode()|0,n=zn(n,31)+this.wf_1|0,zn(n,31)+this.xf_1.hashCode()|0},fe(Ys).equals=function(n){if(this===n)return!0;if(!(n instanceof Ys))return!1;var t=n instanceof Ys?n:le();return!!(this.qf_1.equals(t.qf_1)&&ue(this.rf_1,t.rf_1)&&this.sf_1.equals(t.sf_1)&&this.tf_1.equals(t.tf_1)&&this.uf_1.equals(t.uf_1)&&this.vf_1.equals(t.vf_1)&&this.wf_1===t.wf_1&&this.xf_1.equals(t.xf_1))},fe(vc).ag=function(n,t){var r,i;return n instanceof Qs?r=t.zf(A,A,A,A,A,ls().id(n.of_1,t.vf_1)):n instanceof Vs?r=t.zf(A,A,A,A,ls().id(n.nf_1,t.uf_1)):n instanceof Us?r=t.zf(A,A,A,ls().id(n.mf_1,t.tf_1)):n instanceof pc?r=function(n,t,r,i){var e;return r instanceof Us?e=n.zf(A,A,A,gc(n.tf_1,r,i)):r instanceof Vs?e=n.zf(A,A,A,A,gc(n.uf_1,r,i)):r instanceof Qs?e=n.zf(A,A,A,A,A,gc(n.vf_1,r,i)):(console.error("Unhandled tree intent: "+r),e=n),e}(t,0,n.xc_1,(i=n,function(n){var t;if(!(n instanceof Du))throw ou(re("Failed requirement."));for(var r=n.oa_1,e=i.wc_1,u=Lr(Ct(r,10)),o=0,f=r.f();f.g();){var s,c,a=f.h(),h=o;if(o=h+1|0,e===gr(h)){var l=a.sa_1;c=a.ua(A,null==l?null:l.ad())}else c=a;s=c,u.d(s)}return t=u,n.qa(A,A,t)})):n instanceof wc?(window.navigator.clipboard.writeText(n.hd_1),r=t):n instanceof Zs?r=t.zf(A,A,A,A,A,A,A,n.pf_1):(console.error("Unhandled intent: "+n),r=t),r},fe(vc).ba=function(n,t){var r=n instanceof mc?n:le();return this.ag(r,t instanceof Ys?t:le())},fe(vc).bg=function(n){return Nf().y9(Xf(oc),[Ks(0,n),Xs(0,n)])},fe(vc).z9=function(n){return this.bg(n instanceof Ys?n:le())},fe(wc).toString=function(){return"Copy(text="+this.hd_1+")"},fe(wc).hashCode=function(){return ee(this.hd_1)},fe(wc).equals=function(n){if(this===n)return!0;if(!(n instanceof wc))return!1;var t=n instanceof wc?n:le();return this.hd_1===t.hd_1},fe(pc).toString=function(){return"ToggleStackTracePart(partIndex="+this.wc_1+", location="+this.xc_1+")"},fe(pc).hashCode=function(){var n=this.wc_1;return zn(n,31)+ie(this.xc_1)|0},fe(pc).equals=function(n){if(this===n)return!0;if(!(n instanceof pc))return!1;var t=n instanceof pc?n:le();return this.wc_1===t.wc_1&&!!ue(this.xc_1,t.xc_1)},fe(Xr).k6=function(){var n=Object.create(null);return n.foo=1,delete n.foo,hr(),n},l=null,wn=0,function(){var n=configurationCacheProblems();if(null==n.problemsReport)Sf(zf("report"),Uo(),function(n){var t,r,i,e,u,o,f,s,c,a,h=function(n){for(var t=Tr(),r=Tr(),i=Tr(),e=0,u=n.length;e<u;){var o=n[e];e=e+1|0;var f,s=o.input,c=null==s?null:r.d(Yo(s,o));if(null==c){var a=o.incompatibleTask;f=null==a?null:i.d(Yo(a,o))}else f=c;if(null==f){var h=ae(o.problem);t.d(Yo(h,o))}}return new Zo(t,r,i)}(n.diagnostics),l=n.totalProblemCount;return new po((f=(t=n).buildName,s=t.requestedTasks,c=null==s?null:Yt(s," ",A,r=r!==A&&r)>=0,a=null==c||c,yf().qd((i=t,e=f,u=s,o=a,function(n){n.ed(function(n){var t;if(Yi(n)>0){var r,i=Qi(n,0);r=function(n){return 97<=n&&n<=122||!(xi(n,128)<0)&&function(n){var t;return t=1===function(n){var t=n,r=tu(iu().h9_1,t),i=iu().h9_1[r],e=(i+iu().i9_1[r]|0)-1|0,u=iu().j9_1[r];if(t>e)return 0;var o=3&u;if(0===o){var f=2,s=i,c=0;if(c<=1)do{if(c=c+1|0,(s=s+(u>>f&127)|0)>t)return 3;if((s=s+(u>>(f=f+7|0)&127)|0)>t)return 0;f=f+7|0}while(c<=1);return 3}if(u<=7)return o;var a=t-i|0;return u>>zn(2,u<=31?a%2|0:a)&3}(n)||function(n){var t=tu(uu().k9_1,n);return t>=0&&n<(uu().k9_1[t]+uu().l9_1[t]|0)}(n),t}(n)}(i)?function(n){return function(n){var t=ji(n).toUpperCase();if(t.length>1){var r;if(329===n)r=t;else{var i=Qi(t,0),e=t.substring(1).toLowerCase();r=ji(i)+e}return r}return ji(function(n){return function(n){var t=n;return 452<=t&&t<=460||497<=t&&t<=499?Fe(zn(3,(t+1|0)/3|0)):4304<=t&&t<=4346||4349<=t&&t<=4351?n:pi(n)}(n)}(n))}(n)}(i):ji(i),t=re(r)+n.substring(1)}else t=n;return t}(i.cacheAction)+" the configuration cache for ");var t=e;null==t||n.fd(t),null==e||n.ed(" build and ");var r=u;return null==(null==r?null:n.fd(r))&&n.ed("default"),n.ed(o?" tasks":" task"),hr()}))),function(n,t){var r=n.cacheActionDescription,i=null==r?null:_f(r),e=yf().rd(function(n){var t=n.od_1.k(),r=vf(t,"build configuration input");return t>0?r+" and will cause the cache to be discarded when "+(t<=1?"its":"their")+" value change":r}(t)),u=yf().rd(function(n,t){var r=n.totalProblemCount,i=t.nd_1.k(),e=vf(r,"problem");return r>i?e+", only the first "+i+" "+gf(i)+" included in this report":e}(n,t));return function(n,t){for(var r=0,i=n.length;r<i;){var e=n[r];r=r+1|0,null!=e&&t.d(e)}return t}([i,e,u],Tr())}(n,h),new wf("Gradle Configuration Cache",n.documentationLink),ef(new Qu(Ro().qc_1),Xn(On(h.nd_1),cf)),ef(new Qu(Ho().qc_1),function(n){return Xn(On(n),af)}(h.nd_1)),ef(new Qu(Oo().qc_1),Xn(On(h.od_1),ff)),ef(new Qu($o().qc_1),Xn(On(h.pd_1),sf)),0===l?Oo():Ro())}(n));else{var t=n.problemsReport;Sf(zf("report"),dc(),function(n,t){var r=function(n){for(var t=ui(),r=0,i=n.length;r<i;){var e=n[r];r=r+1|0;var u,o=js(e),f=t.v1(o);if(null==f){var s=Tr();t.h5(o,s),u=s}else u=f;u.d(e)}for(var c=t.o(),a=Lr(Ct(c,10)),h=c.f();h.g();){for(var l,_=h.h(),v=_.i1(),d=Lr(Ct(v,10)),g=v.f();g.g();){var w;w=Ps(g.h(),null,!0),d.d(w)}var b=d,p=Dn(_.i1());l=new ms(Ss(p,new $u(zs(Is(p)).ed(" ("+_.i1().k()+")").j5())),b),a.d(l)}var m=a;return new ss(new ms(new Rs("text"),m))}(t),i=function(n){for(var t=function(){var n=Tr();return new Cs(new ms(new Hs(yf().rd("Ungrouped"),!0),n),n,ui())}(),r=ui(),i=0,e=n.length;i<e;){var u=n[i];i=i+1|0;var o=xs(r,Hn(Tn(u.problemId.slice(),1))),f=Ps(u);null==o?t.ef_1.d(f):o.ef_1.d(f)}for(var s=r.w1(),c=Lr(Ct(s,10)),a=s.f();a.g();){var h;h=a.h().df_1,c.d(h)}var l=$n(c);return l.d(t.df_1),new ss(new ms(new Rs("text"),l))}(t),e=function(n){for(var t=Tr(),r=ui(),i=0,e=n.length;i<e;){var u=n[i];i=i+1|0;var o=u.locations;if(null==o||0===o.length)t.d(Ps(u));else{var f,s=u.locations;if(null==s)f=null;else{for(var c=Tr(),a=Oi(s);a.g();){var h=a.h();null!=h.path&&c.d(h)}f=c}if(null==f);else for(var l=f.f();l.g();){var _=l.h();Bs(r,ae(_.path),u,_)}var v,d=u.locations;if(null==d)v=null;else{for(var g=Tr(),w=Oi(d);w.g();){var b=w.h();null!=b.pluginId&&g.d(b)}v=g}if(null==v);else for(var p=v.f();p.g();){var m=p.h();Bs(r,ae(m.pluginId),u,m)}var k,q=u.locations;if(null==q)k=null;else{for(var y=Tr(),B=Oi(q);B.g();){var C=B.h();null!=C.taskPath&&y.d(C)}k=y}if(null==k);else for(var x=k.f();x.g();){var j=x.h();Bs(r,ae(j.taskPath),u,j)}}}var P=function(n,t){for(var r=n.w1(),i=Lr(Ct(r,10)),e=r.f();e.g();){var u;u=e.h().t3_1,i.d(u)}var o=i;return t.i()?o:function(n,t){var r=Lr(n.k());return r.m(n),r.d(t),r}(o,new ms(new Hs(yf().rd("no location"),!0),t))}(r,t);return new ss(new ms(new Rs("text"),P))}(t);return new Ys(yf().rd("Problems Report"),function(n,t){var r,i,e,u=n.description,o=null==u?null:dr(_f(u));return r=null==o?dr(yf().qd((i=t,e=n,function(n){n.ed(i.length+" problems have been reported during the execution");var t=e.buildName;null==t||(n.ed(" of build "),n.fd(t));var r=e.requestedTasks;return null==r||(n.ed(" for the following tasks:"),n.fd(r),hr()),hr()}))):o,r}(n,t),new wf("reporting problems",n.documentationLink),r,i,e,t.length,function(n,t,r){return ho(r)>0?Os():ho(n)>0?Fs():ho(t)>0?Ds():Fs()}(r,i,e))}(t,n.diagnostics))}}(),n}(void 0===this["configuration-cache-report"]?{}:this["configuration-cache-report"])}}[70](),{}))));
+                !function(n,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports["configuration-cache-report"]=t():n["configuration-cache-report"]=t()}(this,(()=>(({70:function(){void 0===ArrayBuffer.isView&&(ArrayBuffer.isView=function(n){return null!=n&&null!=n.__proto__&&n.__proto__.__proto__===Int8Array.prototype.__proto__}),void 0===Math.imul&&(Math.imul=function(n,t){return(4294901760&n)*(65535&t)+(65535&n)*(0|t)|0}),this["configuration-cache-report"]=function(n){"use strict";var t,r,i,e,u,o,f,s,c,a,h,l,_,v,d,g,w,b,p,m,k,q,y,B,C,x,j,P,I,S,z,T,E,L,N,A,M,F,D,O,R,H,$,G,U,V,Q,Z,Y,W,K,X,J,nn,tn,rn,en,un,on,fn,sn,cn,an,hn,ln,_n,vn,dn,gn,wn,bn,pn,mn,kn,qn,yn,Bn,Cn,xn,jn,Pn,In,Sn,zn,Tn,En,Ln,Nn,An,Mn=Math.imul,Fn=ArrayBuffer.isView;function Dn(n,t){if(!(t>=0))throw _u(ce("Requested element count "+t+" is less than zero."));return function(n,t){if(!(t>=0))throw _u(ce("Requested element count "+t+" is less than zero."));if(0===t)return Ct();if(t>=n.length)return function(n){switch(n.length){case 0:return Ct();case 1:return qr(n[0]);default:return function(n){return Hr(function(n){return new It(n,!1)}(n))}(n)}}(n);if(1===t)return qr(n[0]);var r=0,i=Rr(),e=0,u=n.length;n:for(;e<u;){var o=n[e];if(e=e+1|0,i.d(o),(r=r+1|0)===t)break n}return i}(n,rt(n.length-t|0,0))}function On(n,t,r,i,e,u,o){return t=t===A?", ":t,r=r===A?"":r,i=i===A?"":i,e=e===A?-1:e,u=u===A?"...":u,o=o===A?null:o,function(n,t,r,i,e,u,o,f){r=r===A?", ":r,i=i===A?"":i,e=e===A?"":e,u=u===A?-1:u,o=o===A?"...":o,f=f===A?null:f,t.e(i);var s=0,c=0,a=n.length;n:for(;c<a;){var h=n[c];if(c=c+1|0,(s=s+1|0)>1&&t.e(r),!(u<0||s<=u))break n;Jt(t,h,f)}return u>=0&&s>u&&t.e(o),t.e(e),t}(n,Bi(),t,r,i,e,u,o).toString()}function Rn(n){return n.length-1|0}function Hn(n,t){if(null==t){var r=0,i=n.length-1|0;if(r<=i)do{var e=r;if(r=r+1|0,null==n[e])return e}while(r<=i)}else{var u=0,o=n.length-1|0;if(u<=o)do{var f=u;if(u=u+1|0,le(t,n[f]))return f}while(u<=o)}return-1}function $n(n,t,r,i,e,u,o){return t=t===A?", ":t,r=r===A?"":r,i=i===A?"":i,e=e===A?-1:e,u=u===A?"...":u,o=o===A?null:o,Gn(n,Bi(),t,r,i,e,u,o).toString()}function Gn(n,t,r,i,e,u,o,f){r=r===A?", ":r,i=i===A?"":i,e=e===A?"":e,u=u===A?-1:u,o=o===A?"...":o,f=f===A?null:f,t.e(i);var s=0,c=n.f();n:for(;c.g();){var a=c.h();if((s=s+1|0)>1&&t.e(r),!(u<0||s<=u))break n;Jt(t,a,f)}return u>=0&&s>u&&t.e(o),t.e(e),t}function Un(n){if(n.i())throw xu("List is empty.");return n.j(0)}function Vn(n){return new tt(n)}function Qn(n){if(Ke(n,Di)){var t;switch(n.k()){case 0:t=Ct();break;case 1:t=qr(Ke(n,Fi)?n.j(0):n.f().h());break;default:t=Zn(n)}return t}return xt(Xn(n))}function Zn(n){return Hr(n)}function Yn(n){if(Ke(n,Di)&&n.k()<=1)return Qn(n);var t=Xn(n);return function(n){var t=(n.k()/2|0)-1|0;if(t<0)return br();var r=jt(n),i=0;if(i<=t)do{var e=i;i=i+1|0;var u=n.j(e);n.f4(e,n.j(r)),n.f4(r,u),r=r-1|0}while(e!==t)}(t),t}function Wn(n,t){if(!(t>=0))throw _u(ce("Requested element count "+t+" is less than zero."));return function(n,t){if(!(t>=0))throw _u(ce("Requested element count "+t+" is less than zero."));if(0===t)return Ct();if(Ke(n,Di)){if(t>=n.k())return Qn(n);if(1===t)return qr(function(n){if(Ke(n,Fi))return Un(n);var t=n.f();if(!t.g())throw xu("Collection is empty.");return t.h()}(n))}var r=0,i=Rr(),e=n.f();n:for(;e.g();){var u=e.h();if(i.d(u),(r=r+1|0)===t)break n}return xt(i)}(n,rt(n.k()-t|0,0))}function Kn(n,t){if(!(t>=0))throw _u(ce("Requested element count "+t+" is less than zero."));if(0===t)return Ct();var r=n.k();if(t>=r)return Qn(n);if(1===t)return qr(Jn(n));var i=Rr();if(Ke(n,bi)){var e=r-t|0;if(e<r)do{var u=e;e=e+1|0,i.d(n.j(u))}while(e<r)}else for(var o=n.l(r-t|0);o.g();){var f=o.h();i.d(f)}return i}function Xn(n){return Ke(n,Di)?Zn(n):nt(n,Or())}function Jn(n){if(n.i())throw xu("List is empty.");return n.j(jt(n))}function nt(n,t){for(var r=n.f();r.g();){var i=r.h();t.d(i)}return t}function tt(n){this.n_1=n}function rt(n,t){return n<t?t:n}function it(n,t){return n>t?t:n}function et(n,t){return Kt().q(n,t,-1)}function ut(n,t){return new Ft(n,t)}function ot(n){var t=n.f();if(!t.g())return Ct();var r=t.h();if(!t.g())return qr(r);var i=Or();for(i.d(r);t.g();)i.d(t.h());return i}function ft(n){this.r_1=n}function st(n,t){this.s_1=n,this.t_1=t}function ct(){}function at(n){this.x_1=n,this.w_1=0}function ht(n,t){this.a1_1=n,at.call(this,n),_t().b1(t,this.a1_1.k()),this.w_1=t}function lt(){t=this}function _t(){return null==t&&new lt,t}function vt(){_t(),ct.call(this)}function dt(n){this.h1_1=n}function gt(n,t){return t===n?"(this Map)":Vi(t)}function wt(n,t){var r;n:{for(var i=n.o().f();i.g();){var e=i.h();if(le(e.j1(),t)){r=e;break n}}r=null}return r}function bt(){r=this}function pt(){return null==r&&new bt,r}function mt(n){this.q1_1=n,ct.call(this)}function kt(){pt(),this.n1_1=null,this.o1_1=null}function qt(){i=this}function yt(){return null==i&&new qt,i}function Bt(n){return n.length>0?ou(n):Ct()}function Ct(){return null==e&&new Pt,e}function xt(n){switch(n.k()){case 0:return Ct();case 1:return qr(n.j(0));default:return n}}function jt(n){return n.k()-1|0}function Pt(){e=this,this.z1_1=new ke(-1478467534,-1720727600)}function It(n,t){this.b2_1=n,this.c2_1=t}function St(){u=this}function zt(){return null==u&&new St,u}function Tt(n,t){return Ke(n,Di)?n.k():t}function Et(n,t){if(Ke(t,Di))return n.m(t);for(var r=!1,i=t.f();i.g();){var e=i.h();n.d(e)&&(r=!0)}return r}function Lt(){}function Nt(n,t){this.h2_1=n,this.g2_1=n.i2_1.l(function(n,t){if(!(0<=t&&t<=n.k()))throw du("Position index "+t+" must be in range ["+Ve(0,n.k())+"].");return n.k()-t|0}(n,t))}function At(n){vt.call(this),this.i2_1=n}function Mt(n){this.k2_1=n,this.j2_1=n.l2_1.f()}function Ft(n,t){this.l2_1=n,this.m2_1=t}function Dt(n){for(;n.n2_1.g();){var t=n.n2_1.h();if(n.q2_1.t2_1(t)===n.q2_1.s2_1)return n.p2_1=t,n.o2_1=1,br()}n.o2_1=0}function Ot(n){this.q2_1=n,this.n2_1=n.r2_1.f(),this.o2_1=-1,this.p2_1=null}function Rt(n,t,r){t=t===A||t,this.r2_1=n,this.s2_1=t,this.t2_1=r}function Ht(){return null==o&&new $t,o}function $t(){o=this,this.u2_1=new ke(1993859828,793161749)}function Gt(n,t,r){return Ut(Ut(n,r)-Ut(t,r)|0,r)}function Ut(n,t){var r=n%t|0;return r>=0?r:r+t|0}function Vt(){f=this,this.p_1=new Zt(1,0)}function Qt(){return null==f&&new Vt,f}function Zt(n,t){Qt(),Xt.call(this,n,t,1)}function Yt(n,t,r){Lt.call(this),this.d3_1=r,this.e3_1=t,this.f3_1=this.d3_1>0?n<=t:n>=t,this.g3_1=this.f3_1?n:this.e3_1}function Wt(){s=this}function Kt(){return null==s&&new Wt,s}function Xt(n,t,r){if(Kt(),0===r)throw _u("Step must be non-zero.");if(r===mr().MIN_VALUE)throw _u("Step must be greater than Int.MIN_VALUE to avoid overflow on negation.");this.z2_1=n,this.a3_1=function(n,t,r){var i;if(r>0)i=n>=t?t:t-Gt(t,n,r)|0;else{if(!(r<0))throw _u("Step is zero.");i=n<=t?t:t+Gt(n,t,0|-r)|0}return i}(n,t,r),this.b3_1=r}function Jt(n,t,r){null!=r?n.e(r(t)):null==t||nu(t)?n.e(t):t instanceof Mi?n.i3(t.h3_1):n.e(Vi(t))}function nr(n,t,r){if(n===t)return!0;if(!(r=r!==A&&r))return!1;var i=xi(n),e=xi(t);return i===e||le(new Mi(ne(Li(i).toLowerCase(),0)),new Mi(ne(Li(e).toLowerCase(),0)))}function tr(n){return re(n)-1|0}function rr(n,t,r,i){return r=r===A?0:r,(i=i!==A&&i)||"string"!=typeof n?ir(n,t,r,re(n),i):n.indexOf(t,r)}function ir(n,t,r,i,e,u){var o=(u=u!==A&&u)?et(it(r,tr(n)),rt(i,0)):Ve(rt(r,0),it(i,re(n)));if("string"==typeof n&&"string"==typeof t){var f=o.z2_1,s=o.a3_1,c=o.b3_1;if(c>0&&f<=s||c<0&&s<=f)do{var a=f;if(f=f+c|0,Ti(t,0,n,a,re(t),e))return a}while(a!==s)}else{var h=o.z2_1,l=o.a3_1,_=o.b3_1;if(_>0&&h<=l||_<0&&l<=h)do{var v=h;if(h=h+_|0,fr(t,0,n,v,re(t),e))return v}while(v!==l)}return-1}function er(n){var t=0,r=re(n)-1|0,i=!1;n:for(;t<=r;){var e=ji(ne(n,i?r:t));if(i){if(!e)break n;r=r-1|0}else e?t=t+1|0:i=!0}return ie(n,t,r+1|0)}function ur(n,t){return ce(ie(n,t.y2(),t.c3()+1|0))}function or(n,t,r,i,e){r=r===A?0:r,i=i!==A&&i,sr(e=e===A?0:e);var u,o,f=ou(t);return new hr(n,r,e,(u=f,o=i,function(n,t){var r=function(n,t,r,i){if(!i&&1===t.k()){var e=function(n){if(Ke(n,Fi))return function(n){var t;switch(n.k()){case 0:throw xu("List is empty.");case 1:t=n.j(0);break;default:throw _u("List has more than one element.")}return t}(n);var t=n.f();if(!t.g())throw xu("Collection is empty.");var r=t.h();if(t.g())throw _u("Collection has more than one element.");return r}(t),u=rr(n,e,r);return u<0?null:_r(u,e)}var o=Ve(rt(r,0),re(n));if("string"==typeof n){var f=o.z2_1,s=o.a3_1,c=o.b3_1;if(c>0&&f<=s||c<0&&s<=f)do{var a,h=f;f=f+c|0;n:{for(var l=t.f();l.g();){var _=l.h();if(Ti(_,0,n,h,_.length,i)){a=_;break n}}a=null}if(null!=a)return _r(h,a)}while(h!==s)}else{var v=o.z2_1,d=o.a3_1,g=o.b3_1;if(g>0&&v<=d||g<0&&d<=v)do{var w,b=v;v=v+g|0;n:{for(var p=t.f();p.g();){var m=p.h();if(fr(m,0,n,b,m.length,i)){w=m;break n}}w=null}if(null!=w)return _r(b,w)}while(b!==d)}return null}(n,u,t,o);return null==r?null:_r(r.t3_1,r.u3_1.length)}))}function fr(n,t,r,i,e,u){if(i<0||t<0||t>(re(n)-e|0)||i>(re(r)-e|0))return!1;var o=0;if(o<e)do{var f=o;if(o=o+1|0,!nr(ne(n,t+f|0),ne(r,i+f|0),u))return!1}while(o<e);return!0}function sr(n){if(!(n>=0))throw _u(ce("Limit must be non-negative, but was "+n))}function cr(n){if(n.l3_1<0)n.j3_1=0,n.m3_1=null;else{var t;if(n.o3_1.r3_1>0?(n.n3_1=n.n3_1+1|0,t=n.n3_1>=n.o3_1.r3_1):t=!1,t||n.l3_1>re(n.o3_1.p3_1))n.m3_1=Ve(n.k3_1,tr(n.o3_1.p3_1)),n.l3_1=-1;else{var r=n.o3_1.s3_1(n.o3_1.p3_1,n.l3_1);if(null==r)n.m3_1=Ve(n.k3_1,tr(n.o3_1.p3_1)),n.l3_1=-1;else{var i=r.v3(),e=r.w3();n.m3_1=function(n,t){return t<=mr().MIN_VALUE?Qt().p_1:Ve(n,t-1|0)}(n.k3_1,i),n.k3_1=i+e|0,n.l3_1=n.k3_1+(0===e?1:0)|0}}n.j3_1=1}}function ar(n){this.o3_1=n,this.j3_1=-1,this.k3_1=function(n,t,r){if(0>r)throw _u("Cannot coerce value to an empty range: maximum "+r+" is less than minimum 0.");return n<0?0:n>r?r:n}(n.q3_1,0,re(n.p3_1)),this.l3_1=this.k3_1,this.m3_1=null,this.n3_1=0}function hr(n,t,r,i){this.p3_1=n,this.q3_1=t,this.r3_1=r,this.s3_1=i}function lr(n,t){this.t3_1=n,this.u3_1=t}function _r(n,t){return new lr(n,t)}function vr(){}function dr(){}function gr(){}function wr(){c=this}function br(){return null==c&&new wr,c}function pr(){a=this,this.MIN_VALUE=-2147483648,this.MAX_VALUE=2147483647,this.SIZE_BYTES=4,this.SIZE_BITS=32}function mr(){return null==a&&new pr,a}function kr(n){for(var t=[],r=n.f();r.g();)t.push(r.h());return t}function qr(n){return 0===(t=[n]).length?Or():Hr(new It(t,!0));var t}function yr(n){return n<0&&function(){throw Pu("Index overflow has happened.")}(),n}function Br(n){return void 0!==n.toArray?n.toArray():kr(n)}function Cr(n){return function(n,t){for(var r=0,i=n.length;r<i;){var e=n[r];r=r+1|0,t.d(e)}return t}(t=[n],(r=t.length,i=de(ve(ni)),function(n,t,r){Mr.call(r),ni.call(r),r.y5_1=function(n){return Kr(n,0,de(ve(Xr)))}(n)}(r,0,i),i));var t,r,i}function xr(){ct.call(this)}function jr(n){this.j4_1=n,this.h4_1=0,this.i4_1=-1}function Pr(n,t){this.n4_1=n,jr.call(this,n),_t().b1(t,this.n4_1.k()),this.h4_1=t}function Ir(){xr.call(this),this.o4_1=0}function Sr(n){this.r4_1=n}function zr(n){this.s4_1=n}function Tr(n,t){this.t4_1=n,this.u4_1=t}function Er(){Mr.call(this)}function Lr(n){this.x4_1=n,Mr.call(this)}function Nr(n){this.e5_1=n,xr.call(this)}function Ar(){kt.call(this),this.c5_1=null,this.d5_1=null}function Mr(){xr.call(this)}function Fr(){h=this;var n=Rr();n.c_1=!0,this.i5_1=n}function Dr(){return null==h&&new Fr,h}function Or(){return n=de(ve(Gr)),t=[],Gr.call(n,t),n;var n,t}function Rr(n){return t=de(ve(Gr)),r=[],Gr.call(t,r),t;var t,r}function Hr(n){return function(n,t){var r;return r=Br(n),Gr.call(t,r),t}(n,de(ve(Gr)))}function $r(n,t){return _t().e1(t,n.k()),t}function Gr(n){Dr(),Ir.call(this),this.b_1=n,this.c_1=!1}function Ur(n,t,r,i,e){if(r===i)return n;var u=(r+i|0)/2|0,o=Ur(n,t,r,u,e),f=Ur(n,t,u+1|0,i,e),s=o===t?n:t,c=r,a=u+1|0,h=r;if(h<=i)do{var l=h;if(h=h+1|0,c<=u&&a<=i){var _=o[c],v=f[a];e.compare(_,v)<=0?(s[l]=_,c=c+1|0):(s[l]=v,a=a+1|0)}else c<=u?(s[l]=o[c],c=c+1|0):(s[l]=f[a],a=a+1|0)}while(l!==i);return s}function Vr(n,t){return(3&n)-(3&t)|0}function Qr(){_=this}function Zr(n){this.n5_1=n,Er.call(this)}function Yr(n){return function(n,t){Ar.call(t),Xr.call(t),t.t5_1=n,t.u5_1=n.w5()}(new ui((null==_&&new Qr,_)),n),n}function Wr(){return Yr(de(ve(Xr)))}function Kr(n,t,r){if(Yr(r),!(n>=0))throw _u(ce("Negative initial capacity: "+n));if(!(t>=0))throw _u(ce("Non-positive load factor: "+t));return r}function Xr(){this.v5_1=null}function Jr(n,t){return Mr.call(t),ni.call(t),t.y5_1=n,t}function ni(){}function ti(n,t){var r=ii(n,n.h6_1.m5(t));if(null==r)return null;var i=r;if(null!=i&&Xe(i))return ri(i,n,t);var e=i;return n.h6_1.l5(e.j1(),t)?e:null}function ri(n,t,r){var i;n:{for(var e=0,u=n.length;e<u;){var o=n[e];if(e=e+1|0,t.h6_1.l5(o.j1(),r)){i=o;break n}}i=null}return i}function ii(n,t){var r=n.i6_1[t];return void 0===r?null:r}function ei(n){this.g6_1=n,this.z5_1=-1,this.a6_1=Object.keys(n.i6_1),this.b6_1=-1,this.c6_1=null,this.d6_1=!1,this.e6_1=-1,this.f6_1=null}function ui(n){this.h6_1=n,this.i6_1=this.k6(),this.j6_1=0}function oi(){}function fi(n){this.n6_1=n,this.l6_1=null,this.m6_1=null,this.m6_1=this.n6_1.y6_1.v6_1}function si(){v=this;var n,t=(_i(0,0,n=de(ve(vi))),n);t.x6_1=!0,this.e7_1=t}function ci(){return null==v&&new si,v}function ai(n,t,r){this.d7_1=n,Tr.call(this,t,r),this.b7_1=null,this.c7_1=null}function hi(n){this.y6_1=n,Er.call(this)}function li(){return Yr(n=de(ve(vi))),vi.call(n),n.w6_1=Wr(),n;var n}function _i(n,t,r){return Kr(n,t,r),vi.call(r),r.w6_1=Wr(),r}function vi(){ci(),this.v6_1=null,this.x6_1=!1}function di(){d=this;var n=gi(0),t=n.y5_1;(t instanceof vi?t:pe()).j5(),this.f7_1=n}function gi(n){return function(n,t){return function(n,t,r){Jr(function(n,t){return _i(n,t,de(ve(vi)))}(n,t),r),wi.call(r)}(n,0,t),t}(n,de(ve(wi)))}function wi(){null==d&&new di}function bi(){}function pi(){}function mi(n){pi.call(this),this.k7_1=n}function ki(){qi.call(this)}function qi(){pi.call(this),this.m7_1=""}function yi(){if(!w){w=!0;var n="undefined"!=typeof process&&process.versions&&!!process.versions.node;g=n?new mi(process.stdout):new ki}}function Bi(){return n=de(ve(Ci)),Ci.call(n,""),n;var n}function Ci(n){this.o7_1=void 0!==n?n:""}function xi(n){var t=Li(n).toUpperCase();return t.length>1?n:ne(t,0)}function ji(n){return function(n){return 9<=n&&n<=13||28<=n&&n<=32||160===n||n>4096&&(5760===n||8192<=n&&n<=8202||8232===n||8233===n||8239===n||8287===n||12288===n)}(n)}function Pi(){b=this,this.q7_1=new RegExp("[\\\\^$*+?.()|[\\]{}]","g"),this.r7_1=new RegExp("[\\\\$]","g"),this.s7_1=new RegExp("\\$","g")}function Ii(){return null==b&&new Pi,b}function Si(n,t){Ii(),this.v7_1=n,this.w7_1=function(n){if(Ke(n,Di)){var t;switch(n.k()){case 0:t=Ht();break;case 1:t=Cr(Ke(n,Fi)?n.j(0):n.f().h());break;default:t=nt(n,gi(n.k()))}return t}return function(n){switch(n.k()){case 0:return Ht();case 1:return Cr(n.f().h());default:return n}}(nt(n,(r=de(ve(wi)),Jr(li(),r),wi.call(r),r)));var r}(t),this.x7_1=new RegExp(n,$n(t,"","gu",A,A,A,zi)),this.y7_1=null,this.z7_1=null}function zi(n){return n.d8_1}function Ti(n,t,r,i,e,u){return fr(n,t,r,i,e,u=u!==A&&u)}function Ei(n,t){return n-t|0}function Li(n){return String.fromCharCode(n)}function Ni(){p=this,this.e8_1=0,this.f8_1=65535,this.g8_1=55296,this.h8_1=56319,this.i8_1=56320,this.j8_1=57343,this.k8_1=55296,this.l8_1=57343,this.m8_1=2,this.n8_1=16}function Ai(){return null==p&&new Ni,p}function Mi(n){Ai(),this.h3_1=n}function Fi(){}function Di(){}function Oi(){}function Ri(){}function Hi(){}function $i(){}function Gi(){m=this}function Ui(n,t){null==m&&new Gi,this.p8_1=n,this.q8_1=t}function Vi(n){var t=null==n?null:ce(n);return null==t?"null":t}function Qi(n){return new Zi(n)}function Zi(n){this.t8_1=n,this.s8_1=0}function Yi(){return Ji(),k}function Wi(){return Ji(),q}function Ki(){return Ji(),y}function Xi(){return Ji(),B}function Ji(){x||(x=!0,k=new ArrayBuffer(8),q=new Float64Array(Yi()),new Float32Array(Yi()),y=new Int32Array(Yi()),Wi()[0]=-1,B=0!==Ki()[0]?1:0,C=1-Xi()|0)}function ne(n,t){var r;if(te(n)){var i,e=n.charCodeAt(t);if(Ai(),e<0?i=!0:(Ai(),i=e>65535),i)throw _u("Invalid Char code: "+e);r=Ue(e)}else r=n.y3(t);return r}function te(n){return"string"==typeof n}function re(n){return te(n)?n.length:n.x3()}function ie(n,t,r){return te(n)?n.substring(t,r):n.z3(t,r)}function ee(n){return ce(n)}function ue(n,t){var r;switch(typeof n){case"number":r="number"==typeof t?oe(n,t):t instanceof ke?oe(n,t.w8()):fe(n,t);break;case"string":case"boolean":r=fe(n,t);break;default:r=function(n,t){return n.a4(t)}(n,t)}return r}function oe(n,t){var r;if(n<t)r=-1;else if(n>t)r=1;else if(n===t){var i;if(0!==n)i=0;else{var e=1/n;i=e===1/t?0:e<0?-1:1}r=i}else r=n!=n?t!=t?0:1:-1;return r}function fe(n,t){return n<t?-1:n>t?1:0}function se(n){if(!("kotlinHashCodeValue$"in n)){var t=4294967296*Math.random()|0,r=new Object;r.value=t,r.enumerable=!1,Object.defineProperty(n,"kotlinHashCodeValue$",r)}return n.kotlinHashCodeValue$}function ce(n){return null==n?"null":function(n){return!!Ye(n)||Fn(n)}(n)?"[...]":n.toString()}function ae(n){if(null==n)return 0;var t;switch(typeof n){case"object":t="function"==typeof n.hashCode?n.hashCode():se(n);break;case"function":t=se(n);break;case"number":t=function(n){return Ji(),(0|n)===n?Ge(n):(Wi()[0]=n,Mn(Ki()[(Ji(),C)],31)+Ki()[Xi()]|0)}(n);break;case"boolean":t=n?1:0;break;default:t=he(String(n))}return t}function he(n){var t=0,r=0,i=n.length-1|0;if(r<=i)do{var e=r;r=r+1|0;var u=n.charCodeAt(e);t=Mn(t,31)+u|0}while(e!==i);return t}function le(n,t){return null==n?null==t:null!=t&&("object"==typeof n&&"function"==typeof n.equals?n.equals(t):n!=n?t!=t:"number"==typeof n&&"number"==typeof t?n===t&&(0!==n||1/n==1/t):n===t)}function _e(n,t){null!=Error.captureStackTrace?Error.captureStackTrace(n,t):n.stack=(new Error).stack}function ve(n){return n.prototype}function de(n){return Object.create(n)}function ge(n,t,r){Error.call(n),function(n,t,r){var i=eu(Object.getPrototypeOf(n));if(!(1&i)){var e;if(null==t){var u;if(null!==t){var o=null==r?null:r.toString();u=null==o?A:o}else u=A;e=u}else e=t;n.message=e}2&i||(n.cause=r),n.name=Object.getPrototypeOf(n).constructor.name}(n,t,r)}function we(n){var t;return null==n?function(){throw Eu()}():t=n,t}function be(){throw Nu()}function pe(){throw Mu()}function me(){j=this,this.x8_1=new ke(0,-2147483648),this.y8_1=new ke(-1,2147483647),this.z8_1=8,this.a9_1=64}function ke(n,t){null==j&&new me,gr.call(this),this.u8_1=n,this.v8_1=t}function qe(){return $e(),P}function ye(){return $e(),I}function Be(){return $e(),S}function Ce(){return $e(),T}function xe(){return $e(),E}function je(n,t){if($e(),Te(n,t))return 0;var r=Ne(n),i=Ne(t);return r&&!i?-1:!r&&i?1:Ne(Ie(n,t))?-1:1}function Pe(n,t){$e();var r=n.v8_1>>>16|0,i=65535&n.v8_1,e=n.u8_1>>>16|0,u=65535&n.u8_1,o=t.v8_1>>>16|0,f=65535&t.v8_1,s=t.u8_1>>>16|0,c=0,a=0,h=0,l=0;return c=(c=c+((a=(a=a+((h=(h=h+((l=l+(u+(65535&t.u8_1)|0)|0)>>>16|0)|0)+(e+s|0)|0)>>>16|0)|0)+(i+f|0)|0)>>>16|0)|0)+(r+o|0)|0,new ke((h&=65535)<<16|(l&=65535),(c&=65535)<<16|(a&=65535))}function Ie(n,t){return $e(),Pe(n,t.e9())}function Se(n,t){if($e(),Ae(n))return qe();if(Ae(t))return qe();if(Te(n,Ce()))return Me(t)?Ce():qe();if(Te(t,Ce()))return Me(n)?Ce():qe();if(Ne(n))return Ne(t)?Se(Fe(n),Fe(t)):Fe(Se(Fe(n),t));if(Ne(t))return Fe(Se(n,Fe(t)));if(De(n,xe())&&De(t,xe()))return Oe(ze(n)*ze(t));var r=n.v8_1>>>16|0,i=65535&n.v8_1,e=n.u8_1>>>16|0,u=65535&n.u8_1,o=t.v8_1>>>16|0,f=65535&t.v8_1,s=t.u8_1>>>16|0,c=65535&t.u8_1,a=0,h=0,l=0,_=0;return l=l+((_=_+Mn(u,c)|0)>>>16|0)|0,_&=65535,h=(h=h+((l=l+Mn(e,c)|0)>>>16|0)|0)+((l=(l&=65535)+Mn(u,s)|0)>>>16|0)|0,l&=65535,a=(a=(a=a+((h=h+Mn(i,c)|0)>>>16|0)|0)+((h=(h&=65535)+Mn(e,s)|0)>>>16|0)|0)+((h=(h&=65535)+Mn(u,f)|0)>>>16|0)|0,h&=65535,a=a+(((Mn(r,c)+Mn(i,s)|0)+Mn(e,f)|0)+Mn(u,o)|0)|0,new ke(l<<16|_,(a&=65535)<<16|h)}function ze(n){return $e(),4294967296*n.v8_1+function(n){return $e(),n.u8_1>=0?n.u8_1:4294967296+n.u8_1}(n)}function Te(n,t){return $e(),n.v8_1===t.v8_1&&n.u8_1===t.u8_1}function Ee(n,t){if($e(),t<2||36<t)throw mu("radix out of range: "+t);if(Ae(n))return"0";if(Ne(n)){if(Te(n,Ce())){var r=Le(t),i=n.d9(r),e=Ie(Se(i,r),n).g9();return Ee(i,t)+e.toString(t)}return"-"+Ee(Fe(n),t)}for(var u=2===t?31:t<=10?9:t<=21?7:t<=35?6:5,o=Oe(Math.pow(t,u)),f=n,s="";;){var c=f.d9(o),a=Ie(f,Se(c,o)).g9().toString(t);if(Ae(f=c))return a+s;for(;a.length<u;)a="0"+a;s=a+s}}function Le(n){return $e(),new ke(n,n<0?-1:0)}function Ne(n){return $e(),n.v8_1<0}function Ae(n){return $e(),0===n.v8_1&&0===n.u8_1}function Me(n){return $e(),!(1&~n.u8_1)}function Fe(n){return $e(),n.e9()}function De(n,t){return $e(),je(n,t)<0}function Oe(n){if($e(),(t=n)!=t)return qe();if(n<=-0x8000000000000000)return Ce();if(n+1>=0x8000000000000000)return $e(),z;if(n<0)return Fe(Oe(-n));var t,r=4294967296;return new ke(n%r|0,n/r|0)}function Re(n,t){return $e(),je(n,t)>0}function He(n,t){return $e(),je(n,t)>=0}function $e(){L||(L=!0,P=Le(0),I=Le(1),S=Le(-1),z=new ke(-1,2147483647),T=new ke(0,-2147483648),E=Le(16777216))}function Ge(n){return n instanceof ke?n.g9():function(n){return n>2147483647?2147483647:n<-2147483648?-2147483648:0|n}(n)}function Ue(n){var t;return t=function(n){return n<<16>>16}(Ge(n)),function(n){return 65535&n}(t)}function Ve(n,t){return new Zt(n,t)}function Qe(n,t,r,i){return Ze("class",n,t,r,i,null)}function Ze(n,t,r,i,e,u){return{kind:n,simpleName:t,associatedObjectKey:r,associatedObjects:i,suspendArity:e,$kClass$:A,iid:u}}function Ye(n){return Array.isArray(n)}function We(n,t,r,i,e,u,o,f){null!=i&&(n.prototype=Object.create(i.prototype),n.prototype.constructor=n);var s=r(t,u,o,null==f?[]:f);n.$metadata$=s,null!=e&&((null!=s.iid?n:n.prototype).$imask$=function(n){for(var t=1,r=[],i=0,e=n.length;i<e;){var u=n[i];i=i+1|0;var o=t,f=u.prototype.$imask$,s=null==f?u.$imask$:f;null!=s&&(r.push(s),o=s.length);var c=u.$metadata$.iid,a=null==c?null:(l=void 0,v=1<<(31&(h=c)),(l=new Int32Array(1+(h>>5)|0))[_=h>>5]=l[_]|v,l);null!=a&&(r.push(a),o=Math.max(o,a.length)),o>t&&(t=o)}var h,l,_,v;return function(n,t){for(var r=0,i=new Int32Array(n);r<n;){for(var e=r,u=0,o=0,f=t.length;o<f;){var s=t[o];o=o+1|0,e<s.length&&(u|=s[e])}i[e]=u,r=r+1|0}return i}(t,r)}(e))}function Ke(n,t){return function(n,t){var r=n.$imask$;return null!=r&&function(n,t){var r=t>>5;if(r>n.length)return!1;var i=1<<(31&t);return!!(n[r]&i)}(r,t)}(n,t.$metadata$.iid)}function Xe(n){return!!Ye(n)&&!n.$type$}function Je(n){var t;switch(typeof n){case"string":case"number":case"boolean":case"function":t=!0;break;default:t=n instanceof Object}return t}function nu(n){return"string"==typeof n||Ke(n,vr)}function tu(n,t,r,i){return Ze("interface",n,t,r,i,(null==N&&(N=0),N=ru()+1|0,ru()))}function ru(){if(null!=N)return N;!function(){throw Du("lateinit property iid has not been initialized")}()}function iu(n,t,r,i){return Ze("object",n,t,r,i,null)}function eu(n){var t=n.constructor,r=null==t?null:t.$metadata$,i=null==r?null:r.errorInfo;if(null!=i)return i;var e,u=0;if(uu(n,"message")&&(u|=1),uu(n,"cause")&&(u|=2),3!==u){var o=(e=n,Object.getPrototypeOf(e));o!=Error.prototype&&(u|=eu(o))}return null!=r&&(r.errorInfo=u),u}function uu(n,t){return n.hasOwnProperty(t)}function ou(n){return new Gr(n)}function fu(n,t,r){for(var i=new Int32Array(r),e=0,u=0,o=0,f=0,s=n.length;f<s;){var c=ne(n,f);f=f+1|0;var a=t[c];if(u|=(31&a)<<o,a<32){var h=e;e=h+1|0,i[h]=u,u=0,o=0}else o=o+5|0}return i}function su(n,t){for(var r=0,i=n.length-1|0,e=-1,u=0;r<=i;)if(t>(u=n[e=(r+i|0)/2|0]))r=e+1|0;else{if(t===u)return e;i=e-1|0}return e-(t<u?1:0)|0}function cu(){M=this;var n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",t=new Int32Array(128),r=0,i=re(n)-1|0;if(r<=i)do{var e=r;r=r+1|0,t[ne(n,e)]=e}while(r<=i);var u=fu("hCgBpCQGYHZH5BRpBPPPPPPRMP5BPPlCPP6BkEPPPPcPXPzBvBrB3BOiDoBHwD+E3DauCnFmBmB2D6E1BlBTiBmBlBP5BhBiBrBvBjBqBnBPRtBiCmCtBlB0BmB5BiB7BmBgEmChBZgCoEoGVpBSfRhBPqKQ2BwBYoFgB4CJuTiEvBuCuDrF5DgEgFlJ1DgFmBQtBsBRGsB+BPiBlD1EIjDPRPPPQPPPPPGQSQS/DxENVNU+B9zCwBwBPPCkDPNnBPqDYY1R8B7FkFgTgwGgwUwmBgKwBuBScmEP/BPPPPPPrBP8B7F1B/ErBqC6B7BiBmBfQsBUwCw/KwqIwLwETPcPjQgJxFgBlBsD",t,222),o=new Int32Array(u.length),f=0,s=u.length-1|0;if(f<=s)do{var c=f;f=f+1|0,o[c]=0===c?u[c]:o[c-1|0]+u[c]|0}while(f<=s);this.h9_1=o,this.i9_1=fu("aaMBXHYH5BRpBPPPPPPRMP5BPPlCPPzBDOOPPcPXPzBvBjB3BOhDmBBpB7DoDYxB+EiBP1DoExBkBQhBekBPmBgBhBctBiBMWOOXhCsBpBkBUV3Ba4BkB0DlCgBXgBtD4FSdBfPhBPpKP0BvBXjEQ2CGsT8DhBtCqDpFvD1D3E0IrD2EkBJrBDOBsB+BPiBlB1EIjDPPPPPPPPPPPGPPMNLsBNPNPKCvBvBPPCkDPBmBPhDXXgD4B6FzEgDguG9vUtkB9JcuBSckEP/BPPPPPPBPf4FrBjEhBpC3B5BKaWPrBOwCk/KsCuLqDHPbPxPsFtEaaqDL",t,222),this.j9_1=fu("GFjgggUHGGFFZZZmzpz5qB6s6020B60ptltB6smt2sB60mz22B1+vv+8BZZ5s2850BW5q1ymtB506smzBF3q1q1qB1q1q1+Bgii4wDTm74g3KiggxqM60q1q1Bq1o1q1BF1qlrqrBZ2q5wprBGFZWWZGHFsjiooLowgmOowjkwCkgoiIk7ligGogiioBkwkiYkzj2oNoi+sbkwj04DghhkQ8wgiYkgoioDsgnkwC4gikQ//v+85BkwvoIsgoyI4yguI0whiwEowri4CoghsJowgqYowgm4DkwgsY/nwnzPowhmYkg6wI8yggZswikwHgxgmIoxgqYkwgk4DkxgmIkgoioBsgssoBgzgyI8g9gL8g9kI0wgwJoxgkoC0wgioFkw/wI0w53iF4gioYowjmgBHGq1qkgwBF1q1q8qBHwghuIwghyKk0goQkwgoQk3goQHGFHkyg0pBgxj6IoinkxDswno7Ikwhz9Bo0gioB8z48Rwli0xN0mpjoX8w78pDwltoqKHFGGwwgsIHFH3q1q16BFHWFZ1q10q1B2qlwq1B1q10q1B2q1yq1B6q1gq1Biq1qhxBir1qp1Bqt1q1qB1g1q1+B//3q16B///q1qBH/qlqq9Bholqq9B1i00a1q10qD1op1HkwmigEigiy6Cptogq1Bixo1kDq7/j00B2qgoBWGFm1lz50B6s5q1+BGWhggzhwBFFhgk4//Bo2jigE8wguI8wguI8wgugUog1qoB4qjmIwwi2KgkYHHH4lBgiFWkgIWoghssMmz5smrBZ3q1y50B5sm7gzBtz1smzB5smz50BqzqtmzB5sgzqzBF2/9//5BowgoIwmnkzPkwgk4C8ys65BkgoqI0wgy6FghquZo2giY0ghiIsgh24B4ghsQ8QF/v1q1OFs0O8iCHHF1qggz/B8wg6Iznv+//B08QgohsjK0QGFk7hsQ4gB",t,222)}function au(){return null==M&&new cu,M}function hu(){F=this,this.k9_1=new Int32Array([170,186,688,704,736,837,890,7468,7544,7579,8305,8319,8336,8560,9424,11388,42652,42864,43e3,43868]),this.l9_1=new Int32Array([1,1,9,2,5,1,1,63,1,37,1,1,13,16,26,2,2,1,2,4])}function lu(){return null==F&&new hu,F}function _u(n){var t=function(n,t){return yu(n,t),vu.call(t),t}(n,de(ve(vu)));return _e(t,_u),t}function vu(){_e(this,vu)}function du(n){var t=function(n,t){return yu(n,t),gu.call(t),t}(n,de(ve(gu)));return _e(t,du),t}function gu(){_e(this,gu)}function wu(n){var t=function(n,t){return yu(n,t),bu.call(t),t}(n,de(ve(bu)));return _e(t,wu),t}function bu(){_e(this,bu)}function pu(n,t){return ge(t,n),ku.call(t),t}function mu(n){var t=pu(n,de(ve(ku)));return _e(t,mu),t}function ku(){_e(this,ku)}function qu(n){return function(n){ge(n),ku.call(n)}(n),Bu.call(n),n}function yu(n,t){return pu(n,t),Bu.call(t),t}function Bu(){_e(this,Bu)}function Cu(){var n,t=(qu(n=de(ve(ju))),ju.call(n),n);return _e(t,Cu),t}function xu(n){var t=function(n,t){return yu(n,t),ju.call(t),t}(n,de(ve(ju)));return _e(t,xu),t}function ju(){_e(this,ju)}function Pu(n){var t=function(n,t){return yu(n,t),Iu.call(t),t}(n,de(ve(Iu)));return _e(t,Pu),t}function Iu(){_e(this,Iu)}function Su(){var n,t=(qu(n=de(ve(Tu))),Tu.call(n),n);return _e(t,Su),t}function zu(n){var t=function(n,t){return yu(n,t),Tu.call(t),t}(n,de(ve(Tu)));return _e(t,zu),t}function Tu(){_e(this,Tu)}function Eu(){var n,t=(qu(n=de(ve(Lu))),Lu.call(n),n);return _e(t,Eu),t}function Lu(){_e(this,Lu)}function Nu(){var n,t=(qu(n=de(ve(Au))),Au.call(n),n);return _e(t,Nu),t}function Au(){_e(this,Au)}function Mu(){var n,t=(qu(n=de(ve(Fu))),Fu.call(n),n);return _e(t,Mu),t}function Fu(){_e(this,Fu)}function Du(n){var t=function(n,t){return yu(n,t),Ou.call(t),t}(n,de(ve(Ou)));return _e(t,Du),t}function Ou(){_e(this,Ou)}function Ru(n,t){var r,i=n.className;return(r="(^|.*\\s+)"+t+"($|\\s+.*)",function(n,t){return Si.call(t,n,Ht()),t}(r,de(ve(Si)))).a8(i)}function Hu(n,t){this.o9_1=n,this.p9_1=t}function $u(n){this.q9_1=n}function Gu(n,t,r){var i,e=Gf(),u=ro(),o=$f().ga(t),f=ro();if(0===re(r))i=Of();else{var s=n.ia_1,c=null==s?null:new $u(s).v9(r,"Copy reference to the clipboard");i=null==c?Of():c}return e.ja([u,o,f,i])}function Uu(n){n=n===A?null:n,this.ia_1=n}function Vu(n,t,r){to.call(this),this.ma_1=n,this.na_1=t,this.oa_1=r}function Qu(n,t){this.ra_1=n,this.sa_1=t}function Zu(n,t){to.call(this),this.va_1=n,this.wa_1=t}function Yu(n,t){to.call(this),this.xa_1=n,this.ya_1=t}function Wu(n){to.call(this),this.za_1=n}function Ku(n){to.call(this),this.ab_1=n}function Xu(n){to.call(this),this.bb_1=n}function Ju(n,t){to.call(this),this.cb_1=n,this.db_1=t}function no(n){to.call(this),this.eb_1=n}function to(){}function ro(){return so(),D}function io(){return so(),O}function eo(){return so(),R}function uo(){return so(),H}function oo(n){return so(),Gf().fb(us(fo),n)}function fo(n){return so(),n.gb(["invisible-text","text-for-copy"]),br()}function so(){$||($=!0,D=oo("`"),O=oo(" "),R=oo("("),H=oo(")"))}function co(n,t){to.call(this),this.hb_1=n,this.ib_1=t}function ao(n){to.call(this),this.jb_1=n}function ho(n,t){to.call(this),this.kb_1=n,this.lb_1=t}function lo(n){to.call(this),this.mb_1=n}function _o(n){to.call(this),this.nb_1=n}function vo(n){to.call(this),this.ob_1=n}function go(n,t,r){to.call(this),this.pb_1=n,this.qb_1=t,this.rb_1=r}function wo(n){to.call(this),this.sb_1=n}function bo(n){to.call(this),this.tb_1=n}function po(n){return n.xb_1.vb_1.k()}function mo(){if(Z)return br();Z=!0,G=new jo("Inputs",0,"Build configuration inputs"),U=new jo("ByMessage",1,"Problems grouped by message"),V=new jo("ByLocation",2,"Problems grouped by location"),Q=new jo("IncompatibleTasks",3,"Incompatible tasks")}function ko(n){Fc.call(this),this.yb_1=n}function qo(n){Fc.call(this),this.ac_1=n}function yo(n){Fc.call(this),this.bc_1=n}function Bo(n){Fc.call(this),this.cc_1=n}function Co(n){Po.call(this),this.dc_1=n}function xo(n,t,r,i,e,u,o,f){this.ec_1=n,this.fc_1=t,this.gc_1=r,this.hc_1=i,this.ic_1=e,this.jc_1=u,this.kc_1=o,this.lc_1=f}function jo(n,t,r){Ui.call(this,n,t),this.qc_1=r}function Po(){Oc.call(this)}function Io(n,t){var r=Hf(),i=us(Oo),e=Hf().y9(us(Ro),[]),u=function(n,t){var r,i=Hf(),e=us(Vo),u=Gf().ga("Learn more about the "),o=Yf();return i.y9(e,[u,o.fb(us((r=t,function(n){return n.bd(r.tc_1),br()})),t.sc_1),Gf().ga(".")])}(0,t.gc_1),o=Hf().y9(us(Ho),[zo(0,t)]),f=Hf();return r.y9(i,[e,u,o,f.y9(us($o),[No(0,Qo(),t.lc_1,po(t.jc_1)),No(0,Zo(),t.lc_1,po(t.hc_1)),No(0,Yo(),t.lc_1,po(t.ic_1)),No(0,Wo(),t.lc_1,po(t.kc_1))])])}function So(n,t){var r,i,e=Hf(),u=us(Go);switch(t.lc_1.q8_1){case 0:r=Mo(0,t.jc_1,((i=function(n){return new yo(n)}).callableName="<init>",i));break;case 3:r=Mo(0,t.kc_1,function(){var n=function(n){return new Bo(n)};return n.callableName="<init>",n}());break;case 1:r=Mo(0,t.hc_1,function(){var n=function(n){return new qo(n)};return n.callableName="<init>",n}());break;case 2:r=Mo(0,t.ic_1,function(){var n=function(n){return new ko(n)};return n.callableName="<init>",n}());break;default:be()}return e.y9(u,[r])}function zo(n,t){return Hf().ja([Lo(0,t),To(0,t)])}function To(n,t){for(var r=Hf(),i=t.fc_1,e=Or(),u=0,o=i.f();o.g();){var f=o.h(),s=u;u=s+1|0,Et(e,0===yr(s)?qr(Eo(Xo(),f)):Bt([Wf().ja([]),Eo(Xo(),f)]))}return r.ha(e)}function Eo(n,t){return Uf().ja([Uc(t)])}function Lo(n,t){return Rf().ja([$c().ka(t.ec_1)])}function No(n,t,r,i){var e,u,o;return Hf().y9(us((e=i,u=t,o=r,function(n){return n.t9("group-selector"),0===e?(n.t9("group-selector--disabled"),br()):u.equals(o)?(n.t9("group-selector--active"),br()):(n.u9(function(n){return function(t){return new Co(n)}}(u)),br()),br()})),[Gf().rc(t.qc_1,[Ao(0,i)])])}function Ao(n,t){return Gf().y9(us(Uo),[io(),eo(),Gf().ga(""+t),uo()])}function Mo(n,t,r){return function(n,t,r){var i,e=Hf(),u=Vf();return e.ja([u.ha(Ps(t,(i=r,function(n){var t,r=n.cd().ub_1;return r instanceof Zu?Kc(i,(Xo(),(t=function(n){return Fo(0,n)}).callableName="viewNode",t),n,r.va_1,r.wa_1,Rc()):r instanceof Yu?Kc(i,function(){var n=function(n){return Fo(0,n)};return n.callableName="viewNode",n}(Xo()),n,r.xa_1,r.ya_1,Hc()):r instanceof co?Kc(i,function(){var n=function(n){return Fo(0,n)};return n.callableName="viewNode",n}(Xo()),n,r.hb_1,r.ib_1,A,Ao(Xo(),n.cd().vb_1.k())):r instanceof Vu?Wc(i,n,r):Kc(i,function(){var n=function(n){return Fo(0,n)};return n.callableName="viewNode",n}(Xo()),n,r)})))])}(0,t.xb_1.uc().vc(),r)}function Fo(n,t){var r;return t instanceof ao?Vc((r=t,function(n){return n.ed("project "),n.fd(r.jb_1),br()})):t instanceof go?Vc(function(n){return function(t){return t.ed(n.pb_1+" "),t.fd(n.qb_1),t.ed(" of "),t.fd(n.rb_1),br()}}(t)):t instanceof vo?Vc(function(n){return function(t){return t.ed("system property "),t.fd(n.ob_1),br()}}(t)):t instanceof ho?Vc(function(n){return function(t){return t.ed("task "),t.fd(n.kb_1),t.ed(" of type "),t.fd(n.lb_1),br()}}(t)):t instanceof _o?Vc(function(n){return function(t){return t.ed("bean of type "),t.fd(n.nb_1),br()}}(t)):t instanceof wo?Vc(function(n){return function(t){return t.ed(n.sb_1),br()}}(t)):t instanceof bo?Vc(function(n){return function(t){return t.ed("class "),t.fd(n.tb_1),br()}}(t)):t instanceof no?Vc(function(n){return function(t){return t.ed(n.eb_1),br()}}(t)):t instanceof Wu?Uc(t.za_1):t instanceof Ju?Jo(t):Gf().ga(ce(t))}function Do(n){return n.t9("report-wrapper"),br()}function Oo(n){return n.t9("header"),br()}function Ro(n){return n.t9("gradle-logo"),br()}function Ho(n){return n.t9("title"),br()}function $o(n){return n.t9("groups"),br()}function Go(n){return n.t9("content"),br()}function Uo(n){return n.t9("group-selector__count"),br()}function Vo(n){return n.t9("learn-more"),br()}function Qo(){return mo(),G}function Zo(){return mo(),U}function Yo(){return mo(),V}function Wo(){return mo(),Q}function Ko(){Y=this}function Xo(){return null==Y&&new Ko,Y}function Jo(n){var t;return Yf().fb(us((t=n,function(n){return n.t9("documentation-button"),n.bd(t.cb_1),br()})),n.db_1)}function nf(n,t,r){this.kd_1=n,this.ld_1=t,this.md_1=r}function tf(n,t,r){this.nd_1=n,this.od_1=t,this.pd_1=r}function rf(n,t){for(var r=mf(n),i=t.trace,e=Rr(i.length),u=0,o=i.length;u<o;){var f,s=i[u];u=u+1|0,f=of(s),e.d(f)}return new nf(t,r,e)}function ef(n,t){var r,i=null==(r=t.kd_1.error)?null:ff(r);null==i||n.d(i)}function uf(n){return function(n,t,r){var i=null==n.error?null:new Zu(t,r);return null==i?new Yu(t,r):i}(n.kd_1,new Wu(n.ld_1),af(n.kd_1))}function of(n){var t;switch(n.kind){case"Project":t=new ao(n.path);break;case"Task":t=new ho(n.path,n.type);break;case"TaskPath":t=new lo(n.path);break;case"Bean":t=new _o(n.type);break;case"Field":t=new go("field",n.name,n.declaringType);break;case"InputProperty":t=new go("input property",n.name,n.task);break;case"OutputProperty":t=new go("output property",n.name,n.task);break;case"SystemProperty":t=new vo(n.name);break;case"PropertyUsage":t=new go("property",n.name,n.from);break;case"BuildLogic":t=new wo(n.location);break;case"BuildLogicClass":t=new bo(n.type);break;default:t=new no("Gradle runtime")}return t}function ff(n){var t=n.parts;if(null==t){var r=n.summary;return null==r?null:new Wu(mf(r))}for(var i=n.summary,e=null==i?null:mf(i),u=Or(),o=Qi(t);o.g();){var f=cf(o.h());null==f||u.d(f)}for(var s=$n(u,"\n"),c=Or(),a=Qi(t);a.g();){var h=sf(a.h());null==h||c.d(h)}return new Vu(e,s,c)}function sf(n){var t=cf(n);if(null==t)return null;var r,i,e=ot(new Rt(function(n,t,r,i){var e;return ut(or(n,["\r\n","\n","\r"],A,r=r!==A&&r,i=i===A?0:i),(e=n,function(n){return ur(e,n)}))}(t),!0,bf));return new Qu(e,(r=!(null==n.internalText),i=e.k(),r&&i>1?Cs():null))}function cf(n){var t=n.text;return null==t?n.internalText:t}function af(n){var t=n.documentationLink;return null==t?null:new Ju(t,"")}function hf(n,t){return new ds(lf(n,Ef().sd(t),Cs()))}function lf(n,t,r){return new js(n,function(n,t){var r,i=ut(Vn(n.o()),Nf);return ot(ut(new st(i,new _f(pf)),(r=t,function(n){return lf(n.v3(),n.w3().wd_1,r)})))}(t,1===Lf(t)?xs():Cs()),0===Lf(t)?Cs():r)}function _f(n){this.td_1=n}function vf(n){var t=Or(),r=n.ld_1,i=Un(r.ca_1).fa_1,e=ce(er(nu(i)?i:pe())),u=r.vd(function(n,t){var r;if(!(t>=0))throw _u(ce("Requested element count "+t+" is less than zero."));if(0===t)return Qn(n);if(Ke(n,Di)){var i=n.k()-t|0;if(i<=0)return Ct();if(1===i)return qr(function(n){if(Ke(n,Fi))return Jn(n);var t=n.f();if(!t.g())throw xu("Collection is empty.");for(var r=t.h();t.g();)r=t.h();return r}(n));if(r=Rr(),Ke(n,Fi)){if(Ke(n,bi)){var e=t,u=n.k();if(e<u)do{var o=e;e=e+1|0,r.d(n.j(o))}while(e<u)}else for(var f=n.l(t);f.g();){var s=f.h();r.d(s)}return r}}else r=Or();for(var c=0,a=n.f();a.g();){var h=a.h();c>=t?r.d(h):c=c+1|0}return xt(r)}(r.ca_1,1));return t.d(new co(new no(e),af(n.kd_1))),t.d(new Wu(u)),t.m(n.md_1),t.j5()}function df(n){var t=Or(),r=n.ld_1,i=r.vd(r.ca_1);return t.d(new Yu(new Wu(i),af(n.kd_1))),t.j5()}function gf(n){var t=Or();return t.d(uf(n)),t.m(n.md_1),ef(t,n),t.j5()}function wf(n){var t=Or();return t.m(new At(n.md_1)),t.d(uf(n)),ef(t,n),t.j5()}function bf(n){return re(n)>0}function pf(n,t){return function(n,t){return n===t?0:null==n?-1:null==t?1:ue(null!=n&&("string"==(i=typeof(r=n))||"boolean"===i||function(n){return"number"==typeof n||n instanceof ke}(r)||Ke(r,dr))?n:pe(),t);var r,i}(Vi(n.v3()),Vi(t.v3()))}function mf(n){var t;return Sf().qd((t=n,function(n){for(var r=t,i=0,e=r.length;i<e;){var u=r[i];i=i+1|0;var o=u.text;null==o||n.ed(o);var f=u.name;null==f||(n.fd(f),br())}return br()}))}function kf(n,t){return(0!==(r=n)?r.toString():"No")+" "+qf(t,n)+" "+yf(n)+" found";var r}function qf(n,t){return t<2?n:n+"s"}function yf(n){return n<=1?"was":"were"}function Bf(n,t){this.sc_1=n,this.tc_1=t}function Cf(n){jf.call(this),this.fa_1=n}function xf(n,t){jf.call(this),this.da_1=n,this.ea_1=t}function jf(){}function Pf(){this.dd_1=Or()}function If(){W=this}function Sf(){return null==W&&new If,W}function zf(n){Sf(),this.ca_1=n}function Tf(){K=this}function Ef(){return null==K&&new Tf,K}function Lf(n){return n.k()}function Nf(n){var t=n.j1(),r=n.i1();return _r(t,new Af(Ke(r,Ri)?r:pe()))}function Af(n){Ef(),this.wd_1=n}function Mf(n,t,r){var i;Df(t,n,r),i="Component mounted at #"+n.id+".",yi(),(yi(),g).j7(i)}function Ff(n){var t=document.getElementById(n);if(null==t)throw wu("'"+n+"' element missing");return t}function Df(n,t,r){var i,e,u;i=n.z9(r),e=t,u=function(n,t,r){return function(i){return Df(n,r,n.ba(i,t)),br()}}(n,r,t),_s(),e.innerHTML="",hs(e,i,u)}function Of(){return _s(),X}function Rf(){return _s(),J}function Hf(){return _s(),nn}function $f(){return _s(),tn}function Gf(){return _s(),rn}function Uf(){return _s(),en}function Vf(){return _s(),un}function Qf(){return _s(),on}function Zf(){return _s(),fn}function Yf(){return _s(),sn}function Wf(){return _s(),cn}function Kf(n){this.x9_1=n}function Xf(){an=this}function Jf(){return null==an&&new Xf,an}function ns(){hn=this,es.call(this)}function ts(){return null==hn&&new ns,hn}function rs(n,t,r,i){t=t===A?Ct():t,r=r===A?null:r,i=i===A?Ct():i,es.call(this),this.be_1=n,this.ce_1=t,this.de_1=r,this.ee_1=i}function is(){}function es(){Jf()}function us(n){_s();var t,r=Or();return n(new os((t=r,function(n){return t.d(n),br()}))),r}function os(n){this.r9_1=n}function fs(n,t){as.call(this),this.fe_1=n,this.ge_1=t}function ss(n){as.call(this),this.he_1=n}function cs(n,t){as.call(this),this.ie_1=n,this.je_1=t}function as(){}function hs(n,t,r){if(_s(),t instanceof rs)!function(n,t,r){var i=function(n,t,r){var i=n.createElement(t);return r(i),i}(we(n.ownerDocument),t,r);n.appendChild(i)}(n,t.be_1,(e=t,u=r,function(n){for(var t=e.ce_1.f();t.g();)ls(n,t.h(),u);var r=e.de_1;null==r||function(n,t){n.appendChild(we(n.ownerDocument).createTextNode(t))}(n,r);for(var i=e.ee_1.f();i.g();)hs(n,i.h(),u);return br()}));else if(t instanceof is){var i=t instanceof is?t:pe();hs(n,i.ke_1,function(n,t){return function(r){return n(t.le_1(r)),br()}}(r,i))}else if(le(t,ts()))return br();var e,u}function ls(n,t,r){var i,e;_s(),t instanceof cs?n.setAttribute(t.ie_1,t.je_1):t instanceof ss?function(n,t){for(var r=Or(),i=0,e=t.length;i<e;){var u=t[i];i=i+1|0,Ru(n,u)||r.d(u)}var o=r;if(!o.i()){var f=n.className,s=ce(er(nu(f)?f:pe())),c=Bi();c.p7(s),0!==re(s)&&c.p7(" "),Gn(o,c," "),n.className=c.toString()}}(n,[t.he_1]):t instanceof fs&&n.addEventListener(t.fe_1,(i=r,e=t,function(n){return n.stopPropagation(),i(e.ge_1(n)),br()}))}function _s(){ln||(ln=!0,X=ts(),new Kf("hr"),J=new Kf("h1"),new Kf("h2"),nn=new Kf("div"),new Kf("pre"),tn=new Kf("code"),rn=new Kf("span"),en=new Kf("small"),un=new Kf("ol"),on=new Kf("ul"),fn=new Kf("li"),sn=new Kf("a"),cn=new Kf("br"),new Kf("p"))}function vs(n){gs.call(this),this.ne_1=n}function ds(n){this.xb_1=n}function gs(){}function ws(n){return n.me(A,A,n.wb_1.ad())}function bs(){_n=this}function ps(){return null==_n&&new bs,_n}function ms(){if(gn)return br();gn=!0,vn=new ys("Collapsed",0),dn=new ys("Expanded",1)}function ks(n){Bs.call(this),this.ve_1=n}function qs(n,t,r){Bs.call(this),this.se_1=n,this.te_1=t,this.ue_1=r}function ys(n,t){Ui.call(this,n,t)}function Bs(){}function Cs(){return ms(),vn}function xs(){return ms(),dn}function js(n,t,r){t=t===A?Ct():t,r=r===A?Cs():r,this.ub_1=n,this.vb_1=t,this.wb_1=r}function Ps(n,t){return ot(ut(n,(r=t,function(n){return function(n,t){var r,i=n.cd(),e=Zf(),u=t(n),o=i.vb_1;r=null==(i.wb_1.equals(xs())&&!o.i()?o:null)?null:function(n,t){return Qf().ha(function(n,t){return Ps(n.vc(),t)}(n,t))}(n,t);var f=r;return e.ja([u,null==f?Of():f])}(n,r)})));var r}function Is(){if(xn)return br();xn=!0,kn=new Ss("ByMessage",0,"Messages"),qn=new Ss("ByGroup",1,"Group"),yn=new Ss("ByFileLocation",2,"File Locations"),Bn=new Ss("ByPluginLocation",3,"Plugin Locations"),Cn=new Ss("ByTaskLocation",4,"Task Locations")}function Ss(n,t,r){Ui.call(this,n,t),this.cf_1=r}function zs(n,t){this.df_1=n,this.ef_1=t}function Ts(n,t){this.ff_1=n,this.gf_1=t}function Es(n,t,r){ec();for(var i=Or(),e=li(),u=0,o=n.length;u<o;){var f=n[u];u=u+1|0;var s=f.locations;null==s||0===s.length?i.d(Os(f)):r(f,e)||i.d(Os(f))}var c=function(n,t,r){ec();for(var i=n.w1(),e=Rr(Tt(i,10)),u=i.f();u.g();){var o;o=u.h().t3_1,e.d(o)}var f=Zn(e);return t.i()||f.d(new js(new oc(Sf().rd("no location"),!0),t)),r>0&&f.d(Ns(r)),f}(e,i,t);return new ds(new js(new uc("text"),c))}function Ls(n){return ec(),t=n,function(n,r){var i,e=n.locations;if(null==e)i=null;else{for(var u=Or(),o=Qi(e);o.g();){var f=o.h();null!=t(f)&&u.d(f)}i=u}var s,c=i;if(null==c||c.i())s=!1;else{for(var a=c.f();a.g();){var h=a.h();As(r,we(t(h)),n,h)}s=!0}return s};var t}function Ns(n){return ec(),new js(new Wu(Sf().rd(n+" more problem"+(n>1?"s have":" has")+" been skipped")))}function As(n,t,r,i){ec();var e,u,o=n.v1(t);if(null==o){var f=Or(),s=_r(new js(new oc(Sf().qd((u=t,function(n){return n.fd(u),br()}))),f,xs()),f);n.h5(t,s),e=s}else e=o;e.u3_1.d(Os(r,i))}function Ms(n,t,r,i){var e,u;if(t=t===A?Or():t,r=r===A?li():r,i===A){var o=(ec(),mn);u=o+1|0,ec(),mn=u,e=o}else e=i;i=e,this.hf_1=n,this.if_1=t,this.jf_1=r,this.kf_1=i}function Fs(n,t){if(ec(),t.i())return null;for(var r,i=n,e=null,u=t.f();u.g();){var o=u.h();r=e;var f,s=i,c=o.ef_1+" ("+o.df_1+")",a=s.v1(c);if(null==a){var h=Or(),l=new Ms(new js(new oc(Sf().qd(Ys(o))),h,xs()),h);s.h5(c,l),f=l}else f=a;e=f,null==r||we(r).if_1.u(we(e).hf_1)||we(r).if_1.d(we(e).hf_1),i=we(e).jf_1}return e}function Ds(n,t){if(ec(),n.k()===t.length){var r;n:{var i=function(n,t){var r=t.length,i=Tt(n,10),e=Rr(Math.min(i,r)),u=0,o=n.f();t:for(;o.g();){var f,s=o.h();if(u>=r)break t;var c=u;u=c+1|0,f=_r(s,t[c]),e.d(f)}return e}(n,t);if(Ke(i,Di)&&i.i())r=!0;else{for(var e=i.f();e.g();){var u=e.h();if(u.t3_1.df_1!==u.u3_1.name||u.t3_1.ef_1!==u.u3_1.displayName){r=!1;break n}}r=!0}}return r}return!1}function Os(n,t,r){t=t===A?null:t,r=r!==A&&r,ec();var i=function(n,t,r){t=t===A?null:t,r=r!==A&&r,ec();var i=$s(function(n,t){return ec(),n&&null!=t.contextualLabel?we(t.contextualLabel):Rs(t)}(r,n),t).j5();return Hs(n,new Wu(i))}(n,t,r),e=function(n,t,r){r=r!==A&&r,ec();var i,e=n.problemDetails;if(null==e)i=null;else{var u,o=e[0].text,f=null==o?null:function(n,t,r,i){if(r=r!==A&&r,i=i===A?0:i,1===t.length){var e=t[0];if(0!==re(e))return function(n,t,r,i){sr(i);var e=0,u=rr(n,t,e,r);if(-1===u||1===i)return qr(ce(n));var o,f=i>0,s=Rr(f&&it(i,10));n:do{var c;if(c=ce(ie(n,e,u)),s.d(c),e=u+t.length|0,f&&s.k()===(i-1|0))break n;u=rr(n,t,e,r)}while(-1!==u);return o=ce(ie(n,e,re(n))),s.d(o),s}(n,e,r,i)}for(var u=function(n){return new ft(n)}(or(n,t,A,r,i)),o=Rr(Tt(u,10)),f=u.f();f.g();){var s;s=ur(n,f.h()),o.d(s)}return o}(o,["\n"]);if(null==f)u=null;else{for(var s=Rr(Tt(f,10)),c=f.f();c.g();){var a,h=c.h();a=Us(n)?Sf().qd(Ks(h)):Sf().rd(h),s.d(a)}u=s}var l,_=u;if(null==_)l=null;else{for(var v=Rr(Tt(_,10)),d=_.f();d.g();){var g;g=new js(new Wu(d.h())),v.d(g)}l=v}var w=null==l?null:Zn(l);i=null==w?Or():w}var b=i,p=null==b?Or():b;r||null==n.contextualLabel||p.d(new js(new Wu(Sf().rd(we(n.contextualLabel)))));var m=function(n){ec();var t=n.solutions;if(null==t||0===t.length)return null;for(var r=new Xu(Sf().rd("Solutions")),i=we(n.solutions),e=Rr(i.length),u=0,o=i.length;u<o;){var f,s=i[u];u=u+1|0,f=new js(new Ku(mf(s))),e.d(f)}return new js(r,e)}(n);null==m||p.d(m);var k,q=n.error,y=null==q?null:ff(q);if(null==y||p.d(new js(y)),t){var B=n.locations;k=!(null==B||0===B.length)}else k=!1;return k&&p.d(function(n){ec();var t,r=n.locations;if(null==r)t=null;else{for(var i=Rr(r.length),e=Qi(r);e.g();){var u,o=e.h();u=new js(new Wu(Sf().qd(Xs(o)))),i.d(u)}t=i}var f=t;return new js(new no("Locations"),null==f?Ct():f)}(n)),p}(n,null==t,r);return new js(i,e)}function Rs(n){return ec(),function(n){if(0===n.length)throw xu("Array is empty.");return n[Rn(n)]}(n.problemId).displayName}function Hs(n,t){var r;switch(ec(),n.severity){case"WARNING":var i=n.documentationLink;r=new Yu(t,null==i?null:new Ju(i,""));break;case"ERROR":var e=n.documentationLink;r=new Zu(t,null==e?null:new Ju(e,""));break;case"ADVICE":var u=n.documentationLink;r=new fc(t,null==u?null:new Ju(u,""));break;default:console.error("no severity "+n.severity),r=t}return r}function $s(n,t){t=t===A?null:t,ec();var r,i=new Pf;if(i.ed(n),null==t);else if(null!=t.line){var e=Gs(t);i.xd(e+(r=t,ec(),null==r.line||null==r.length?"":"-"+r.length),""+t.path+e),br()}else null!=t.taskPath?(i.fd(we(t.taskPath)),br()):null!=t.pluginId&&(i.fd(we(t.pluginId)),br());return i}function Gs(n){var t;if(ec(),null==n.line)t=null;else{var r,i=":"+n.line,e=n.column;t=i+(null==(r=null==e?null:":"+e)?"":r)}return null==t?"":t}function Us(n){var t;ec();var r,i=n.problemId;n:{for(var e=0,u=i.length;e<u;){var o=i[e];if(e=e+1|0,"compilation"===o.name){r=o;break n}}r=null}if(null!=r){var f,s=n.problemId;n:{for(var c=0,a=s.length;c<a;){var h=s[c];if(c=c+1|0,"java"===h.name){f=h;break n}}f=null}t=!(null==f)}else t=!1;return t}function Vs(n){return ec(),n.path}function Qs(n){return ec(),n.pluginId}function Zs(n){return ec(),n.taskPath}function Ys(n){return function(t){return t.ed(n.ef_1),t.fd(n.df_1),br()}}function Ws(n){return ec(),n.name}function Ks(n){return function(t){return t.xd(function(n,t,r,i){i=i!==A&&i;var e=new RegExp(Ii().t7(" "),i?"gui":"gu"),u=Ii().u7(" ");return n.replace(e,u)}(n),""),br()}}function Xs(n){return function(t){var r;return t.ed("- "),t.fd((r=n,ec(),null!=r.path?""+r.path+Gs(r):null!=r.taskPath?we(r.taskPath):"<undefined>")),br()}}function Js(){return Is(),kn}function nc(){return Is(),qn}function tc(){return Is(),yn}function rc(){return Is(),Bn}function ic(){return Is(),Cn}function ec(){jn||(jn=!0,wn=Ls(Vs),bn=Ls(Qs),pn=Ls(Zs),mn=0)}function uc(n){sc.call(this),this.lf_1=n}function oc(n,t){t=t!==A&&t,sc.call(this),this.mf_1=n,this.nf_1=t}function fc(n,t){t=t===A?null:t,to.call(this),this.of_1=n,this.pf_1=t}function sc(){to.call(this)}function cc(n){Fc.call(this),this.qf_1=n}function ac(n){Fc.call(this),this.rf_1=n}function hc(n){Fc.call(this),this.sf_1=n}function lc(n){Fc.call(this),this.tf_1=n}function _c(n){Fc.call(this),this.uf_1=n}function vc(n){gc.call(this),this.vf_1=n}function dc(n,t,r,i,e,u,o,f,s,c){this.wf_1=n,this.xf_1=t,this.yf_1=r,this.zf_1=i,this.ag_1=e,this.bg_1=u,this.cg_1=o,this.dg_1=f,this.eg_1=s,this.fg_1=c}function gc(){Oc.call(this)}function wc(n,t){var r=Or();po(t.zf_1)>0&&r.d(yc(0,Js(),t.fg_1,t.eg_1)),po(t.ag_1)>0&&r.d(yc(0,nc(),t.fg_1,t.eg_1)),po(t.bg_1)>0&&r.d(yc(0,tc(),t.fg_1,t.eg_1)),po(t.cg_1)>0&&r.d(yc(0,rc(),t.fg_1,t.eg_1)),po(t.dg_1)>0&&r.d(yc(0,ic(),t.fg_1,t.eg_1));var i=Hf(),e=us(jc),u=Hf().y9(us(Pc),[]),o=function(n,t){var r,i=Hf(),e=us(Ec),u=Gf().ga("Learn more about "),o=Yf();return i.y9(e,[u,o.fb(us((r=t,function(n){return n.bd(r.tc_1),br()})),t.sc_1),Gf().ga(".")])}(0,t.yf_1),f=Hf().y9(us(Ic),[pc(0,t)]),s=Hf();return i.y9(e,[u,o,f,s.zd(us(Sc),r)])}function bc(n,t){var r,i,e=Hf(),u=us(zc);switch(t.fg_1.q8_1){case 0:r=Bc(0,t.zf_1,((i=function(n){return new cc(n)}).callableName="<init>",i));break;case 1:r=Bc(0,t.ag_1,function(){var n=function(n){return new ac(n)};return n.callableName="<init>",n}());break;case 2:r=Bc(0,t.bg_1,function(){var n=function(n){return new hc(n)};return n.callableName="<init>",n}());break;case 3:r=Bc(0,t.cg_1,function(){var n=function(n){return new lc(n)};return n.callableName="<init>",n}());break;case 4:r=Bc(0,t.dg_1,function(){var n=function(n){return new _c(n)};return n.callableName="<init>",n}());break;default:be()}return e.y9(u,[r])}function pc(n,t){return Hf().ja([qc(0,t),mc(0,t)])}function mc(n,t){for(var r=Hf(),i=t.xf_1,e=Or(),u=0,o=i.f();o.g();){var f=o.h(),s=u;u=s+1|0,Et(e,0===yr(s)?qr(kc(Nc(),f)):Bt([Wf().ja([]),kc(Nc(),f)]))}return r.ha(e)}function kc(n,t){return Uf().ja([Uc(t)])}function qc(n,t){return Rf().ja([$c().ka(t.wf_1)])}function yc(n,t,r,i){var e,u,o,f;return Hf().y9(us((e=i,u=t,o=r,function(n){return n.t9("group-selector"),0===e?(n.t9("group-selector--disabled"),br()):u.equals(o)?(n.t9("group-selector--active"),br()):(n.u9(function(n){return function(t){return new vc(n)}}(u)),br()),br()})),[Gf().rc(t.cf_1,[(f=i,Gf().y9(us(Tc),[io(),eo(),Gf().ga(""+f),uo()]))])])}function Bc(n,t,r){return function(n,t,r){var i,e=Hf(),u=Vf();return e.ja([u.ha(Ps(t,(i=r,function(n){return function(n,t,r,i){var e,u;return t instanceof uc?Uc(Sf().rd(t.lf_1)):t instanceof oc?Hf().y9(us((u=t,function(n){return u.nf_1&&(n.t9("uncategorized"),br()),br()})),[Hf().ja([Qc(r,i),Uc(t.mf_1)])]):t instanceof Vu?Wc(i,r,t):t instanceof Wu?Uc(t.za_1):t instanceof Ku?Hf().ja([(sa(),Tn),Uc(t.ab_1)]):t instanceof Xu?Hf().ja([Qc(r,i),Uc(t.bb_1)]):t instanceof Zu?Kc(i,((e=function(n){return Cc(0,n)}).callableName="viewIt",e),r,t.va_1,t.wa_1,Rc()):t instanceof fc?Kc(i,function(){var n=function(n){return Cc(0,n)};return n.callableName="viewIt",n}(),r,t.of_1,t.pf_1,(sa(),Sn)):t instanceof Yu?Kc(i,function(){var n=function(n){return Cc(0,n)};return n.callableName="viewIt",n}(),r,t.xa_1,t.ya_1,Hc()):t instanceof no?Hf().ja([Qc(r,i),Uc(Sf().rd(t.eb_1))]):Gf().ga("Unknown node type viewNode: "+t)}(Nc(),n.cd().ub_1,n,i)})))])}(0,t.xb_1.uc().vc(),r)}function Cc(n,t){var r;if(t instanceof Ju)r=Jo(t);else if(t instanceof no)r=Uc(Sf().rd(t.eb_1));else if(t instanceof Wu)r=Uc(t.za_1);else{var i="Unknown node type viewIt: "+t;console.error(i),r=Gf().ga(i)}return r}function xc(n){return n.t9("report-wrapper"),br()}function jc(n){return n.t9("header"),br()}function Pc(n){return n.t9("gradle-logo"),br()}function Ic(n){return n.t9("title"),br()}function Sc(n){return n.t9("groups"),br()}function zc(n){return n.t9("content"),br()}function Tc(n){return n.t9("group-selector__count"),br()}function Ec(n){return n.t9("learn-more"),br()}function Lc(){Pn=this,document.title="Gradle - Problems Report"}function Nc(){return null==Pn&&new Lc,Pn}function Ac(n,t,r){return n.pe(t.zb().oe(),r)}function Mc(n){Oc.call(this),this.hd_1=n}function Fc(){Oc.call(this)}function Dc(n,t){Oc.call(this),this.wc_1=n,this.xc_1=t}function Oc(){}function Rc(){return sa(),In}function Hc(){return sa(),zn}function $c(){return sa(),En}function Gc(){return sa(),Ln}function Uc(n){return sa(),Gc().ka(n)}function Vc(n){return sa(),Gc().ka(Sf().qd(n))}function Qc(n,t){return sa(),n.cd().ye()?Xc(n,t):function(n){return sa(),Gf().fb(us(oa),Jc(n))}(n)}function Zc(n,t,r,i){var e,u,o;return sa(),Gf().fb(us((e=r,u=t,o=i,function(n){return n.t9("java-exception-part-toggle"),n.u9(function(n,t){return function(r){return new Dc(n,t())}}(u,o)),n.s9("Click to "+function(n){var t;switch(sa(),n.q8_1){case 0:t="show";break;case 1:t="hide";break;default:be()}return t}(e)),br()})),"("+n+" internal "+qf("line",n)+" "+function(n){var t;switch(sa(),n.q8_1){case 0:t="hidden";break;case 1:t="shown";break;default:be()}return t}(r)+")")}function Yc(n,t){t=t===A?Of():t,sa();for(var r=Qf(),i=Rr(Tt(n,10)),e=0,u=n.f();u.g();){var o,f=e;e=f+1|0,s=u.h(),c=(c=0===yr(f)?t:Of())===A?Of():c,sa(),o=Zf().ja([$f().ga(s),c]),i.d(o)}var s,c;return r.ha(i)}function Wc(n,t,r){sa();var i,e,u,o=Hf(),f=Xc(t,n),s=Gf().ga("Exception"),c=Gf().ja([(sa(),Nn).v9(r.na_1,"Copy exception to the clipboard")]),a=null==r.ma_1?null:Gf().ga(" "),h=null==a?Of():a,l=r.ma_1,_=null==l?null:Uc(l),v=null==_?Of():_;switch(t.cd().wb_1.q8_1){case 0:i=Of();break;case 1:i=function(n,t){sa();for(var r=Hf(),i=us(fa),e=n.oa_1,u=Rr(Tt(e,10)),o=0,f=e.f();f.g();){var s,c=f.h(),a=o;o=a+1|0;var h,l=yr(a);if(null!=c.sa_1){var _,v=Zc(c.ra_1.k(),l,c.sa_1,t),d=c.sa_1;switch(null==d?-1:d.q8_1){case 0:_=Yc(Kn(c.ra_1,1),v);break;case 1:_=Yc(c.ra_1,v);break;default:be()}h=_}else h=Yc(c.ra_1);s=h,u.d(s)}return r.zd(i,u)}(r,(e=n,u=t,function(){return e(new vs(u))}));break;default:be()}return o.ja([f,s,c,h,v,i])}function Kc(n,t,r,i,e,u,o){e=e===A?null:e,u=u===A?Of():u,o=o===A?Of():o,sa();var f=Hf(),s=Qc(r,n),c=t(i),a=null==e?null:t(e);return f.ja([s,u,c,null==a?Of():a,o])}function Xc(n,t){var r,i;return sa(),Gf().fb(us((r=n,i=t,function(n){return n.gb(["invisible-text","tree-btn"]),r.cd().wb_1===Cs()&&(n.t9("collapsed"),br()),r.cd().wb_1===xs()&&(n.t9("expanded"),br()),n.s9("Click to "+function(n){var t;switch(sa(),n.q8_1){case 0:t="expand";break;case 1:t="collapse";break;default:be()}return t}(r.cd().wb_1)),n.u9(function(n,t){return function(r){return n(new vs(t))}}(i,r)),br()})),Jc(n))}function Jc(n){return sa(),function(n,t){var r;if(!(t>=0))throw _u(ce("Count 'n' must be non-negative, but was "+t+"."));switch(t){case 0:r="";break;case 1:r=ce(n);break;default:var i="";if(0!==re(n))for(var e=ce(n),u=t;1&~u||(i+=e),0!=(u=u>>>1|0);)e+=e;return i}return r}("    ",n.we()-1|0)+"- "}function na(n){return sa(),n.gb(["invisible-text","error-icon"]),br()}function ta(n){return sa(),n.gb(["invisible-text","advice-icon"]),br()}function ra(n){return sa(),n.gb(["invisible-text","warning-icon"]),br()}function ia(n){return sa(),n.gb(["invisible-text","enum-icon"]),br()}function ea(n){return sa(),new Mc(n)}function ua(n){return sa(),new Mc(n)}function oa(n){return sa(),n.gb(["invisible-text","leaf-icon"]),br()}function fa(n){return sa(),n.t9("java-exception"),br()}function sa(){if(!An){An=!0;var n=Gf();In=n.fb(us(na),"[error] ");var t=Gf();Sn=t.fb(us(ta),"[advice] ");var r=Gf();zn=r.fb(us(ra),"[warn]  ");var i=Gf();Tn=i.fb(us(ia),"[enum]  "),En=new Uu,Ln=new Uu(ea),Nn=new $u(ua)}}return We(tt,A,Qe),We(ft,A,Qe),We(st,A,Qe),We(Di,"Collection",tu),We(ct,"AbstractCollection",Qe,A,[Di]),We(at,"IteratorImpl",Qe),We(ht,"ListIteratorImpl",Qe,at),We(lt,"Companion",iu),We(Fi,"List",tu,A,[Di]),We(vt,"AbstractList",Qe,ct,[ct,Fi]),We(dt,A,Qe),We(bt,"Companion",iu),We(mt,A,Qe,ct),We(Ri,"Map",tu),We(kt,"AbstractMap",Qe,A,[Ri]),We(qt,"Companion",iu),We(bi,"RandomAccess",tu),We(Pt,"EmptyList",iu,A,[Fi,bi]),We(It,"ArrayAsCollection",Qe,A,[Di]),We(St,"EmptyIterator",iu),We(Lt,"IntIterator",Qe),We(Nt,A,Qe),We(At,"ReversedListReadOnly",Qe,vt),We(Mt,A,Qe),We(Ft,"TransformingSequence",Qe),We(Ot,A,Qe),We(Rt,"FilteringSequence",Qe),We($i,"Set",tu,A,[Di]),We($t,"EmptySet",iu,A,[$i]),We(Vt,"Companion",iu),We(Xt,"IntProgression",Qe),We(Zt,"IntRange",Qe,Xt),We(Yt,"IntProgressionIterator",Qe,Lt),We(Wt,"Companion",iu),We(ar,A,Qe),We(hr,"DelimitedRangesSequence",Qe),We(lr,"Pair",Qe),We(vr,"CharSequence",tu),We(dr,"Comparable",tu),We(gr,"Number",Qe),We(wr,"Unit",iu),We(pr,"IntCompanionObject",iu),We(xr,"AbstractMutableCollection",Qe,ct,[ct,Di]),We(jr,"IteratorImpl",Qe),We(Pr,"ListIteratorImpl",Qe,jr),We(Ir,"AbstractMutableList",Qe,xr,[xr,Di,Fi]),We(Sr,A,Qe),We(zr,A,Qe),We(Oi,"Entry",tu),We(Hi,"MutableEntry",tu,A,[Oi]),We(Tr,"SimpleEntry",Qe,A,[Hi]),We(Mr,"AbstractMutableSet",Qe,xr,[xr,$i,Di]),We(Er,"AbstractEntrySet",Qe,Mr),We(Lr,A,Qe,Mr),We(Nr,A,Qe,xr),We(Ar,"AbstractMutableMap",Qe,kt,[kt,Ri]),We(Fr,"Companion",iu),We(Gr,"ArrayList",Qe,Ir,[Ir,Di,Fi,bi]),We(Qr,"HashCode",iu),We(Zr,"EntrySet",Qe,Er),We(Xr,"HashMap",Qe,Ar,[Ar,Ri]),We(ni,"HashSet",Qe,Mr,[Mr,$i,Di]),We(ei,A,Qe),We(oi,"InternalMap",tu),We(ui,"InternalHashCodeMap",Qe,A,[oi]),We(fi,"EntryIterator",Qe),We(si,"Companion",iu),We(ai,"ChainEntry",Qe,Tr),We(hi,"EntrySet",Qe,Er),We(vi,"LinkedHashMap",Qe,Xr,[Xr,Ri]),We(di,"Companion",iu),We(wi,"LinkedHashSet",Qe,ni,[ni,$i,Di]),We(pi,"BaseOutput",Qe),We(mi,"NodeJsOutput",Qe,pi),We(qi,"BufferedOutput",Qe,pi),We(ki,"BufferedOutputToConsoleLog",Qe,qi),We(Ci,"StringBuilder",Qe,A,[vr]),We(Pi,"Companion",iu),We(Si,"Regex",Qe),We(Ni,"Companion",iu),We(Mi,"Char",Qe,A,[dr]),We(Gi,"Companion",iu),We(Ui,"Enum",Qe,A,[dr]),We(Zi,A,Qe),We(me,"Companion",iu),We(ke,"Long",Qe,gr,[gr,dr]),We(cu,"Letter",iu),We(hu,"OtherLowercase",iu),We(ku,"Exception",Qe,Error),We(Bu,"RuntimeException",Qe,ku),We(vu,"IllegalArgumentException",Qe,Bu),We(gu,"IndexOutOfBoundsException",Qe,Bu),We(bu,"IllegalStateException",Qe,Bu),We(ju,"NoSuchElementException",Qe,Bu),We(Iu,"ArithmeticException",Qe,Bu),We(Tu,"UnsupportedOperationException",Qe,Bu),We(Lu,"NullPointerException",Qe,Bu),We(Au,"NoWhenBranchMatchedException",Qe,Bu),We(Fu,"ClassCastException",Qe,Bu),We(Ou,"UninitializedPropertyAccessException",Qe,Bu),We(Hu,"Model",Qe),We($u,"CopyButtonComponent",Qe),We(Uu,"PrettyTextComponent",Qe),We(to,"ProblemNode",Qe),We(Vu,"Exception",Qe,to),We(Qu,"StackTracePart",Qe),We(Zu,"Error",Qe,to),We(Yu,"Warning",Qe,to),We(Wu,"Message",Qe,to),We(Ku,"ListElement",Qe,to),We(Xu,"TreeNode",Qe,to),We(Ju,"Link",Qe,to),We(no,"Label",Qe,to),We(co,"Info",Qe,to),We(ao,"Project",Qe,to),We(ho,"Task",Qe,to),We(lo,"TaskPath",Qe,to),We(_o,"Bean",Qe,to),We(vo,"SystemProperty",Qe,to),We(go,"Property",Qe,to),We(wo,"BuildLogic",Qe,to),We(bo,"BuildLogicClass",Qe,to),We(Oc,"BaseIntent",Qe),We(Fc,"TreeIntent",Qe,Oc),We(ko,"TaskTreeIntent",Qe,Fc),We(qo,"MessageTreeIntent",Qe,Fc),We(yo,"InputTreeIntent",Qe,Fc),We(Bo,"IncompatibleTaskTreeIntent",Qe,Fc),We(Po,"Intent",Qe,Oc),We(Co,"SetTab",Qe,Po),We(xo,"Model",Qe),We(jo,"Tab",Qe,Ui),We(Ko,"ConfigurationCacheReportPage",iu),We(nf,"ImportedProblem",Qe),We(tf,"ImportedDiagnostics",Qe),We(_f,"sam$kotlin_Comparator$0",Qe),We(Bf,"LearnMore",Qe),We(jf,"Fragment",Qe),We(Cf,"Text",Qe,jf),We(xf,"Reference",Qe,jf),We(Pf,"Builder",Qe),We(If,"Companion",iu),We(zf,"PrettyText",Qe),We(Tf,"Companion",iu),We(Af,"Trie",Qe),We(Kf,"ViewFactory",Qe),We(Xf,"Companion",iu),We(es,"View",Qe),We(ns,"Empty",iu,es),We(rs,"Element",Qe,es),We(is,"MappedView",Qe,es),We(os,"Attributes",Qe),We(as,"Attribute",Qe),We(fs,"OnEvent",Qe,as),We(ss,"ClassName",Qe,as),We(cs,"Named",Qe,as),We(gs,"Intent",Qe),We(vs,"Toggle",Qe,gs),We(ds,"Model",Qe),We(bs,"TreeView",iu),We(Bs,"Focus",Qe),We(ks,"Original",Qe,Bs),We(qs,"Child",Qe,Bs),We(ys,"ViewState",Qe,Ui),We(js,"Tree",Qe),We(Ss,"Tab",Qe,Ui),We(zs,"ProblemIdElement",Qe),We(Ts,"ProblemSummary",Qe),We(Ms,"ProblemNodeGroup",Qe),We(sc,"ProblemApiNode",Qe,to),We(uc,"Text",Qe,sc),We(oc,"ProblemIdNode",Qe,sc),We(fc,"Advice",Qe,to),We(cc,"MessageTreeIntent",Qe,Fc),We(ac,"ProblemIdTreeIntent",Qe,Fc),We(hc,"FileLocationTreeIntent",Qe,Fc),We(lc,"PluginLocationTreeIntent",Qe,Fc),We(_c,"TaskLocationTreeIntent",Qe,Fc),We(gc,"Intent",Qe,Oc),We(vc,"SetTab",Qe,gc),We(dc,"Model",Qe),We(Lc,"ProblemsReportPage",iu),We(Mc,"Copy",Qe,Oc),We(Dc,"ToggleStackTracePart",Qe,Oc),ve(tt).f=function(){return this.n_1.f()},ve(ft).f=function(){return this.r_1.f()},ve(st).f=function(){var n,t,r=function(n,t){for(var r=n.f();r.g();){var i=r.h();t.d(i)}return t}(this.s_1,Or());return n=r,t=this.t_1,function(n,t){if(n.k()<=1)return br();var r=Br(n);!function(n,t){if(function(){if(null!=l)return l;l=!1;var n=[],t=0;if(t<600)do{var r=t;t=t+1|0,n.push(r)}while(t<600);var i=Vr;n.sort(i);var e=1,u=n.length;if(e<u)do{var o=e;e=e+1|0;var f=n[o-1|0],s=n[o];if((3&f)==(3&s)&&f>=s)return!1}while(e<u);return l=!0,!0}()){var r=(i=t,function(n,t){return i.compare(n,t)});n.sort(r)}else!function(n,t,r,i){var e=n.length,u=function(n){var t=0,r=n.length-1|0;if(t<=r)do{var i=t;t=t+1|0,n[i]=null}while(i!==r);return n}(Array(e)),o=Ur(n,u,0,r,i);if(o!==n){var f=0;if(f<=r)do{var s=f;f=f+1|0,n[s]=o[s]}while(s!==r)}}(n,0,Rn(n),t);var i}(r,t);var i=0,e=r.length;if(i<e)do{var u=i;i=i+1|0,n.f4(u,r[u])}while(i<e)}(n,t),r.f()},ve(ct).u=function(n){var t;n:if(Ke(this,Di)&&this.i())t=!1;else{for(var r=this.f();r.g();)if(le(r.h(),n)){t=!0;break n}t=!1}return t},ve(ct).v=function(n){var t;n:if(Ke(n,Di)&&n.i())t=!0;else{for(var r=n.f();r.g();){var i=r.h();if(!this.u(i)){t=!1;break n}}t=!0}return t},ve(ct).i=function(){return 0===this.k()},ve(ct).toString=function(){return $n(this,", ","[","]",A,A,(n=this,function(t){return t===n?"(this Collection)":Vi(t)}));var n},ve(ct).toArray=function(){return kr(this)},ve(at).g=function(){return this.w_1<this.x_1.k()},ve(at).h=function(){if(!this.g())throw Cu();var n=this.w_1;return this.w_1=n+1|0,this.x_1.j(n)},ve(ht).c1=function(){return this.w_1>0},ve(ht).d1=function(){if(!this.c1())throw Cu();return this.w_1=this.w_1-1|0,this.a1_1.j(this.w_1)},ve(lt).e1=function(n,t){if(n<0||n>=t)throw du("index: "+n+", size: "+t)},ve(lt).b1=function(n,t){if(n<0||n>t)throw du("index: "+n+", size: "+t)},ve(lt).f1=function(n){for(var t=1,r=n.f();r.g();){var i=r.h(),e=Mn(31,t),u=null==i?null:ae(i);t=e+(null==u?0:u)|0}return t},ve(lt).g1=function(n,t){if(n.k()!==t.k())return!1;for(var r=t.f(),i=n.f();i.g();)if(!le(i.h(),r.h()))return!1;return!0},ve(vt).f=function(){return new at(this)},ve(vt).l=function(n){return new ht(this,n)},ve(vt).equals=function(n){return n===this||!(null==n||!Ke(n,Fi))&&_t().g1(this,n)},ve(vt).hashCode=function(){return _t().f1(this)},ve(dt).g=function(){return this.h1_1.g()},ve(dt).h=function(){return this.h1_1.h().i1()},ve(bt).k1=function(n){var t=n.j1(),r=null==t?null:ae(t),i=null==r?0:r,e=n.i1(),u=null==e?null:ae(e);return i^(null==u?0:u)},ve(bt).l1=function(n){return Vi(n.j1())+"="+Vi(n.i1())},ve(bt).m1=function(n,t){return!(null==t||!Ke(t,Oi))&&!!le(n.j1(),t.j1())&&le(n.i1(),t.i1())},ve(mt).r1=function(n){return this.q1_1.s1(n)},ve(mt).u=function(n){return!(null!=n&&!Je(n))&&this.r1(null==n||Je(n)?n:pe())},ve(mt).f=function(){return new dt(this.q1_1.o().f())},ve(mt).k=function(){return this.q1_1.k()},ve(kt).t1=function(n){return!(null==wt(this,n))},ve(kt).s1=function(n){var t;n:{var r=this.o();if(Ke(r,Di)&&r.i())t=!1;else{for(var i=r.f();i.g();)if(le(i.h().i1(),n)){t=!0;break n}t=!1}}return t},ve(kt).u1=function(n){if(null==n||!Ke(n,Oi))return!1;var t=n.j1(),r=n.i1(),i=(Ke(this,Ri)?this:pe()).v1(t);return!(!le(r,i)||null==i&&!(Ke(this,Ri)?this:pe()).t1(t))},ve(kt).equals=function(n){if(n===this)return!0;if(null==n||!Ke(n,Ri))return!1;if(this.k()!==n.k())return!1;var t;n:{var r=n.o();if(Ke(r,Di)&&r.i())t=!0;else{for(var i=r.f();i.g();){var e=i.h();if(!this.u1(e)){t=!1;break n}}t=!0}}return t},ve(kt).v1=function(n){var t=wt(this,n);return null==t?null:t.i1()},ve(kt).hashCode=function(){return ae(this.o())},ve(kt).i=function(){return 0===this.k()},ve(kt).k=function(){return this.o().k()},ve(kt).toString=function(){var n;return $n(this.o(),", ","{","}",A,A,(n=this,function(t){return n.p1(t)}))},ve(kt).p1=function(n){return gt(this,n.j1())+"="+gt(this,n.i1())},ve(kt).w1=function(){return null==this.o1_1&&(this.o1_1=new mt(this)),we(this.o1_1)},ve(qt).x1=function(n){for(var t=0,r=n.f();r.g();){var i=r.h(),e=t,u=null==i?null:ae(i);t=e+(null==u?0:u)|0}return t},ve(qt).y1=function(n,t){return n.k()===t.k()&&n.v(t)},ve(Pt).equals=function(n){return!(null==n||!Ke(n,Fi))&&n.i()},ve(Pt).hashCode=function(){return 1},ve(Pt).toString=function(){return"[]"},ve(Pt).k=function(){return 0},ve(Pt).i=function(){return!0},ve(Pt).a2=function(n){return n.i()},ve(Pt).v=function(n){return this.a2(n)},ve(Pt).j=function(n){throw du("Empty list doesn't contain element at index "+n+".")},ve(Pt).f=function(){return zt()},ve(Pt).l=function(n){if(0!==n)throw du("Index: "+n);return zt()},ve(It).k=function(){return this.b2_1.length},ve(It).i=function(){return 0===this.b2_1.length},ve(It).d2=function(n){return function(n,t){return Hn(n,t)>=0}(this.b2_1,n)},ve(It).e2=function(n){var t;n:if(Ke(n,Di)&&n.i())t=!0;else{for(var r=n.f();r.g();){var i=r.h();if(!this.d2(i)){t=!1;break n}}t=!0}return t},ve(It).v=function(n){return this.e2(n)},ve(It).f=function(){return Qi(this.b2_1)},ve(St).g=function(){return!1},ve(St).c1=function(){return!1},ve(St).h=function(){throw Cu()},ve(St).d1=function(){throw Cu()},ve(Lt).h=function(){return this.f2()},ve(Nt).g=function(){return this.g2_1.c1()},ve(Nt).c1=function(){return this.g2_1.g()},ve(Nt).h=function(){return this.g2_1.d1()},ve(Nt).d1=function(){return this.g2_1.h()},ve(At).k=function(){return this.i2_1.k()},ve(At).j=function(n){return this.i2_1.j(function(n,t){if(!(0<=t&&t<=jt(n)))throw du("Element index "+t+" must be in range ["+Ve(0,jt(n))+"].");return jt(n)-t|0}(this,n))},ve(At).f=function(){return this.l(0)},ve(At).l=function(n){return new Nt(this,n)},ve(Mt).h=function(){return this.k2_1.m2_1(this.j2_1.h())},ve(Mt).g=function(){return this.j2_1.g()},ve(Ft).f=function(){return new Mt(this)},ve(Ot).h=function(){if(-1===this.o2_1&&Dt(this),0===this.o2_1)throw Cu();var n=this.p2_1;return this.p2_1=null,this.o2_1=-1,null==n||Je(n)?n:pe()},ve(Ot).g=function(){return-1===this.o2_1&&Dt(this),1===this.o2_1},ve(Rt).f=function(){return new Ot(this)},ve($t).equals=function(n){return!(null==n||!Ke(n,$i))&&n.i()},ve($t).hashCode=function(){return 0},ve($t).toString=function(){return"[]"},ve($t).k=function(){return 0},ve($t).i=function(){return!0},ve($t).a2=function(n){return n.i()},ve($t).v=function(n){return this.a2(n)},ve($t).f=function(){return zt()},ve(Zt).y2=function(){return this.z2_1},ve(Zt).c3=function(){return this.a3_1},ve(Zt).i=function(){return this.z2_1>this.a3_1},ve(Zt).equals=function(n){return n instanceof Zt&&(!(!this.i()||!n.i())||this.z2_1===n.z2_1&&this.a3_1===n.a3_1)},ve(Zt).hashCode=function(){return this.i()?-1:Mn(31,this.z2_1)+this.a3_1|0},ve(Zt).toString=function(){return this.z2_1+".."+this.a3_1},ve(Yt).g=function(){return this.f3_1},ve(Yt).f2=function(){var n=this.g3_1;if(n===this.e3_1){if(!this.f3_1)throw Cu();this.f3_1=!1}else this.g3_1=this.g3_1+this.d3_1|0;return n},ve(Wt).q=function(n,t,r){return new Xt(n,t,r)},ve(Xt).f=function(){return new Yt(this.z2_1,this.a3_1,this.b3_1)},ve(Xt).i=function(){return this.b3_1>0?this.z2_1>this.a3_1:this.z2_1<this.a3_1},ve(Xt).equals=function(n){return n instanceof Xt&&(!(!this.i()||!n.i())||this.z2_1===n.z2_1&&this.a3_1===n.a3_1&&this.b3_1===n.b3_1)},ve(Xt).hashCode=function(){return this.i()?-1:Mn(31,Mn(31,this.z2_1)+this.a3_1|0)+this.b3_1|0},ve(Xt).toString=function(){return this.b3_1>0?this.z2_1+".."+this.a3_1+" step "+this.b3_1:this.z2_1+" downTo "+this.a3_1+" step "+(0|-this.b3_1)},ve(ar).h=function(){if(-1===this.j3_1&&cr(this),0===this.j3_1)throw Cu();var n=this.m3_1,t=n instanceof Zt?n:pe();return this.m3_1=null,this.j3_1=-1,t},ve(ar).g=function(){return-1===this.j3_1&&cr(this),1===this.j3_1},ve(hr).f=function(){return new ar(this)},ve(lr).toString=function(){return"("+this.t3_1+", "+this.u3_1+")"},ve(lr).v3=function(){return this.t3_1},ve(lr).w3=function(){return this.u3_1},ve(lr).hashCode=function(){var n=null==this.t3_1?0:ae(this.t3_1);return Mn(n,31)+(null==this.u3_1?0:ae(this.u3_1))|0},ve(lr).equals=function(n){if(this===n)return!0;if(!(n instanceof lr))return!1;var t=n instanceof lr?n:pe();return!!le(this.t3_1,t.t3_1)&&!!le(this.u3_1,t.u3_1)},ve(wr).toString=function(){return"kotlin.Unit"},ve(pr).b4=function(){return this.MIN_VALUE},ve(pr).c4=function(){return this.MAX_VALUE},ve(pr).d4=function(){return this.SIZE_BYTES},ve(pr).e4=function(){return this.SIZE_BITS},ve(xr).m=function(n){this.g4();for(var t=!1,r=n.f();r.g();){var i=r.h();this.d(i)&&(t=!0)}return t},ve(xr).toJSON=function(){return this.toArray()},ve(xr).g4=function(){},ve(jr).g=function(){return this.h4_1<this.j4_1.k()},ve(jr).h=function(){if(!this.g())throw Cu();var n=this.h4_1;return this.h4_1=n+1|0,this.i4_1=n,this.j4_1.j(this.i4_1)},ve(Pr).c1=function(){return this.h4_1>0},ve(Pr).d1=function(){if(!this.c1())throw Cu();return this.h4_1=this.h4_1-1|0,this.i4_1=this.h4_1,this.n4_1.j(this.i4_1)},ve(Ir).d=function(n){return this.g4(),this.p4(this.k(),n),!0},ve(Ir).f=function(){return new jr(this)},ve(Ir).u=function(n){return this.q4(n)>=0},ve(Ir).q4=function(n){var t=0,r=jt(this);if(t<=r)do{var i=t;if(t=t+1|0,le(this.j(i),n))return i}while(i!==r);return-1},ve(Ir).l=function(n){return new Pr(this,n)},ve(Ir).equals=function(n){return n===this||!(null==n||!Ke(n,Fi))&&_t().g1(this,n)},ve(Ir).hashCode=function(){return _t().f1(this)},ve(Sr).g=function(){return this.r4_1.g()},ve(Sr).h=function(){return this.r4_1.h().j1()},ve(zr).g=function(){return this.s4_1.g()},ve(zr).h=function(){return this.s4_1.h().i1()},ve(Tr).j1=function(){return this.t4_1},ve(Tr).i1=function(){return this.u4_1},ve(Tr).v4=function(n){var t=this.u4_1;return this.u4_1=n,t},ve(Tr).hashCode=function(){return pt().k1(this)},ve(Tr).toString=function(){return pt().l1(this)},ve(Tr).equals=function(n){return pt().m1(this,n)},ve(Er).u=function(n){return this.w4(n)},ve(Lr).y4=function(n){throw zu("Add is not supported on keys")},ve(Lr).d=function(n){return this.y4(null==n||Je(n)?n:pe())},ve(Lr).z4=function(n){return this.x4_1.t1(n)},ve(Lr).u=function(n){return!(null!=n&&!Je(n))&&this.z4(null==n||Je(n)?n:pe())},ve(Lr).f=function(){return new Sr(this.x4_1.o().f())},ve(Lr).k=function(){return this.x4_1.k()},ve(Lr).g4=function(){return this.x4_1.g4()},ve(Nr).f5=function(n){throw zu("Add is not supported on values")},ve(Nr).d=function(n){return this.f5(null==n||Je(n)?n:pe())},ve(Nr).r1=function(n){return this.e5_1.s1(n)},ve(Nr).u=function(n){return!(null!=n&&!Je(n))&&this.r1(null==n||Je(n)?n:pe())},ve(Nr).f=function(){return new zr(this.e5_1.o().f())},ve(Nr).k=function(){return this.e5_1.k()},ve(Nr).g4=function(){return this.e5_1.g4()},ve(Ar).g5=function(){return null==this.c5_1&&(this.c5_1=new Lr(this)),we(this.c5_1)},ve(Ar).w1=function(){return null==this.d5_1&&(this.d5_1=new Nr(this)),we(this.d5_1)},ve(Ar).g4=function(){},ve(Mr).equals=function(n){return n===this||!(null==n||!Ke(n,$i))&&yt().y1(this,n)},ve(Mr).hashCode=function(){return yt().x1(this)},ve(Gr).j5=function(){return this.g4(),this.c_1=!0,this.k()>0?this:Dr().i5_1},ve(Gr).k=function(){return this.b_1.length},ve(Gr).j=function(n){var t=this.b_1[$r(this,n)];return null==t||Je(t)?t:pe()},ve(Gr).f4=function(n,t){this.g4(),$r(this,n);var r=this.b_1[n];this.b_1[n]=t;var i=r;return null==i||Je(i)?i:pe()},ve(Gr).d=function(n){return this.g4(),this.b_1.push(n),this.o4_1=this.o4_1+1|0,!0},ve(Gr).p4=function(n,t){this.g4(),this.b_1.splice(function(n,t){return _t().b1(t,n.k()),t}(this,n),0,t),this.o4_1=this.o4_1+1|0},ve(Gr).m=function(n){if(this.g4(),n.i())return!1;for(var t,r,i,e=(t=this,r=n.k(),i=t.k(),t.b_1.length=t.k()+r|0,i),u=0,o=n.f();o.g();){var f=o.h(),s=u;u=s+1|0;var c=yr(s);this.b_1[e+c|0]=f}return this.o4_1=this.o4_1+1|0,!0},ve(Gr).q4=function(n){return Hn(this.b_1,n)},ve(Gr).toString=function(){return On(this.b_1,", ","[","]",A,A,ee)},ve(Gr).k5=function(){return[].slice.call(this.b_1)},ve(Gr).toArray=function(){return this.k5()},ve(Gr).g4=function(){if(this.c_1)throw Su()},ve(Qr).l5=function(n,t){return le(n,t)},ve(Qr).m5=function(n){var t=null==n?null:ae(n);return null==t?0:t},ve(Zr).o5=function(n){throw zu("Add is not supported on entries")},ve(Zr).d=function(n){return this.o5(null!=n&&Ke(n,Hi)?n:pe())},ve(Zr).w4=function(n){return this.n5_1.u1(n)},ve(Zr).f=function(){return this.n5_1.t5_1.f()},ve(Zr).k=function(){return this.n5_1.k()},ve(Xr).t1=function(n){return this.t5_1.z4(n)},ve(Xr).s1=function(n){var t;n:{var r=this.t5_1;if(Ke(r,Di)&&r.i())t=!1;else{for(var i=r.f();i.g();){var e=i.h();if(this.u5_1.l5(e.i1(),n)){t=!0;break n}}t=!1}}return t},ve(Xr).o=function(){return null==this.v5_1&&(this.v5_1=this.x5()),we(this.v5_1)},ve(Xr).x5=function(){return new Zr(this)},ve(Xr).v1=function(n){return this.t5_1.v1(n)},ve(Xr).h5=function(n,t){return this.t5_1.h5(n,t)},ve(Xr).k=function(){return this.t5_1.k()},ve(ni).d=function(n){return null==this.y5_1.h5(n,this)},ve(ni).u=function(n){return this.y5_1.t1(n)},ve(ni).i=function(){return this.y5_1.i()},ve(ni).f=function(){return this.y5_1.g5().f()},ve(ni).k=function(){return this.y5_1.k()},ve(ei).g=function(){return-1===this.z5_1&&(this.z5_1=function(n){if(null!=n.c6_1&&n.d6_1){var t=n.c6_1.length;if(n.e6_1=n.e6_1+1|0,n.e6_1<t)return 0}if(n.b6_1=n.b6_1+1|0,n.b6_1<n.a6_1.length){n.c6_1=n.g6_1.i6_1[n.a6_1[n.b6_1]];var r=n,i=n.c6_1;return r.d6_1=null!=i&&Xe(i),n.e6_1=0,0}return n.c6_1=null,1}(this)),0===this.z5_1},ve(ei).h=function(){if(!this.g())throw Cu();var n=this.d6_1?this.c6_1[this.e6_1]:this.c6_1;return this.f6_1=n,this.z5_1=-1,n},ve(ui).w5=function(){return this.h6_1},ve(ui).k=function(){return this.j6_1},ve(ui).h5=function(n,t){var r=this.h6_1.m5(n),i=ii(this,r);if(null==i)this.i6_1[r]=new Tr(n,t);else{if(null==i||!Xe(i)){var e,u=i;return this.h6_1.l5(u.j1(),n)?u.v4(t):(e=[u,new Tr(n,t)],this.i6_1[r]=e,this.j6_1=this.j6_1+1|0,null)}var o=i,f=ri(o,this,n);if(null!=f)return f.v4(t);o.push(new Tr(n,t))}return this.j6_1=this.j6_1+1|0,null},ve(ui).z4=function(n){return!(null==ti(this,n))},ve(ui).v1=function(n){var t=ti(this,n);return null==t?null:t.i1()},ve(ui).f=function(){return new ei(this)},ve(fi).g=function(){return!(null===this.m6_1)},ve(fi).h=function(){if(!this.g())throw Cu();var n=we(this.m6_1);this.l6_1=n;var t,r=n.b7_1;return t=r!==this.n6_1.y6_1.v6_1?r:null,this.m6_1=t,n},ve(ai).v4=function(n){return this.d7_1.g4(),ve(Tr).v4.call(this,n)},ve(hi).o5=function(n){throw zu("Add is not supported on entries")},ve(hi).d=function(n){return this.o5(null!=n&&Ke(n,Hi)?n:pe())},ve(hi).w4=function(n){return this.y6_1.u1(n)},ve(hi).f=function(){return new fi(this)},ve(hi).k=function(){return this.y6_1.k()},ve(hi).g4=function(){return this.y6_1.g4()},ve(vi).j5=function(){var n;if(this.g4(),this.x6_1=!0,this.k()>0)n=this;else{var t=ci().e7_1;n=Ke(t,Ri)?t:pe()}return n},ve(vi).t1=function(n){return this.w6_1.t1(n)},ve(vi).s1=function(n){var t=this.v6_1;if(null==t)return!1;var r=t;do{if(le(r.i1(),n))return!0;r=we(r.b7_1)}while(r!==this.v6_1);return!1},ve(vi).x5=function(){return new hi(this)},ve(vi).v1=function(n){var t=this.w6_1.v1(n);return null==t?null:t.i1()},ve(vi).h5=function(n,t){this.g4();var r=this.w6_1.v1(n);if(null==r){var i=new ai(this,n,t);return this.w6_1.h5(n,i),function(n,t){if(null!=n.b7_1||null!=n.c7_1)throw wu(ce("Check failed."));var r=t.v6_1;if(null==r)t.v6_1=n,n.b7_1=n,n.c7_1=n;else{var i=r.c7_1;if(null==i)throw wu(ce("Required value was null."));var e=i;n.c7_1=e,n.b7_1=r,r.c7_1=n,e.b7_1=n}}(i,this),null}return r.v4(t)},ve(vi).k=function(){return this.w6_1.k()},ve(vi).g4=function(){if(this.x6_1)throw Su()},ve(wi).g4=function(){return this.y5_1.g4()},ve(pi).h7=function(){this.i7("\n")},ve(pi).j7=function(n){this.i7(n),this.h7()},ve(mi).i7=function(n){var t=String(n);this.k7_1.write(t)},ve(ki).i7=function(n){var t=String(n),r=t.lastIndexOf("\n",0);if(r>=0){var i=this.m7_1;this.m7_1=i+t.substring(0,r),this.n7();var e=r+1|0;t=t.substring(e)}this.m7_1=this.m7_1+t},ve(ki).n7=function(){console.log(this.m7_1),this.m7_1=""},ve(qi).i7=function(n){var t=this.m7_1;this.m7_1=t+String(n)},ve(Ci).x3=function(){return this.o7_1.length},ve(Ci).y3=function(n){var t=this.o7_1;if(!(n>=0&&n<=tr(t)))throw du("index: "+n+", length: "+this.x3()+"}");return ne(t,n)},ve(Ci).z3=function(n,t){return this.o7_1.substring(n,t)},ve(Ci).i3=function(n){return this.o7_1=this.o7_1+new Mi(n),this},ve(Ci).e=function(n){return this.o7_1=this.o7_1+Vi(n),this},ve(Ci).p7=function(n){var t=this.o7_1;return this.o7_1=t+(null==n?"null":n),this},ve(Ci).toString=function(){return this.o7_1},ve(Pi).t7=function(n){var t=this.q7_1;return n.replace(t,"\\$&")},ve(Pi).u7=function(n){var t=this.s7_1;return n.replace(t,"$$$$")},ve(Si).a8=function(n){this.x7_1.lastIndex=0;var t=this.x7_1.exec(ce(n));return null!=t&&0===t.index&&this.x7_1.lastIndex===re(n)},ve(Si).toString=function(){return this.x7_1.toString()},ve(Mi).o8=function(n){return Ei(this.h3_1,n)},ve(Mi).a4=function(n){return function(n,t){return Ei(n.h3_1,t instanceof Mi?t.h3_1:pe())}(this,n)},ve(Mi).equals=function(n){return function(n,t){return t instanceof Mi&&n===t.h3_1}(this.h3_1,n)},ve(Mi).hashCode=function(){return this.h3_1},ve(Mi).toString=function(){return Li(this.h3_1)},ve(Ui).r8=function(n){return ue(this.q8_1,n.q8_1)},ve(Ui).a4=function(n){return this.r8(n instanceof Ui?n:pe())},ve(Ui).equals=function(n){return this===n},ve(Ui).hashCode=function(){return se(this)},ve(Ui).toString=function(){return this.p8_1},ve(Zi).g=function(){return!(this.s8_1===this.t8_1.length)},ve(Zi).h=function(){if(this.s8_1===this.t8_1.length)throw xu(""+this.s8_1);var n=this.s8_1;return this.s8_1=n+1|0,this.t8_1[n]},ve(ke).b9=function(n){return je(this,n)},ve(ke).a4=function(n){return this.b9(n instanceof ke?n:pe())},ve(ke).c9=function(n){return Pe(this,n)},ve(ke).d9=function(n){return function(n,t){if($e(),Ae(t))throw mu("division by zero");if(Ae(n))return qe();if(Te(n,Ce())){if(Te(t,ye())||Te(t,Be()))return Ce();if(Te(t,Ce()))return ye();var r=function(n){$e();return new ke(n.u8_1>>>1|n.v8_1<<31,n.v8_1>>1)}(n),i=function(n){$e();return new ke(n.u8_1<<1,n.v8_1<<1|n.u8_1>>>31)}(r.d9(t));return Te(i,qe())?Ne(t)?ye():Be():Pe(i,Ie(n,Se(t,i)).d9(t))}if(Te(t,Ce()))return qe();if(Ne(n))return Ne(t)?Fe(n).d9(Fe(t)):Fe(Fe(n).d9(t));if(Ne(t))return Fe(n.d9(Fe(t)));for(var e=qe(),u=n;He(u,t);){for(var o=ze(u)/ze(t),f=Math.max(1,Math.floor(o)),s=Math.ceil(Math.log(f)/Math.LN2),c=s<=48?1:Math.pow(2,s-48),a=Oe(f),h=Se(a,t);Ne(h)||Re(h,u);)h=Se(a=Oe(f-=c),t);Ae(a)&&(a=ye()),e=Pe(e,a),u=Ie(u,h)}return e}(this,n)},ve(ke).e9=function(){return this.f9().c9(new ke(1,0))},ve(ke).f9=function(){return new ke(~this.u8_1,~this.v8_1)},ve(ke).g9=function(){return this.u8_1},ve(ke).w8=function(){return ze(this)},ve(ke).valueOf=function(){return this.w8()},ve(ke).equals=function(n){return n instanceof ke&&Te(this,n)},ve(ke).hashCode=function(){return $e(),this.u8_1^this.v8_1},ve(ke).toString=function(){return Ee(this,10)},ve(Hu).toString=function(){return"Model(text="+this.o9_1+", tooltip="+this.p9_1+")"},ve(Hu).hashCode=function(){var n=he(this.o9_1);return Mn(n,31)+he(this.p9_1)|0},ve(Hu).equals=function(n){if(this===n)return!0;if(!(n instanceof Hu))return!1;var t=n instanceof Hu?n:pe();return this.o9_1===t.o9_1&&this.p9_1===t.p9_1},ve($u).v9=function(n,t){return this.w9(new Hu(n,t))},ve($u).w9=function(n){var t,r;return Uf().y9(us((t=n,r=this,function(n){return n.s9(t.p9_1),n.t9("copy-button"),n.u9(function(n,t){return function(r){return n.q9_1(t.o9_1)}}(r,t)),br()})),[])},ve($u).z9=function(n){return this.w9(n instanceof Hu?n:pe())},ve($u).aa=function(n,t){return t},ve($u).ba=function(n,t){var r=null==n||Je(n)?n:pe();return this.aa(r,t instanceof Hu?t:pe())},ve(Uu).ka=function(n){return function(n,t){for(var r=Gf(),i=t.ca_1,e=Rr(Tt(i,10)),u=i.f();u.g();){var o,f,s=u.h();s instanceof Cf?f=Gf().ga(s.fa_1):s instanceof xf?f=Gu(n,s.da_1,s.ea_1):be(),o=f,e.d(o)}return r.ha(e)}(this,n)},ve(Uu).z9=function(n){return this.ka(n instanceof zf?n:pe())},ve(Uu).la=function(n,t){return t},ve(Uu).ba=function(n,t){var r=null==n||Je(n)?n:pe();return this.la(r,t instanceof zf?t:pe())},ve(Vu).pa=function(n,t,r){return new Vu(n,t,r)},ve(Vu).qa=function(n,t,r,i){return n=n===A?this.ma_1:n,t=t===A?this.na_1:t,r=r===A?this.oa_1:r,i===A?this.pa(n,t,r):i.pa.call(this,n,t,r)},ve(Vu).toString=function(){return"Exception(summary="+this.ma_1+", fullText="+this.na_1+", parts="+this.oa_1+")"},ve(Vu).hashCode=function(){var n=null==this.ma_1?0:this.ma_1.hashCode();return n=Mn(n,31)+he(this.na_1)|0,Mn(n,31)+ae(this.oa_1)|0},ve(Vu).equals=function(n){if(this===n)return!0;if(!(n instanceof Vu))return!1;var t=n instanceof Vu?n:pe();return!!le(this.ma_1,t.ma_1)&&this.na_1===t.na_1&&!!le(this.oa_1,t.oa_1)},ve(Qu).ta=function(n,t){return new Qu(n,t)},ve(Qu).ua=function(n,t,r){return n=n===A?this.ra_1:n,t=t===A?this.sa_1:t,r===A?this.ta(n,t):r.ta.call(this,n,t)},ve(Qu).toString=function(){return"StackTracePart(lines="+this.ra_1+", state="+this.sa_1+")"},ve(Qu).hashCode=function(){var n=ae(this.ra_1);return Mn(n,31)+(null==this.sa_1?0:this.sa_1.hashCode())|0},ve(Qu).equals=function(n){if(this===n)return!0;if(!(n instanceof Qu))return!1;var t=n instanceof Qu?n:pe();return!!le(this.ra_1,t.ra_1)&&!!le(this.sa_1,t.sa_1)},ve(Zu).toString=function(){return"Error(label="+this.va_1+", docLink="+this.wa_1+")"},ve(Zu).hashCode=function(){var n=ae(this.va_1);return Mn(n,31)+(null==this.wa_1?0:ae(this.wa_1))|0},ve(Zu).equals=function(n){if(this===n)return!0;if(!(n instanceof Zu))return!1;var t=n instanceof Zu?n:pe();return!!le(this.va_1,t.va_1)&&!!le(this.wa_1,t.wa_1)},ve(Yu).toString=function(){return"Warning(label="+this.xa_1+", docLink="+this.ya_1+")"},ve(Yu).hashCode=function(){var n=ae(this.xa_1);return Mn(n,31)+(null==this.ya_1?0:ae(this.ya_1))|0},ve(Yu).equals=function(n){if(this===n)return!0;if(!(n instanceof Yu))return!1;var t=n instanceof Yu?n:pe();return!!le(this.xa_1,t.xa_1)&&!!le(this.ya_1,t.ya_1)},ve(Wu).toString=function(){return"Message(prettyText="+this.za_1+")"},ve(Wu).hashCode=function(){return this.za_1.hashCode()},ve(Wu).equals=function(n){if(this===n)return!0;if(!(n instanceof Wu))return!1;var t=n instanceof Wu?n:pe();return!!this.za_1.equals(t.za_1)},ve(Ku).toString=function(){return"ListElement(prettyText="+this.ab_1+")"},ve(Ku).hashCode=function(){return this.ab_1.hashCode()},ve(Ku).equals=function(n){if(this===n)return!0;if(!(n instanceof Ku))return!1;var t=n instanceof Ku?n:pe();return!!this.ab_1.equals(t.ab_1)},ve(Xu).toString=function(){return"TreeNode(prettyText="+this.bb_1+")"},ve(Xu).hashCode=function(){return this.bb_1.hashCode()},ve(Xu).equals=function(n){if(this===n)return!0;if(!(n instanceof Xu))return!1;var t=n instanceof Xu?n:pe();return!!this.bb_1.equals(t.bb_1)},ve(Ju).toString=function(){return"Link(href="+this.cb_1+", label="+this.db_1+")"},ve(Ju).hashCode=function(){var n=he(this.cb_1);return Mn(n,31)+he(this.db_1)|0},ve(Ju).equals=function(n){if(this===n)return!0;if(!(n instanceof Ju))return!1;var t=n instanceof Ju?n:pe();return this.cb_1===t.cb_1&&this.db_1===t.db_1},ve(no).toString=function(){return"Label(text="+this.eb_1+")"},ve(no).hashCode=function(){return he(this.eb_1)},ve(no).equals=function(n){if(this===n)return!0;if(!(n instanceof no))return!1;var t=n instanceof no?n:pe();return this.eb_1===t.eb_1},ve(co).toString=function(){return"Info(label="+this.hb_1+", docLink="+this.ib_1+")"},ve(co).hashCode=function(){var n=ae(this.hb_1);return Mn(n,31)+(null==this.ib_1?0:ae(this.ib_1))|0},ve(co).equals=function(n){if(this===n)return!0;if(!(n instanceof co))return!1;var t=n instanceof co?n:pe();return!!le(this.hb_1,t.hb_1)&&!!le(this.ib_1,t.ib_1)},ve(ao).toString=function(){return"Project(path="+this.jb_1+")"},ve(ao).hashCode=function(){return he(this.jb_1)},ve(ao).equals=function(n){if(this===n)return!0;if(!(n instanceof ao))return!1;var t=n instanceof ao?n:pe();return this.jb_1===t.jb_1},ve(ho).toString=function(){return"Task(path="+this.kb_1+", type="+this.lb_1+")"},ve(ho).hashCode=function(){var n=he(this.kb_1);return Mn(n,31)+he(this.lb_1)|0},ve(ho).equals=function(n){if(this===n)return!0;if(!(n instanceof ho))return!1;var t=n instanceof ho?n:pe();return this.kb_1===t.kb_1&&this.lb_1===t.lb_1},ve(lo).toString=function(){return"TaskPath(path="+this.mb_1+")"},ve(lo).hashCode=function(){return he(this.mb_1)},ve(lo).equals=function(n){if(this===n)return!0;if(!(n instanceof lo))return!1;var t=n instanceof lo?n:pe();return this.mb_1===t.mb_1},ve(_o).toString=function(){return"Bean(type="+this.nb_1+")"},ve(_o).hashCode=function(){return he(this.nb_1)},ve(_o).equals=function(n){if(this===n)return!0;if(!(n instanceof _o))return!1;var t=n instanceof _o?n:pe();return this.nb_1===t.nb_1},ve(vo).toString=function(){return"SystemProperty(name="+this.ob_1+")"},ve(vo).hashCode=function(){return he(this.ob_1)},ve(vo).equals=function(n){if(this===n)return!0;if(!(n instanceof vo))return!1;var t=n instanceof vo?n:pe();return this.ob_1===t.ob_1},ve(go).toString=function(){return"Property(kind="+this.pb_1+", name="+this.qb_1+", owner="+this.rb_1+")"},ve(go).hashCode=function(){var n=he(this.pb_1);return n=Mn(n,31)+he(this.qb_1)|0,Mn(n,31)+he(this.rb_1)|0},ve(go).equals=function(n){if(this===n)return!0;if(!(n instanceof go))return!1;var t=n instanceof go?n:pe();return this.pb_1===t.pb_1&&this.qb_1===t.qb_1&&this.rb_1===t.rb_1},ve(wo).toString=function(){return"BuildLogic(location="+this.sb_1+")"},ve(wo).hashCode=function(){return he(this.sb_1)},ve(wo).equals=function(n){if(this===n)return!0;if(!(n instanceof wo))return!1;var t=n instanceof wo?n:pe();return this.sb_1===t.sb_1},ve(bo).toString=function(){return"BuildLogicClass(type="+this.tb_1+")"},ve(bo).hashCode=function(){return he(this.tb_1)},ve(bo).equals=function(n){if(this===n)return!0;if(!(n instanceof bo))return!1;var t=n instanceof bo?n:pe();return this.tb_1===t.tb_1},ve(ko).zb=function(){return this.yb_1},ve(ko).toString=function(){return"TaskTreeIntent(delegate="+this.yb_1+")"},ve(ko).hashCode=function(){return ae(this.yb_1)},ve(ko).equals=function(n){if(this===n)return!0;if(!(n instanceof ko))return!1;var t=n instanceof ko?n:pe();return!!le(this.yb_1,t.yb_1)},ve(qo).zb=function(){return this.ac_1},ve(qo).toString=function(){return"MessageTreeIntent(delegate="+this.ac_1+")"},ve(qo).hashCode=function(){return ae(this.ac_1)},ve(qo).equals=function(n){if(this===n)return!0;if(!(n instanceof qo))return!1;var t=n instanceof qo?n:pe();return!!le(this.ac_1,t.ac_1)},ve(yo).zb=function(){return this.bc_1},ve(yo).toString=function(){return"InputTreeIntent(delegate="+this.bc_1+")"},ve(yo).hashCode=function(){return ae(this.bc_1)},ve(yo).equals=function(n){if(this===n)return!0;if(!(n instanceof yo))return!1;var t=n instanceof yo?n:pe();return!!le(this.bc_1,t.bc_1)},ve(Bo).zb=function(){return this.cc_1},ve(Bo).toString=function(){return"IncompatibleTaskTreeIntent(delegate="+this.cc_1+")"},ve(Bo).hashCode=function(){return ae(this.cc_1)},ve(Bo).equals=function(n){if(this===n)return!0;if(!(n instanceof Bo))return!1;var t=n instanceof Bo?n:pe();return!!le(this.cc_1,t.cc_1)},ve(Co).toString=function(){return"SetTab(tab="+this.dc_1+")"},ve(Co).hashCode=function(){return this.dc_1.hashCode()},ve(Co).equals=function(n){if(this===n)return!0;if(!(n instanceof Co))return!1;var t=n instanceof Co?n:pe();return!!this.dc_1.equals(t.dc_1)},ve(xo).mc=function(n,t,r,i,e,u,o,f){return new xo(n,t,r,i,e,u,o,f)},ve(xo).nc=function(n,t,r,i,e,u,o,f,s){return n=n===A?this.ec_1:n,t=t===A?this.fc_1:t,r=r===A?this.gc_1:r,i=i===A?this.hc_1:i,e=e===A?this.ic_1:e,u=u===A?this.jc_1:u,o=o===A?this.kc_1:o,f=f===A?this.lc_1:f,s===A?this.mc(n,t,r,i,e,u,o,f):s.mc.call(this,n,t,r,i,e,u,o,f)},ve(xo).toString=function(){return"Model(heading="+this.ec_1+", summary="+this.fc_1+", learnMore="+this.gc_1+", messageTree="+this.hc_1+", locationTree="+this.ic_1+", inputTree="+this.jc_1+", incompatibleTaskTree="+this.kc_1+", tab="+this.lc_1+")"},ve(xo).hashCode=function(){var n=this.ec_1.hashCode();return n=Mn(n,31)+ae(this.fc_1)|0,n=Mn(n,31)+this.gc_1.hashCode()|0,n=Mn(n,31)+this.hc_1.hashCode()|0,n=Mn(n,31)+this.ic_1.hashCode()|0,n=Mn(n,31)+this.jc_1.hashCode()|0,n=Mn(n,31)+this.kc_1.hashCode()|0,Mn(n,31)+this.lc_1.hashCode()|0},ve(xo).equals=function(n){if(this===n)return!0;if(!(n instanceof xo))return!1;var t=n instanceof xo?n:pe();return!!(this.ec_1.equals(t.ec_1)&&le(this.fc_1,t.fc_1)&&this.gc_1.equals(t.gc_1)&&this.hc_1.equals(t.hc_1)&&this.ic_1.equals(t.ic_1)&&this.jc_1.equals(t.jc_1)&&this.kc_1.equals(t.kc_1)&&this.lc_1.equals(t.lc_1))},ve(Ko).gd=function(n,t){var r,i;return n instanceof ko?r=t.nc(A,A,A,A,ps().id(n.yb_1,t.ic_1)):n instanceof qo?r=t.nc(A,A,A,ps().id(n.ac_1,t.hc_1)):n instanceof yo?r=t.nc(A,A,A,A,A,ps().id(n.bc_1,t.jc_1)):n instanceof Bo?r=t.nc(A,A,A,A,A,A,ps().id(n.cc_1,t.kc_1)):n instanceof Dc?r=function(n,t,r,i){var e;return r instanceof qo?e=n.nc(A,A,A,Ac(n.hc_1,r,i)):r instanceof ko?e=n.nc(A,A,A,A,Ac(n.ic_1,r,i)):r instanceof yo?e=n.nc(A,A,A,A,A,Ac(n.jc_1,r,i)):r instanceof Bo?e=n.nc(A,A,A,A,A,A,Ac(n.kc_1,r,i)):(console.error("Unhandled tree intent: "+r),e=n),e}(t,0,n.xc_1,(i=n,function(n){var t;if(!(n instanceof Vu))throw _u(ce("Failed requirement."));for(var r=n.oa_1,e=i.wc_1,u=Rr(Tt(r,10)),o=0,f=r.f();f.g();){var s,c,a=f.h(),h=o;if(o=h+1|0,e===yr(h)){var l=a.sa_1;c=a.ua(A,null==l?null:l.ad())}else c=a;s=c,u.d(s)}return t=u,n.qa(A,A,t)})):n instanceof Mc?(window.navigator.clipboard.writeText(n.hd_1),r=t):n instanceof Co?r=t.nc(A,A,A,A,A,A,A,n.dc_1):(console.error("Unhandled intent: "+n),r=t),r},ve(Ko).ba=function(n,t){var r=n instanceof Oc?n:pe();return this.gd(r,t instanceof xo?t:pe())},ve(Ko).jd=function(n){return Hf().y9(us(Do),[Io(0,n),So(0,n)])},ve(Ko).z9=function(n){return this.jd(n instanceof xo?n:pe())},ve(nf).toString=function(){return"ImportedProblem(problem="+this.kd_1+", message="+this.ld_1+", trace="+this.md_1+")"},ve(nf).hashCode=function(){var n=ae(this.kd_1);return n=Mn(n,31)+this.ld_1.hashCode()|0,Mn(n,31)+ae(this.md_1)|0},ve(nf).equals=function(n){if(this===n)return!0;if(!(n instanceof nf))return!1;var t=n instanceof nf?n:pe();return!!le(this.kd_1,t.kd_1)&&!!this.ld_1.equals(t.ld_1)&&!!le(this.md_1,t.md_1)},ve(_f).ud=function(n,t){return this.td_1(n,t)},ve(_f).compare=function(n,t){return this.ud(n,t)},ve(Bf).toString=function(){return"LearnMore(text="+this.sc_1+", documentationLink="+this.tc_1+")"},ve(Bf).hashCode=function(){var n=he(this.sc_1);return Mn(n,31)+he(this.tc_1)|0},ve(Bf).equals=function(n){if(this===n)return!0;if(!(n instanceof Bf))return!1;var t=n instanceof Bf?n:pe();return this.sc_1===t.sc_1&&this.tc_1===t.tc_1},ve(Cf).toString=function(){return"Text(text="+this.fa_1+")"},ve(Cf).hashCode=function(){return he(this.fa_1)},ve(Cf).equals=function(n){if(this===n)return!0;if(!(n instanceof Cf))return!1;var t=n instanceof Cf?n:pe();return this.fa_1===t.fa_1},ve(xf).toString=function(){return"Reference(name="+this.da_1+", clipboardString="+this.ea_1+")"},ve(xf).hashCode=function(){var n=he(this.da_1);return Mn(n,31)+he(this.ea_1)|0},ve(xf).equals=function(n){if(this===n)return!0;if(!(n instanceof xf))return!1;var t=n instanceof xf?n:pe();return this.da_1===t.da_1&&this.ea_1===t.ea_1},ve(Pf).ed=function(n){return this.dd_1.d(new Cf(n)),this},ve(Pf).xd=function(n,t){return this.dd_1.d(new xf(n,t)),this},ve(Pf).fd=function(n,t,r){return t=t===A?n:t,r===A?this.xd(n,t):r.xd.call(this,n,t)},ve(Pf).j5=function(){return new zf(Qn(this.dd_1))},ve(If).rd=function(n){return new zf(qr(new Cf(n)))},ve(If).qd=function(n){var t=new Pf;return n(t),t.j5()},ve(zf).vd=function(n){return new zf(n)},ve(zf).toString=function(){return"PrettyText(fragments="+this.ca_1+")"},ve(zf).hashCode=function(){return ae(this.ca_1)},ve(zf).equals=function(n){if(this===n)return!0;if(!(n instanceof zf))return!1;var t=n instanceof zf?n:pe();return!!le(this.ca_1,t.ca_1)},ve(Tf).sd=function(n){return function(n){for(var t=Wr(),r=n.f();r.g();)for(var i=t,e=r.h().f();e.g();){var u,o=e.h(),f=i,s=f.v1(o);if(null==s){var c=Wr();f.h5(o,c),u=c}else u=s;i=u instanceof Xr?u:pe()}return t}(n)},ve(Af).toString=function(){return"Trie(nestedMaps="+this.wd_1+")"},ve(Af).hashCode=function(){return ae(this.wd_1)},ve(Af).equals=function(n){return function(n,t){return t instanceof Af&&!!le(n,t instanceof Af?t.wd_1:pe())}(this.wd_1,n)},ve(Kf).ga=function(n){return Jf().yd(this.x9_1,A,n)},ve(Kf).ha=function(n){return Jf().yd(this.x9_1,A,A,n)},ve(Kf).ja=function(n){return Jf().yd(this.x9_1,A,A,ou(n))},ve(Kf).y9=function(n,t){return Jf().yd(this.x9_1,n,A,ou(t))},ve(Kf).zd=function(n,t){return Jf().yd(this.x9_1,n,A,t)},ve(Kf).fb=function(n,t){return Jf().yd(this.x9_1,n,t)},ve(Kf).rc=function(n,t){return Jf().yd(this.x9_1,A,n,ou(t))},ve(Kf).toString=function(){return"ViewFactory(elementName="+this.x9_1+")"},ve(Kf).hashCode=function(){return he(this.x9_1)},ve(Kf).equals=function(n){if(this===n)return!0;if(!(n instanceof Kf))return!1;var t=n instanceof Kf?n:pe();return this.x9_1===t.x9_1},ve(Xf).ae=function(n,t,r,i){return new rs(n,t,r,i)},ve(Xf).yd=function(n,t,r,i,e){return t=t===A?Ct():t,r=r===A?null:r,i=i===A?Ct():i,e===A?this.ae(n,t,r,i):e.ae.call(this,n,t,r,i)},ve(rs).toString=function(){return"Element(elementName="+this.be_1+", attributes="+this.ce_1+", innerText="+this.de_1+", children="+this.ee_1+")"},ve(rs).hashCode=function(){var n=he(this.be_1);return n=Mn(n,31)+ae(this.ce_1)|0,n=Mn(n,31)+(null==this.de_1?0:he(this.de_1))|0,Mn(n,31)+ae(this.ee_1)|0},ve(rs).equals=function(n){if(this===n)return!0;if(!(n instanceof rs))return!1;var t=n instanceof rs?n:pe();return this.be_1===t.be_1&&!!le(this.ce_1,t.ce_1)&&this.de_1==t.de_1&&!!le(this.ee_1,t.ee_1)},ve(os).u9=function(n){return this.r9_1(new fs("click",n))},ve(os).t9=function(n){return this.r9_1(new ss(n))},ve(os).gb=function(n){for(var t=0,r=n.length;t<r;){var i=n[t];t=t+1|0,this.r9_1(new ss(i))}return br()},ve(os).s9=function(n){return this.r9_1(new cs("title",n))},ve(os).bd=function(n){return this.r9_1(new cs("href",n))},ve(vs).oe=function(){return this.ne_1},ve(vs).toString=function(){return"Toggle(focus="+this.ne_1+")"},ve(vs).hashCode=function(){return ae(this.ne_1)},ve(vs).equals=function(n){if(this===n)return!0;if(!(n instanceof vs))return!1;var t=n instanceof vs?n:pe();return!!le(this.ne_1,t.ne_1)},ve(ds).pe=function(n,t){return this.re(n.qe((r=t,function(n){return n.me(r(n.ub_1))})));var r},ve(ds).re=function(n){return new ds(n)},ve(ds).toString=function(){return"Model(tree="+this.xb_1+")"},ve(ds).hashCode=function(){return this.xb_1.hashCode()},ve(ds).equals=function(n){if(this===n)return!0;if(!(n instanceof ds))return!1;var t=n instanceof ds?n:pe();return!!this.xb_1.equals(t.xb_1)},ve(bs).id=function(n,t){var r;if(n instanceof vs){var i=n.oe();r=t.re(i.qe(ws))}else be();return r},ve(ks).cd=function(){return this.ve_1},ve(ks).we=function(){return 0},ve(ks).qe=function(n){return n(this.ve_1)},ve(ks).toString=function(){return"Original(tree="+this.ve_1+")"},ve(ks).hashCode=function(){return this.ve_1.hashCode()},ve(ks).equals=function(n){if(this===n)return!0;if(!(n instanceof ks))return!1;var t=n instanceof ks?n:pe();return!!this.ve_1.equals(t.ve_1)},ve(qs).cd=function(){return this.ue_1},ve(qs).we=function(){return this.se_1.we()+1|0},ve(qs).qe=function(n){return this.se_1.qe((t=this,r=n,function(n){for(var i,e=n.vb_1,u=t.te_1,o=Rr(Tt(e,10)),f=0,s=e.f();s.g();){var c,a=s.h(),h=f;f=h+1|0,c=u===yr(h)?r(a):a,o.d(c)}return i=o,n.me(A,i)}));var t,r},ve(qs).toString=function(){return"Child(parent="+this.se_1+", index="+this.te_1+", tree="+this.ue_1+")"},ve(qs).hashCode=function(){var n=ae(this.se_1);return n=Mn(n,31)+this.te_1|0,Mn(n,31)+this.ue_1.hashCode()|0},ve(qs).equals=function(n){if(this===n)return!0;if(!(n instanceof qs))return!1;var t=n instanceof qs?n:pe();return!!le(this.se_1,t.se_1)&&this.te_1===t.te_1&&!!this.ue_1.equals(t.ue_1)},ve(ys).ad=function(){var n;switch(this.q8_1){case 0:n=xs();break;case 1:n=Cs();break;default:be()}return n},ve(Bs).vc=function(){var n,t;return ut(Vn(Ve(0,this.cd().vb_1.k()-1|0)),(n=this,(t=function(t){return n.xe(t)}).callableName="child",t))},ve(Bs).xe=function(n){return new qs(this,n,this.cd().vb_1.j(n))},ve(js).uc=function(){return new ks(this)},ve(js).ye=function(){return!this.vb_1.i()},ve(js).ze=function(n,t,r){return new js(n,t,r)},ve(js).me=function(n,t,r,i){return n=n===A?this.ub_1:n,t=t===A?this.vb_1:t,r=r===A?this.wb_1:r,i===A?this.ze(n,t,r):i.ze.call(this,n,t,r)},ve(js).toString=function(){return"Tree(label="+this.ub_1+", children="+this.vb_1+", state="+this.wb_1+")"},ve(js).hashCode=function(){var n=null==this.ub_1?0:ae(this.ub_1);return n=Mn(n,31)+ae(this.vb_1)|0,Mn(n,31)+this.wb_1.hashCode()|0},ve(js).equals=function(n){if(this===n)return!0;if(!(n instanceof js))return!1;var t=n instanceof js?n:pe();return!!le(this.ub_1,t.ub_1)&&!!le(this.vb_1,t.vb_1)&&!!this.wb_1.equals(t.wb_1)},ve(zs).toString=function(){return"ProblemIdElement(name="+this.df_1+", displayName="+this.ef_1+")"},ve(zs).hashCode=function(){var n=he(this.df_1);return Mn(n,31)+he(this.ef_1)|0},ve(zs).equals=function(n){if(this===n)return!0;if(!(n instanceof zs))return!1;var t=n instanceof zs?n:pe();return this.df_1===t.df_1&&this.ef_1===t.ef_1},ve(Ts).toString=function(){return"ProblemSummary(problemId="+this.ff_1+", count="+this.gf_1+")"},ve(Ts).hashCode=function(){var n=ae(this.ff_1);return Mn(n,31)+this.gf_1|0},ve(Ts).equals=function(n){if(this===n)return!0;if(!(n instanceof Ts))return!1;var t=n instanceof Ts?n:pe();return!!le(this.ff_1,t.ff_1)&&this.gf_1===t.gf_1},ve(Ms).toString=function(){return"ProblemNodeGroup(tree="+this.hf_1+", children="+this.if_1+", childGroups="+this.jf_1+", id="+this.kf_1+")"},ve(Ms).hashCode=function(){var n=this.hf_1.hashCode();return n=Mn(n,31)+ae(this.if_1)|0,n=Mn(n,31)+ae(this.jf_1)|0,Mn(n,31)+this.kf_1|0},ve(Ms).equals=function(n){if(this===n)return!0;if(!(n instanceof Ms))return!1;var t=n instanceof Ms?n:pe();return!!this.hf_1.equals(t.hf_1)&&!!le(this.if_1,t.if_1)&&!!le(this.jf_1,t.jf_1)&&this.kf_1===t.kf_1},ve(uc).toString=function(){return"Text(text="+this.lf_1+")"},ve(uc).hashCode=function(){return he(this.lf_1)},ve(uc).equals=function(n){if(this===n)return!0;if(!(n instanceof uc))return!1;var t=n instanceof uc?n:pe();return this.lf_1===t.lf_1},ve(oc).toString=function(){return"ProblemIdNode(prettyText="+this.mf_1+", separator="+this.nf_1+")"},ve(oc).hashCode=function(){var n=this.mf_1.hashCode();return Mn(n,31)+(0|this.nf_1)|0},ve(oc).equals=function(n){if(this===n)return!0;if(!(n instanceof oc))return!1;var t=n instanceof oc?n:pe();return!!this.mf_1.equals(t.mf_1)&&this.nf_1===t.nf_1},ve(fc).toString=function(){return"Advice(label="+this.of_1+", docLink="+this.pf_1+")"},ve(fc).hashCode=function(){var n=ae(this.of_1);return Mn(n,31)+(null==this.pf_1?0:ae(this.pf_1))|0},ve(fc).equals=function(n){if(this===n)return!0;if(!(n instanceof fc))return!1;var t=n instanceof fc?n:pe();return!!le(this.of_1,t.of_1)&&!!le(this.pf_1,t.pf_1)},ve(cc).zb=function(){return this.qf_1},ve(cc).toString=function(){return"MessageTreeIntent(delegate="+this.qf_1+")"},ve(cc).hashCode=function(){return ae(this.qf_1)},ve(cc).equals=function(n){if(this===n)return!0;if(!(n instanceof cc))return!1;var t=n instanceof cc?n:pe();return!!le(this.qf_1,t.qf_1)},ve(ac).zb=function(){return this.rf_1},ve(ac).toString=function(){return"ProblemIdTreeIntent(delegate="+this.rf_1+")"},ve(ac).hashCode=function(){return ae(this.rf_1)},ve(ac).equals=function(n){if(this===n)return!0;if(!(n instanceof ac))return!1;var t=n instanceof ac?n:pe();return!!le(this.rf_1,t.rf_1)},ve(hc).zb=function(){return this.sf_1},ve(hc).toString=function(){return"FileLocationTreeIntent(delegate="+this.sf_1+")"},ve(hc).hashCode=function(){return ae(this.sf_1)},ve(hc).equals=function(n){if(this===n)return!0;if(!(n instanceof hc))return!1;var t=n instanceof hc?n:pe();return!!le(this.sf_1,t.sf_1)},ve(lc).zb=function(){return this.tf_1},ve(lc).toString=function(){return"PluginLocationTreeIntent(delegate="+this.tf_1+")"},ve(lc).hashCode=function(){return ae(this.tf_1)},ve(lc).equals=function(n){if(this===n)return!0;if(!(n instanceof lc))return!1;var t=n instanceof lc?n:pe();return!!le(this.tf_1,t.tf_1)},ve(_c).zb=function(){return this.uf_1},ve(_c).toString=function(){return"TaskLocationTreeIntent(delegate="+this.uf_1+")"},ve(_c).hashCode=function(){return ae(this.uf_1)},ve(_c).equals=function(n){if(this===n)return!0;if(!(n instanceof _c))return!1;var t=n instanceof _c?n:pe();return!!le(this.uf_1,t.uf_1)},ve(vc).toString=function(){return"SetTab(tab="+this.vf_1+")"},ve(vc).hashCode=function(){return this.vf_1.hashCode()},ve(vc).equals=function(n){if(this===n)return!0;if(!(n instanceof vc))return!1;var t=n instanceof vc?n:pe();return!!this.vf_1.equals(t.vf_1)},ve(dc).gg=function(n,t,r,i,e,u,o,f,s,c){return new dc(n,t,r,i,e,u,o,f,s,c)},ve(dc).hg=function(n,t,r,i,e,u,o,f,s,c,a){return n=n===A?this.wf_1:n,t=t===A?this.xf_1:t,r=r===A?this.yf_1:r,i=i===A?this.zf_1:i,e=e===A?this.ag_1:e,u=u===A?this.bg_1:u,o=o===A?this.cg_1:o,f=f===A?this.dg_1:f,s=s===A?this.eg_1:s,c=c===A?this.fg_1:c,a===A?this.gg(n,t,r,i,e,u,o,f,s,c):a.gg.call(this,n,t,r,i,e,u,o,f,s,c)},ve(dc).toString=function(){return"Model(heading="+this.wf_1+", summary="+this.xf_1+", learnMore="+this.yf_1+", messageTree="+this.zf_1+", problemIdTree="+this.ag_1+", fileLocationTree="+this.bg_1+", pluginLocationTree="+this.cg_1+", taskLocationTree="+this.dg_1+", problemCount="+this.eg_1+", tab="+this.fg_1+")"},ve(dc).hashCode=function(){var n=this.wf_1.hashCode();return n=Mn(n,31)+ae(this.xf_1)|0,n=Mn(n,31)+this.yf_1.hashCode()|0,n=Mn(n,31)+this.zf_1.hashCode()|0,n=Mn(n,31)+this.ag_1.hashCode()|0,n=Mn(n,31)+this.bg_1.hashCode()|0,n=Mn(n,31)+this.cg_1.hashCode()|0,n=Mn(n,31)+this.dg_1.hashCode()|0,n=Mn(n,31)+this.eg_1|0,Mn(n,31)+this.fg_1.hashCode()|0},ve(dc).equals=function(n){if(this===n)return!0;if(!(n instanceof dc))return!1;var t=n instanceof dc?n:pe();return!!(this.wf_1.equals(t.wf_1)&&le(this.xf_1,t.xf_1)&&this.yf_1.equals(t.yf_1)&&this.zf_1.equals(t.zf_1)&&this.ag_1.equals(t.ag_1)&&this.bg_1.equals(t.bg_1)&&this.cg_1.equals(t.cg_1)&&this.dg_1.equals(t.dg_1)&&this.eg_1===t.eg_1&&this.fg_1.equals(t.fg_1))},ve(Lc).ig=function(n,t){var r,i;return n instanceof hc?r=t.hg(A,A,A,A,A,ps().id(n.sf_1,t.bg_1)):n instanceof lc?r=t.hg(A,A,A,A,A,A,ps().id(n.tf_1,t.cg_1)):n instanceof _c?r=t.hg(A,A,A,A,A,A,A,ps().id(n.uf_1,t.dg_1)):n instanceof ac?r=t.hg(A,A,A,A,ps().id(n.rf_1,t.ag_1)):n instanceof cc?r=t.hg(A,A,A,ps().id(n.qf_1,t.zf_1)):n instanceof Dc?r=function(n,t,r,i){var e;return r instanceof cc?e=n.hg(A,A,A,Ac(n.zf_1,r,i)):r instanceof ac?e=n.hg(A,A,A,A,Ac(n.ag_1,r,i)):r instanceof hc?e=n.hg(A,A,A,A,A,Ac(n.bg_1,r,i)):r instanceof lc?e=n.hg(A,A,A,A,A,A,Ac(n.cg_1,r,i)):r instanceof _c?e=n.hg(A,A,A,A,A,A,A,Ac(n.dg_1,r,i)):(console.error("Unhandled tree intent: "+r),e=n),e}(t,0,n.xc_1,(i=n,function(n){var t;if(!(n instanceof Vu))throw _u(ce("Failed requirement."));for(var r=n.oa_1,e=i.wc_1,u=Rr(Tt(r,10)),o=0,f=r.f();f.g();){var s,c,a=f.h(),h=o;if(o=h+1|0,e===yr(h)){var l=a.sa_1;c=a.ua(A,null==l?null:l.ad())}else c=a;s=c,u.d(s)}return t=u,n.qa(A,A,t)})):n instanceof Mc?(window.navigator.clipboard.writeText(n.hd_1),r=t):n instanceof vc?r=t.hg(A,A,A,A,A,A,A,A,A,n.vf_1):(console.error("Unhandled intent: "+n),r=t),r},ve(Lc).ba=function(n,t){var r=n instanceof Oc?n:pe();return this.ig(r,t instanceof dc?t:pe())},ve(Lc).jg=function(n){return Hf().y9(us(xc),[wc(0,n),bc(0,n)])},ve(Lc).z9=function(n){return this.jg(n instanceof dc?n:pe())},ve(Mc).toString=function(){return"Copy(text="+this.hd_1+")"},ve(Mc).hashCode=function(){return he(this.hd_1)},ve(Mc).equals=function(n){if(this===n)return!0;if(!(n instanceof Mc))return!1;var t=n instanceof Mc?n:pe();return this.hd_1===t.hd_1},ve(Dc).toString=function(){return"ToggleStackTracePart(partIndex="+this.wc_1+", location="+this.xc_1+")"},ve(Dc).hashCode=function(){var n=this.wc_1;return Mn(n,31)+ae(this.xc_1)|0},ve(Dc).equals=function(n){if(this===n)return!0;if(!(n instanceof Dc))return!1;var t=n instanceof Dc?n:pe();return this.wc_1===t.wc_1&&!!le(this.xc_1,t.xc_1)},ve(ui).k6=function(){var n=Object.create(null);return n.foo=1,delete n.foo,br(),n},l=null,function(){var n=configurationCacheProblems();if(null==n.problemsReport)Mf(Ff("report"),Xo(),function(n){var t,r,i,e,u,o,f,s,c,a,h=function(n){for(var t=Or(),r=Or(),i=Or(),e=0,u=n.length;e<u;){var o=n[e];e=e+1|0;var f,s=o.input,c=null==s?null:r.d(rf(s,o));if(null==c){var a=o.incompatibleTask;f=null==a?null:i.d(rf(a,o))}else f=c;if(null==f){var h=we(o.problem);t.d(rf(h,o))}}return new tf(t,r,i)}(n.diagnostics),l=n.totalProblemCount;return new xo((f=(t=n).buildName,s=t.requestedTasks,c=null==s?null:rr(s," ",A,r=r!==A&&r)>=0,a=null==c||c,Sf().qd((i=t,e=f,u=s,o=a,function(n){n.ed(function(n){var t;if(re(n)>0){var r,i=ne(n,0);r=function(n){return 97<=n&&n<=122||!(Ei(n,128)<0)&&function(n){var t;return t=1===function(n){var t=n,r=su(au().h9_1,t),i=au().h9_1[r],e=(i+au().i9_1[r]|0)-1|0,u=au().j9_1[r];if(t>e)return 0;var o=3&u;if(0===o){var f=2,s=i,c=0;if(c<=1)do{if(c=c+1|0,(s=s+(u>>f&127)|0)>t)return 3;if((s=s+(u>>(f=f+7|0)&127)|0)>t)return 0;f=f+7|0}while(c<=1);return 3}if(u<=7)return o;var a=t-i|0;return u>>Mn(2,u<=31?a%2|0:a)&3}(n)||function(n){var t=su(lu().k9_1,n);return t>=0&&n<(lu().k9_1[t]+lu().l9_1[t]|0)}(n),t}(n)}(i)?function(n){return function(n){var t=Li(n).toUpperCase();if(t.length>1){var r;if(329===n)r=t;else{var i=ne(t,0),e=t.substring(1).toLowerCase();r=Li(i)+e}return r}return Li(function(n){return function(n){var t=n;return 452<=t&&t<=460||497<=t&&t<=499?Ue(Mn(3,(t+1|0)/3|0)):4304<=t&&t<=4346||4349<=t&&t<=4351?n:xi(n)}(n)}(n))}(n)}(i):Li(i),t=ce(r)+n.substring(1)}else t=n;return t}(i.cacheAction)+" the configuration cache for ");var t=e;null==t||n.fd(t),null==e||n.ed(" build and ");var r=u;return null==(null==r?null:n.fd(r))&&n.ed("default"),n.ed(o?" tasks":" task"),br()}))),function(n,t){var r=n.cacheActionDescription,i=null==r?null:mf(r),e=Sf().rd(function(n){var t=n.od_1.k(),r=kf(t,"build configuration input");return t>0?r+" and will cause the cache to be discarded when "+(t<=1?"its":"their")+" value change":r}(t)),u=Sf().rd(function(n,t){var r=n.totalProblemCount,i=t.nd_1.k(),e=kf(r,"problem");return r>i?e+", only the first "+i+" "+yf(i)+" included in this report":e}(n,t));return function(n,t){for(var r=0,i=n.length;r<i;){var e=n[r];r=r+1|0,null!=e&&t.d(e)}return t}([i,e,u],Or())}(n,h),new Bf("Gradle Configuration Cache",n.documentationLink),hf(new no(Zo().qc_1),ut(Vn(h.nd_1),gf)),hf(new no(Yo().qc_1),function(n){return ut(Vn(n),wf)}(h.nd_1)),hf(new no(Qo().qc_1),ut(Vn(h.od_1),vf)),hf(new no(Wo().qc_1),ut(Vn(h.pd_1),df)),0===l?Qo():Zo())}(n));else{var t=n.problemsReport;Mf(Ff("report"),Nc(),function(n,t){ec();for(var r=n.summaries,i=Rr(r.length),e=0,u=r.length;e<u;){var o,f=r[e];e=e+1|0;for(var s=f.problemId,c=Rr(s.length),a=0,h=s.length;a<h;){var l,_=s[a];a=a+1|0,l=new zs(_.name,_.displayName),c.d(l)}o=new Ts(c,f.count),i.d(o)}for(var v=i,d=function(n,t){ec();for(var r=li(),i=0,e=n.length;i<e;){var u=n[i];i=i+1|0;var o,f=(a=u.problemId,ec(),On(a,":",A,A,A,A,Ws)),s=r.v1(f);if(null==s){var c=Or();r.h5(f,c),o=c}else o=s;o.d(u)}for(var a,h=r.o(),l=Rr(Tt(h,10)),_=h.f();_.g();){for(var v,d=_.h(),g=d.i1(),w=Rr(Tt(g,10)),b=g.f();b.g();){var p;p=Os(b.h(),null,!0),w.d(p)}var m,k=Zn(w),q=Un(d.i1()),y=Hs(q,new Wu($s(Rs(q)).ed(" ("+d.i1().k()+")").j5()));n:{for(var B=t.f();B.g();){var C=B.h();if(Ds(C.ff_1,q.problemId)){m=C;break n}}m=null}var x=m;null==x||k.d(Ns(x.gf_1)),v=new js(y,k),l.d(v)}var j=l;return new ds(new js(new uc("message tree root"),j))}(t,v),g=function(n,t){ec();for(var r=function(){ec();var n=Or();return new Ms(new js(new oc(Sf().rd("Ungrouped"),!0),n),n,li())}(),i=li(),e=0,u=n.length;e<u;){var o=n[e];e=e+1|0;for(var f=Yn(Dn(o.problemId,1)),s=Rr(Tt(f,10)),c=f.f();c.g();){var a,h=c.h();a=new zs(h.name,h.displayName),s.d(a)}var l=Fs(i,s),_=Os(o);null==l?r.if_1.d(_):l.if_1.d(_)}for(var v=Rr(Tt(t,10)),d=t.f();d.g();){var g,w=d.h();g=new Ts(Yn(Wn(w.ff_1,1)),w.gf_1),v.d(g)}for(var b=li(),p=v.f();p.g();){var m,k=p.h(),q=k.ff_1,y=b.v1(q);if(null==y){var B=Or();b.h5(q,B),m=B}else m=y;m.d(k)}for(var C=b.o(),x=Rr(Tt(C,10)),j=C.f();j.g();){for(var P,I=j.h(),S=I.j1(),z=0,T=I.i1().f();T.g();)z=z+T.h().gf_1|0;P=new Ts(S,z),x.d(P)}for(var E=x.f();E.g();){var L=E.h(),N=Fs(i,L.ff_1),A=null==N?null:N.if_1;null==A||A.d(Ns(L.gf_1))}for(var M=i.w1(),F=Rr(Tt(M,10)),D=M.f();D.g();){var O;O=D.h().hf_1,F.d(O)}var R=function(n,t){var r=Rr(n.k());return r.m(n),r.d(t),r}(F,r.hf_1);return new ds(new js(new uc("group tree root"),R))}(t,v),w=0,b=v.f();b.g();)w=w+b.h().gf_1|0;for(var p=Es(t,w,(ec(),wn)),m=0,k=v.f();k.g();)m=m+k.h().gf_1|0;for(var q=Es(t,m,(ec(),bn)),y=0,B=v.f();B.g();)y=y+B.h().gf_1|0;var C=Es(t,y,(ec(),pn));return new dc(Sf().rd("Problems Report"),function(n,t){ec();var r,i,e,u=n.description,o=null==u?null:qr(mf(u));return r=null==o?qr(Sf().qd((i=t,e=n,function(n){n.ed(i.length+" problems have been reported during the execution");var t=e.buildName;null==t||(n.ed(" of build "),n.fd(t));var r=e.requestedTasks;return null==r||(n.ed(" for the following tasks:"),n.fd(r),br()),br()}))):o,r}(n,t),new Bf("reporting problems",n.documentationLink),d,g,p,q,C,t.length,function(n,t,r,i,e){return ec(),po(r)>0?tc():po(n)>0?Js():po(t)>0?nc():po(i)>0?rc():po(e)>0?ic():Js()}(d,g,p,q,C))}(t,n.diagnostics))}}(),n}(void 0===this["configuration-cache-report"]?{}:this["configuration-cache-report"])}}[70](),{}))));
 //# sourceMappingURL=configuration-cache-report.js.map
                 </script>
 
diff --git a/android/gradle.properties b/android/gradle.properties
index 25971708..f018a618 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index f587a472..e603bd33 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
index 833c476b..e173b2c9 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -18,11 +18,11 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.7.3" apply false
+    id "com.android.application" version "8.12.0" apply false
     // START: FlutterFire Configuration
-    id "com.google.gms.google-services" version "4.4.2" apply false
+    id "com.google.gms.google-services" version "4.4.3" apply false
     // END: FlutterFire Configuration
-    id "org.jetbrains.kotlin.android" version "2.0.21" apply false
+    id "org.jetbrains.kotlin.android" version "2.2.10" apply false
 }
 
 include ":app"
diff --git a/assets/icons/reply.svg b/assets/icons/reply.svg
new file mode 100644
index 00000000..b62c76ae
--- /dev/null
+++ b/assets/icons/reply.svg
@@ -0,0 +1,3 @@
+<svg width="19" height="14" viewBox="0 0 19 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.56039 6.73215L7.06827 10.2925C7.22519 10.452 7.3026 10.6385 7.30049 10.8521C7.29855 11.0656 7.21569 11.2555 7.0519 11.4218C6.88812 11.577 6.70269 11.6573 6.49563 11.6629C6.28874 11.6682 6.1034 11.5879 5.93961 11.4218L1.19568 6.60653C1.0048 6.41278 0.909363 6.1868 0.909363 5.92858C0.909363 5.67037 1.0048 5.44439 1.19568 5.25064L5.93961 0.435368C6.08581 0.287154 6.26675 0.211261 6.48243 0.207689C6.69829 0.204297 6.88812 0.280189 7.0519 0.435368C7.21569 0.601618 7.29759 0.792601 7.29759 1.00831C7.29759 1.22385 7.21569 1.41474 7.0519 1.58099L3.56039 5.12501H13.4583C14.8441 5.12501 16.0261 5.62162 17.0045 6.61483C17.983 7.60787 18.4722 8.80769 18.4722 10.2143V13.1607C18.4722 13.3888 18.3964 13.5797 18.2448 13.7334C18.0933 13.8873 17.9052 13.9643 17.6806 13.9643C17.4559 13.9643 17.2678 13.8873 17.1164 13.7334C16.9647 13.5797 16.8889 13.3888 16.8889 13.1607V10.2143C16.8889 9.25269 16.5539 8.43197 15.884 7.75215C15.2143 7.07215 14.4057 6.73215 13.4583 6.73215H3.56039Z" fill="#2F80ED"/>
+</svg>
diff --git a/assets/icons/resend.svg b/assets/icons/resend.svg
new file mode 100644
index 00000000..245a03be
--- /dev/null
+++ b/assets/icons/resend.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19.377 11L15.3193 6.94225C15.1641 6.78709 15.0865 6.60892 15.0865 6.40775C15.0865 6.20642 15.1641 6.02817 15.3193 5.873C15.4744 5.72817 15.6542 5.65734 15.8587 5.6605C16.0631 5.66384 16.2345 5.73467 16.373 5.873L20.8673 10.3673C20.9609 10.4609 21.0269 10.5597 21.0653 10.6635C21.1038 10.7673 21.123 10.8795 21.123 11C21.123 11.1205 21.1038 11.2327 21.0653 11.3365C21.0269 11.4403 20.9609 11.5391 20.8673 11.6328L16.373 16.127C16.2178 16.282 16.0422 16.357 15.8462 16.352C15.6501 16.3468 15.4744 16.2718 15.3193 16.127C15.1641 15.9718 15.0856 15.7946 15.0837 15.5953C15.0817 15.3959 15.1551 15.2218 15.3038 15.073L19.377 11ZM14.0693 11.75H7.25C6.3525 11.75 5.5865 12.0673 4.952 12.702C4.31733 13.3365 4 14.1025 4 15V17.75C4 17.9628 3.92817 18.141 3.7845 18.2845C3.641 18.4282 3.46283 18.5 3.25 18.5C3.03717 18.5 2.859 18.4282 2.7155 18.2845C2.57183 18.141 2.5 17.9628 2.5 17.75V15C2.5 13.6872 2.9635 12.5673 3.8905 11.6405C4.81733 10.7135 5.93717 10.25 7.25 10.25H14.0693L10.7615 6.94225C10.6065 6.78709 10.529 6.60892 10.529 6.40775C10.529 6.20642 10.6065 6.02817 10.7615 5.873C10.9167 5.72817 11.0965 5.65734 11.301 5.6605C11.5055 5.66384 11.677 5.73467 11.8155 5.873L16.3095 10.3673C16.4032 10.4609 16.4692 10.5597 16.5078 10.6635C16.5463 10.7673 16.5655 10.8795 16.5655 11C16.5655 11.1205 16.5463 11.2327 16.5078 11.3365C16.4692 11.4403 16.4032 11.5391 16.3095 11.6328L11.8155 16.127C11.6603 16.282 11.4847 16.357 11.2885 16.352C11.0923 16.3468 10.9167 16.2718 10.7615 16.127C10.6065 15.9718 10.528 15.7946 10.526 15.5953C10.524 15.3959 10.5974 15.2218 10.7463 15.073L14.0693 11.75Z" fill="#2F80ED"/>
+</svg>
diff --git a/env/.env b/env/.env
new file mode 100644
index 00000000..e69de29b
diff --git a/ios/Gemfile b/ios/Gemfile
index 7a118b49..791ac593 100644
--- a/ios/Gemfile
+++ b/ios/Gemfile
@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem "fastlane"
+gem "fastlane", "~> 2.217"
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 648ad30f..e484a472 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -213,10 +213,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -283,10 +287,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -388,7 +396,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 37;
+				CURRENT_PROJECT_VERSION = 69;
 				DEVELOPMENT_TEAM = VL68C36HYS;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -406,7 +414,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.50;
+				MARKETING_VERSION = 1.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044";
@@ -538,7 +546,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 37;
+				CURRENT_PROJECT_VERSION = 69;
 				DEVELOPMENT_TEAM = VL68C36HYS;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -556,7 +564,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.50;
+				MARKETING_VERSION = 1.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044";
@@ -576,7 +584,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution: ITVIO, OOO (VL68C36HYS)";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 37;
+				CURRENT_PROJECT_VERSION = 69;
 				DEVELOPMENT_TEAM = VL68C36HYS;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -594,7 +602,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 1.0.50;
+				MARKETING_VERSION = 1.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.eatvioapp.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.eatvioapp.app 1747050044";
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 4009d581..7e814e8a 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>eatvio_app</string>
+	<string>Итвио</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>37</string>
+	<string>69</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
@@ -32,7 +32,7 @@
 		<true/>
 	</dict>
 	<key>NSAppleMusicUsageDescription</key>
-    <string>This permission is not needed by the app, but it is required by an underlying API. If you see this dialog, contact us.</string>
+	<string>This permission is not needed by the app, but it is required by an underlying API. If you see this dialog, contact us.</string>
 	<key>NSCameraUsageDescription</key>
 	<string>Предоставление доступа позволит Вам делать фотографии и добавлять к записям</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements
index 903def2a..7b8ca2a8 100644
--- a/ios/Runner/Runner.entitlements
+++ b/ios/Runner/Runner.entitlements
@@ -4,5 +4,10 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:eatvio.ru</string>
+		<string>applinks:www.eatvio.ru</string>
+	</array>
 </dict>
 </plist>
diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile
index 4073b355..ebd745be 100644
--- a/ios/fastlane/Fastfile
+++ b/ios/fastlane/Fastfile
@@ -18,9 +18,68 @@ default_platform(:ios)
 platform :ios do
   desc "Push a new beta build to TestFlight"
   lane :beta do
-    match(type: "appstore")
+    UI.message "Current working directory: #{Dir.pwd}"
+    UI.message "Checking API key file..."
+    
+    possible_paths = [
+      "../AuthKey.p8",
+      "./AuthKey.p8", 
+      "../../AuthKey.p8",
+      File.expand_path("../AuthKey.p8"),
+      File.expand_path("./AuthKey.p8")
+    ]
+    
+    auth_key_path = nil
+    possible_paths.each do |path|
+      if File.exist?(path)
+        UI.message "Found AuthKey.p8 at: #{path}"
+        auth_key_path = File.expand_path(path)
+        break
+      end
+    end
+    
+    if auth_key_path.nil?
+      UI.user_error!("API key file not found. Tried paths: #{possible_paths.join(', ')}")
+    end
+    
+    UI.message "Using auth_key_path: #{auth_key_path}"
+    
+    match(type: "appstore", readonly: true)
     increment_build_number(xcodeproj: "Runner.xcodeproj")
-    build_app(workspace: "Runner.xcworkspace", scheme: "Runner", export_method: "app-store", codesigning_identity: "Apple Distribution")
-    upload_to_testflight
+
+    build_date = Time.now.getlocal("+03:00").strftime("%Y-%m-%d %H:%M:%S")
+    
+    build_app(
+      workspace: "Runner.xcworkspace", 
+      scheme: "Runner", 
+      export_method: "app-store", 
+      codesigning_identity: "Apple Distribution",
+      xcargs: "--dart-define=HIDE_PLANS=true --dart-define=BUILD_DATE='#{build_date}'"
+    )
+    
+
+    
+    app_store_connect_api_key(
+      key_id: "325JS9JCZH", 
+      issuer_id: "dfa27d1d-2bb8-4d4d-847e-0b32f9b880b3", 
+      key_filepath: auth_key_path,
+      duration: 1200,
+      in_house: false
+    )
+    
+    begin
+      upload_to_testflight(
+        skip_waiting_for_build_processing: true,
+        skip_submission: true,
+        distribute_external: false,
+        notify_external_testers: false,
+        changelog: "TestFlight build #{get_build_number(xcodeproj: 'Runner.xcodeproj')}",
+        verbose: true
+      )
+    rescue => ex
+      UI.error "Upload to TestFlight failed: #{ex.message}"
+      UI.error "Full error: #{ex.backtrace.join("\n")}"
+      raise ex
+    end
   end
 end
diff --git a/ios/fastlane/report.xml b/ios/fastlane/report.xml
index c86e2b65..0d039029 100644
--- a/ios/fastlane/report.xml
+++ b/ios/fastlane/report.xml
@@ -5,22 +5,24 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000206">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000227">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: increment_build_number" time="0.195115">
+      <testcase classname="fastlane.lanes" name="1: match" time="8.292217">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: build_app" time="116.686863">
+      <testcase classname="fastlane.lanes" name="2: increment_build_number" time="0.201631">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: upload_to_testflight" time="338.642203">
+      <testcase classname="fastlane.lanes" name="3: build_app" time="9.870647">
+        
+          <failure message="/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/actions/actions_helper.rb:67:in &apos;Fastlane::Actions.execute_action&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/runner.rb:255:in &apos;block in Fastlane::Runner#execute_action&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/runner.rb:229:in &apos;Dir.chdir&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/runner.rb:229:in &apos;Fastlane::Runner#execute_action&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/runner.rb:157:in &apos;Fastlane::Runner#trigger_action_by_name&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/fast_file.rb:159:in &apos;Fastlane::FastFile#method_missing&apos;&#10;Fastfile:23:in &apos;block (2 levels) in Fastlane::FastFile#parsing_binding&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/lane.rb:41:in &apos;Fastlane::Lane#call&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/runner.rb:49:in &apos;block in Fastlane::Runner#execute&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/runner.rb:45:in &apos;Dir.chdir&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/runner.rb:45:in &apos;Fastlane::Runner#execute&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/lane_manager.rb:46:in &apos;Fastlane::LaneManager.cruise_lane&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/command_line_handler.rb:34:in &apos;Fastlane::CommandLineHandler.handle&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/commands_generator.rb:110:in &apos;block (2 levels) in Fastlane::CommandsGenerator#run&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/commander-4.6.0/lib/commander/command.rb:187:in &apos;Commander::Command#call&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/commander-4.6.0/lib/commander/command.rb:157:in &apos;Commander::Command#run&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/commander-4.6.0/lib/commander/runner.rb:444:in &apos;Commander::Runner#run_active_command&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb:124:in &apos;Commander::Runner#run!&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/commander-4.6.0/lib/commander/delegates.rb:18:in &apos;Commander::Delegates#run!&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/commands_generator.rb:363:in &apos;Fastlane::CommandsGenerator#run&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/commands_generator.rb:43:in &apos;Fastlane::CommandsGenerator.start&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/fastlane/lib/fastlane/cli_tools_distributor.rb:123:in &apos;Fastlane::CLIToolsDistributor.take_off&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/gems/fastlane-2.228.0/bin/fastlane:23:in &apos;&lt;top (required)&gt;&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/bin/fastlane:25:in &apos;Kernel#load&apos;&#10;/opt/homebrew/Cellar/fastlane/2.228.0/libexec/bin/fastlane:25:in &apos;&lt;main&gt;&apos;&#10;&#10;Error building the application - see the log above" />
         
       </testcase>
     
diff --git a/lib/core/app_router.dart b/lib/core/app_router.dart
index 2f4c88fa..c691b0b2 100644
--- a/lib/core/app_router.dart
+++ b/lib/core/app_router.dart
@@ -1,5 +1,3 @@
-import 'dart:io';
-import 'package:device_info_plus/device_info_plus.dart';
 import 'package:dio/dio.dart';
 import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/core/firebase_api.dart';
@@ -46,7 +44,6 @@ import 'package:eatvio_app/features/finances_and_consultations_archive/presentat
 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/notifications_screen.dart';
-import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
 import 'package:eatvio_app/features/plans/presentation/pages/about_plan_screen.dart';
 import 'package:eatvio_app/features/profile/presentation/pages/profile_screen.dart';
 import 'package:eatvio_app/features/profile/presentation/pages/subs_screen.dart';
@@ -71,6 +68,7 @@ import 'package:eatvio_app/features/user_details/presentation/user_details_scree
 import 'package:eatvio_app/features/welcome/presentation/pages/welcome_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:go_router/go_router.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -83,6 +81,30 @@ class AppRouter {
   static GoRouter appRouter = GoRouter(
     initialLocation: '/update-screen',
     navigatorKey: navigatorKey,
+    redirect: (context, state) {
+      final segments = state.uri.pathSegments;
+      if (segments.length >= 3) {
+        final type = segments[1];
+        final contentIdentifier = segments[2];
+
+        switch (type) {
+          case 'recipe':
+            FlutterNativeSplash.remove();
+            return '/about-recipes-screen?slug=$contentIdentifier';
+          case 'blog_post':
+            FlutterNativeSplash.remove();
+            return '/blog-post-screen?id=$contentIdentifier';
+          case 'plan':
+            FlutterNativeSplash.remove();
+            return '/about-plan-screen?slug=$contentIdentifier';
+          case 'diet':
+            FlutterNativeSplash.remove();
+            return '/about-diet-screen?slug=$contentIdentifier';
+        }
+      }
+
+      return null;
+    },
     routes: [
       GoRoute(
         path: '/auth-screen',
@@ -97,7 +119,9 @@ class AppRouter {
           GoRoute(
             path: 'forget-password-screen',
             name: 'forgetPasswordScreen',
-            builder: (context, state) => const ForgetPasswordScreen(),
+            builder: (context, state) => ForgetPasswordScreen(
+              isAuth: state.extra as bool,
+            ),
           ),
           GoRoute(
             path: 'scan-qr-code-screen',
@@ -181,21 +205,9 @@ class AppRouter {
         builder: (context, state) => const WelcomeScreen(),
         redirect: (context, state) async {
           try {
-            if (await TokenStorage.haveTokenInStorage()) {
-              final firebaseApi = sl<FirebaseApi>();
-              final fbToken = await firebaseApi.getToken();
-              final deviceInfo = DeviceInfoPlugin();
-              await sl<Dio>().post(
-                '/api/profile/notification/token/register',
-                data: {
-                  'platform': Platform.isIOS ? 'ios' : 'android',
-                  'hw_id': Platform.isIOS ? (await deviceInfo.iosInfo).identifierForVendor : (await deviceInfo.androidInfo).id,
-                  'token': fbToken,
-                },
-              );
-            }
             final sharedPreferences = await SharedPreferences.getInstance();
             final welcomeScreenWasShowed = sharedPreferences.getBool('welcomeScreenWasShowed') ?? false;
+            await sl<FirebaseApi>().registerPushToken();
             if (welcomeScreenWasShowed == false) {
               return null;
             } else if (await TokenStorage.haveTokenInStorage()) {
@@ -204,7 +216,7 @@ class AppRouter {
               return '/auth-screen';
             }
           } catch (e) {
-            rethrow;
+            return '/feed-screen';
           }
         },
       ),
@@ -261,8 +273,17 @@ class AppRouter {
         path: '/about-plan-screen',
         name: 'aboutPlanScreen',
         builder: (context, state) {
+          final slug = state.uri.queryParameters['slug'];
+          if (slug != null) {
+            return AboutPlanScreen(
+              slug: slug,
+              navigateToComments: false,
+              index: null,
+            );
+          }
+
           final data = state.extra as Map<String, dynamic>;
-          return AboutPlanScreen(plan: data['plan'] as PlanModel, index: data['index'] as int?, navigateToComments: data['navigateToComments'] as bool);
+          return AboutPlanScreen(slug: data['slug'] as String, index: data['index'] as int?, navigateToComments: data['navigateToComments'] as bool);
         },
       ),
       GoRoute(path: '/glossary-screen', name: 'glossaryScreen', builder: (context, state) => const GlossaryScreen()),
@@ -270,9 +291,18 @@ class AppRouter {
         path: '/about-recipes-screen',
         name: 'aboutRecipesScreen',
         builder: (context, state) {
+          final slug = state.uri.queryParameters['slug'];
+          if (slug != null) {
+            return AboutRecipeScreen(
+              recipeSlug: slug,
+              navigateToComments: false,
+              index: null,
+            );
+          }
+
           final data = state.extra as Map<String, dynamic>;
           return AboutRecipeScreen(
-            recipe: data['recipe'] as Recipe,
+            recipeSlug: data['recipe'] as String,
             index: data['index'] as int?,
             navigateToComments: data['navigateToComments'] as bool,
           );
@@ -295,8 +325,16 @@ class AppRouter {
         path: '/about-diet-screen',
         name: 'aboutDietScreen',
         builder: (context, state) {
+          final slug = state.uri.queryParameters['slug'];
+          if (slug != null) {
+            return AboutDietScreen(
+              slug: slug,
+              index: null,
+              navigateToComments: false,
+            );
+          }
           final data = state.extra as Map<String, dynamic>;
-          return AboutDietScreen(diet: data['diet'] as Diet, index: data['index'] as int?, navigateToComments: data['navigateToComments'] as bool);
+          return AboutDietScreen(slug: data['slug'] as String, index: data['index'] as int?, navigateToComments: data['navigateToComments'] as bool);
         },
       ),
       GoRoute(
@@ -304,16 +342,29 @@ class AppRouter {
         name: 'blogPostCreateScreen',
         builder: (context, state) => BlogPostCreateScreen(feedBlogPostModel: state.extra != null ? state.extra as FeedBlogPostModel : null),
       ),
-      GoRoute(path: '/blog-post-screen', name: 'blogPostScreen', builder: (context, state) => BlogPostScreen(blogPost: state.extra as FeedBlogPostModel)),
+      GoRoute(
+          path: '/blog-post-screen',
+          name: 'blogPostScreen',
+          builder: (context, state) {
+            final id = state.uri.queryParameters['id'];
+            final parsedId = int.tryParse(id ?? '');
+            if (parsedId != null) {
+              return BlogPostScreen(
+                id: parsedId,
+              );
+            }
+
+            return BlogPostScreen(id: state.extra as int);
+          }),
       GoRoute(
         path: '/chat-screen',
         name: 'chatScreen',
         builder: (context, state) {
           final data = state.extra as Map<String, dynamic>;
-          final chatId = data['chatId'] as String;
+          final uuid = data['uuid'] as String;
           final sendInitialMessage = data['sendInitialMessage'] as bool?;
           return ChatScreen(
-            chatId: chatId,
+            uuid: uuid,
             sendInitialMessage: sendInitialMessage,
           );
         },
diff --git a/lib/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart b/lib/core/comments/comments_cubit/comments_cubit.dart
similarity index 59%
rename from lib/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart
rename to lib/core/comments/comments_cubit/comments_cubit.dart
index 106521e9..7e5df141 100644
--- a/lib/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart
+++ b/lib/core/comments/comments_cubit/comments_cubit.dart
@@ -1,20 +1,25 @@
-import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_state.dart';
+import 'dart:developer';
+
+import 'package:eatvio_app/core/comments/comments_cubit/comments_state.dart';
+import 'package:eatvio_app/core/comments/repositories/comments_repository.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/comments_widget.dart';
 import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
 class CommentsCubit extends Cubit<CommentsState> {
   final FeedRepository feedRepository;
+  final CommentsRepository commentsRepository;
 
   CommentsCubit({
     required this.feedRepository,
+    required this.commentsRepository,
   }) : super(const CommentsState());
 
-  setReplyId(int? replyId) {
+  void setReplyId(int? replyId) {
     emit((state as CommentsStateLoaded).copyWith(replyId: replyId));
   }
 
-  getComments(String id, CommentSourceType commentSourceType, [bool isFirstFetch = false]) async {    
+  Future<void> getComments(String id, CommentSourceType commentSourceType, [bool isFirstFetch = false]) async {
     if (isFirstFetch) emit(const CommentsState.loading());
     try {
       switch (commentSourceType) {
@@ -27,7 +32,7 @@ class CommentsCubit extends Cubit<CommentsState> {
         case CommentSourceType.recipe:
           emit(CommentsState.loaded(comment: await feedRepository.getRecipesComments(id: id)));
           break;
-        case CommentSourceType.plan:  
+        case CommentSourceType.plan:
           emit(CommentsState.loaded(comment: await feedRepository.getPlansComments(slug: id)));
           break;
       }
@@ -36,7 +41,7 @@ class CommentsCubit extends Cubit<CommentsState> {
     }
   }
 
-  sendComment({
+  Future<void> sendComment({
     required String id,
     required String commentText,
     required CommentSourceType commentSourceType,
@@ -78,4 +83,34 @@ class CommentsCubit extends Cubit<CommentsState> {
       emit(CommentsState.error(errorMessage: e.toString()));
     }
   }
+
+  Future<bool> deleteComment({required int id}) async {
+    if (state is! CommentsStateLoaded) return false;
+    final commentModel = (state as CommentsStateLoaded).comment;
+    final updatedCommentModel = commentModel.copyWith(data: commentModel.data.where((comment) => comment.id != id).toList());
+    try {
+      await commentsRepository.deleteComment(id: id);
+      emit(CommentsState.loaded(comment: updatedCommentModel));
+      return true;
+    } catch (e, st) {
+      emit(CommentsState.loaded(comment: commentModel));
+      log(e.toString(), stackTrace: st);
+    }
+    return false;
+  }
+
+  Future<bool> updateComment({required int id, required String body}) async {
+    final commentModel = (state as CommentsStateLoaded).comment;
+    final updatedCommentModel =
+        commentModel.copyWith(data: commentModel.data.map((comment) => comment.id == id ? comment.copyWith(body: body) : comment).toList());
+    try {
+      await commentsRepository.updateComment(id: id, body: body);
+      emit(CommentsState.loaded(comment: updatedCommentModel));
+      return true;
+    } catch (e, st) {
+      emit(CommentsState.loaded(comment: commentModel));
+      log(e.toString(), stackTrace: st);
+    }
+    return false;
+  }
 }
diff --git a/lib/features/feed/presentation/bloc/comments_cubit/comments_state.dart b/lib/core/comments/comments_cubit/comments_state.dart
similarity index 95%
rename from lib/features/feed/presentation/bloc/comments_cubit/comments_state.dart
rename to lib/core/comments/comments_cubit/comments_state.dart
index 0f9c49ea..79fed119 100644
--- a/lib/features/feed/presentation/bloc/comments_cubit/comments_state.dart
+++ b/lib/core/comments/comments_cubit/comments_state.dart
@@ -12,6 +12,7 @@ abstract class CommentsState with _$CommentsState {
   const factory CommentsState.loaded({
     required CommentModel comment,
     int? replyId,
+    int? editedCommentId,
   }) = CommentsStateLoaded;
 
   const factory CommentsState.error({
diff --git a/lib/core/comments/models/comment_update_model.dart b/lib/core/comments/models/comment_update_model.dart
new file mode 100644
index 00000000..dfe26dfe
--- /dev/null
+++ b/lib/core/comments/models/comment_update_model.dart
@@ -0,0 +1,12 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'comment_update_model.freezed.dart';
+part 'comment_update_model.g.dart';
+
+@freezed
+abstract class CommentUpdateModel with _$CommentUpdateModel {
+
+  factory CommentUpdateModel({required String body}) = _CommentUpdateModel;
+
+  factory CommentUpdateModel.fromJson(Map<String, dynamic> json) => _$CommentUpdateModelFromJson(json);
+}
\ No newline at end of file
diff --git a/lib/core/comments/presentation/comments_actions_bottom_sheet.dart b/lib/core/comments/presentation/comments_actions_bottom_sheet.dart
new file mode 100644
index 00000000..3c1c3859
--- /dev/null
+++ b/lib/core/comments/presentation/comments_actions_bottom_sheet.dart
@@ -0,0 +1,173 @@
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/bottom_sheet_action_widget.dart';
+import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
+import 'package:eatvio_app/core/widgets/custom_divider.dart';
+import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
+
+void showCommentsActionsBottomSheet(
+  BuildContext context, {
+  required void Function()? reply,
+  required void Function() copy,
+  required void Function(String text) edit,
+  required void Function() delete,
+  required void Function() complain,
+  required String commentText,
+  required bool isMyComment,
+}) {
+  showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      backgroundColor: Colors.transparent,
+      builder: (context) => Container(
+            margin: EdgeInsets.only(left: 8, right: 8, bottom: MediaQuery.of(context).padding.bottom + 20),
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.circular(12),
+              color: appTheme.whiteA700,
+            ),
+            child: CommentsActionsBottomSheet(
+              isMyComment: isMyComment,
+              reply: reply,
+              copy: copy,
+              edit: edit,
+              delete: delete,
+              complain: complain,
+              commentText: commentText,
+            ),
+          ));
+}
+
+class CommentsActionsBottomSheet extends StatefulWidget {
+  const CommentsActionsBottomSheet({
+    super.key,
+    required this.isMyComment,
+    required this.reply,
+    required this.copy,
+    required this.edit,
+    required this.delete,
+    required this.complain,
+    required this.commentText,
+  });
+  final bool isMyComment;
+  final void Function()? reply;
+  final void Function() copy;
+  final void Function(String text) edit;
+  final void Function() delete;
+  final void Function() complain;
+  final String commentText;
+
+  @override
+  State<CommentsActionsBottomSheet> createState() => _CommentsActionsBottomSheetState();
+}
+
+class _CommentsActionsBottomSheetState extends State<CommentsActionsBottomSheet> {
+  bool isUserEditingComment = false;
+  final controller = TextEditingController();
+  @override
+  void initState() {
+    super.initState();
+    controller.text = widget.commentText;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      child: isUserEditingComment
+          ? Padding(
+              padding: const EdgeInsets.symmetric(vertical: 16.0),
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Row(children: [
+                    Expanded(
+                      child: CustomTextFormField(
+                        autofocus: true,
+                        controller: controller,
+                        onChanged: (value) => setState(() {}),
+                      ),
+                    ),
+                    const SizedBox(width: 8),
+                    GestureDetector(
+                      onTap: () {
+                        widget.edit(controller.text);
+                        GoRouter.of(context).pop();
+                      },
+                      child: Container(
+                        decoration: BoxDecoration(
+                          color: controller.text.length > 2 ? appTheme.blueA400 : appTheme.gray50,
+                          shape: BoxShape.circle,
+                        ),
+                        height: 32,
+                        width: 32,
+                        child: Icon(
+                          Icons.send_rounded,
+                          size: 18,
+                          color: controller.text.length > 2 ? appTheme.whiteA700 : appTheme.black,
+                        ),
+                      ),
+                    )
+                  ])
+                ],
+              ),
+            )
+          : Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                const SizedBox(
+                  height: 7,
+                ),
+                const BottomSheetHandlerBar(),
+                if (widget.isMyComment)
+                  BottomSheetActionWidget(
+                    text: s.edit,
+                    iconPath: 'assets/icons/edit_paint.svg',
+                    needToPop: false,
+                    onTap: () => setState(() {
+                      isUserEditingComment = true;
+                    }),
+                  )
+                else if (widget.reply != null)
+                  BottomSheetActionWidget(
+                    text: s.reply,
+                    iconPath: 'assets/icons/reply.svg',
+                    onTap: widget.reply!,
+                  ),
+                if (widget.reply != null) const CustomDivider(),
+                BottomSheetActionWidget(
+                  text: s.copy,
+                  iconPath: 'assets/icons/copy2.svg',
+                  onTap: widget.copy,
+                ),
+                if (widget.isMyComment) ...[
+                  if (widget.reply != null) ...[
+                    const CustomDivider(),
+                    BottomSheetActionWidget(
+                      text: s.reply,
+                      iconPath: 'assets/icons/reply.svg',
+                      onTap: widget.reply!,
+                    ),
+                  ],
+                  const CustomDivider(),
+                  BottomSheetActionWidget(
+                    text: s.deleteComment,
+                    iconPath: 'assets/icons/red_trash.svg',
+                    onTap: widget.delete,
+                  ),
+                ] else ...[
+                  const CustomDivider(),
+                  BottomSheetActionWidget(
+                    text: s.complain,
+                    iconPath: 'assets/icons/complain.svg',
+                    onTap: widget.complain,
+                  ),
+                ]
+              ],
+            ),
+    );
+  }
+}
+
diff --git a/lib/core/comments/repositories/comments_repository.dart b/lib/core/comments/repositories/comments_repository.dart
new file mode 100644
index 00000000..096c3690
--- /dev/null
+++ b/lib/core/comments/repositories/comments_repository.dart
@@ -0,0 +1,24 @@
+import 'package:eatvio_app/core/comments/models/comment_update_model.dart';
+import 'package:eatvio_app/core/comments/services/comments_service.dart';
+
+class CommentsRepository {
+  final CommentsService service;
+
+  CommentsRepository({required this.service});
+
+  Future<void> deleteComment({required int id}) async {
+    try {
+      return service.deleteComment(id);
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  Future<void> updateComment({required int id, required String body}) async {
+    try {
+      return service.updateComment(id, CommentUpdateModel(body: body));
+    } catch (e) {
+      rethrow;
+    }
+  }
+}
diff --git a/lib/core/comments/services/comments_service.dart b/lib/core/comments/services/comments_service.dart
new file mode 100644
index 00000000..606f61bd
--- /dev/null
+++ b/lib/core/comments/services/comments_service.dart
@@ -0,0 +1,16 @@
+import 'package:dio/dio.dart';
+import 'package:eatvio_app/core/comments/models/comment_update_model.dart';
+import 'package:retrofit/retrofit.dart';
+
+part 'comments_service.g.dart';
+
+@RestApi()
+abstract class CommentsService {
+  factory CommentsService(Dio dio, {String baseUrl}) = _CommentsService;
+
+  @DELETE('/api/comments/{id}')
+  Future<void> deleteComment(@Path('id') int id);
+
+  @PATCH('/api/comments/{id}')
+  Future<void> updateComment(@Path('id') int id, @Body() CommentUpdateModel body);
+}
diff --git a/lib/core/const.dart b/lib/core/const.dart
index 618a9866..98f7bc4a 100644
--- a/lib/core/const.dart
+++ b/lib/core/const.dart
@@ -1,4 +1,8 @@
-String baseUrl = 'https://eatvio.ru';
+import 'package:eatvio_app/core/env_config.dart';
+
+String baseUrl = EnvConfig.baseUrl;
+bool hidePlans = const bool.fromEnvironment('HIDE_PLANS', defaultValue: false);
+const buildDate = String.fromEnvironment('BUILD_DATE', defaultValue: '');
 
 const List<int> durationValues = [7, 14, 21];
 
diff --git a/lib/core/credentials_storage.dart b/lib/core/credentials_storage.dart
deleted file mode 100644
index 7bbd0bef..00000000
--- a/lib/core/credentials_storage.dart
+++ /dev/null
@@ -1,32 +0,0 @@
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-
-abstract class CredentialsStorage {
-  static Future<bool> haveCredentialsInStorage() async {
-    try {
-      if (await const FlutterSecureStorage().read(key: 'email') == null || await const FlutterSecureStorage().read(key: 'password') == null) {
-        return false;
-      } else {
-        return true;
-      }
-    } catch (e) {
-      return false;
-    }
-  }
-
-  static Future<Map<String, String>> getCredentialsFromStorage() async {
-    return {
-      'email': (await const FlutterSecureStorage().read(key: 'email'))!,
-      'password': (await const FlutterSecureStorage().read(key: 'password'))!,
-    };
-  }
-
-  static saveCredentials(String email, String password) async {
-    await const FlutterSecureStorage().write(key: 'email', value: email);
-    await const FlutterSecureStorage().write(key: 'password', value: password);
-  }
-
-  static removeCredentials() async {
-    await const FlutterSecureStorage().delete(key: 'email');
-    await const FlutterSecureStorage().delete(key: 'password');
-  }
-}
diff --git a/lib/core/enums/complained_content.dart b/lib/core/enums/complained_content.dart
index 66fe8ee1..4df54a33 100644
--- a/lib/core/enums/complained_content.dart
+++ b/lib/core/enums/complained_content.dart
@@ -1,7 +1 @@
-enum ComplainedContent {
-  diet, 
-  plan, 
-  recipe,
-  profile,
-  posts
-}
\ No newline at end of file
+enum ComplainedContent { diet, plan, recipe, profile, posts, comment }
diff --git a/lib/core/env_config.dart b/lib/core/env_config.dart
new file mode 100644
index 00000000..b363ad70
--- /dev/null
+++ b/lib/core/env_config.dart
@@ -0,0 +1,43 @@
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+
+class EnvConfig {
+  static String get baseUrl => dotenv.env['BASE_URL'] ?? '';
+  static String get devBaseUrl => dotenv.env['DEV_BASE_URL'] ?? '';
+
+  // Sentry Configuration
+  static String get sentryDsn => dotenv.env['SENTRY_DSN'] ?? '';
+
+  // Firebase Configuration
+  static String get firebaseProjectId => dotenv.env['FIREBASE_PROJECT_ID'] ?? '';
+  static String get firebaseDatabaseUrl => dotenv.env['FIREBASE_DATABASE_URL'] ?? '';
+  static String get firebaseStorageBucket => dotenv.env['FIREBASE_STORAGE_BUCKET'] ?? '';
+  static String get firebaseMessagingSenderId => dotenv.env['FIREBASE_MESSAGING_SENDER_ID'] ?? '';
+
+  // Firebase Android Configuration
+  static String get firebaseAndroidApiKey => dotenv.env['FIREBASE_ANDROID_API_KEY'] ?? '';
+  static String get firebaseAndroidAppId => dotenv.env['FIREBASE_ANDROID_APP_ID'] ?? '';
+
+  // Firebase iOS Configuration
+  static String get firebaseIosApiKey => dotenv.env['FIREBASE_IOS_API_KEY'] ?? '';
+  static String get firebaseIosAppId => dotenv.env['FIREBASE_IOS_APP_ID'] ?? '';
+  static String get firebaseIosBundleId => dotenv.env['FIREBASE_IOS_BUNDLE_ID'] ?? '';
+
+  // App Store URLs
+  static String get appStoreUrl => dotenv.env['APP_STORE_URL'] ?? '';
+  static String get rustoreUrl => dotenv.env['RUSTORE_URL'] ?? '';
+
+  // Telegram Support
+  static String get telegramSupportUrl => dotenv.env['TELEGRAM_SUPPORT_URL'] ?? '';
+  static String get supportEmail => dotenv.env['SUPPORT_EMAIL'] ?? '';
+
+  // Test Credentials (for development only)
+  static String get testEmail => dotenv.env['TEST_EMAIL'] ?? '';
+  static String get testPassword => dotenv.env['TEST_PASSWORD'] ?? '';
+
+  // Email Validation API
+  static String get emailValidationApiUrl => dotenv.env['EMAIL_VALIDATION_API_URL'] ?? '';
+
+  // Connection Check URLs
+  static String get googleCheckUrl => dotenv.env['GOOGLE_CHECK_URL'] ?? '';
+  static String get yandexCheckUrl => dotenv.env['YANDEX_CHECK_URL'] ?? '';
+}
diff --git a/lib/core/firebase_api.dart b/lib/core/firebase_api.dart
index fbf8e5c1..572b56f6 100644
--- a/lib/core/firebase_api.dart
+++ b/lib/core/firebase_api.dart
@@ -1,3 +1,10 @@
+import 'dart:developer';
+import 'dart:io';
+
+import 'package:device_info_plus/device_info_plus.dart';
+import 'package:dio/dio.dart';
+import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/token_storage.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 
 class FirebaseApi {
@@ -7,4 +14,22 @@ class FirebaseApi {
     await _firebaseMessaging.requestPermission();
     return await _firebaseMessaging.getToken();
   }
+
+  Future<void> registerPushToken() async {
+    if (await TokenStorage.haveTokenInStorage()) {
+      try {
+        final deviceInfo = DeviceInfoPlugin();
+        await sl<Dio>().post(
+          '/api/profile/notification/token/register',
+          data: {
+            'platform': Platform.isIOS ? 'ios' : 'android',
+            'hw_id': Platform.isIOS ? (await deviceInfo.iosInfo).identifierForVendor : (await deviceInfo.androidInfo).id,
+            'token': await getToken(),
+          },
+        );
+      } catch (e, st) {
+        log(e.toString(), stackTrace: st);
+      }
+    }
+  }
 }
diff --git a/lib/core/locator_service.dart b/lib/core/locator_service.dart
index 3dbfabd4..724d8b59 100644
--- a/lib/core/locator_service.dart
+++ b/lib/core/locator_service.dart
@@ -1,4 +1,6 @@
 import 'package:dio/dio.dart';
+import 'package:eatvio_app/core/comments/repositories/comments_repository.dart';
+import 'package:eatvio_app/core/comments/services/comments_service.dart';
 import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/core/dio/phone_verify_error_interceptor.dart';
 import 'package:eatvio_app/core/firebase_api.dart';
@@ -11,6 +13,7 @@ import 'package:eatvio_app/features/auth/repositories/auth_repository.dart';
 import 'package:eatvio_app/features/auth/repositories/reset_password_repository.dart';
 import 'package:eatvio_app/features/auth/services/auth_service.dart';
 import 'package:eatvio_app/features/auth/services/reset_password_service.dart';
+import 'package:eatvio_app/features/blog_post/presentation/cubit/blog_post_cubit.dart';
 import 'package:eatvio_app/features/cancel_plan_bottom_sheet/cubit/cancel_plan_cubit.dart';
 import 'package:eatvio_app/features/cancel_plan_bottom_sheet/repository/cancel_plan_repository.dart';
 import 'package:eatvio_app/features/cancel_plan_bottom_sheet/service/cancel_plan_service.dart';
@@ -55,7 +58,7 @@ import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
 import 'package:eatvio_app/features/diary/repositories/diary_repository.dart';
 import 'package:eatvio_app/features/diary/services/diary_service.dart';
 import 'package:eatvio_app/features/diets/presentation/cubit/about_diet_cubit.dart';
-import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart';
+import 'package:eatvio_app/core/comments/comments_cubit/comments_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/consultants_cubit/consultants_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/diets_cubit/diets_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
@@ -104,7 +107,6 @@ import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/se
 import 'package:eatvio_app/features/settings/repositories/service_repository.dart';
 import 'package:eatvio_app/features/settings/services/settings_service.dart';
 import 'package:eatvio_app/features/user_details/presentation/cubit/user_details_cubit.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:get_it/get_it.dart';
 import 'package:eatvio_app/features/profile/presentation/bloc/plans_cubit/plans_cubit.dart' as profile_plans;
 
@@ -127,7 +129,7 @@ Future<void> init() async {
   sl.registerFactory<ProfileCubit>(() => ProfileCubit(profileRepository: sl(), chatRepository: sl(), consultantRepository: sl()));
   sl.registerFactory<profile_plans.PlansCubit>(() => profile_plans.PlansCubit(plansRepository: sl()));
   sl.registerFactory<DietsCubit>(() => DietsCubit(feedRepository: sl(), dietsRepository: sl()));
-  sl.registerFactory<CommentsCubit>(() => CommentsCubit(feedRepository: sl()));
+  sl.registerFactory<CommentsCubit>(() => CommentsCubit(feedRepository: sl(), commentsRepository: sl()));
   sl.registerFactory<PlansCubit>(() => PlansCubit(feedRepository: sl(), planRepository: sl()));
   sl.registerFactory<SettingsCubit>(() => SettingsCubit(profileRepository: sl(), settingsRepository: sl(), consultantRepository: sl()));
   sl.registerFactory<RegisterConsultantCubit>(() => RegisterConsultantCubit(consultantRepository: sl()));
@@ -165,6 +167,7 @@ Future<void> init() async {
   sl.registerFactory<ConsultantFinancesCubit>(() => ConsultantFinancesCubit(consultationsRepository: sl()));
   sl.registerFactory<UserPurchasesCubit>(() => UserPurchasesCubit(consultationsRepository: sl()));
   sl.registerFactory<ResetPasswordCubit>(() => ResetPasswordCubit(resetPasswordRepository: sl()));
+  sl.registerFactory<BlogPostCubit>(() => BlogPostCubit(sl()));
   sl.registerFactory<BlockedUsersCubit>(() => BlockedUsersCubit(blockedUsersRepository: sl()));
 
   // Repository
@@ -196,6 +199,7 @@ Future<void> init() async {
   sl.registerFactory<MyRecipesRepository>(() => MyRecipesRepository(myRecipesService: sl()));
   sl.registerFactory<ResetPasswordRepository>(() => ResetPasswordRepository(resetPasswordService: sl()));
   sl.registerLazySingleton<BlockedUsersRepository>(() => BlockedUsersRepository(blockedUserService: sl()));
+  sl.registerLazySingleton<CommentsRepository>(() => CommentsRepository(service: sl()));
 
   // Services
   sl.registerLazySingleton<ChatService>(() => ChatService(sl()));
@@ -228,6 +232,7 @@ Future<void> init() async {
   sl.registerLazySingleton<FirebaseApi>(() => FirebaseApi());
   sl.registerLazySingleton<ResetPasswordService>(() => ResetPasswordService(sl()));
   sl.registerLazySingleton<BlockedUserService>(() => BlockedUserService(sl()));
+  sl.registerLazySingleton<CommentsService>(() => CommentsService(sl()));
 
   // External
   sl.registerLazySingleton(
@@ -238,7 +243,6 @@ Future<void> init() async {
           'accept': 'application/json',
           'content-type': 'application/json',
         },
-        validateStatus: (status) => status != null && status < 500,
       ),
     )..interceptors.addAll(
         [
@@ -247,5 +251,4 @@ Future<void> init() async {
         ],
       ),
   );
-  sl.registerLazySingleton(() async => const FlutterSecureStorage());
 }
diff --git a/lib/core/permission_handler/permission_handler.dart b/lib/core/permission_handler/permission_handler.dart
index a311e84d..f107c2c0 100644
--- a/lib/core/permission_handler/permission_handler.dart
+++ b/lib/core/permission_handler/permission_handler.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/cupertino.dart';
@@ -11,6 +13,10 @@ class PermissionHandler {
     required Future<void> Function() onGranted,
     required BuildContext context,
   }) async {
+    if (Platform.isAndroid) {
+      await onGranted();
+      return;
+    }
     final permissionState = await permission.request();
     if (permissionState.isGranted) {
       await onGranted();
diff --git a/lib/core/theme/custom_text_style.dart b/lib/core/theme/custom_text_style.dart
index 88851233..62544e86 100644
--- a/lib/core/theme/custom_text_style.dart
+++ b/lib/core/theme/custom_text_style.dart
@@ -7,162 +7,162 @@ import 'package:flutter/material.dart';
 
 class CustomTextStyles {
   // Headline style
-  static get headlineSmallMulish => theme.textTheme.headlineSmall!.mulish;
+  static TextStyle get headlineSmallMulish => theme.textTheme.headlineSmall!.mulish;
 
   // Title text style
-  static get titleMediumSegoeUI => theme.textTheme.titleMedium!.segoeUI.copyWith(
+  static TextStyle get titleMediumSegoeUI => theme.textTheme.titleMedium!.segoeUI.copyWith(
         fontWeight: FontWeight.w600,
       );
 
-  static get bodyMediumBlack900 => theme.textTheme.bodyMedium!.copyWith(
+  static TextStyle get bodyMediumBlack900 => theme.textTheme.bodyMedium!.copyWith(
         color: appTheme.black900,
       );
 
-  static get bodyMediumBlack90013 => theme.textTheme.bodyMedium!.copyWith(
+  static TextStyle get bodyMediumBlack90013 => theme.textTheme.bodyMedium!.copyWith(
         color: appTheme.black900,
         fontSize: 13,
       );
 
-  static get bodyMediumBluegray800 => theme.textTheme.bodyMedium!.copyWith(
+  static TextStyle get bodyMediumBluegray800 => theme.textTheme.bodyMedium!.copyWith(
         color: appTheme.black,
       );
 
-  static get bodyMediumBluegray800_1 => theme.textTheme.bodyMedium!.copyWith(
+  static TextStyle get bodyMediumBluegray800_1 => theme.textTheme.bodyMedium!.copyWith(
         color: appTheme.black,
       );
 
-  static get bodyMediumBluegray800_2 => theme.textTheme.bodyMedium!.copyWith(
+  static TextStyle get bodyMediumBluegray800_2 => theme.textTheme.bodyMedium!.copyWith(
         color: appTheme.black,
       );
 
-  static get bodyMediumWhiteA700 => theme.textTheme.bodyMedium!.copyWith(
+  static TextStyle get bodyMediumWhiteA700 => theme.textTheme.bodyMedium!.copyWith(
         color: appTheme.whiteA700,
       );
 
-  static get bodySmallMulishBlack900 => theme.textTheme.bodySmall!.mulish.copyWith(
+  static TextStyle get bodySmallMulishBlack900 => theme.textTheme.bodySmall!.mulish.copyWith(
         color: appTheme.black900,
         fontSize: 12,
       );
 
-  static get bodySmallMulishBluegray800 => theme.textTheme.bodySmall!.mulish.copyWith(
+  static TextStyle get bodySmallMulishBluegray800 => theme.textTheme.bodySmall!.mulish.copyWith(
         color: appTheme.black,
         fontSize: 12,
       );
 
-  static get bodySmallMulishBluegray80012 => theme.textTheme.bodySmall!.mulish.copyWith(
+  static TextStyle get bodySmallMulishBluegray80012 => theme.textTheme.bodySmall!.mulish.copyWith(
         color: appTheme.black,
         fontSize: 12,
       );
 
-  static get bodySmallMulishBluegray80012_1 => theme.textTheme.bodySmall!.mulish.copyWith(
+  static TextStyle get bodySmallMulishBluegray80012_1 => theme.textTheme.bodySmall!.mulish.copyWith(
         color: appTheme.black,
         fontSize: 12,
       );
 
-  static get bodySmallMulishBluegray900 => theme.textTheme.bodySmall!.mulish.copyWith(
+  static TextStyle get bodySmallMulishBluegray900 => theme.textTheme.bodySmall!.mulish.copyWith(
         color: appTheme.blueGray900,
         fontSize: 12,
       );
 
-  static get bodySmallMulishGray600 => theme.textTheme.bodySmall!.mulish.copyWith(
+  static TextStyle get bodySmallMulishGray600 => theme.textTheme.bodySmall!.mulish.copyWith(
         color: appTheme.gray600,
       );
 
-  static get bodySmallMulishPrimary => theme.textTheme.bodySmall!.mulish.copyWith(
+  static TextStyle get bodySmallMulishPrimary => theme.textTheme.bodySmall!.mulish.copyWith(
         color: theme.colorScheme.primary,
         fontSize: 12,
       );
 
-  static get bodySmallSegoeUIBlack900 => theme.textTheme.bodySmall!.segoeUI.copyWith(
+  static TextStyle get bodySmallSegoeUIBlack900 => theme.textTheme.bodySmall!.segoeUI.copyWith(
         color: appTheme.black900,
         fontSize: 12,
       );
 
   // Label text style
-  static get labelLargeGray60003 => theme.textTheme.labelLarge!.copyWith(
+  static TextStyle get labelLargeGray60003 => theme.textTheme.labelLarge!.copyWith(
         color: appTheme.gray60003,
       );
 
-  static get labelLargeWhiteA700 => theme.textTheme.labelLarge!.copyWith(
+  static TextStyle get labelLargeWhiteA700 => theme.textTheme.labelLarge!.copyWith(
         color: appTheme.whiteA700,
       );
 
   // Title text style
-  static get titleMedium16 => theme.textTheme.titleMedium!.copyWith(
+  static TextStyle get titleMedium16 => theme.textTheme.titleMedium!.copyWith(
         fontSize: 16,
       );
 
-  static get titleMediumBlack => theme.textTheme.titleMedium!.copyWith(
+  static TextStyle get titleMediumBlack => theme.textTheme.titleMedium!.copyWith(
         fontSize: 17,
         fontWeight: FontWeight.w900,
       );
 
-  static get titleMediumBlack900 => theme.textTheme.titleMedium!.copyWith(
+  static TextStyle get titleMediumBlack900 => theme.textTheme.titleMedium!.copyWith(
         color: appTheme.black900,
       );
 
-  static get titleMediumSemiBold => theme.textTheme.titleMedium!.copyWith(
+  static TextStyle get titleMediumSemiBold => theme.textTheme.titleMedium!.copyWith(
         fontWeight: FontWeight.w600,
       );
 
-  static get titleMediumWhiteA700 => theme.textTheme.titleMedium!.copyWith(
+  static TextStyle get titleMediumWhiteA700 => theme.textTheme.titleMedium!.copyWith(
         color: appTheme.whiteA700,
         fontWeight: FontWeight.w600,
       );
 
-  static get titleSmallBlue800 => theme.textTheme.titleSmall!.copyWith(
+  static TextStyle get titleSmallBlue800 => theme.textTheme.titleSmall!.copyWith(
         color: appTheme.blue800,
         fontWeight: FontWeight.w800,
       );
 
-  static get titleSmallBluegray800 => theme.textTheme.titleSmall!.copyWith(
+  static TextStyle get titleSmallBluegray800 => theme.textTheme.titleSmall!.copyWith(
         color: appTheme.black,
       );
 
-  static get titleSmallBluegray800Bold => theme.textTheme.titleSmall!.copyWith(
+  static TextStyle get titleSmallBluegray800Bold => theme.textTheme.titleSmall!.copyWith(
         color: appTheme.black,
         fontWeight: FontWeight.w700,
       );
 
-  static get titleSmallBluegray800ExtraBold => theme.textTheme.titleSmall!.copyWith(
+  static TextStyle get titleSmallBluegray800ExtraBold => theme.textTheme.titleSmall!.copyWith(
         color: appTheme.black,
         fontWeight: FontWeight.w800,
       );
 
-  static get titleSmallBold => theme.textTheme.titleSmall!.copyWith(
+  static TextStyle get titleSmallBold => theme.textTheme.titleSmall!.copyWith(
         fontSize: 15,
         fontWeight: FontWeight.w700,
       );
 
-  static get titleSmallGreenA70001 => theme.textTheme.titleSmall!.copyWith(
+  static TextStyle get titleSmallGreenA70001 => theme.textTheme.titleSmall!.copyWith(
         color: appTheme.greenA70001,
       );
 
-  static get titleSmallGreenA70001ExtraBold => theme.textTheme.titleSmall!.copyWith(
+  static TextStyle get titleSmallGreenA70001ExtraBold => theme.textTheme.titleSmall!.copyWith(
         color: appTheme.greenA70001,
         fontWeight: FontWeight.w800,
       );
 
-  static get titleSmallLightgreen300 => theme.textTheme.titleSmall!.copyWith(
+  static TextStyle get titleSmallLightgreen300 => theme.textTheme.titleSmall!.copyWith(
         color: appTheme.lightGreen300,
         fontWeight: FontWeight.w800,
       );
 
-  static get titleSmallRed200 => theme.textTheme.titleSmall!.copyWith(
+  static TextStyle get titleSmallRed200 => theme.textTheme.titleSmall!.copyWith(
         color: appTheme.red200,
         fontWeight: FontWeight.w800,
       );
 
-  static get titleSmallSecondaryContainer => theme.textTheme.titleSmall!.copyWith(
+  static TextStyle get titleSmallSecondaryContainer => theme.textTheme.titleSmall!.copyWith(
         color: theme.colorScheme.secondaryContainer,
         fontWeight: FontWeight.w800,
       );
 
-  static get titleSmallSecondaryContainer_1 => theme.textTheme.titleSmall!.copyWith(
+  static TextStyle get titleSmallSecondaryContainer_1 => theme.textTheme.titleSmall!.copyWith(
         color: theme.colorScheme.secondaryContainer,
       );
 
-  static get titleSmallSegoeUIOnPrimary => theme.textTheme.titleSmall!.segoeUI.copyWith(
+  static TextStyle get titleSmallSegoeUIOnPrimary => theme.textTheme.titleSmall!.segoeUI.copyWith(
         color: theme.colorScheme.onPrimary,
       );
 }
diff --git a/lib/core/token_storage.dart b/lib/core/token_storage.dart
index ec16d1ea..f67e919c 100644
--- a/lib/core/token_storage.dart
+++ b/lib/core/token_storage.dart
@@ -1,9 +1,10 @@
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 abstract class TokenStorage {
   static Future<bool> haveTokenInStorage() async {
+    final sharedPreferences = await SharedPreferences.getInstance();
     try {
-      if (await const FlutterSecureStorage().read(key: 'token') == null) {
+      if (sharedPreferences.getString('token') == null) {
         return false;
       } else {
         return true;
@@ -13,11 +14,48 @@ abstract class TokenStorage {
     }
   }
 
-  static Future<String?> getTokenFromStorage() async => await const FlutterSecureStorage().read(key: 'token');
-
-  static saveTokenInStorage(String token) async {
-    await const FlutterSecureStorage().write(key: 'token', value: token);
+  static Future<String?> getTokenFromStorage() async {
+    final sharedPreferences = await SharedPreferences.getInstance();
+    return sharedPreferences.getString('token');
   }
 
-  static Future<void> removeTokenInStorage() async => (await const FlutterSecureStorage().delete(key: 'token'));
+  static Future<void> saveTokenInStorage(String token) async {
+    final sharedPreferences = await SharedPreferences.getInstance();
+    await sharedPreferences.setString('token', token);
+  }
+
+  static Future<void> removeTokenInStorage() async {
+    final sharedPreferences = await SharedPreferences.getInstance();
+    await sharedPreferences.remove('token');
+  }
+}
+
+abstract class SocketIdStorage {
+  static Future<bool> haveSocketIdInStorage() async {
+    final sharedPreferences = await SharedPreferences.getInstance();
+    try {
+      if (sharedPreferences.getString('socketId') == null) {
+        return false;
+      } else {
+        return true;
+      }
+    } catch (e) {
+      return false;
+    }
+  }
+
+  static Future<String?> getSocketIdFromStorage() async {
+    final sharedPreferences = await SharedPreferences.getInstance();
+    return sharedPreferences.getString('socketId');
+  }
+
+  static Future<void> saveSocketIdInStorage(String socketId) async {
+    final sharedPreferences = await SharedPreferences.getInstance();
+    await sharedPreferences.setString('socketId', socketId);
+  }
+
+  static Future<void> removeSocketIdInStorage() async {
+    final sharedPreferences = await SharedPreferences.getInstance();
+    await sharedPreferences.remove('socketId');
+  }
 }
diff --git a/lib/core/websockets/ws_manager.dart b/lib/core/websockets/ws_manager.dart
index 73431542..528f2ae9 100644
--- a/lib/core/websockets/ws_manager.dart
+++ b/lib/core/websockets/ws_manager.dart
@@ -1,3 +1,4 @@
+import 'dart:convert';
 import 'dart:developer';
 
 import 'package:dart_pusher_channels/dart_pusher_channels.dart';
@@ -59,6 +60,24 @@ class WsManager {
           ),
         );
 
+        String? extractSocketId(String? data) {
+          if (data == null) return null;
+          try {
+            final decoded = jsonDecode(data);
+            return decoded['socket_id'] as String?;
+          } catch (_) {
+            return null;
+          }
+        }
+
+        client?.eventStream.listen((event) async {
+          if (event.name == 'pusher:connection_established') {
+            final data = event.data;
+            final socketId = extractSocketId(data);
+            await SocketIdStorage.saveSocketIdInStorage(socketId!);
+          }
+        });
+
         await client?.connect();
 
         client = client;
@@ -77,9 +96,8 @@ class WsManager {
           EasyDebounce.debounce(
             'searchChatRoom',
             const Duration(milliseconds: 300),
-                () => sl<ChatsCubit>().getChatRooms(),
+            () => sl<ChatsCubit>().getChatRooms(),
           );
-          log(event.rootObject.toString());
         });
         _subscribe();
       } catch (e, st) {
diff --git a/lib/core/widgets/bottom_sheet_action_widget.dart b/lib/core/widgets/bottom_sheet_action_widget.dart
new file mode 100644
index 00000000..004b5567
--- /dev/null
+++ b/lib/core/widgets/bottom_sheet_action_widget.dart
@@ -0,0 +1,33 @@
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
+
+class BottomSheetActionWidget extends StatelessWidget {
+  const BottomSheetActionWidget({super.key, required this.text, required this.iconPath, required this.onTap, this.needToPop = true, this.color});
+  final String text;
+  final String iconPath;
+  final void Function() onTap;
+  final bool needToPop;
+  final Color? color;
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: () {
+        if (needToPop) Navigator.pop(context);
+        onTap();
+      },
+      child: Padding(
+        padding: const EdgeInsets.symmetric(vertical: 12),
+        child: Row(
+          children: [
+            Expanded(
+              child: Text(text, style: TextStyles.textLMedium.copyWith(color: appTheme.black)),
+            ),
+            SvgPicture.asset(iconPath, colorFilter: color != null ? ColorFilter.mode(color!, BlendMode.srcIn) : null),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/core/widgets/custom_drop_down.dart b/lib/core/widgets/custom_drop_down.dart
index bbd07a09..9580afe7 100644
--- a/lib/core/widgets/custom_drop_down.dart
+++ b/lib/core/widgets/custom_drop_down.dart
@@ -2,7 +2,8 @@ import 'package:eatvio_app/core/data/selectionPopupModel/selection_popup_model.d
 import 'package:flutter/material.dart';
 
 class CustomDropDown extends StatelessWidget {
-  const CustomDropDown({super.key, 
+  const CustomDropDown({
+    super.key,
     this.alignment,
     this.width,
     this.focusNode,
@@ -48,20 +49,15 @@ class CustomDropDown extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return alignment != null
-        ? Align(
-            alignment: alignment ?? Alignment.center,
-            child: _buildDropDownWidget(context),
-          )
-        : _buildDropDownWidget(context);
+    return alignment != null ? Align(alignment: alignment ?? Alignment.center, child: _buildDropDownWidget(context)) : _buildDropDownWidget(context);
   }
 
-  _buildDropDownWidget(BuildContext context) {
+  DropdownButtonFormField<SelectionPopupModel> _buildDropDownWidget(BuildContext context) {
     return DropdownButtonFormField<SelectionPopupModel>(
       focusNode: focusNode ?? FocusNode(),
       icon: const Icon(Icons.keyboard_arrow_down_rounded),
       autofocus: autofocus!,
-      value: value,
+      initialValue: value,
       isDense: true,
       isExpanded: true,
       items: items?.map((SelectionPopupModel item) {
@@ -69,12 +65,7 @@ class CustomDropDown extends StatelessWidget {
           value: item,
           child: Text(
             item.title,
-            style: hintStyle ??
-                const TextStyle(
-                  fontSize: 16,
-                  fontWeight: FontWeight.w400,
-                  color: Colors.black,
-                ),
+            style: hintStyle ?? const TextStyle(fontSize: 16, fontWeight: FontWeight.w400, color: Colors.black),
           ),
         );
       }).toList(),
@@ -84,25 +75,15 @@ class CustomDropDown extends StatelessWidget {
     );
   }
 
-  void onDropDownChanged(value) {
+  void onDropDownChanged(dynamic value) {
     onChanged!(value!);
   }
 
   InputDecoration _buildInputDecoration(BuildContext context) {
     return InputDecoration(
-      labelStyle: const TextStyle(
-        fontSize: 16,
-        color: Colors.black,
-        fontWeight: FontWeight.w400,
-      ),
+      labelStyle: const TextStyle(fontSize: 16, color: Colors.black, fontWeight: FontWeight.w400),
       hintText: hintText ?? "",
-      hintStyle: hintStyle ??
-          TextStyle(
-            fontSize: 16,
-            fontWeight: FontWeight.w400,
-            color: Colors.grey.shade400,
-            height: 1,
-          ),
+      hintStyle: hintStyle ?? TextStyle(fontSize: 16, fontWeight: FontWeight.w400, color: Colors.grey.shade400, height: 1),
       prefixIcon: prefix,
       prefixIconConstraints: prefixConstraints,
       suffixIcon: suffix,
@@ -111,18 +92,9 @@ class CustomDropDown extends StatelessWidget {
       contentPadding: const EdgeInsets.symmetric(vertical: 16, horizontal: 12),
       fillColor: const Color(0xFFF6F6F6),
       filled: filled,
-      border: const OutlineInputBorder(
-        borderRadius: BorderRadius.all(Radius.circular(20)),
-        borderSide: BorderSide.none,
-      ),
-      enabledBorder: const OutlineInputBorder(
-        borderRadius: BorderRadius.all(Radius.circular(20)),
-        borderSide: BorderSide.none,
-      ),
-      focusedBorder: const OutlineInputBorder(
-        borderRadius: BorderRadius.all(Radius.circular(20)),
-        borderSide: BorderSide.none,
-      ),
+      border: const OutlineInputBorder(borderRadius: BorderRadius.all(Radius.circular(20)), borderSide: BorderSide.none),
+      enabledBorder: const OutlineInputBorder(borderRadius: BorderRadius.all(Radius.circular(20)), borderSide: BorderSide.none),
+      focusedBorder: const OutlineInputBorder(borderRadius: BorderRadius.all(Radius.circular(20)), borderSide: BorderSide.none),
     );
   }
 }
diff --git a/lib/core/widgets/custom_drop_down_button.dart b/lib/core/widgets/custom_drop_down_button.dart
index 714382e7..ac8f3c2b 100644
--- a/lib/core/widgets/custom_drop_down_button.dart
+++ b/lib/core/widgets/custom_drop_down_button.dart
@@ -3,14 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 
 class CustomDropDownButton<T> extends StatelessWidget {
-  const CustomDropDownButton({
-    super.key,
-    required this.items,
-    required this.onChanged,
-    this.value,
-    this.hint,
-    this.hasError = false,
-  });
+  const CustomDropDownButton({super.key, required this.items, required this.onChanged, this.value, this.hint, this.hasError = false});
   final T? value;
   final List<DropdownMenuItem<T>> items;
   final void Function(T?)? onChanged;
@@ -20,11 +13,7 @@ class CustomDropDownButton<T> extends StatelessWidget {
   Widget build(BuildContext context) {
     return DropdownButtonFormField(
       hint: hint,
-      icon: SvgPicture.asset(
-        'assets/icons/arrow_down2.svg',
-        width: 12,
-        height: 8,
-      ),
+      icon: SvgPicture.asset('assets/icons/arrow_down2.svg', width: 12, height: 8),
       borderRadius: BorderRadius.circular(20),
       dropdownColor: appTheme.lightGray0,
       decoration: InputDecoration(
@@ -43,7 +32,7 @@ class CustomDropDownButton<T> extends StatelessWidget {
         fillColor: appTheme.lightGray0,
         filled: true,
       ),
-      value: value,
+      initialValue: value,
       items: items,
       onChanged: onChanged,
     );
diff --git a/lib/core/widgets/custom_popup.dart b/lib/core/widgets/custom_popup.dart
index 1ba0224e..b5934f4d 100644
--- a/lib/core/widgets/custom_popup.dart
+++ b/lib/core/widgets/custom_popup.dart
@@ -76,7 +76,7 @@ class CustomPopup extends StatelessWidget {
     );
   }
 
-  List<PopupMenuEntry> _buildMenuItems(s, context) {
+  List<PopupMenuEntry> _buildMenuItems(S s,BuildContext context) {
     final entries = <PopupMenuEntry>[];
 
     void addItem(String icon, String text, Function() onTap) {
@@ -110,28 +110,28 @@ class CustomPopup extends StatelessWidget {
       addItem('assets/icons/red_trash.svg', 'Удалить', () async {
         if (complainedContentType == ComplainedContent.posts) {
           final result = await sl<BlogPostCreateCubit>().deleteBlogPost(id!);
-          if (!result) {
+          if (!result && context.mounted) {
             showErrorDialog(context, title: S.current.could_not_delete_blog_post);
             return;
           }
           showSuccessToast('Пост удален, обновите ленту');
         } else if (complainedContentType == ComplainedContent.recipe) {
           final result = await sl<RecipesCubit>().deleteRecipe(slug!);
-          if (!result) {
+          if (!result && context.mounted) {
             showErrorDialog(context, title: 'Не удалось удалить рецепт');
             return;
           }
           showSuccessToast('Рецепт удален, обновите ленту');
         } else if (complainedContentType == ComplainedContent.diet) {
           final result = await sl<DietsCubit>().deleteDiet(id!);
-          if (!result) {
+          if (!result && context.mounted) {
             showErrorDialog(context, title: 'Не удалось удалить диету');
             return;
           }
           showSuccessToast('Диета удалена, обновите ленту');
         } else if (complainedContentType == ComplainedContent.plan) {
           final result = await sl<MyPlansCubit>().deletePlan(slug!);
-          if (!result) {
+          if (!result && context.mounted) {
             showErrorDialog(context, title: 'Не удалось удалить план');
             return;
           }
diff --git a/lib/core/widgets/success_published_recipe_bottom_sheet.dart b/lib/core/widgets/success_published_recipe_bottom_sheet.dart
index 9fb1ddeb..796e7d91 100644
--- a/lib/core/widgets/success_published_recipe_bottom_sheet.dart
+++ b/lib/core/widgets/success_published_recipe_bottom_sheet.dart
@@ -26,9 +26,13 @@ class SuccessPublishedRecipeBottomSheet extends StatelessWidget {
           s.recipe_publishing,
           style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
         ),
-        Text(
-          '"$title" ${s.successfully_published}',
-          style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 12),
+          child: Text(
+            '"$title" ${s.successfully_published}',
+            textAlign: TextAlign.center,
+            style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+          ),
         ),
         const SizedBox(
           height: 20,
diff --git a/lib/features/auth/presentation/bloc/reset_password_cubit/reset_password_cubit.dart b/lib/features/auth/presentation/bloc/reset_password_cubit/reset_password_cubit.dart
index 37fd0d5a..136ca9b8 100644
--- a/lib/features/auth/presentation/bloc/reset_password_cubit/reset_password_cubit.dart
+++ b/lib/features/auth/presentation/bloc/reset_password_cubit/reset_password_cubit.dart
@@ -7,7 +7,7 @@ class ResetPasswordCubit extends Cubit<ResetPasswordState> {
 
   ResetPasswordCubit({required this.resetPasswordRepository}) : super(const ResetPasswordState.empty());
 
-  trySendEmailCode(String email) async {
+  Future<void> trySendEmailCode(String email) async {
     emit(const ResetPasswordState.loadingSendEmailCode());
     try {
       if (await resetPasswordRepository.sendEmailCodeForPasswordChange(email)) {
@@ -20,7 +20,7 @@ class ResetPasswordCubit extends Cubit<ResetPasswordState> {
     }
   }
 
-  tryResetPassword(String email, String code, String password, String passwordConfirmation) async {
+  Future<void> tryResetPassword(String email, String code, String password, String passwordConfirmation) async {
     emit(const ResetPasswordState.loadingResetPassword());
     try {
       if (await resetPasswordRepository.confirmPasswordChange(code, password, passwordConfirmation, email)) {
diff --git a/lib/features/auth/presentation/pages/auth_screen.dart b/lib/features/auth/presentation/pages/auth_screen.dart
index 31028059..20b0e26c 100644
--- a/lib/features/auth/presentation/pages/auth_screen.dart
+++ b/lib/features/auth/presentation/pages/auth_screen.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'package:eatvio_app/core/app_router.dart';
 import 'package:eatvio_app/core/const.dart';
+import 'package:eatvio_app/core/firebase_api.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/core/utils/image_constant.dart';
@@ -66,19 +67,20 @@ class _AuthScreenState extends State<AuthScreen> {
         await sl<ChatsCubit>().connectToWebSocket();
         await sl<NotificationsCubit>().getNotifications();
         await sl<NotificationsCubit>().connectToWebSocket();
+        await sl<FirebaseApi>().registerPushToken();
         showSuccessToast('Успешный вход');
       } catch (e) {
         rethrow;
       }
     }
-    AppRouter.navigatorKey.currentContext?.go(
-      '/feed-screen',
-      extra: {'needToInitializeWebSocket': false},
-    );
+    AppRouter.navigatorKey.currentContext?.go('/feed-screen', extra: {'needToInitializeWebSocket': false});
   }
 
   @override
   Widget build(BuildContext context) {
+    var shortestSide = MediaQuery.sizeOf(context).shortestSide;
+    final bool useMobileLayout = shortestSide < 600;
+    if (!useMobileLayout) isFocused = true;
     final s = S.of(context);
     FlutterNativeSplash.remove();
     return BlocProvider<AuthCubit>(
@@ -97,11 +99,7 @@ class _AuthScreenState extends State<AuthScreen> {
                     GoRouter.of(context).pushNamed(DevToolsScreen.name);
                   }
                 },
-                child: SvgPicture.asset(
-                  ImageConstant.imgLogoEatvio,
-                  height: isFocused ? 64 : MediaQuery.of(context).size.width - 64,
-                  fit: BoxFit.contain,
-                ),
+                child: SvgPicture.asset(ImageConstant.imgLogoEatvio, height: isFocused ? 64 : MediaQuery.of(context).size.width - 64, fit: BoxFit.contain),
               ),
             ),
             body: SafeArea(
@@ -132,23 +130,16 @@ class _AuthScreenState extends State<AuthScreen> {
                             hidePassword = !hidePassword;
                           });
                         },
-                        icon: Icon(
-                          hidePassword ? Icons.visibility_outlined : Icons.visibility_off_outlined,
-                          color: Colors.grey,
-                        ),
+                        icon: Icon(hidePassword ? Icons.visibility_outlined : Icons.visibility_off_outlined, color: Colors.grey),
                       ),
                     ),
                     const SizedBox(height: 16),
                     Center(
                       child: GestureDetector(
-                        onTap: () => GoRouter.of(context).goNamed('forgetPasswordScreen'),
+                        onTap: () => GoRouter.of(context).goNamed('forgetPasswordScreen', extra: false),
                         child: Text(
                           'Забыли пароль?',
-                          style: TextStyle(
-                            color: appTheme.blueA400,
-                            decorationColor: appTheme.blueA400,
-                            decoration: TextDecoration.underline,
-                          ),
+                          style: TextStyle(color: appTheme.blueA400, decorationColor: appTheme.blueA400, decoration: TextDecoration.underline),
                         ),
                       ),
                     ),
@@ -161,11 +152,7 @@ class _AuthScreenState extends State<AuthScreen> {
                           onTap: () => GoRouter.of(context).goNamed('registrationScreen'),
                           child: Text(
                             'Зарегистрироваться',
-                            style: TextStyle(
-                              color: appTheme.blueA400,
-                              decorationColor: appTheme.blueA400,
-                              decoration: TextDecoration.underline,
-                            ),
+                            style: TextStyle(color: appTheme.blueA400, decorationColor: appTheme.blueA400, decoration: TextDecoration.underline),
                           ),
                         ),
                       ],
@@ -176,23 +163,22 @@ class _AuthScreenState extends State<AuthScreen> {
                         textAlign: TextAlign.center,
                         text: TextSpan(
                           text: 'Нажимая "Войти" или "Зарегистрироваться", Вы соглашаетесь \n',
-                          style: const TextStyle(
-                            fontSize: 12,
-                            color: Colors.black,
-                          ),
+                          style: const TextStyle(fontSize: 12, color: Colors.black),
                           children: [
                             const TextSpan(text: 'c '),
-                            TextSpan(
-                              text: ' Публичной офертой',
-                              style: TextStyle(
-                                fontSize: 12,
-                                color: appTheme.blueA400,
-                                decorationColor: appTheme.blueA400,
-                                decoration: TextDecoration.underline,
+                            if (!hidePlans) ...[
+                              TextSpan(
+                                text: ' Публичной офертой',
+                                style: TextStyle(
+                                  fontSize: 12,
+                                  color: appTheme.blueA400,
+                                  decorationColor: appTheme.blueA400,
+                                  decoration: TextDecoration.underline,
+                                ),
+                                recognizer: TapGestureRecognizer()..onTap = () async => await launchUrl(Uri.parse('$baseUrl/oferta_bs.pdf')),
                               ),
-                              recognizer: TapGestureRecognizer()..onTap = () async => await launchUrl(Uri.parse('$baseUrl/oferta_bs.pdf')),
-                            ),
-                            const TextSpan(text: ' и '),
+                              const TextSpan(text: ' и '),
+                            ],
                             TextSpan(
                               text: 'Политикой конфиденциальности\nи защитой персональных данных',
                               style: TextStyle(
@@ -218,17 +204,12 @@ class _AuthScreenState extends State<AuthScreen> {
                             highlightElevation: 0,
                             elevation: 0,
                             focusElevation: 0,
-                            shape: RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(20),
-                            ),
+                            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
                             backgroundColor: state is AuthStateLoading ? Colors.black.withAlpha(50) : appTheme.blueA400,
                             onPressed: state is AuthStateLoading
                                 ? null
                                 : () async {
-                                    final isAuthenticated = await authCubit.getTokenByCredentials(
-                                      emailController.text,
-                                      passwordController.text,
-                                    );
+                                    final isAuthenticated = await authCubit.getTokenByCredentials(emailController.text, passwordController.text);
                                     if (isAuthenticated) {
                                       if (context.mounted) {
                                         _reconnectWebSocket(context);
@@ -237,10 +218,7 @@ class _AuthScreenState extends State<AuthScreen> {
                                   },
                             label: state is AuthStateLoading
                                 ? const CupertinoActivityIndicator()
-                                : Text(
-                                    'Войти',
-                                    style: theme.textTheme.titleSmall!.copyWith(color: Colors.white),
-                                  ),
+                                : Text('Войти', style: theme.textTheme.titleSmall!.copyWith(color: Colors.white)),
                           ),
                         ),
                         const SizedBox(width: 8),
@@ -252,21 +230,71 @@ class _AuthScreenState extends State<AuthScreen> {
                             highlightElevation: 0,
                             elevation: 0,
                             focusElevation: 0,
-                            shape: RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(16),
-                            ),
+                            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
                             backgroundColor: state is AuthStateLoading ? Colors.black.withAlpha(50) : appTheme.blueA400,
                             onPressed: state is AuthStateLoading
                                 ? null
-                                : () {
-                                    GoRouter.of(context).pushNamed('scanQRCodeScreen');
+                                : () async {
+                                    await showDialog(
+                                      context: context,
+                                      builder: (BuildContext context) {
+                                        return Dialog(
+                                          child: Padding(
+                                            padding: const EdgeInsets.all(24),
+                                            child: Column(
+                                              crossAxisAlignment: CrossAxisAlignment.start,
+                                              mainAxisSize: MainAxisSize.min,
+                                              children: [
+                                                const Text('Где взять QR-код?\n', style: TextStyle(fontSize: 18)),
+                                                Text(
+                                                  '1. Войдите на сайте $baseUrl в свой аккаунт\n\n2. Перейдите в настройки профиля\n\n3. В разделе "Доп информация" перейдите на "QR Login"',
+                                                ),
+                                                const SizedBox(height: 12),
+                                                Row(
+                                                  mainAxisAlignment: MainAxisAlignment.end,
+                                                  children: [
+                                                    InkWell(
+                                                      borderRadius: BorderRadius.circular(8),
+                                                      onTap: () {
+                                                        AppRouter.navigatorKey.currentContext?.pop();
+                                                      },
+                                                      child: Ink(
+                                                        padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+                                                        decoration: BoxDecoration(borderRadius: BorderRadius.circular(8)),
+                                                        child: const Text(
+                                                          'Отмена',
+                                                          style: TextStyle(color: Colors.black, fontWeight: FontWeight.w400),
+                                                        ),
+                                                      ),
+                                                    ),
+                                                    const SizedBox(width: 8),
+                                                    InkWell(
+                                                      borderRadius: BorderRadius.circular(8),
+                                                      onTap: () {
+                                                        AppRouter.navigatorKey.currentContext?.pop();
+                                                        AppRouter.navigatorKey.currentContext?.pushNamed('scanQRCodeScreen');
+                                                      },
+                                                      child: Ink(
+                                                        padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+                                                        decoration: BoxDecoration(borderRadius: BorderRadius.circular(8)),
+                                                        child: Text(
+                                                          'Перейти',
+                                                          style: TextStyle(color: appTheme.blueA400, fontWeight: FontWeight.w600),
+                                                        ),
+                                                      ),
+                                                    ),
+                                                  ],
+                                                ),
+                                              ],
+                                            ),
+                                          ),
+                                        );
+                                      },
+                                    );
                                   },
                             label: state is AuthStateLoading
                                 ? const CupertinoActivityIndicator()
-                                : const Icon(
-                                    Icons.qr_code_scanner_rounded,
-                                    color: Colors.white,
-                                  ),
+                                : const Icon(Icons.qr_code_scanner_rounded, color: Colors.white),
                           ),
                         ),
                       ],
diff --git a/lib/features/auth/presentation/pages/forget_password_screen.dart b/lib/features/auth/presentation/pages/forget_password_screen.dart
index 78313a15..d842fcfc 100644
--- a/lib/features/auth/presentation/pages/forget_password_screen.dart
+++ b/lib/features/auth/presentation/pages/forget_password_screen.dart
@@ -9,7 +9,8 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
 
 class ForgetPasswordScreen extends StatefulWidget {
-  const ForgetPasswordScreen({super.key});
+  final bool isAuth;
+  const ForgetPasswordScreen({super.key, required this.isAuth});
 
   @override
   State<ForgetPasswordScreen> createState() => _ForgetPasswordScreenState();
@@ -29,7 +30,7 @@ class _ForgetPasswordScreenState extends State<ForgetPasswordScreen> {
         builder: (BuildContext context, ResetPasswordState state) {
           return Scaffold(
             appBar: AppBar(
-              title: const Text('Смена пароля'),
+              title: widget.isAuth ? const Text('Смена пароля') : const Text('Восстановление пароля'),
               centerTitle: false,
             ),
             body: state is ResetPasswordStateLoadingResetPassword || state is ResetPasswordStateLoadingSendEmailCode
@@ -42,9 +43,9 @@ class _ForgetPasswordScreenState extends State<ForgetPasswordScreen> {
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         if (state is ResetPasswordStateCodeSendError || state is ResetPasswordStateEmpty) ...[
-                          const Text(
-                            'Забыли пароль? Укажите свой email,\nи мы пришлём код для сброса.',
-                            style: TextStyle(
+                          Text(
+                            '${widget.isAuth ? '' : 'Забыли пароль? '}Укажите свой email,\nи мы пришлём код для сброса.',
+                            style: const TextStyle(
                               fontSize: 16,
                               fontWeight: FontWeight.w500,
                             ),
@@ -156,7 +157,7 @@ class _ForgetPasswordScreenState extends State<ForgetPasswordScreen> {
           }
           if (state is ResetPasswordStateResetPassowrdSuccess) {
             GoRouter.of(context).pop();
-            showSuccessToast('Пароль успешно сменён. Войдите в аккаунт');
+            showSuccessToast('Пароль успешно сменён. ${widget.isAuth ? '' : 'Войдите в аккаунт'}');
           }
         },
       ),
diff --git a/lib/features/auth/presentation/pages/scan_qr_code_screen.dart b/lib/features/auth/presentation/pages/scan_qr_code_screen.dart
index 411cb3a5..83296f0e 100644
--- a/lib/features/auth/presentation/pages/scan_qr_code_screen.dart
+++ b/lib/features/auth/presentation/pages/scan_qr_code_screen.dart
@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:dio/dio.dart';
 import 'package:eatvio_app/core/app_router.dart';
 import 'package:eatvio_app/core/const.dart';
+import 'package:eatvio_app/core/firebase_api.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/token_storage.dart';
 import 'package:eatvio_app/core/utils/toasts.dart';
@@ -92,6 +93,7 @@ class _ScanQRCodeScreenState extends State<ScanQRCodeScreen> {
           await sl<ChatsCubit>().connectToWebSocket();
           await sl<NotificationsCubit>().getNotifications();
           await sl<NotificationsCubit>().connectToWebSocket();
+          await sl<FirebaseApi>().registerPushToken();
         } catch (e) {
           rethrow;
         }
diff --git a/lib/features/blog_post/presentation/cubit/blog_post_cubit.dart b/lib/features/blog_post/presentation/cubit/blog_post_cubit.dart
new file mode 100644
index 00000000..59665002
--- /dev/null
+++ b/lib/features/blog_post/presentation/cubit/blog_post_cubit.dart
@@ -0,0 +1,21 @@
+import 'dart:developer';
+
+import 'package:eatvio_app/features/blog_post/presentation/cubit/blog_post_state.dart';
+import 'package:eatvio_app/features/feed/repositories/feed_repository.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+class BlogPostCubit extends Cubit<BlogPostState> {
+  final FeedRepository feedRepository;
+  BlogPostCubit(this.feedRepository) : super(BlogPostState());
+
+  Future<void> getBlogPost(int id) async {
+    try {
+      emit(state.copyWith(isLoading: true));
+      final postModel = await feedRepository.getBlogPost(id: id);
+      emit(state.copyWith(blogPostModel: postModel, isLoading: false));
+    } catch (e, st) {
+      log(e.toString(), stackTrace: st);
+      emit(state.copyWith(isLoading: false));
+    }
+  }
+}
diff --git a/lib/features/blog_post/presentation/cubit/blog_post_state.dart b/lib/features/blog_post/presentation/cubit/blog_post_state.dart
new file mode 100644
index 00000000..9b5684da
--- /dev/null
+++ b/lib/features/blog_post/presentation/cubit/blog_post_state.dart
@@ -0,0 +1,17 @@
+import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'blog_post_state.freezed.dart';
+part 'blog_post_state.g.dart';
+
+@freezed
+abstract class BlogPostState with _$BlogPostState {
+
+  factory BlogPostState({
+    @Default(null) FeedBlogPostModel? blogPostModel,
+    @Default(false) bool isLoading,
+    @Default(null) String? error,
+  }) = _BlogPostState;
+
+  factory BlogPostState.fromJson(Map<String, dynamic> json) => _$BlogPostStateFromJson(json);
+}
\ No newline at end of file
diff --git a/lib/features/blog_post/presentation/pages/blog_post_screen.dart b/lib/features/blog_post/presentation/pages/blog_post_screen.dart
index 580e89f0..25636a57 100644
--- a/lib/features/blog_post/presentation/pages/blog_post_screen.dart
+++ b/lib/features/blog_post/presentation/pages/blog_post_screen.dart
@@ -5,9 +5,10 @@ import 'package:eatvio_app/core/enums/complained_content.dart';
 import 'package:eatvio_app/core/utils/date_time_utils.dart';
 import 'package:eatvio_app/core/widgets/custom_popup.dart';
 import 'package:eatvio_app/core/widgets/loader.dart';
-import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
-import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart';
-import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_state.dart';
+import 'package:eatvio_app/features/blog_post/presentation/cubit/blog_post_cubit.dart';
+import 'package:eatvio_app/features/blog_post/presentation/cubit/blog_post_state.dart';
+import 'package:eatvio_app/core/comments/comments_cubit/comments_cubit.dart';
+import 'package:eatvio_app/core/comments/comments_cubit/comments_state.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/comments_widget.dart';
 import 'package:eatvio_app/core/locator_service.dart';
@@ -19,9 +20,9 @@ import 'package:go_router/go_router.dart';
 import 'package:share_plus/share_plus.dart';
 
 class BlogPostScreen extends StatefulWidget {
-  final FeedBlogPostModel blogPost;
+  final int id;
 
-  const BlogPostScreen({super.key, required this.blogPost});
+  const BlogPostScreen({super.key, required this.id});
 
   @override
   State<BlogPostScreen> createState() => _BlogPostScreenState();
@@ -31,264 +32,294 @@ class _BlogPostScreenState extends State<BlogPostScreen> {
   final CommentsCubit commentsCubit = sl<CommentsCubit>();
   final textEditingController = TextEditingController();
   int? replyId;
-  late bool isLiked;
-  late int totalLikes;
+  bool isLiked = false;
+  int totalLikes = 0;
 
   @override
   void initState() {
-    isLiked = widget.blogPost.wasLikedByMe;
-    totalLikes = widget.blogPost.totalLikes;
-    context.read<FeedCubit>().viewPost(widget.blogPost.id);
+    context.read<FeedCubit>().viewPost(widget.id);
     super.initState();
   }
 
   @override
   Widget build(BuildContext context) {
-    return BlocProvider<CommentsCubit>(
-      create: (BuildContext context) => commentsCubit..getComments(widget.blogPost.id.toString(), CommentSourceType.blogPost, true),
-      child: BlocConsumer<CommentsCubit, CommentsState>(
-        listener: (BuildContext context, CommentsState state) {
-          if (state is CommentsStateLoaded) {
-            setState(() {
-              replyId = state.replyId;
-            });
-          }
-        },
-        builder: (BuildContext context, CommentsState state) {
-          return Scaffold(
-            resizeToAvoidBottomInset: true,
-            bottomSheet: Container(
-              padding: const EdgeInsets.symmetric(vertical: 12) + (Platform.isIOS ? const EdgeInsets.only(bottom: 16) : EdgeInsets.zero),
-              decoration: BoxDecoration(color: Colors.white, border: Border(top: BorderSide(color: Colors.black.withValues(alpha: 0.1)))),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.center,
-                children: [
-                  if (replyId != null)
-                    GestureDetector(
-                      onTap: () {
-                        context.read<CommentsCubit>().setReplyId(null);
-                        setState(() {
-                          replyId = null;
-                          textEditingController.clear();
-                        });
-                        FocusManager.instance.primaryFocus?.unfocus();
-                      },
-                      child: Container(
-                        decoration: BoxDecoration(color: appTheme.blueA400, shape: BoxShape.circle),
-                        height: 32,
-                        width: 32,
-                        child: const Icon(Icons.close_rounded, size: 18, color: Colors.white),
-                      ),
-                    ),
-                  if (replyId != null) const SizedBox(width: 8),
-                  SizedBox(
-                    width: MediaQuery.of(context).size.width - (replyId == null ? 64 : 104),
-                    child: ConstrainedBox(
-                      constraints: const BoxConstraints(minHeight: 52),
-                      child: TextFormField(
-                        textCapitalization: TextCapitalization.sentences,
-                        onChanged: (_) {
-                          setState(() {});
-                        },
-                        controller: textEditingController,
-                        maxLines: 5,
-                        minLines: 1,
-                        keyboardType: TextInputType.multiline,
-                        style: const TextStyle(
-                          fontSize: 16,
-                          fontWeight: FontWeight.w400,
-                          color: Colors.black,
-                          height: 1.2,
-                        ),
-                        decoration: InputDecoration(
-                          isDense: false,
-                          // убираем true, чтобы padding учитывался корректно
-                          contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16),
-                          // вертикальный паддинг увеличен
-                          hintText: 'Комментарий',
-                          hintStyle: const TextStyle(
-                            fontSize: 16,
-                            fontWeight: FontWeight.w400,
-                            height: 1.2,
-                            color: Color(0xFFAEAEB2),
-                          ),
-                          filled: true,
-                          border: OutlineInputBorder(
-                            borderRadius: BorderRadius.circular(16),
-                            borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
-                          ),
-                          enabledBorder: OutlineInputBorder(
-                            borderRadius: BorderRadius.circular(16),
-                            borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
-                          ),
-                          focusedBorder: OutlineInputBorder(
-                            borderRadius: BorderRadius.circular(16),
-                            borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
-                          ),
-                        ),
-                      ),
-                    ),
-                  ),
-                  const SizedBox(width: 8),
-                  GestureDetector(
-                    onTap: () {
-                      if (textEditingController.text.length > 2) {
-                        commentsCubit.sendComment(
-                          id: widget.blogPost.id.toString(),
-                          commentText: textEditingController.text,
-                          parentCommentId: replyId,
-                          commentSourceType: CommentSourceType.blogPost,
-                        );
-                        context.read<CommentsCubit>().setReplyId(null);
-                        setState(() {
-                          textEditingController.clear();
-                          replyId = null;
-                        });
-                        FocusManager.instance.primaryFocus?.unfocus();
-                      }
-                    },
-                    child: Container(
-                      decoration: BoxDecoration(color: textEditingController.text.length > 2 ? appTheme.blueA400 : Colors.grey, shape: BoxShape.circle),
-                      height: 32,
-                      width: 32,
-                      child: const Icon(Icons.send_rounded, size: 18, color: Colors.white),
-                    ),
-                  ),
-                ],
-              ),
-            ),
-            appBar: AppBar(
-              title: Text(widget.blogPost.title),
-              actions: [
-                CustomPopup(
-                  isAuthor: widget.blogPost.author.authorIsMe,
-                  complainedContentType: ComplainedContent.posts,
-                  path: 'blog_post/${(widget.blogPost.id)}',
-                  id: widget.blogPost.id,
-                  feedBlogPostModel: widget.blogPost,
-                  userSlug: widget.blogPost.author.authorSlug,
-                ),
-                const SizedBox(width: 16),
-              ],
-            ),
-            body: SingleChildScrollView(
-              padding: const EdgeInsets.only(bottom: 80),
-              physics: const BouncingScrollPhysics(),
-              child: Column(
-                children: [
-                  GestureDetector(
-                    onTap: () => GoRouter.of(context).pushNamed('profileScreen', extra: widget.blogPost.author),
-                    child: Ink(
-                      padding: const EdgeInsets.symmetric(horizontal: 16),
-                      child: Row(
-                        crossAxisAlignment: CrossAxisAlignment.center,
-                        mainAxisAlignment: MainAxisAlignment.start,
-                        children: [
-                          CircleAvatar(
-                            radius: 16,
-                            foregroundImage: NetworkImage(
-                              baseUrl + widget.blogPost.author.authorProfileIcon,
-                            ),
-                            backgroundImage: const AssetImage('assets/images/no_avatar.png'),
-                          ),
-                          const SizedBox(width: 8),
-                          Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Text(
-                                widget.blogPost.author.authorName,
-                                style: const TextStyle(color: Colors.black, fontSize: 14, fontWeight: FontWeight.w400, height: 1),
-                              ),
-                              const SizedBox(height: 2),
-                              Text(
-                                widget.blogPost.createdAt.format('dd MMMM', 'ru'),
-                                style: TextStyle(color: Colors.grey.shade600, fontSize: 12, fontWeight: FontWeight.w400, height: 1),
-                              ),
-                            ],
-                          ),
-                        ],
-                      ),
-                    ),
-                  ),
-                  if (widget.blogPost.description.isNotEmpty)
-                    Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 8),
-                      child: Html(data: widget.blogPost.description, style: {"*": Style(color: Colors.black87)}),
-                    ),
-                  const SizedBox(height: 8),
-                  if (widget.blogPost.image.isNotEmpty)
-                    CachedNetworkImage(
-                      imageUrl: '$baseUrl/storage/${widget.blogPost.image}',
-                    ),
-                  Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
-                    child: Row(
-                      children: [
-                        _iconButton(
-                          icon: 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--;
-                            });
-                            isLiked
-                                ? await context.read<FeedCubit>().likePost(widget.blogPost.id)
-                                : await context.read<FeedCubit>().unlikedPost(widget.blogPost.id);
-                            sl<FeedCubit>().updateFeedBlogPostList(widget.blogPost, isLiked);
+    return BlocProvider(
+      create: (context) => sl<BlogPostCubit>()..getBlogPost(widget.id),
+      child: BlocProvider<CommentsCubit>(
+        create: (BuildContext context) => commentsCubit..getComments(widget.id.toString(), CommentSourceType.blogPost, true),
+        child: BlocBuilder<BlogPostCubit, BlogPostState>(
+          builder: (context, blogPostState) {
+            return BlocConsumer<CommentsCubit, CommentsState>(
+              listener: (BuildContext context, CommentsState state) {
+                if (state is CommentsStateLoaded) {
+                  setState(() {
+                    replyId = state.replyId;
+                  });
+                }
+              },
+              builder: (BuildContext context, CommentsState state) {
+                if (blogPostState.isLoading) {
+                  return Scaffold(
+                      appBar: AppBar(
+                        leading: BackButton(
+                          onPressed: () {
+                            if (context.canPop()) {
+                              GoRouter.of(context).pop();
+                              return;
+                            }
+                            GoRouter.of(context).go('/feed-screen');
                           },
                         ),
+                      ),
+                      body: const Loader());
+                }
+                isLiked = blogPostState.blogPostModel?.wasLikedByMe ?? false;
+                totalLikes = blogPostState.blogPostModel?.totalLikes ?? 0;
+                return Scaffold(
+                  resizeToAvoidBottomInset: true,
+                  bottomSheet: Container(
+                    padding: const EdgeInsets.symmetric(vertical: 12) + (Platform.isIOS ? const EdgeInsets.only(bottom: 16) : EdgeInsets.zero),
+                    decoration: BoxDecoration(color: Colors.white, border: Border(top: BorderSide(color: Colors.black.withValues(alpha: 0.1)))),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        if (replyId != null)
+                          GestureDetector(
+                            onTap: () {
+                              context.read<CommentsCubit>().setReplyId(null);
+                              setState(() {
+                                replyId = null;
+                                textEditingController.clear();
+                              });
+                              FocusManager.instance.primaryFocus?.unfocus();
+                            },
+                            child: Container(
+                              decoration: BoxDecoration(color: appTheme.blueA400, shape: BoxShape.circle),
+                              height: 32,
+                              width: 32,
+                              child: const Icon(Icons.close_rounded, size: 18, color: Colors.white),
+                            ),
+                          ),
+                        if (replyId != null) const SizedBox(width: 8),
+                        SizedBox(
+                          width: MediaQuery.of(context).size.width - (replyId == null ? 64 : 104),
+                          child: ConstrainedBox(
+                            constraints: const BoxConstraints(minHeight: 52),
+                            child: TextFormField(
+                              textCapitalization: TextCapitalization.sentences,
+                              onChanged: (_) {
+                                setState(() {});
+                              },
+                              controller: textEditingController,
+                              maxLines: 5,
+                              minLines: 1,
+                              keyboardType: TextInputType.multiline,
+                              style: const TextStyle(
+                                fontSize: 16,
+                                fontWeight: FontWeight.w400,
+                                color: Colors.black,
+                                height: 1.2,
+                              ),
+                              decoration: InputDecoration(
+                                isDense: false,
+                                // убираем true, чтобы padding учитывался корректно
+                                contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16),
+                                // вертикальный паддинг увеличен
+                                hintText: 'Комментарий',
+                                hintStyle: const TextStyle(
+                                  fontSize: 16,
+                                  fontWeight: FontWeight.w400,
+                                  height: 1.2,
+                                  color: Color(0xFFAEAEB2),
+                                ),
+                                filled: true,
+                                border: OutlineInputBorder(
+                                  borderRadius: BorderRadius.circular(16),
+                                  borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
+                                ),
+                                enabledBorder: OutlineInputBorder(
+                                  borderRadius: BorderRadius.circular(16),
+                                  borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
+                                ),
+                                focusedBorder: OutlineInputBorder(
+                                  borderRadius: BorderRadius.circular(16),
+                                  borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
+                                ),
+                              ),
+                            ),
+                          ),
+                        ),
                         const SizedBox(width: 8),
-                        _iconButton(
-                          icon: Icons.reply_rounded,
+                        GestureDetector(
                           onTap: () {
-                            final box = context.findRenderObject() as RenderBox?;
-                            SharePlus.instance.share(
-                              ShareParams(
-                                uri: Uri.parse('$baseUrl/ru/blog_post/${widget.blogPost.id}'),
-                                sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
-                              ),
-                            );
+                            if (textEditingController.text.length > 2) {
+                              commentsCubit.sendComment(
+                                id: widget.id.toString(),
+                                commentText: textEditingController.text,
+                                parentCommentId: replyId,
+                                commentSourceType: CommentSourceType.blogPost,
+                              );
+                              context.read<CommentsCubit>().setReplyId(null);
+                              setState(() {
+                                textEditingController.clear();
+                                replyId = null;
+                              });
+                              FocusManager.instance.primaryFocus?.unfocus();
+                            }
                           },
+                          child: Container(
+                            decoration: BoxDecoration(color: textEditingController.text.length > 2 ? appTheme.blueA400 : Colors.grey, shape: BoxShape.circle),
+                            height: 32,
+                            width: 32,
+                            child: const Icon(Icons.send_rounded, size: 18, color: Colors.white),
+                          ),
                         ),
-                        const Spacer(),
-                        Icon(Icons.visibility_rounded, size: 16, color: appTheme.gray500),
-                        const SizedBox(width: 4),
-                        Text(widget.blogPost.totalViews.toString(), style: TextStyle(fontSize: 12, color: appTheme.gray500, fontWeight: FontWeight.w400)),
                       ],
                     ),
                   ),
-                  Container(
-                    width: MediaQuery.of(context).size.width - 32,
-                    height: 0.4,
-                    decoration: BoxDecoration(color: Colors.black.withValues(alpha: 0.2), borderRadius: BorderRadius.circular(16)),
+                  appBar: AppBar(
+                    title: Text(blogPostState.blogPostModel?.title ?? ''),
+                    leading: BackButton(
+                      onPressed: () {
+                        if (context.canPop()) {
+                          GoRouter.of(context).pop();
+                          return;
+                        }
+                        GoRouter.of(context).go('/feed-screen');
+                      },
+                    ),
+                    actions: [
+                      CustomPopup(
+                        isAuthor: blogPostState.blogPostModel?.author.authorIsMe ?? false,
+                        complainedContentType: ComplainedContent.posts,
+                        path: 'blog_post/${(widget.id)}',
+                        id: widget.id,
+                        feedBlogPostModel: blogPostState.blogPostModel,
+                        userSlug: blogPostState.blogPostModel?.author.authorSlug ?? '',
+                ),
+                      const SizedBox(width: 16),
+                    ],
                   ),
-                  const SizedBox(height: 8),
-                  Container(
-                    padding: const EdgeInsets.symmetric(horizontal: 16),
-                    alignment: Alignment.centerLeft,
-                    child: Text(
-                      '${widget.blogPost.totalComments} КОММЕНТАРИЕВ',
-                      style: TextStyle(fontSize: 12, color: appTheme.gray500, fontWeight: FontWeight.w400),
+                  body: SingleChildScrollView(
+                    padding: const EdgeInsets.only(bottom: 80),
+                    physics: const BouncingScrollPhysics(),
+                    child: Column(
+                      children: [
+                        GestureDetector(
+                          onTap: () => GoRouter.of(context).pushNamed('profileScreen', extra: blogPostState.blogPostModel?.author),
+                          child: Ink(
+                            padding: const EdgeInsets.symmetric(horizontal: 16),
+                            child: Row(
+                              crossAxisAlignment: CrossAxisAlignment.center,
+                              mainAxisAlignment: MainAxisAlignment.start,
+                              children: [
+                                CircleAvatar(
+                                  radius: 16,
+                                  foregroundImage: NetworkImage(
+                                    baseUrl + (blogPostState.blogPostModel?.author.authorProfileIcon ?? ''),
+                                  ),
+                                  backgroundImage: const AssetImage('assets/images/no_avatar.png'),
+                                ),
+                                const SizedBox(width: 8),
+                                Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  children: [
+                                    Text(
+                                      blogPostState.blogPostModel?.author.authorName ?? '',
+                                      style: const TextStyle(color: Colors.black, fontSize: 14, fontWeight: FontWeight.w400, height: 1),
+                                    ),
+                                    const SizedBox(height: 2),
+                                    Text(
+                                      (blogPostState.blogPostModel?.createdAt ?? DateTime.now()).format('dd MMMM', 'ru'),
+                                      style: TextStyle(color: Colors.grey.shade600, fontSize: 12, fontWeight: FontWeight.w400, height: 1),
+                                    ),
+                                  ],
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                        if (blogPostState.blogPostModel?.description.isNotEmpty ?? false)
+                          Padding(
+                            padding: const EdgeInsets.symmetric(horizontal: 8),
+                            child: Html(data: blogPostState.blogPostModel?.description.replaceAll('\n', '<br>'), style: {"*": Style(color: Colors.black87)}),
+                          ),
+                        const SizedBox(height: 8),
+                        if (blogPostState.blogPostModel?.image.isNotEmpty ?? false)
+                          CachedNetworkImage(
+                            imageUrl: '$baseUrl/storage/${blogPostState.blogPostModel?.image ?? ''}',
+                          ),
+                        Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
+                          child: Row(
+                            children: [
+                              _iconButton(
+                                icon: 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--;
+                                  });
+                                  isLiked ? await context.read<FeedCubit>().likePost(widget.id) : await context.read<FeedCubit>().unlikedPost(widget.id);
+                                  sl<FeedCubit>().updateFeedBlogPostList(blogPostState.blogPostModel, isLiked);
+                                },
+                              ),
+                              const SizedBox(width: 8),
+                              _iconButton(
+                                icon: Icons.reply_rounded,
+                                onTap: () {
+                                  final box = context.findRenderObject() as RenderBox?;
+                                  SharePlus.instance.share(
+                                    ShareParams(
+                                      uri: Uri.parse('$baseUrl/ru/blog_post/${widget.id}'),
+                                      sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
+                                    ),
+                                  );
+                                },
+                              ),
+                              const Spacer(),
+                              Icon(Icons.visibility_rounded, size: 16, color: appTheme.gray500),
+                              const SizedBox(width: 4),
+                              Text(blogPostState.blogPostModel?.totalViews.toString() ?? '',
+                                  style: TextStyle(fontSize: 12, color: appTheme.gray500, fontWeight: FontWeight.w400)),
+                            ],
+                          ),
+                        ),
+                        Container(
+                          width: MediaQuery.of(context).size.width - 32,
+                          height: 0.4,
+                          decoration: BoxDecoration(color: Colors.black.withValues(alpha: 0.2), borderRadius: BorderRadius.circular(16)),
+                        ),
+                        const SizedBox(height: 8),
+                        Container(
+                          padding: const EdgeInsets.symmetric(horizontal: 16),
+                          alignment: Alignment.centerLeft,
+                          child: Text(
+                            '${blogPostState.blogPostModel?.totalComments} КОММЕНТАРИЕВ',
+                            style: TextStyle(fontSize: 12, color: appTheme.gray500, fontWeight: FontWeight.w400),
+                          ),
+                        ),
+                        const SizedBox(height: 16),
+                        if (state is CommentsStateLoading) const Loader(),
+                        if (state is CommentsStateLoaded)
+                          CommentsWidget(id: widget.id.toString(), commentSourceType: CommentSourceType.blogPost, comment: state.comment, replyId: replyId),
+                      ],
                     ),
                   ),
-                  const SizedBox(height: 16),
-                  if (state is CommentsStateLoading) const Loader(),
-                  if (state is CommentsStateLoaded)
-                    CommentsWidget(id: widget.blogPost.id.toString(), commentSourceType: CommentSourceType.blogPost, comment: state.comment, replyId: replyId),
-                ],
-              ),
-            ),
-          );
-        },
+                );
+              },
+            );
+          },
+        ),
       ),
     );
   }
 
-  _iconButton({required IconData icon, String? text, Function()? onTap, Color? iconColor, Color? backgroundColor, Color? textColor}) {
+  InkWell _iconButton({required IconData icon, String? text, Function()? onTap, Color? iconColor, Color? backgroundColor, Color? textColor}) {
     return InkWell(
       onTap: onTap ?? () {},
       borderRadius: BorderRadius.circular(16),
diff --git a/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart b/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
index d1682338..6be43b3a 100644
--- a/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
+++ b/lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
@@ -80,7 +80,7 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
     );
   }
 
-  _showImagePicker() {
+  void _showImagePicker() {
     showCupertinoModalPopup<void>(
       context: context,
       builder: (context) {
@@ -145,7 +145,7 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
     );
   }
 
-  _buildBlogPostCreate(BuildContext context) {
+  Scaffold _buildBlogPostCreate(BuildContext context) {
     return Scaffold(
       resizeToAvoidBottomInset: true,
       appBar: AppBar(),
@@ -253,7 +253,7 @@ class _BlogPostCreateScreenState extends State<BlogPostCreateScreen> {
     );
   }
 
-  _buildAddPhoto() {
+  GestureDetector _buildAddPhoto() {
     return GestureDetector(
       onTap: () {
         _showImagePicker();
diff --git a/lib/features/bottom_navigation_bar/presentation/bloc/new_messages_cubit/new_messages_cubit.dart b/lib/features/bottom_navigation_bar/presentation/bloc/new_messages_cubit/new_messages_cubit.dart
index 6f31b94b..8aef9871 100644
--- a/lib/features/bottom_navigation_bar/presentation/bloc/new_messages_cubit/new_messages_cubit.dart
+++ b/lib/features/bottom_navigation_bar/presentation/bloc/new_messages_cubit/new_messages_cubit.dart
@@ -6,7 +6,7 @@ class NewMessagesCubit extends Cubit<NewMessagesState> {
 
   NewMessagesCubit() : super(const NewMessagesState.empty());
 
-  incrementCounter() {
+  void incrementCounter() {
     _messagesCount++;
     emit(NewMessagesState.loaded(messagesCount: _messagesCount));
   }
diff --git a/lib/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart b/lib/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart
index 94ae4601..cc7939dd 100644
--- a/lib/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart
+++ b/lib/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart
@@ -11,7 +11,7 @@ class ProfileAvatarCubit extends Cubit<ProfileAvatarState> {
     required this.profileRepository,
   }) : super(const ProfileAvatarState.loading());
 
-  getMyProfile() async {
+  Future<void> getMyProfile() async {
     emit(const ProfileAvatarState.loading());
     try {
       emit(
diff --git a/lib/features/calendar/presentation/bloc/calendar_cubit.dart b/lib/features/calendar/presentation/bloc/calendar_cubit.dart
index 01a16da9..84fa9f0e 100644
--- a/lib/features/calendar/presentation/bloc/calendar_cubit.dart
+++ b/lib/features/calendar/presentation/bloc/calendar_cubit.dart
@@ -7,7 +7,7 @@ class CalendarCubit extends Cubit<CalendarState> {
 
   CalendarCubit({required this.calendarRepository}) : super(const CalendarState.loading());
 
-  loadCalendarList() async {
+  Future<void> loadCalendarList() async {
     emit(const CalendarState.loading());
     try {
       final calendarList = await calendarRepository.getCalendar();
diff --git a/lib/features/calendar/presentation/pages/calendar_screen.dart b/lib/features/calendar/presentation/pages/calendar_screen.dart
index a409a1b0..2ba9a0b7 100644
--- a/lib/features/calendar/presentation/pages/calendar_screen.dart
+++ b/lib/features/calendar/presentation/pages/calendar_screen.dart
@@ -89,7 +89,7 @@ class CalendarScreen extends StatelessWidget {
     );
   }
 
-  _buildCalendarBody(BuildContext context, CalendarStateLoaded state) {
+  ListView _buildCalendarBody(BuildContext context, CalendarStateLoaded state) {
     return ListView.separated(
       padding: const EdgeInsets.all(8),
       shrinkWrap: true,
diff --git a/lib/features/chat/models/chat_message_model.dart b/lib/features/chat/models/chat_message_model.dart
index 7224912a..8dd8545a 100644
--- a/lib/features/chat/models/chat_message_model.dart
+++ b/lib/features/chat/models/chat_message_model.dart
@@ -15,7 +15,11 @@ abstract class ChatMessageModel with _$ChatMessageModel {
     @JsonKey(name: 'read_by_to_user', defaultValue: false) required bool isRead,
     @JsonKey(name: 'is_author_message_auth_user') required bool? isCurrentUserAuthor,
     @JsonKey(name: 'room_id') required String? roomId,
+    @Default(MessageState.sent) @JsonKey(includeToJson: false, includeFromJson: false) MessageState messageState,
+    @Default(null) @JsonKey(includeToJson: false, includeFromJson: false) String? uuid,
   }) = _ChatMessageModel;
 
   factory ChatMessageModel.fromJson(Map<String, Object?> json) => _$ChatMessageModelFromJson(json);
 }
+
+enum MessageState { loading, sent, error }
diff --git a/lib/features/chat/models/chat_room_model.dart b/lib/features/chat/models/chat_room_model.dart
index d7bf450a..c5ee559f 100644
--- a/lib/features/chat/models/chat_room_model.dart
+++ b/lib/features/chat/models/chat_room_model.dart
@@ -22,13 +22,9 @@ abstract class ChatRoomModel with _$ChatRoomModel {
 @freezed
 abstract class Users with _$Users {
   const factory Users({
-    
     @JsonKey(name: 'from_chat_user') required ChatUserModel sender,
     @JsonKey(name: 'to_chat_user') required ChatUserModel receiver,
-        
   }) = _Users;
 
   factory Users.fromJson(Map<String, Object?> json) => _$UsersFromJson(json);
 }
-
-
diff --git a/lib/features/chat/models/chat_room_pagination_model.dart b/lib/features/chat/models/chat_room_pagination_model.dart
index 7bb8ceb5..19de28c3 100644
--- a/lib/features/chat/models/chat_room_pagination_model.dart
+++ b/lib/features/chat/models/chat_room_pagination_model.dart
@@ -1,3 +1,4 @@
+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/plans/models/chosen_plan_model.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
@@ -8,29 +9,18 @@ part 'chat_room_pagination_model.g.dart';
 @freezed
 abstract class ChatRoomPaginationModel with _$ChatRoomPaginationModel {
   const factory ChatRoomPaginationModel({
-    @JsonKey(name: "chatRooms") required ChatRooms chatRooms,
+    @JsonKey(name: "data") required List<ChatRoom> data,
     @JsonKey(name: "number_of_unread_chat_rooms") required int unreadChatsCount,
+    required Meta meta,
   }) = _ChatRoomPreviewModel;
 
   factory ChatRoomPaginationModel.fromJson(Map<String, dynamic> json) => _$ChatRoomPaginationModelFromJson(json);
 }
 
-@freezed
-abstract class ChatRooms with _$ChatRooms {
-  const factory ChatRooms({
-    @JsonKey(name: "data") required List<ChatRoom> data,
-    @JsonKey(name: "last_page") required int lastPage,
-    @JsonKey(name: "current_page") required int currentPage,
-  }) = _ChatRooms;
-
-  factory ChatRooms.fromJson(Map<String, dynamic> json) => _$ChatRoomsFromJson(json);
-}
-
 @freezed
 abstract class ChatRoom with _$ChatRoom {
   const factory ChatRoom({
     @JsonKey(name: "id") required String id,
-    @JsonKey(name: "room_name") required String roomName,
     @JsonKey(name: "last_message", fromJson: parseLastMessage) required ChatMessageModel? lastMessage,
     @JsonKey(name: "users") required Users users,
     @JsonKey(name: "unread_messages_count") required int unreadMessagesCount,
diff --git a/lib/features/chat/models/chat_room_settings_model.dart b/lib/features/chat/models/chat_room_settings_model.dart
index 5298d3d9..737d0c82 100644
--- a/lib/features/chat/models/chat_room_settings_model.dart
+++ b/lib/features/chat/models/chat_room_settings_model.dart
@@ -6,11 +6,8 @@ part 'chat_room_settings_model.g.dart';
 @freezed
 abstract class ChatRoomSettingsModel with _$ChatRoomSettingsModel {
   const factory ChatRoomSettingsModel({
-    required int id,
-    @JsonKey(name: 'room_name') required String roomName,
+    @JsonKey(name: 'room_name') required String name,
     required String state,
-    @JsonKey(name: 'access_level') required String accessLevel,
-    @JsonKey(name: 'updated_at') required String updatedAt,
   }) = _ChatRoomSettingsModel;
 
   factory ChatRoomSettingsModel.fromJson(Map<String, Object?> json) => _$ChatRoomSettingsModelFromJson(json);
diff --git a/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart b/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart
index f36cbbe5..5206889b 100644
--- a/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart
+++ b/lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart
@@ -4,6 +4,7 @@ import 'dart:developer';
 import 'dart:io';
 
 import 'package:audioplayers/audioplayers.dart';
+import 'package:collection/collection.dart';
 import 'package:dart_pusher_channels/dart_pusher_channels.dart';
 import 'package:easy_debounce/easy_debounce.dart';
 import 'package:eatvio_app/core/image_compressing/image_compress_utility.dart';
@@ -19,6 +20,7 @@ import 'package:eatvio_app/features/my_finance/models/card_model.dart';
 import 'package:eatvio_app/features/my_finance/repositories/cards_repository.dart';
 import 'package:eatvio_app/features/plans/models/chosen_plan_model.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:uuid/uuid.dart';
 
 class ChatRoomCubit extends Cubit<ChatRoomState> {
   final ChatRepository chatRepository;
@@ -31,12 +33,9 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
   late int lastPage;
   bool isLoading = false;
   Timer? _timer;
+  var uuid = const Uuid();
 
-  ChatRoomCubit({
-    required this.chatRepository,
-    required this.wsManager,
-    required this.cardsRepository,
-  }) : super(const ChatRoomState.loading());
+  ChatRoomCubit({required this.chatRepository, required this.wsManager, required this.cardsRepository}) : super(const ChatRoomState.loading());
 
   void setTimer() {
     _timer?.cancel();
@@ -47,14 +46,14 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
     _timer?.cancel();
   }
 
-  loadNextPage(String chatId) async {
+  Future<void> loadNextPage(String uuid) async {
     if (currentPage < lastPage && !isLoading) {
       isLoading = true;
 
       emit((state as ChatRoomStateLoaded).copyWith(isLoading: isLoading));
 
       try {
-        final chatMessages = await chatRepository.getChatMessages(chatId, currentPage + 1);
+        final chatMessages = await chatRepository.getChatMessages(uuid, currentPage + 1);
 
         isLoading = false;
         emit(
@@ -89,17 +88,16 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
     }
   }
 
-  initChat(String chatId, {bool sendInitialMessage = false}) async {
+  Future<void> initChat(String uuid, {bool sendInitialMessage = false}) async {
     try {
-      final chatRoom = await chatRepository.getChatRoom(chatId);
+      final chatRoom = await chatRepository.getChatRoom(uuid);
       ChosenPlanModel? chosenPlan;
       if (chatRoom.chosenPlanId != null) {
         chosenPlan = await chatRepository.getChosenPlan(id: chatRoom.chosenPlanId!);
       }
-      final chatMessages = await chatRepository.getChatMessages(chatId, currentPage);
+      final chatMessages = await chatRepository.getChatMessages(uuid, currentPage);
       lastPage = chatMessages.meta.lastPage;
-
-      await _subscribeToChatChannel(chatId: chatId);
+      await _subscribeToChatChannel(uuid: uuid, chatId: chatRoom.id);
       emit(
         ChatRoomState.loaded(
           chatRoom: chatRoom.copyWith(chosenPlan: chosenPlan),
@@ -158,43 +156,80 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
     }
   }
 
-  Future<void> _subscribeToChatChannel({required String chatId}) async {
+  Future<void> _subscribeToChatChannel({required String uuid, required String chatId}) async {
     final client = wsManager.client;
     if (client == null) return;
     await wsManager.initPrivateDirectChatChannel(chatId);
     wsManager.subscribeDirectChatChannel();
     messagesSubscription = wsManager.directChatStream?.listen((event) {
       AudioPlayer().play((AssetSource('audio/recive_message.wav')));
-      final message = ChatMessageModel.fromJson(jsonDecode(event.data)['message']);
+      final message = ChatMessageModel.fromJson(jsonDecode(event.data));
       List<ChatMessageModel> messagesList = [message, ...(state as ChatRoomStateLoaded).chatMessages];
       chatRepository.emitNewMessageToChats(message);
       emit((state as ChatRoomStateLoaded).copyWith(chatMessages: messagesList, isLoading: isLoading));
-      EasyDebounce.debounce(
-        'searchChatRoom',
-        const Duration(milliseconds: 300),
-        () => sl<ChatsCubit>().getChatRooms(),
-      );
+      EasyDebounce.debounce('searchChatRoom', const Duration(milliseconds: 300), () => sl<ChatsCubit>().getChatRooms());
     });
 
     typingSubscription = wsManager.clientTypingStream?.listen((event) {
       emit((state as ChatRoomStateLoaded).copyWith(isTyping: true, isLoading: isLoading));
       EasyDebounce.debounce(
-          'client-typing', const Duration(seconds: 3), () => emit((state as ChatRoomStateLoaded).copyWith(isTyping: false, isLoading: isLoading)));
+        'client-typing',
+        const Duration(seconds: 3),
+        () => emit((state as ChatRoomStateLoaded).copyWith(isTyping: false, isLoading: isLoading)),
+      );
     });
   }
 
-  Future<bool> sendMessage({
-    String? data,
-    List<File>? files,
-    required String userSlug,
-  }) async {
+  Future<bool> sendMessage({String? data, List<File>? files, required String userSlug}) async {
     try {
-      await chatRepository.sendMessage(
-        data: data,
-        files: files != null ? await ImageCompressUtility.compressFilesList(List<File>.from(files)) : null,
-        slug: userSlug,
-      );
+      final messageUuid = uuid.v4();
+      final compressedFiles = files != null ? await ImageCompressUtility.compressFilesList(List<File>.from(files)) : null;
       AudioPlayer().play((AssetSource('audio/send_message.wav')));
+      emit(
+        (state as ChatRoomStateLoaded).copyWith(
+          chatMessages: [
+            ChatMessageModel(
+              id: 1,
+              data: data ?? '',
+              mediaData: compressedFiles,
+              authorId: 1,
+              updatedAt: DateTime.now(),
+              isRead: true,
+              isCurrentUserAuthor: true,
+              roomId: '',
+              messageState: MessageState.loading,
+              uuid: messageUuid,
+            ),
+            ...(state as ChatRoomStateLoaded).chatMessages,
+          ],
+        ),
+      );
+
+      try {
+        await chatRepository.sendMessage(data: data, files: compressedFiles, slug: userSlug);
+        emit(
+          (state as ChatRoomStateLoaded).copyWith(
+            chatMessages: (state as ChatRoomStateLoaded).chatMessages.map((elem) {
+              if (elem.uuid == messageUuid) {
+                return elem.copyWith(messageState: MessageState.sent);
+              }
+              return elem;
+            }).toList(),
+          ),
+        );
+      } catch (e) {
+        emit(
+          (state as ChatRoomStateLoaded).copyWith(
+            chatMessages: (state as ChatRoomStateLoaded).chatMessages.map((elem) {
+              if (elem.uuid == messageUuid) {
+                return elem.copyWith(messageState: MessageState.error);
+              }
+              return elem;
+            }).toList(),
+          ),
+        );
+      }
+      sl<ChatsCubit>().getChatRooms();
       return true;
     } catch (e, st) {
       log(e.toString(), stackTrace: st);
@@ -239,7 +274,10 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
     try {
       final planId = (state as ChatRoomStateLoaded).chatRoom.chosenPlan?.id;
       if (planId == null) return false;
-      await chatRepository.complainAboutConsultation(id: planId, body: PlanComplainModel(description: description));
+      await chatRepository.complainAboutConsultation(
+        id: planId,
+        body: PlanComplainModel(description: description),
+      );
       return true;
     } catch (e) {
       log(e.toString());
@@ -267,4 +305,70 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
     typingSubscription?.cancel();
     super.close();
   }
+
+  void deleteMessage(String uuid) {
+    final currentState = state;
+    if (currentState is ChatRoomStateLoaded) {
+      emit(currentState.copyWith(chatMessages: currentState.chatMessages.where((message) => message.uuid != uuid).toList()));
+    }
+  }
+
+  Future<void> resendMessage({required String uuid, required String userSlug}) async {
+    final currentState = state;
+    if (currentState is ChatRoomStateLoaded) {
+      final message = currentState.chatMessages.firstWhereOrNull((message) => message.uuid == uuid);
+      if (message != null) {
+        try {
+          AudioPlayer().play((AssetSource('audio/send_message.wav')));
+          emit(
+            (state as ChatRoomStateLoaded).copyWith(
+              chatMessages: [
+                ChatMessageModel(
+                  id: 1,
+                  data: message.data,
+                  mediaData: message.mediaData,
+                  authorId: 1,
+                  updatedAt: DateTime.now(),
+                  isRead: true,
+                  isCurrentUserAuthor: true,
+                  roomId: '',
+                  messageState: MessageState.loading,
+                  uuid: uuid,
+                ),
+                ...(state as ChatRoomStateLoaded).chatMessages.where((message) => message.uuid != uuid),
+              ],
+            ),
+          );
+
+          try {
+            await chatRepository.sendMessage(data: message.data, files: message.mediaData as List<File>?, slug: userSlug);
+            emit(
+              (state as ChatRoomStateLoaded).copyWith(
+                chatMessages: (state as ChatRoomStateLoaded).chatMessages.map((elem) {
+                  if (elem.uuid == uuid) {
+                    return elem.copyWith(messageState: MessageState.sent);
+                  }
+                  return elem;
+                }).toList(),
+              ),
+            );
+          } catch (e) {
+            emit(
+              (state as ChatRoomStateLoaded).copyWith(
+                chatMessages: (state as ChatRoomStateLoaded).chatMessages.map((elem) {
+                  if (elem.uuid == uuid) {
+                    return elem.copyWith(messageState: MessageState.error);
+                  }
+                  return elem;
+                }).toList(),
+              ),
+            );
+          }
+          sl<ChatsCubit>().getChatRooms();
+        } catch (e, st) {
+          log(e.toString(), stackTrace: st);
+        }
+      }
+    }
+  }
 }
diff --git a/lib/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart b/lib/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart
index 3b50c995..174108b3 100644
--- a/lib/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart
+++ b/lib/features/chat/presentation/bloc/chats_cubit/chats_cubit.dart
@@ -21,7 +21,7 @@ class ChatsCubit extends Cubit<ChatsState> {
     required this.chatRepository,
     required this.wsManager,
     required this.profileRepository,
-  }) : super(ChatsState()) {    
+  }) : super(ChatsState()) {
     newLastMessageSubscription = chatRepository.newUserMessagesStream.listen((message) {
       _setNewLastMessage(message);
     });
@@ -29,6 +29,7 @@ class ChatsCubit extends Cubit<ChatsState> {
   String? _query;
   int page = 1;
   late int lastPage;
+
   Future<void> connectToWebSocket() async {
     await newIncomingMessagesSubscription?.cancel();
     newIncomingMessagesSubscription = wsManager.newMessagesStream?.listen((event) {
@@ -43,10 +44,10 @@ class ChatsCubit extends Cubit<ChatsState> {
     try {
       final chatRoomsPaginationModel = await chatRepository.getChatRooms(query: query);
       final unreadChats = chatRoomsPaginationModel.unreadChatsCount;
-      lastPage = chatRoomsPaginationModel.chatRooms.lastPage + 1;
+      lastPage = chatRoomsPaginationModel.meta.lastPage + 1;
       emit(
         state.copyWith(
-          chatRooms: chatRoomsPaginationModel.chatRooms.data,
+          chatRooms: chatRoomsPaginationModel.data,
           chatsWithUnreadMessagesCount: unreadChats,
           state: BaseState.success,
         ),
@@ -65,10 +66,10 @@ class ChatsCubit extends Cubit<ChatsState> {
     try {
       final chatRoomsPaginationModel = await chatRepository.getChatRooms(query: query);
       final unreadChats = chatRoomsPaginationModel.unreadChatsCount;
-      lastPage = chatRoomsPaginationModel.chatRooms.lastPage + 1;
+      lastPage = chatRoomsPaginationModel.meta.lastPage + 1;
       emit(
         state.copyWith(
-          chatRooms: chatRoomsPaginationModel.chatRooms.data,
+          chatRooms: chatRoomsPaginationModel.data,
           chatsWithUnreadMessagesCount: unreadChats,
           state: BaseState.success,
         ),
@@ -90,7 +91,7 @@ class ChatsCubit extends Cubit<ChatsState> {
       final unreadChats = chatRoomsPaginationModel.unreadChatsCount;
       emit(
         state.copyWith(
-          chatRooms: [...state.chatRooms, ...chatRoomsPaginationModel.chatRooms.data],
+          chatRooms: [...state.chatRooms, ...chatRoomsPaginationModel.data],
           chatsWithUnreadMessagesCount: unreadChats,
           state: BaseState.success,
           isLoadingMoreChats: false,
diff --git a/lib/features/chat/presentation/pages/chat_screen.dart b/lib/features/chat/presentation/pages/chat_screen.dart
index ab1c80c5..97a574ee 100644
--- a/lib/features/chat/presentation/pages/chat_screen.dart
+++ b/lib/features/chat/presentation/pages/chat_screen.dart
@@ -13,6 +13,8 @@ import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.da
 import 'package:eatvio_app/features/chat/presentation/widgets/about_order_button.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/chat_bubble_widget.dart';
 import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart';
+import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_state.dart';
 import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:eatvio_app/features/chat/presentation/widgets/notification_banner.dart';
@@ -32,10 +34,10 @@ import 'package:intl/intl.dart';
 import 'package:visibility_detector/visibility_detector.dart';
 
 class ChatScreen extends StatefulWidget {
-  final String chatId;
+  final String uuid;
   final bool? sendInitialMessage;
 
-  const ChatScreen({required this.chatId, super.key, required this.sendInitialMessage});
+  const ChatScreen({required this.uuid, super.key, required this.sendInitialMessage});
 
   @override
   State<ChatScreen> createState() => _ChatScreenState();
@@ -64,14 +66,14 @@ class _ChatScreenState extends State<ChatScreen> {
   void initState() {
     super.initState();
     scrollController.addListener(_onScroll);
-    chatRoomCubit.initChat(widget.chatId, sendInitialMessage: widget.sendInitialMessage ?? false);
+    chatRoomCubit.initChat(widget.uuid, sendInitialMessage: widget.sendInitialMessage ?? false);
     chatRoomCubit.setTimer();
     _listener = AppLifecycleListener(onHide: _onHide, onResume: _onResume);
   }
 
-  _onScroll() {
+  void _onScroll() {
     if (scrollController.offset >= scrollController.position.maxScrollExtent && !scrollController.position.outOfRange) {
-      chatRoomCubit.loadNextPage(widget.chatId);
+      chatRoomCubit.loadNextPage(widget.uuid);
     }
   }
 
@@ -93,7 +95,10 @@ class _ChatScreenState extends State<ChatScreen> {
           if (state is ChatRoomStateLoaded) {
             return _buildChat(context, state);
           } else if (state is ChatRoomStateError) {
-            return Scaffold(appBar: AppBar(), body: DataErrorWidget(onReload: () => chatRoomCubit.initChat(widget.chatId)));
+            return Scaffold(
+              appBar: AppBar(),
+              body: DataErrorWidget(onReload: () => chatRoomCubit.initChat(widget.uuid)),
+            );
           } else {
             return const Scaffold(body: Loader());
           }
@@ -102,7 +107,7 @@ class _ChatScreenState extends State<ChatScreen> {
     );
   }
 
-  _buildChat(BuildContext context, ChatRoomStateLoaded state) {
+  Scaffold _buildChat(BuildContext context, ChatRoomStateLoaded state) {
     final chosenPlan = state.chatRoom.chosenPlan;
     final amIConsultant = chosenPlan?.consultantId == state.chatRoom.users.sender.id;
     final showUserDetailsButton = [
@@ -168,34 +173,19 @@ class _ChatScreenState extends State<ChatScreen> {
                   width: 40,
                   height: 40,
                   alignment: Alignment.center,
-                  decoration: const BoxDecoration(
-                    color: Color(0xFFEBF4FF),
-                    shape: BoxShape.circle,
-                  ),
+                  decoration: const BoxDecoration(color: Color(0xFFEBF4FF), shape: BoxShape.circle),
                   child: Text(
                     state.chatRoom.users.receiver.name.split(' ').first[0] + state.chatRoom.users.receiver.name.split(' ')[1][0],
-                    style: const TextStyle(
-                      color: Color(0xFF7F9CF5),
-                      fontWeight: FontWeight.w400,
-                      fontSize: 20,
-                    ),
+                    style: const TextStyle(color: Color(0xFF7F9CF5), fontWeight: FontWeight.w400, fontSize: 20),
                   ),
                 ),
               const SizedBox(width: 16),
               Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  Text(
-                    state.chatRoom.users.receiver.name,
-                    style: CustomTextStyles.titleSmallBold.copyWith(
-                      color: PrimaryColors().black,
-                    ),
-                  ),
+                  Text(state.chatRoom.users.receiver.name, style: CustomTextStyles.titleSmallBold.copyWith(color: PrimaryColors().black)),
                   AnimatedCrossFade(
-                    firstChild: Text(
-                      'Печатает...',
-                      style: CustomTextStyles.bodySmallMulishPrimary,
-                    ),
+                    firstChild: Text('Печатает...', style: CustomTextStyles.bodySmallMulishPrimary),
                     firstCurve: Curves.easeIn,
                     secondCurve: Curves.easeOut,
                     secondChild: const SizedBox.shrink(),
@@ -251,9 +241,9 @@ class _ChatScreenState extends State<ChatScreen> {
                                             if (!result) return;
                                             if (!context.mounted) return;
                                             context.read<ChatsCubit>().reduceUnreadMessagesCount(
-                                                  chatId: state.chatRoom.id,
-                                                  count: unreadMessagesIdsCopy.length,
-                                                );
+                                              chatId: state.chatRoom.id,
+                                              count: unreadMessagesIdsCopy.length,
+                                            );
                                             unreadMessagesIdsCopy.clear();
                                           });
                                         }
@@ -264,6 +254,9 @@ class _ChatScreenState extends State<ChatScreen> {
                                         text: state.chatMessages[index].data.trim(),
                                         isCurrentUser: isCurrentUserAuthor,
                                         mediaData: state.chatMessages[index].mediaData ?? [],
+                                        messageState: state.chatMessages[index].messageState,
+                                        messageUuid: state.chatMessages[index].uuid ?? '',
+                                        userSlug: state.chatRoom.users.receiver.slug,
                                       ),
                                     ),
                                   ],
@@ -290,6 +283,9 @@ class _ChatScreenState extends State<ChatScreen> {
                                   text: state.chatMessages[index].data.trim(),
                                   isCurrentUser: isCurrentUserAuthor,
                                   mediaData: state.chatMessages[index].mediaData ?? [],
+                                  messageState: state.chatMessages[index].messageState,
+                                  messageUuid: state.chatMessages[index].uuid ?? '',
+                                  userSlug: state.chatRoom.users.receiver.slug,
                                 ),
                               );
                             },
@@ -361,11 +357,7 @@ class _ChatScreenState extends State<ChatScreen> {
                                             final imageIndex = _imageIndexAt(pickedFiles, i);
 
                                             context.pushTransparentRoute(
-                                              PhotoViewScreen(
-                                                imageUrls: imageFiles.map((e) => e.path).toList(),
-                                                isLocal: true,
-                                                index: imageIndex,
-                                              ),
+                                              PhotoViewScreen(imageUrls: imageFiles.map((e) => e.path).toList(), isLocal: true, index: imageIndex),
                                             );
                                           },
                                           child: Hero(
@@ -373,14 +365,7 @@ class _ChatScreenState extends State<ChatScreen> {
                                             transitionOnUserGestures: true,
                                             child: ClipRRect(
                                               borderRadius: BorderRadius.circular(8),
-                                              child: SizedBox(
-                                                height: 104,
-                                                width: 104,
-                                                child: Image.file(
-                                                  pickedFiles[i],
-                                                  fit: BoxFit.cover,
-                                                ),
-                                              ),
+                                              child: SizedBox(height: 104, width: 104, child: Image.file(pickedFiles[i], fit: BoxFit.cover)),
                                             ),
                                           ),
                                         )
@@ -397,15 +382,8 @@ class _ChatScreenState extends State<ChatScreen> {
                                       },
                                       child: Container(
                                         padding: const EdgeInsets.all(4),
-                                        decoration: BoxDecoration(
-                                          color: appTheme.gray50,
-                                          shape: BoxShape.circle,
-                                        ),
-                                        child: const Icon(
-                                          size: 20,
-                                          Icons.close,
-                                          color: Colors.black,
-                                        ),
+                                        decoration: BoxDecoration(color: appTheme.gray50, shape: BoxShape.circle),
+                                        child: const Icon(size: 20, Icons.close, color: Colors.black),
                                       ),
                                     ),
                                   ),
@@ -427,7 +405,10 @@ class _ChatScreenState extends State<ChatScreen> {
                             child: Ink(
                               height: 40,
                               width: 40,
-                              child: Transform.rotate(angle: pi / 4, child: const Icon(Icons.attach_file_rounded, size: 30, color: Color(0xFF858E99))),
+                              child: Transform.rotate(
+                                angle: pi / 4,
+                                child: const Icon(Icons.attach_file_rounded, size: 30, color: Color(0xFF858E99)),
+                              ),
                             ),
                           ),
                           const SizedBox(width: 8),
@@ -449,7 +430,9 @@ class _ChatScreenState extends State<ChatScreen> {
                                   hintStyle: const TextStyle(fontSize: 14, fontWeight: FontWeight.w400, height: 1, color: Color(0xFFAEAEB2)),
                                   filled: true,
                                   border: OutlineInputBorder(
-                                      borderRadius: BorderRadius.circular(100), borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1)),
+                                    borderRadius: BorderRadius.circular(100),
+                                    borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
+                                  ),
                                   enabledBorder: OutlineInputBorder(
                                     borderRadius: BorderRadius.circular(100),
                                     borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
@@ -465,7 +448,27 @@ class _ChatScreenState extends State<ChatScreen> {
                           const SizedBox(width: 8),
                           InkWell(
                             customBorder: const CircleBorder(),
-                            onTap: () {
+                            onTap: () async {
+                              // Проверяем, заблокирован ли пользователь
+                              final blockedUsersCubit = sl<BlockedUsersCubit>();
+                              await blockedUsersCubit.getBlockedUsers();
+                              final blockedState = blockedUsersCubit.state;
+                              
+                              if (blockedState is BlockedUsersStateLoaded) {
+                                final isBlocked = blockedState.profilesList.any((profile) => profile.slug == state.chatRoom.users.receiver.slug);
+                                if (isBlocked) {
+                                  if (context.mounted) {
+                                    ScaffoldMessenger.of(context).showSnackBar(
+                                      const SnackBar(
+                                        content: Text('Вы не можете отправить сообщение заблокированному пользователю'),
+                                        backgroundColor: Colors.red,
+                                      ),
+                                    );
+                                  }
+                                  return;
+                                }
+                              }
+                              
                               if (textEditingController.text.isNotEmpty || pickedFiles.isNotEmpty) {
                                 chatRoomCubit.sendMessage(
                                   data: textEditingController.text.isEmpty ? null : textEditingController.text.trim(),
@@ -525,13 +528,7 @@ class _ChatScreenState extends State<ChatScreen> {
             const Icon(Icons.attach_file, size: 32, color: Colors.black54),
             Padding(
               padding: const EdgeInsets.symmetric(horizontal: 4),
-              child: Text(
-                fileName,
-                textAlign: TextAlign.center,
-                maxLines: 2,
-                overflow: TextOverflow.ellipsis,
-                style: const TextStyle(fontSize: 12),
-              ),
+              child: Text(fileName, textAlign: TextAlign.center, maxLines: 2, overflow: TextOverflow.ellipsis, style: const TextStyle(fontSize: 12)),
             ),
           ],
         ),
@@ -560,7 +557,7 @@ class _ChatScreenState extends State<ChatScreen> {
     return 0;
   }
 
-  showImagePicker(String slug) {
+  void showImagePicker(String slug) {
     showCupertinoModalPopup<void>(
       context: context,
       builder: (context) => CupertinoActionSheet(
@@ -579,13 +576,7 @@ class _ChatScreenState extends State<ChatScreen> {
               //   await chatRoomCubit.sendMessage(files: [File(image.path)], userSlug: slug);
               // }
             },
-            child: const Row(
-              children: [
-                Icon(Icons.photo_camera),
-                SizedBox(width: 8),
-                Text('Фото'),
-              ],
-            ),
+            child: const Row(children: [Icon(Icons.photo_camera), SizedBox(width: 8), Text('Фото')]),
           ),
           CupertinoActionSheetAction(
             onPressed: () async {
@@ -600,13 +591,7 @@ class _ChatScreenState extends State<ChatScreen> {
                 // await chatRoomCubit.sendMessage(files: files, userSlug: slug);
               }
             },
-            child: const Row(
-              children: [
-                Icon(Icons.photo_library_rounded),
-                SizedBox(width: 8),
-                Text('Галерея'),
-              ],
-            ),
+            child: const Row(children: [Icon(Icons.photo_library_rounded), SizedBox(width: 8), Text('Галерея')]),
           ),
           CupertinoActionSheetAction(
             onPressed: () async {
@@ -643,29 +628,22 @@ class _ChatScreenState extends State<ChatScreen> {
                 // await chatRoomCubit.sendMessage(files: files, userSlug: slug);
               }
             },
-            child: const Row(
-              children: [
-                Icon(Icons.file_present_rounded),
-                SizedBox(width: 8),
-                Text('Файлы'),
-              ],
-            ),
+            child: const Row(children: [Icon(Icons.file_present_rounded), SizedBox(width: 8), Text('Файлы')]),
           ),
         ],
-        cancelButton: CupertinoActionSheetAction(
-          onPressed: () => Navigator.of(context).pop(),
-          isDestructiveAction: true,
-          child: const Text('Отмена'),
-        ),
+        cancelButton: CupertinoActionSheetAction(onPressed: () => Navigator.of(context).pop(), isDestructiveAction: true, child: const Text('Отмена')),
       ),
     );
   }
 
-  _messageDate(DateTime date) {
+  Center _messageDate(DateTime date) {
     return Center(
       child: Padding(
         padding: const EdgeInsets.only(top: 32),
-        child: Text(DateFormat.yMMMMd('RU').format(date), style: const TextStyle(height: 1, color: Color(0xFF8393A1), fontWeight: FontWeight.w500)),
+        child: Text(
+          DateFormat.yMMMMd('RU').format(date),
+          style: const TextStyle(height: 1, color: Color(0xFF8393A1), fontWeight: FontWeight.w500),
+        ),
       ),
     );
   }
diff --git a/lib/features/chat/presentation/pages/chats_screen.dart b/lib/features/chat/presentation/pages/chats_screen.dart
index 6c4c2398..befaa00f 100644
--- a/lib/features/chat/presentation/pages/chats_screen.dart
+++ b/lib/features/chat/presentation/pages/chats_screen.dart
@@ -83,7 +83,7 @@ class _ChatsScreenState extends State<ChatsScreen> {
     );
   }
 
-  _buildChatList(BuildContext context, ChatsState state) {
+  NotificationListener<ScrollNotification> _buildChatList(BuildContext context, ChatsState state) {
     return NotificationListener<ScrollNotification>(
       onNotification: (notification) {
         loadNewContent(notification, context.read<ChatsCubit>().loadMoreChatRooms);
diff --git a/lib/features/chat/presentation/pages/empty_chat_screen.dart b/lib/features/chat/presentation/pages/empty_chat_screen.dart
index 2f8e91b3..d6a87c46 100644
--- a/lib/features/chat/presentation/pages/empty_chat_screen.dart
+++ b/lib/features/chat/presentation/pages/empty_chat_screen.dart
@@ -12,6 +12,8 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:image_picker/image_picker.dart';
+import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart';
+import 'package:eatvio_app/features/menu/presentation/blocked_user_cubit/blocked_users_state.dart';
 
 class EmptyChatScreen extends StatefulWidget {
   final Author author;
@@ -133,21 +135,45 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
                   InkWell(
                     customBorder: const CircleBorder(),
                     onTap: () async {
+                      // Проверяем, заблокирован ли пользователь
+                      final blockedUsersCubit = sl<BlockedUsersCubit>();
+                      await blockedUsersCubit.getBlockedUsers();
+                      final blockedState = blockedUsersCubit.state;
+                      
+                      if (blockedState is BlockedUsersStateLoaded) {
+                        final isBlocked = blockedState.profilesList.any((profile) => profile.slug == widget.author.authorSlug);
+                        if (isBlocked) {
+                          if (context.mounted) {
+                            ScaffoldMessenger.of(context).showSnackBar(
+                              const SnackBar(
+                                content: Text('Вы не можете отправить сообщение заблокированному пользователю'),
+                                backgroundColor: Colors.red,
+                              ),
+                            );
+                          }
+                          return;
+                        }
+                      }
+                      
                       if (textEditingController.text.isNotEmpty) {
                         await sl<ChatRepository>().sendMessage(
                           data: textEditingController.text.trim(),
                           slug: widget.author.authorSlug,
                         );
-                        setState(() {
-                          textEditingController.clear();
-                        });
+                        if (mounted) {
+                          setState(() {
+                            textEditingController.clear();
+                          });
+                        }
                         final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.author.authorSlug);
-                        AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
-                          'chatScreen',
-                          extra: {
-                            'chatId': chatIdOrError,
-                          },
-                        );
+                        if (context.mounted) {
+                          AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
+                            'chatScreen',
+                            extra: {
+                              'uuid': chatIdOrError,
+                            },
+                          );
+                        }
                       }
                     },
                     child: Ink(
@@ -167,7 +193,7 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
     );
   }
 
-  showImagePicker(String slug) {
+  void showImagePicker(String slug) {
     showCupertinoModalPopup<void>(
       context: context,
       builder: (context) => CupertinoActionSheet(
@@ -175,20 +201,44 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
           CupertinoActionSheetAction(
             onPressed: () async {
               Navigator.of(context).pop();
+              
+              // Проверяем, заблокирован ли пользователь
+              final blockedUsersCubit = sl<BlockedUsersCubit>();
+              await blockedUsersCubit.getBlockedUsers();
+              final blockedState = blockedUsersCubit.state;
+              
+              if (blockedState is BlockedUsersStateLoaded) {
+                final isBlocked = blockedState.profilesList.any((profile) => profile.slug == widget.author.authorSlug);
+                if (isBlocked) {
+                  if (context.mounted) {
+                    ScaffoldMessenger.of(context).showSnackBar(
+                      const SnackBar(
+                        content: Text('Вы не можете отправить сообщение заблокированному пользователю'),
+                        backgroundColor: Colors.red,
+                      ),
+                    );
+                  }
+                  return;
+                }
+              }
+              
               final picker = ImagePicker();
-              XFile? image = await picker.pickImage(source: ImageSource.camera);
-              if (image != null) {
+              List<XFile>? images = await picker.pickMultiImage();
+              if (images.isNotEmpty) {
+                List<File> files = images.map((image) => File(image.path)).toList();
                 await sl<ChatRepository>().sendMessage(
-                  files: [File(image.path)],
+                  files: files,
                   slug: widget.author.authorSlug,
                 );
                 final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.author.authorSlug);
-                AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
-                  'chatScreen',
-                  extra: {
-                    'chatId': chatIdOrError,
-                  },
-                );
+                if (mounted) {
+                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
+                    'chatScreen',
+                    extra: {
+                      'uuid': chatIdOrError,
+                    },
+                  );
+                }
               }
             },
             child: const Row(
@@ -211,12 +261,14 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
                   slug: widget.author.authorSlug,
                 );
                 final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.author.authorSlug);
-                AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
-                  'chatScreen',
-                  extra: {
-                    'chatId': chatIdOrError,
-                  },
-                );
+                if (mounted) {
+                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
+                    'chatScreen',
+                    extra: {
+                      'uuid': chatIdOrError,
+                    },
+                  );
+                }
               }
             },
             child: const Row(
@@ -261,12 +313,14 @@ class _EmptyChatScreenState extends State<EmptyChatScreen> {
                   slug: widget.author.authorSlug,
                 );
                 final chatIdOrError = await sl<ChatRepository>().getChatByUserSlug(widget.author.authorSlug);
-                AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
-                  'chatScreen',
-                  extra: {
-                    'chatId': chatIdOrError,
-                  },
-                );
+                if (mounted) {
+                  AppRouter.navigatorKey.currentContext?.pushReplacementNamed(
+                    'chatScreen',
+                    extra: {
+                      'uuid': chatIdOrError,
+                    },
+                  );
+                }
               }
             },
             child: const Row(
diff --git a/lib/features/chat/presentation/pages/photo_view_screen.dart b/lib/features/chat/presentation/pages/photo_view_screen.dart
index 260c051d..1c17d40e 100644
--- a/lib/features/chat/presentation/pages/photo_view_screen.dart
+++ b/lib/features/chat/presentation/pages/photo_view_screen.dart
@@ -1,5 +1,3 @@
-import 'dart:io';
-
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:dismissible_page/dismissible_page.dart';
 import 'package:eatvio_app/core/const.dart';
@@ -11,7 +9,7 @@ import 'package:photo_view/photo_view_gallery.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class PhotoViewScreen extends StatefulWidget {
-  final List<String> imageUrls;
+  final List<dynamic> imageUrls;
   final int index;
   final bool isLocal;
 
@@ -50,14 +48,12 @@ class _PhotoViewScreenState extends State<PhotoViewScreen> {
         ),
         scrollPhysics: const BouncingScrollPhysics(),
         builder: (BuildContext context, int index) {
+          final imageProvider = widget.isLocal
+              ? FileImage(widget.imageUrls[index]) as ImageProvider<Object>
+              : CachedNetworkImageProvider(widget.imageUrls[index]) as ImageProvider<Object>;
+
           return PhotoViewGalleryPageOptions(
-            imageProvider: widget.isLocal
-                ? FileImage(
-                    File(widget.imageUrls[index]),
-                  ) as ImageProvider
-                : CachedNetworkImageProvider(
-                    widget.imageUrls[index],
-                  ),
+            imageProvider: imageProvider,
             initialScale: PhotoViewComputedScale.contained,
             minScale: PhotoViewComputedScale.contained,
             heroAttributes: PhotoViewHeroAttributes(
diff --git a/lib/features/chat/presentation/widgets/chat_bubble_widget.dart b/lib/features/chat/presentation/widgets/chat_bubble_widget.dart
index 74e6f6a6..eb387691 100644
--- a/lib/features/chat/presentation/widgets/chat_bubble_widget.dart
+++ b/lib/features/chat/presentation/widgets/chat_bubble_widget.dart
@@ -1,10 +1,17 @@
+import 'dart:io';
+
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:dismissible_page/dismissible_page.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/utils/date_time_utils.dart';
+import 'package:eatvio_app/features/chat/models/chat_message_model.dart';
+import 'package:eatvio_app/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart';
 import 'package:eatvio_app/features/chat/presentation/pages/photo_view_screen.dart';
+import 'package:eatvio_app/features/chat/presentation/widgets/message_action_bottom_sheet.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class ChatBubbleWidget extends StatelessWidget {
@@ -15,6 +22,9 @@ class ChatBubbleWidget extends StatelessWidget {
     required this.isCurrentUser,
     required this.mediaData,
     required this.isRead,
+    required this.messageState,
+    required this.messageUuid,
+    required this.userSlug
   });
 
   final DateTime sendTime;
@@ -22,7 +32,9 @@ class ChatBubbleWidget extends StatelessWidget {
   final bool isCurrentUser;
   final bool isRead;
   final List<dynamic> mediaData;
-
+  final MessageState messageState;
+  final String messageUuid;
+  final String userSlug;
   @override
   Widget build(BuildContext context) {
     final size = MediaQuery.sizeOf(context);
@@ -36,17 +48,33 @@ class ChatBubbleWidget extends StatelessWidget {
           mainAxisAlignment: isCurrentUser ? MainAxisAlignment.end : MainAxisAlignment.start,
           children: [
             if (isCurrentUser)
-              Padding(
-                padding: const EdgeInsets.only(right: 4, bottom: 4),
-                child: Text(
-                  sendTime.format('HH:mm', 'ru'),
-                  style: const TextStyle(
-                    color: Color(0xFF7B8794),
-                    height: 1,
-                    fontSize: 10,
-                  ),
+              switch (messageState) {
+                MessageState.loading => Padding(
+                  padding: const EdgeInsets.only(right: 4, bottom: 4),
+                  child: SizedBox(width: 10, height: 10, child: CircularProgressIndicator(strokeWidth: 2, color: appTheme.blueA400)),
                 ),
-              ),
+
+                MessageState.sent => Padding(
+                  padding: const EdgeInsets.only(right: 4, bottom: 4),
+                  child: Text(sendTime.format('HH:mm', 'ru'), style: const TextStyle(color: Color(0xFF7B8794), height: 1, fontSize: 10)),
+                ),
+
+                MessageState.error => GestureDetector(
+                  onTap: () {
+                    showMessageActionsBottomSheet(
+                      context,
+                      resend: () {
+                        context.read<ChatRoomCubit>().resendMessage(uuid: messageUuid, userSlug: userSlug);
+                      },
+                      delete: () {
+                        context.read<ChatRoomCubit>().deleteMessage(messageUuid);
+                      },
+                    );
+                  },
+                  child: Padding(padding: const EdgeInsets.only(right: 4, bottom: 4), child: SvgPicture.asset('assets/icons/error_icon.svg')),
+                ),
+              },
+
             Container(
               constraints: BoxConstraints(maxWidth: size.width * 0.7),
               decoration: BoxDecoration(
@@ -59,8 +87,9 @@ class ChatBubbleWidget extends StatelessWidget {
                       ),
               ),
               child: Padding(
-                padding:
-                    mediaData.isNotEmpty ? const EdgeInsets.all(8) : EdgeInsets.only(top: 8, bottom: 8, left: isCurrentUser ? 16 : 8, right: isCurrentUser ? 8 : 16),
+                padding: mediaData.isNotEmpty
+                    ? const EdgeInsets.all(8)
+                    : EdgeInsets.only(top: 8, bottom: 8, left: isCurrentUser ? 16 : 8, right: isCurrentUser ? 8 : 16),
                 child: Column(
                   crossAxisAlignment: isCurrentUser ? CrossAxisAlignment.end : CrossAxisAlignment.start,
                   children: [
@@ -84,32 +113,19 @@ class ChatBubbleWidget extends StatelessWidget {
                                         throw Exception('Could not launch ${mediaData[index].toString()}');
                                       }
                                     },
-                                    leading: const Icon(
-                                      Icons.file_copy_outlined,
-                                      color: Colors.white,
-                                    ),
-                                    trailing: const Icon(
-                                      Icons.download_outlined,
-                                      color: Colors.white,
-                                    ),
+                                    leading: const Icon(Icons.file_copy_outlined, color: Colors.black),
+                                    trailing: const Icon(Icons.download_outlined, color: Colors.black),
                                     title: Text(
                                       mediaData[index].toString().replaceAll('chat_files/', ''),
                                       maxLines: 2,
-                                      style: const TextStyle(
-                                        color: Colors.white,
-                                        fontSize: 12,
-                                        overflow: TextOverflow.ellipsis,
-                                      ),
+                                      style: const TextStyle(color: Colors.black, fontSize: 12, overflow: TextOverflow.ellipsis),
                                     ),
                                   );
                                 }
                                 return GestureDetector(
                                   onTap: () {
                                     context.pushTransparentRoute(
-                                      PhotoViewScreen(
-                                        imageUrls: mediaData.map((e) => '$e').toList(),
-                                        index: index,
-                                      ),
+                                      PhotoViewScreen(imageUrls: mediaData, index: index, isLocal: mediaData[index] is File ? true : false),
                                     );
                                   },
                                   child: Hero(
@@ -117,9 +133,7 @@ class ChatBubbleWidget extends StatelessWidget {
                                     transitionOnUserGestures: true,
                                     child: ClipRRect(
                                       borderRadius: BorderRadius.circular(16),
-                                      child: CachedNetworkImage(
-                                        imageUrl: '${mediaData[index]}',
-                                      ),
+                                      child: mediaData[index] is File ? Image.file(mediaData[index]) : CachedNetworkImage(imageUrl: '${mediaData[index]}'),
                                     ),
                                   ),
                                 );
@@ -131,11 +145,7 @@ class ChatBubbleWidget extends StatelessWidget {
                         ),
                       ),
                     if (mediaData.isNotEmpty && text.isNotEmpty) const SizedBox(height: 8),
-                    if (text.isNotEmpty)
-                      Text(
-                        text,
-                        style: TextStyles.textFS13FW400.copyWith(color: appTheme.black, fontSize: 16),
-                      ),
+                    if (text.isNotEmpty) Text(text, style: TextStyles.textFS13FW400.copyWith(color: appTheme.black, fontSize: 16)),
                   ],
                 ),
               ),
@@ -145,12 +155,7 @@ class ChatBubbleWidget extends StatelessWidget {
                 padding: const EdgeInsets.only(left: 4, bottom: 4),
                 child: Text(
                   sendTime.format('HH:mm', 'ru'),
-                  style: const TextStyle(
-                    color: Color(0xFF7B8794),
-                    height: 1,
-                    fontSize: 10,
-                    fontWeight: FontWeight.w500,
-                  ),
+                  style: const TextStyle(color: Color(0xFF7B8794), height: 1, fontSize: 10, fontWeight: FontWeight.w500),
                 ),
               ),
           ],
diff --git a/lib/features/chat/presentation/widgets/chat_entry_widget.dart b/lib/features/chat/presentation/widgets/chat_entry_widget.dart
index 44cc67f9..dacff9cb 100644
--- a/lib/features/chat/presentation/widgets/chat_entry_widget.dart
+++ b/lib/features/chat/presentation/widgets/chat_entry_widget.dart
@@ -24,7 +24,7 @@ class _ChatEntryWidgetState extends State<ChatEntryWidget> {
       onTap: () => GoRouter.of(context).pushNamed(
         'chatScreen',
         extra: {
-          'chatId': widget.chatRoom.id.toString(),
+          'uuid': widget.chatRoom.id.toString(),
         },
       ),
       child: Container(
diff --git a/lib/features/chat/presentation/widgets/chat_search_bar_widget.dart b/lib/features/chat/presentation/widgets/chat_search_bar_widget.dart
index 80e0c42c..8691beb3 100644
--- a/lib/features/chat/presentation/widgets/chat_search_bar_widget.dart
+++ b/lib/features/chat/presentation/widgets/chat_search_bar_widget.dart
@@ -78,7 +78,7 @@ class ChatSearchBarWidget extends StatelessWidget {
     return searchViewWidget(context);
   }
 
-  searchViewWidget(BuildContext context) => SizedBox(
+  SizedBox searchViewWidget(BuildContext context) => SizedBox(
         width: width ?? MediaQuery.of(context).size.width,
         child: TextFormField(
           textCapitalization: TextCapitalization.sentences,
diff --git a/lib/features/chat/presentation/widgets/message_action_bottom_sheet.dart b/lib/features/chat/presentation/widgets/message_action_bottom_sheet.dart
new file mode 100644
index 00000000..1f455764
--- /dev/null
+++ b/lib/features/chat/presentation/widgets/message_action_bottom_sheet.dart
@@ -0,0 +1,48 @@
+import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/bottom_sheet_action_widget.dart';
+import 'package:eatvio_app/core/widgets/bottom_sheet_handler_bar.dart';
+import 'package:eatvio_app/core/widgets/custom_divider.dart';
+import 'package:eatvio_app/generated/l10n.dart';
+import 'package:flutter/material.dart';
+
+void showMessageActionsBottomSheet(BuildContext context, {required void Function() resend, required void Function() delete}) {
+  showModalBottomSheet(
+    context: context,
+    isScrollControlled: true,
+    backgroundColor: Colors.transparent,
+    builder: (context) => Container(
+      margin: EdgeInsets.only(left: 8, right: 8, bottom: MediaQuery.of(context).padding.bottom + 20),
+      decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: appTheme.whiteA700),
+      child: MessageActionsBottomSheet(resend: resend, delete: delete),
+    ),
+  );
+}
+
+class MessageActionsBottomSheet extends StatefulWidget {
+  const MessageActionsBottomSheet({super.key, required this.resend, required this.delete});
+  final void Function() resend;
+  final void Function() delete;
+
+  @override
+  State<MessageActionsBottomSheet> createState() => _MessageActionsBottomSheet();
+}
+
+class _MessageActionsBottomSheet extends State<MessageActionsBottomSheet> {
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          const SizedBox(height: 7),
+          const BottomSheetHandlerBar(),
+          BottomSheetActionWidget(text: s.resend, iconPath: 'assets/icons/resend.svg', onTap: widget.resend),
+          const CustomDivider(),
+          BottomSheetActionWidget(text: s.delete, iconPath: 'assets/icons/trash_can.svg', onTap: widget.delete, color: appTheme.red),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/features/chat/repositories/chat_repository.dart b/lib/features/chat/repositories/chat_repository.dart
index 54924fcd..b1961b2a 100644
--- a/lib/features/chat/repositories/chat_repository.dart
+++ b/lib/features/chat/repositories/chat_repository.dart
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:developer';
 import 'dart:io';
 import 'package:dio/dio.dart';
+import 'package:eatvio_app/core/token_storage.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';
@@ -47,10 +48,11 @@ class ChatRepository {
         }
       }
 
-      await chatService.sendMessageByUserSlug(
-        userSlug: slug,
+      await chatService.sendMessage(
+        slug: slug,
         data: data,
         mediaData: multipartFiles.isEmpty ? null : multipartFiles,
+        socketId: (await SocketIdStorage.getSocketIdFromStorage())!,
       );
     } catch (e, st) {
       log(e.toString(), stackTrace: st);
@@ -58,10 +60,11 @@ class ChatRepository {
     }
   }
 
-  Future<ChatRoomModel> getChatRoom(String chatId) async {
+  Future<ChatRoomModel> getChatRoom(String uuid) async {
     try {
-      return (await chatService.getChatRoom(id: chatId))['chatRoom']!;
-    } catch (e) {
+      return (await chatService.getChatRoom(uuid: uuid));
+    } catch (e, st) {
+      log(e.toString(), stackTrace: st);
       rethrow;
     }
   }
@@ -74,9 +77,9 @@ class ChatRepository {
     }
   }
 
-  Future<ChatMessagesModel> getChatMessages(String chatId, int page) async {
+  Future<ChatMessagesModel> getChatMessages(String id, int page) async {
     try {
-      return (await chatService.getChatMessages(id: chatId, page: page));
+      return (await chatService.getChatMessages(id: id, page: page));
     } catch (e) {
       rethrow;
     }
@@ -90,9 +93,9 @@ class ChatRepository {
     }
   }
 
-  Future<void> markMessagesAsRead(String chatId, List<int> messageIds) async {
+  Future<void> markMessagesAsRead(String id, List<int> messageIds) async {
     try {
-      await chatService.markMessagesAsRead(id: chatId, body: {'messages_ids': messageIds});
+      await chatService.markMessagesAsRead(id: id, body: {'messages_ids': messageIds});
     } catch (e) {
       rethrow;
     }
diff --git a/lib/features/chat/services/chat_service.dart b/lib/features/chat/services/chat_service.dart
index dcdab395..89d65749 100644
--- a/lib/features/chat/services/chat_service.dart
+++ b/lib/features/chat/services/chat_service.dart
@@ -13,32 +13,33 @@ part 'chat_service.g.dart';
 abstract class ChatService {
   factory ChatService(Dio dio, {String baseUrl}) = _ChatService;
 
-  @GET('/api/chat/index')
+  @GET('/api/v2/chat/index')
   Future<ChatRoomPaginationModel> getChatRooms({
     @Query('page') required int page,
-    @Query('find') String? query,
+    @Query('filters[data][\$conversation_name]') String? query,
   });
 
-  @GET('/api/chat/show/{id}')
-  Future<Map<String, ChatRoomModel>> getChatRoom({
-    @Path() required String id,
+  @GET('/api/v2/chat/show/{uuid}')
+  Future<ChatRoomModel> getChatRoom({
+    @Path() required String uuid,
   });
 
-  @POST('/api/v2/chat/message/send/{id}')
+  @POST('/api/v2/chat/message/send/{slug}')
   @MultiPart()
   Future<void> sendMessage({
-    @Path() required String id,
+    @Header('X-Socket-ID') required String socketId,
+    @Path() required String slug,
     @Part() String? data,
     @Part(name: 'media_data[]', contentType: 'multipart/form-data') List<MultipartFile>? mediaData,
   });
 
-  @GET('/api/chat/show/{id}/messages?page={page}')
+  @GET('/api/v2/chat/show/{id}/messages?page={page}')
   Future<ChatMessagesModel> getChatMessages({
     @Path() required String id,
     @Path() required int page,
   });
 
-  @GET('/api/chat/get_by_user/{user}')
+  @GET('/api/v2/chat/get_by_user/{user}')
   Future<ChatRoomModel> getChatRoomIdByUserSlug({
     @Path() required String user,
   });
@@ -81,16 +82,8 @@ abstract class ChatService {
     @Body() required PlanComplainModel body,
   });
 
-  @GET('/api/v2/chat/get_by_user/{slug}')
+  @GET('/api/chat/get_by_user/{slug}')
   Future<HttpResponse> getChatByUserSlug({
     @Path() required String slug,
   });
-
-  @POST('/api/v2/chat/message/send/{userSlug}')
-  @MultiPart()
-  Future<void> sendMessageByUserSlug({
-    @Path() required String userSlug,
-    @Part() String? data,
-    @Part(name: 'media_data[]', contentType: 'multipart/form-data') List<MultipartFile>? mediaData,
-  });
 }
diff --git a/lib/features/complaining/presentation/complaining_bottom_sheet.dart b/lib/features/complaining/presentation/complaining_bottom_sheet.dart
index e3f42616..aa5e1b90 100644
--- a/lib/features/complaining/presentation/complaining_bottom_sheet.dart
+++ b/lib/features/complaining/presentation/complaining_bottom_sheet.dart
@@ -9,6 +9,7 @@ import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:eatvio_app/core/widgets/loader.dart';
 import 'package:eatvio_app/features/complaining/presentation/cubit/complaining_cubit.dart';
 import 'package:eatvio_app/features/complaining/presentation/cubit/complaining_state.dart';
+import 'package:eatvio_app/features/create_diet/presentation/widgets/error_widget.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -194,63 +195,74 @@ class _LawViolationWidgetState extends State<_LawViolationWidget> {
   @override
   Widget build(BuildContext context) {
     final s = S.of(context);
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        const BottomSheetHandlerBar(),
-        const SizedBox(height: 20),
-        Text(
-          s.lawViolation,
-          style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
-        ),
-        const SizedBox(height: 8),
-        SizedBox(
-          width: MediaQuery.sizeOf(context).width * 0.7,
-          child: Text(
-            s.what_do_you_want_to_complaint_about,
-            textAlign: TextAlign.center,
-            style: TextStyles.textMMedium.copyWith(color: appTheme.black),
-          ),
-        ),
-        const SizedBox(height: 24),
-        ...tags.mapIndexed((index, element) {
-          return Row(
-            children: [
-              Checkbox(
-                activeColor: appTheme.blueA400,
-                side: BorderSide(width: 2, color: tags[index].$1 ? appTheme.blueA400 : appTheme.blueGray),
-                value: element.$1,
-                onChanged: (isChecked) {
-                  setState(() {
-                    if (isChecked == null) return;
-                    if (index == tags.length - 1 && !isChecked) {
-                      context.read<ComplainingCubit>().toggleDescription();
-                    }
-                    tags[index] = (isChecked, element.$2);
-                    final activeTags = tags.where((elem) => elem.$1).map((e) => e.$2).toList();
-                    context.read<ComplainingCubit>().setTags(activeTags);
-                  });
+    return BlocBuilder<ComplainingCubit, ComplainingState>(
+      builder: (context, state) {
+        return Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            const BottomSheetHandlerBar(),
+            const SizedBox(height: 20),
+            Text(
+              s.lawViolation,
+              style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+            ),
+            const SizedBox(height: 8),
+            SizedBox(
+              width: MediaQuery.sizeOf(context).width * 0.7,
+              child: Text(
+                s.what_do_you_want_to_complaint_about,
+                textAlign: TextAlign.center,
+                style: TextStyles.textMMedium.copyWith(color: appTheme.black),
+              ),
+            ),
+            const SizedBox(height: 24),
+            ...tags.mapIndexed((index, element) {
+              return Row(
+                children: [
+                  Checkbox(
+                    activeColor: appTheme.blueA400,
+                    side: BorderSide(width: 2, color: tags[index].$1 ? appTheme.blueA400 : appTheme.blueGray),
+                    value: element.$1,
+                    onChanged: (isChecked) {
+                      setState(() {
+                        if (isChecked == null) return;
+                        if (index == tags.length - 1 && !isChecked) {
+                          context.read<ComplainingCubit>().toggleDescription();
+                        }
+                        tags[index] = (isChecked, element.$2);
+                        final activeTags = tags.where((elem) => elem.$1).map((e) => e.$2).toList();
+                        context.read<ComplainingCubit>().setTags(activeTags);
+                      });
+                    },
+                  ),
+                  Text(
+                    element.$2,
+                    style: TextStyles.textLSemibold.copyWith(color: appTheme.black),
+                  ),
+                ],
+              );
+            }),
+            if (tags.last.$1) ...[
+              const SizedBox(height: 12),
+              CustomTextFormField(
+                hintText: s.type_here_your_complaint,
+                hasError: (state.complainInfo.description?.length ?? 10) < 10,
+                onChanged: (value) {
+                  context.read<ComplainingCubit>().setDescription(value);
                 },
               ),
-              Text(
-                element.$2,
-                style: TextStyles.textLSemibold.copyWith(color: appTheme.black),
-              ),
+              if ((state.complainInfo.description?.length ?? 10) < 10) ...[
+                const SizedBox(height: 4),
+                const ValidationErrorWidget(error: 'Минимум 10 символов'),
+              ]
             ],
-          );
-        }),
-        if (tags.last.$1) ...[
-          const SizedBox(height: 12),
-          CustomTextFormField(
-            hintText: s.type_here_your_complaint,
-            onChanged: (value) {
-              context.read<ComplainingCubit>().setDescription(value);
-            },
-          ),
-        ],
-        const SizedBox(height: 20),
-        const _ComplainButton(),
-      ],
+            const SizedBox(height: 20),
+            _ComplainButton(
+              isDisabled: (state.complainInfo.description?.length ?? 0) < 10,
+            ),
+          ],
+        );
+      },
     );
   }
 }
@@ -515,8 +527,8 @@ class _ComplaintFailedWidget extends StatelessWidget {
 }
 
 class _ComplainButton extends StatelessWidget {
-  const _ComplainButton();
-
+  const _ComplainButton({this.isDisabled = false});
+  final bool isDisabled;
   @override
   Widget build(BuildContext context) {
     final s = S.of(context);
@@ -534,6 +546,10 @@ class _ComplainButton extends StatelessWidget {
             backgroundColor: WidgetStatePropertyAll(appTheme.blueA400),
           ),
           onPressed: () async {
+            if (isDisabled) {
+              context.read<ComplainingCubit>().setDescription('');
+              return;
+            }
             await context.read<ComplainingCubit>().complain();
           },
         );
diff --git a/lib/features/complaining/presentation/cubit/complaining_cubit.dart b/lib/features/complaining/presentation/cubit/complaining_cubit.dart
index 0a2827f3..896fa6e9 100644
--- a/lib/features/complaining/presentation/cubit/complaining_cubit.dart
+++ b/lib/features/complaining/presentation/cubit/complaining_cubit.dart
@@ -72,6 +72,12 @@ class ComplainingCubit extends Cubit<ComplainingState> {
               emit(state.copyWith(wasSentSuccessfully: true));
               return;
             }
+          case ComplainedContent.comment:
+            if (id != null) {
+              await repository.sendCommentComplain(id: id, category: category.getValue(), body: state.complainInfo);
+              emit(state.copyWith(wasSentSuccessfully: true));
+              return;
+            }
         }
       }
     } catch (e, st) {
diff --git a/lib/features/complaining/repositories/complaining_repository.dart b/lib/features/complaining/repositories/complaining_repository.dart
index 1b1a5d14..32aab577 100644
--- a/lib/features/complaining/repositories/complaining_repository.dart
+++ b/lib/features/complaining/repositories/complaining_repository.dart
@@ -64,4 +64,16 @@ class ComplainingRepository {
       rethrow;
     }
   }
+
+  Future<void> sendCommentComplain({
+    required int id,
+    required String category,
+    required ComplainModel body,
+  }) async {
+    try {
+      await service.sendCommentComplain(id: id, category: category, body: body);
+    } catch (e) {
+      rethrow;
+    }
+  }
 }
diff --git a/lib/features/complaining/services/complaining_service.dart b/lib/features/complaining/services/complaining_service.dart
index 242545ad..276ac750 100644
--- a/lib/features/complaining/services/complaining_service.dart
+++ b/lib/features/complaining/services/complaining_service.dart
@@ -42,5 +42,12 @@ abstract class ComplainingService {
     @Path() required String category,
     @Body() required ComplainModel body,
   }); 
+
+  @POST('/api/comments/{id}/complain/{category}')
+  Future<void> sendCommentComplain({
+    @Path() required int id,
+    @Path() required String category,
+    @Body() required ComplainModel body,
+  }); 
 }
 
diff --git a/lib/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart b/lib/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart
index 05bfd52a..84961990 100644
--- a/lib/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart
+++ b/lib/features/consultant/become_consultant/presentation/bloc/register_consultant_cubit/register_consultant_cubit.dart
@@ -37,7 +37,7 @@ class RegisterConsultantCubit extends Cubit<RegisterConsultantState> {
     }
   }
 
-  getMyRequestStatus(String slug) async {
+  Future<void> getMyRequestStatus(String slug) async {
     _update = true;
     final myRequestStatus = await consultantRepository.getMyRequestStatus(slug);
 
@@ -81,11 +81,11 @@ class RegisterConsultantCubit extends Cubit<RegisterConsultantState> {
     );
   }
 
-  disableLoading() {
+  void disableLoading() {
     emit(state.copyWith(loading: false));
   }
 
-  updateConsultantProfileModel(ConsultantProfileModel consultant, [bool acceptOffer = false]) {
+  void updateConsultantProfileModel(ConsultantProfileModel consultant, [bool acceptOffer = false]) {
     emit(
       state.copyWith(
         consultant: consultant,
@@ -95,7 +95,7 @@ class RegisterConsultantCubit extends Cubit<RegisterConsultantState> {
     );
   }
 
-  registerConsultant() async {
+  Future<void> registerConsultant() async {
     if (state.consultant.photos != null) {
       updateConsultantProfileModel(
         state.consultant.copyWith(
diff --git a/lib/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart
index c559654c..ce13f905 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/additional_settings_screen.dart
@@ -76,7 +76,7 @@ class _AdditionalSettingsScreenState extends State<AdditionalSettingsScreen> {
     );
   }
 
-  _tile({
+  ListTile _tile({
     required String title,
     required Function() onTap,
     required bool value,
@@ -102,7 +102,7 @@ class _AdditionalSettingsScreenState extends State<AdditionalSettingsScreen> {
     );
   }
 
-  _divider(BuildContext context) {
+  Center _divider(BuildContext context) {
     return Center(
       child: Container(
         height: 0.4,
diff --git a/lib/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart
index bcffc6e4..ef9f5cec 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/become_consultant_screen.dart
@@ -35,7 +35,7 @@ class _BecomeConsultantScreenState extends State<BecomeConsultantScreen> {
     );
   }
 
-  _startRegistrationButton() {
+  InkWell _startRegistrationButton() {
     return InkWell(
       onTap: () => GoRouter.of(context).pushReplacementNamed('stepperBecomeConsultantScreen'),
       borderRadius: BorderRadius.circular(20),
diff --git a/lib/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart
index 3b877c4d..b2b26c0e 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/certificates_and_diplomas_screen.dart
@@ -82,7 +82,7 @@ class _CertificatesAndDiplomasScreenState extends State<CertificatesAndDiplomasS
     );
   }
 
-  _divider(BuildContext context) {
+  Container _divider(BuildContext context) {
     return Container(
       height: 0.4,
       width: MediaQuery.of(context).size.width - 32,
@@ -93,7 +93,7 @@ class _CertificatesAndDiplomasScreenState extends State<CertificatesAndDiplomasS
     );
   }
 
-  _diplomaInfo({
+  Column _diplomaInfo({
     required DiplomaEntity diploma,
   }) {
     return Column(
@@ -159,7 +159,7 @@ class _CertificatesAndDiplomasScreenState extends State<CertificatesAndDiplomasS
     );
   }
 
-  onTapCalendar(BuildContext context, DiplomaEntity diploma) {
+  Null Function() onTapCalendar(BuildContext context, DiplomaEntity diploma) {
     return () {
       _showDialog(
         CupertinoDatePicker(
@@ -198,7 +198,7 @@ class _CertificatesAndDiplomasScreenState extends State<CertificatesAndDiplomasS
     );
   }
 
-  checkLast() {
+  void checkLast() {
     if (diplomasList.last.textEditingController.text.isNotEmpty || diplomasList.last.date != null) {
       setState(() {
         diplomasList.add(
@@ -219,7 +219,7 @@ class _CertificatesAndDiplomasScreenState extends State<CertificatesAndDiplomasS
     }
   }
 
-  enableDeleteButton(DiplomaEntity diploma) {
+  void enableDeleteButton(DiplomaEntity diploma) {
     if (diploma.textEditingController.text.isNotEmpty || diploma.date != null) {
       setState(() {
         diplomasList[diplomasList.indexOf(diploma)].enableDeleteButton = true;
@@ -228,7 +228,7 @@ class _CertificatesAndDiplomasScreenState extends State<CertificatesAndDiplomasS
     _saveState();
   }
 
-  _saveState() {
+  void _saveState() {
     context.read<RegisterConsultantCubit>().updateConsultantProfileModel(
           context.read<RegisterConsultantCubit>().state.consultant.copyWith(
                 certificates: diplomasList.map((e) => CertificatesModel(title: e.textEditingController.text, date: e.date.toString())).toList().sublist(
diff --git a/lib/features/consultant/become_consultant/presentation/pages/last_step_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/last_step_screen.dart
index 302aae96..d44920cb 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/last_step_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/last_step_screen.dart
@@ -25,24 +25,16 @@ class _LastStepScreenState extends State<LastStepScreen> {
         children: [
           const Padding(
             padding: EdgeInsets.symmetric(horizontal: 16),
-            child: Text(
-              'Последний шаг',
-              style: TextStyle(
-                fontSize: 24,
-                fontWeight: FontWeight.w700,
-                height: 1.1,
-              ),
-            ),
+            child: Text('Последний шаг', style: TextStyle(fontSize: 24, fontWeight: FontWeight.w700, height: 1.1)),
           ),
           const SizedBox(height: 16),
           CheckboxListTile(
             value: checkboxState,
-            title: const Text(
-              'Я ознакомлен и принимаю договор публичной офёрты',
-              style: TextStyle(
-                fontSize: 18,
-                height: 1,
-              ),
+            title: Text(
+              hidePlans
+                  ? 'Я ознакомлен и принимаю политику конфиденциальности и защиту персональных данных'
+                  : 'Я ознакомлен и принимаю договор публичной офёрты',
+              style: const TextStyle(fontSize: 18, height: 1),
             ),
             onChanged: (_) {
               setState(() {
@@ -53,25 +45,14 @@ class _LastStepScreenState extends State<LastStepScreen> {
             activeColor: appTheme.blueA400,
             contentPadding: const EdgeInsets.symmetric(horizontal: 16),
           ),
-          Padding(
-            padding: const EdgeInsets.symmetric(
-              horizontal: 16,
-              vertical: 16,
-            ),
-            child: _divider(context),
-          ),
+          Padding(padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16), child: _divider(context)),
           Padding(
             padding: const EdgeInsets.symmetric(horizontal: 4),
             child: TextButton(
-              onPressed: () async => await launchUrl(Uri.parse('$baseUrl/oferta_bs.pdf')),
-              child: const Text(
-                'Договор офёрты',
-                style: TextStyle(
-                  height: 1,
-                  fontSize: 16,
-                  color: Color(0xFF323F4B),
-                  decoration: TextDecoration.underline,
-                ),
+              onPressed: () async => await launchUrl(Uri.parse(hidePlans ? '$baseUrl/docs/privacy.pdf' : '$baseUrl/oferta_bs.pdf')),
+              child: Text(
+                hidePlans ? 'Политика конфиденциальности и пользовательское соглашение' : 'Договор офёрты',
+                style: const TextStyle(height: 1, fontSize: 16, color: Color(0xFF323F4B), decoration: TextDecoration.underline),
               ),
             ),
           ),
@@ -80,14 +61,11 @@ class _LastStepScreenState extends State<LastStepScreen> {
     );
   }
 
-  _divider(BuildContext context) {
+  Container _divider(BuildContext context) {
     return Container(
       height: 0.4,
       width: MediaQuery.of(context).size.width - 32,
-      decoration: BoxDecoration(
-        color: Colors.black26,
-        borderRadius: BorderRadius.circular(16),
-      ),
+      decoration: BoxDecoration(color: Colors.black26, borderRadius: BorderRadius.circular(16)),
     );
   }
 }
diff --git a/lib/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart
index 672499b2..234e3d74 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/photo_or_scans_screen.dart
@@ -148,7 +148,7 @@ class _PhotoOrScansScreenState extends State<PhotoOrScansScreen> {
     );
   }
 
-  _saveState() {
+  void _saveState() {
     context.read<RegisterConsultantCubit>().updateConsultantProfileModel(
           context.read<RegisterConsultantCubit>().state.consultant.copyWith(
                 photos: imagesPaths,
diff --git a/lib/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart
index 5d69d36a..b8fed20b 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/registration_as_screen.dart
@@ -23,95 +23,116 @@ class _RegistrationAsScreenState extends State<RegistrationAsScreen> {
         children: [
           const Padding(
             padding: EdgeInsets.symmetric(horizontal: 16),
-            child: Text(
-              'Регистрация в качестве',
-              style: TextStyle(
-                fontSize: 24,
-                fontWeight: FontWeight.w700,
-                height: 1.1,
-              ),
-            ),
+            child: Text('Регистрация в качестве', style: TextStyle(fontSize: 24, fontWeight: FontWeight.w700, height: 1.1)),
           ),
           const SizedBox(height: 16),
-          RadioListTile<RegistrationAsType>(
-            value: RegistrationAsType.physical,
-            groupValue: registrationAsType,
-            title: const Text(
-              'Физического лица',
-              style: TextStyle(
-                fontSize: 18,
-                height: 1,
+          Column(
+            children: [
+              Row(
+                children: [
+                  Radio<RegistrationAsType>(
+                    value: RegistrationAsType.physical,
+                    // ignore: deprecated_member_use
+                    groupValue: registrationAsType,
+                    activeColor: appTheme.blueA400,
+                    // ignore: deprecated_member_use
+                    onChanged: (value) {
+                      setState(() {
+                        registrationAsType = value!;
+                      });
+                    },
+                  ),
+                  const Expanded(
+                    child: Padding(
+                      padding: EdgeInsets.symmetric(horizontal: 8),
+                      child: Text('Физического лица', style: TextStyle(fontSize: 18, height: 1)),
+                    ),
+                  ),
+                ],
               ),
-            ),
-            activeColor: appTheme.blueA400,
-            onChanged: (value) {},
-            contentPadding: const EdgeInsets.symmetric(horizontal: 8),
-          ),
-          RadioListTile<RegistrationAsType>(
-            value: RegistrationAsType.selfBusy,
-            groupValue: registrationAsType,
-            title: const Text(
-              'Самозанятого',
-              style: TextStyle(
-                fontSize: 18,
-                height: 1,
+              Row(
+                children: [
+                  Radio<RegistrationAsType>(
+                    value: RegistrationAsType.selfBusy,
+                    // ignore: deprecated_member_use
+                    groupValue: registrationAsType,
+                    activeColor: appTheme.blueA400,
+                    // ignore: deprecated_member_use
+                    onChanged: (value) {
+                      setState(() {
+                        registrationAsType = value!;
+                      });
+                    },
+                  ),
+                  const Expanded(
+                    child: Padding(
+                      padding: EdgeInsets.symmetric(horizontal: 8),
+                      child: Text('Самозанятого', style: TextStyle(fontSize: 18, height: 1)),
+                    ),
+                  ),
+                ],
               ),
-            ),
-            onChanged: null,
-            contentPadding: const EdgeInsets.symmetric(horizontal: 8),
-          ),
-          RadioListTile<RegistrationAsType>(
-            value: RegistrationAsType.iP,
-            groupValue: registrationAsType,
-            title: const Text(
-              'Индивидуального предпринимателя',
-              style: TextStyle(
-                fontSize: 18,
-                height: 1,
+              Row(
+                children: [
+                  Radio<RegistrationAsType>(
+                    value: RegistrationAsType.iP,
+                    // ignore: deprecated_member_use
+                    groupValue: registrationAsType,
+                    activeColor: appTheme.blueA400,
+                    // ignore: deprecated_member_use
+                    onChanged: (value) {
+                      setState(() {
+                        registrationAsType = value!;
+                      });
+                    },
+                  ),
+                  const Expanded(
+                    child: Padding(
+                      padding: EdgeInsets.symmetric(horizontal: 8),
+                      child: Text('Индивидуального предпринимателя', style: TextStyle(fontSize: 18, height: 1)),
+                    ),
+                  ),
+                ],
               ),
-            ),
-            onChanged: null,
-            contentPadding: const EdgeInsets.symmetric(horizontal: 8),
-          ),
-          RadioListTile<RegistrationAsType>(
-            value: RegistrationAsType.ooo,
-            groupValue: registrationAsType,
-            title: const Text(
-              'Общества с ограниченной ответственностью',
-              style: TextStyle(
-                fontSize: 18,
-                height: 1,
+              Row(
+                children: [
+                  Radio<RegistrationAsType>(
+                    value: RegistrationAsType.ooo,
+                    // ignore: deprecated_member_use
+                    groupValue: registrationAsType,
+                    activeColor: appTheme.blueA400,
+                    // ignore: deprecated_member_use
+                    onChanged: (value) {
+                      setState(() {
+                        registrationAsType = value!;
+                      });
+                    },
+                  ),
+                  const Expanded(
+                    child: Padding(
+                      padding: EdgeInsets.symmetric(horizontal: 8),
+                      child: Text('Общества с ограниченной ответственностью', style: TextStyle(fontSize: 18, height: 1)),
+                    ),
+                  ),
+                ],
               ),
-            ),
-            onChanged: null,
-            contentPadding: const EdgeInsets.symmetric(horizontal: 8),
-          ),
-          Padding(
-            padding: const EdgeInsets.symmetric(
-              horizontal: 16,
-              vertical: 16,
-            ),
-            child: _divider(context),
+            ],
           ),
+          Padding(padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16), child: _divider(context)),
           const Padding(
             padding: EdgeInsets.symmetric(horizontal: 16),
-            child: Text(
-              '* На данный момент регистрация доступна только в качестве физического лица. Остальные варианты скоро появятся',
-            ),
+            child: Text('* На данный момент регистрация доступна только в качестве физического лица. Остальные варианты скоро появятся'),
           ),
         ],
       ),
     );
   }
 
-  _divider(BuildContext context) {
+  Container _divider(BuildContext context) {
     return Container(
       height: 0.4,
       width: MediaQuery.of(context).size.width - 32,
-      decoration: BoxDecoration(
-        color: Colors.black26,
-        borderRadius: BorderRadius.circular(16),
-      ),
+      decoration: BoxDecoration(color: Colors.black26, borderRadius: BorderRadius.circular(16)),
     );
   }
 }
diff --git a/lib/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart b/lib/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart
index 5c0076c3..609e94a5 100644
--- a/lib/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart
+++ b/lib/features/consultant/become_consultant/presentation/pages/social_networks_screen.dart
@@ -158,7 +158,7 @@ class _SocialNetworksScreenState extends State<SocialNetworksScreen> {
     );
   }
 
-  setLinksState({
+  void setLinksState({
     String? tgLink,
     String? vkLink,
     String? personalSiteLink,
diff --git a/lib/features/consultations/presentation/widgets/consultation_card_widget.dart b/lib/features/consultations/presentation/widgets/consultation_card_widget.dart
index 11322228..760a8783 100644
--- a/lib/features/consultations/presentation/widgets/consultation_card_widget.dart
+++ b/lib/features/consultations/presentation/widgets/consultation_card_widget.dart
@@ -14,10 +14,7 @@ import 'package:go_router/go_router.dart';
 class ConsultationCardWidget extends StatefulWidget {
   final ConsultationModel consultationsModel;
 
-  const ConsultationCardWidget({
-    super.key,
-    required this.consultationsModel,
-  });
+  const ConsultationCardWidget({super.key, required this.consultationsModel});
 
   @override
   State<ConsultationCardWidget> createState() => _ConsultationCardWidgetState();
@@ -32,13 +29,7 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
     'Дневник заполнен, прокомментирован консультантом и после этого клиент просмотрел комментарии.',
   ];
 
-  final List<Color> legendColors = const [
-    Colors.white,
-    Color(0xFFF0C497),
-    Color(0xFFFF9500),
-    Color(0xFF2F80ED),
-    Color(0xFF4CD964),
-  ];
+  final List<Color> legendColors = const [Colors.white, Color(0xFFF0C497), Color(0xFFFF9500), Color(0xFF2F80ED), Color(0xFF4CD964)];
 
   late final List<(int, DiaryModel)> givenDaysWithDayNumber;
   final List<List<DiaryStateEnum>> legendStates = [
@@ -46,7 +37,7 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
     [DiaryStateEnum.started, DiaryStateEnum.lastDayStarted],
     [DiaryStateEnum.finished, DiaryStateEnum.lastDayFinished],
     [DiaryStateEnum.commented, DiaryStateEnum.lastDayCommented],
-    [DiaryStateEnum.reviewedByUser]
+    [DiaryStateEnum.reviewedByUser],
   ];
   @override
   void initState() {
@@ -72,32 +63,19 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
           children: [
             Row(
               children: [
-                CircleAvatar(
-                  radius: 30,
-                  backgroundImage: NetworkImage(baseUrl + widget.consultationsModel.userProfilePhotoUrl),
-                ),
+                CircleAvatar(radius: 30, backgroundImage: NetworkImage(baseUrl + widget.consultationsModel.userProfilePhotoUrl)),
                 const SizedBox(width: 12),
                 Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     Text(
                       widget.consultationsModel.userName,
-                      style: const TextStyle(
-                        height: 1,
-                        color: Color(0xFF323F4B),
-                        fontSize: 16,
-                        fontWeight: FontWeight.w600,
-                      ),
+                      style: const TextStyle(height: 1, color: Color(0xFF323F4B), fontSize: 16, fontWeight: FontWeight.w600),
                     ),
                     const SizedBox(height: 4),
                     Text(
                       widget.consultationsModel.planTitle,
-                      style: const TextStyle(
-                        height: 1,
-                        color: Color(0xFF88949F),
-                        fontSize: 14,
-                        fontWeight: FontWeight.w500,
-                      ),
+                      style: const TextStyle(height: 1, color: Color(0xFF88949F), fontSize: 14, fontWeight: FontWeight.w500),
                     ),
                   ],
                 ),
@@ -127,12 +105,7 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
               children: [
                 Text(
                   'День ${widget.consultationsModel.currentDiaryDay} из ${widget.consultationsModel.duration}',
-                  style: const TextStyle(
-                    height: 1,
-                    color: Color(0xFF323F4B),
-                    fontSize: 16,
-                    fontWeight: FontWeight.w500,
-                  ),
+                  style: const TextStyle(height: 1, color: Color(0xFF323F4B), fontSize: 16, fontWeight: FontWeight.w500),
                 ),
                 GestureDetector(
                   onTap: () {
@@ -149,12 +122,7 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
                           children: [
                             const Text(
                               'Легенда',
-                              style: TextStyle(
-                                height: 1,
-                                fontSize: 20,
-                                fontWeight: FontWeight.w700,
-                                color: Color(0xFF323F4B),
-                              ),
+                              style: TextStyle(height: 1, fontSize: 20, fontWeight: FontWeight.w700, color: Color(0xFF323F4B)),
                             ),
                             const SizedBox(height: 16),
                             ListView.separated(
@@ -170,11 +138,7 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
                       ),
                     );
                   },
-                  child: const Icon(
-                    Icons.help_outline_rounded,
-                    color: Color(0xFF323F4B),
-                    size: 20,
-                  ),
+                  child: const Icon(Icons.help_outline_rounded, color: Color(0xFF323F4B), size: 20),
                 ),
               ],
             ),
@@ -185,7 +149,8 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
                 children: List.generate(widget.consultationsModel.duration, (index) {
                   final day = givenDaysWithDayNumber.firstWhereOrNull((e) => e.$1 == index);
                   final hasActivity = day != null && day.$2.state != DiaryStateEnum.init;
-                  final canConsultantOpenThisDay = day != null &&
+                  final canConsultantOpenThisDay =
+                      day != null &&
                       (day.$2.state != DiaryStateEnum.init && day.$2.state != DiaryStateEnum.started && day.$2.state != DiaryStateEnum.lastDayStarted);
                   return Padding(
                     padding: const EdgeInsets.only(right: 12),
@@ -195,81 +160,74 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
                         InkWell(
                           onTap: () {
                             if (!hasActivity || !canConsultantOpenThisDay) {
-                              showErrorDialog(context,
-                                  title: s.you_can_not_open_this_day, description: '${widget.consultationsModel.userName} ${s.has_not_filled_it_yet}');
+                              showErrorDialog(
+                                context,
+                                title: s.you_can_not_open_this_day,
+                                description: '${widget.consultationsModel.userName} ${s.has_not_filled_it_yet}',
+                              );
                               return;
                             }
-                            GoRouter.of(context).push(UserDiaryScreen.path, extra: {
-                              'diaryId': day.$2.id,
-                              'currentDiaryDay': index + 1,
-                            });
+                            GoRouter.of(context).push(UserDiaryScreen.path, extra: {'diaryId': day.$2.id, 'currentDiaryDay': index + 1});
                           },
                           borderRadius: BorderRadius.circular(100),
                           child: Ink(
                             decoration: BoxDecoration(
-                                color: hasActivity ? appTheme.dividerColor : appTheme.dividerColor.withValues(alpha: 0.4),
-                                borderRadius: BorderRadius.circular(100)),
+                              color: hasActivity ? appTheme.dividerColor : appTheme.dividerColor.withValues(alpha: 0.4),
+                              borderRadius: BorderRadius.circular(100),
+                            ),
                             width: 58,
                             height: 32,
                             child: Center(
                               child: Text(
                                 (index + 1).toString(),
-                                style: TextStyles.textMSemibold.copyWith(
-                                  color: hasActivity ? appTheme.gray : appTheme.gray.withValues(alpha: 0.4),
-                                ),
+                                style: TextStyles.textMSemibold.copyWith(color: hasActivity ? appTheme.gray : appTheme.gray.withValues(alpha: 0.4)),
                               ),
                             ),
                           ),
                         ),
                         if (hasActivity) ...[
-                          const SizedBox(
-                            height: 4,
-                          ),
+                          const SizedBox(height: 4),
                           switch (day.$2.state) {
                             DiaryStateEnum.init => const SizedBox.shrink(),
                             DiaryStateEnum.started => Container(
-                                width: 8,
-                                height: 8,
-                                decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[1]),
-                              ),
+                              width: 8,
+                              height: 8,
+                              decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[1]),
+                            ),
                             DiaryStateEnum.lastDayStarted => Container(
-                                width: 8,
-                                height: 8,
-                                decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[1]),
-                              ),
+                              width: 8,
+                              height: 8,
+                              decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[1]),
+                            ),
                             DiaryStateEnum.finished => Container(
-                                width: 8,
-                                height: 8,
-                                decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[2]),
-                              ),
+                              width: 8,
+                              height: 8,
+                              decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[2]),
+                            ),
                             DiaryStateEnum.lastDayFinished => Container(
-                                width: 8,
-                                height: 8,
-                                decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[2]),
-                              ),
+                              width: 8,
+                              height: 8,
+                              decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[2]),
+                            ),
                             DiaryStateEnum.commented => Container(
-                                width: 8,
-                                height: 8,
-                                decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[3]),
-                              ),
+                              width: 8,
+                              height: 8,
+                              decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[3]),
+                            ),
                             DiaryStateEnum.lastDayCommented => Container(
-                                width: 8,
-                                height: 8,
-                                decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[3]),
-                              ),
+                              width: 8,
+                              height: 8,
+                              decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[3]),
+                            ),
                             DiaryStateEnum.reviewedByUser => Container(
-                                width: 8,
-                                height: 8,
-                                decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[4]),
-                              ),
+                              width: 8,
+                              height: 8,
+                              decoration: BoxDecoration(shape: BoxShape.circle, color: legendColors[4]),
+                            ),
                           },
-                          const SizedBox(
-                            height: 12,
-                          ),
+                          const SizedBox(height: 12),
                         ] else
-                          const SizedBox(
-                            height: 24,
-                          ),
+                          const SizedBox(height: 24),
                       ],
                     ),
                   );
@@ -280,11 +238,7 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
             const SizedBox(height: 12),
             Text(
               '${widget.consultationsModel.consultationOptionPrice.toStringAsFixed(0)} ₽',
-              style: const TextStyle(
-                color: Color(0xFF019A3E),
-                fontSize: 20,
-                fontWeight: FontWeight.w600,
-              ),
+              style: const TextStyle(color: Color(0xFF019A3E), fontSize: 20, fontWeight: FontWeight.w600),
             ),
             const SizedBox(height: 16),
             Row(
@@ -293,36 +247,26 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
                   borderRadius: BorderRadius.circular(20),
                   onTap: () {
                     final lastActiveDay = givenDaysWithDayNumber
-                        .where(
-                          (e) => e.$2.state == DiaryStateEnum.finished || e.$2.state == DiaryStateEnum.lastDayFinished,
-                        )
+                        .where((e) => e.$2.state == DiaryStateEnum.finished || e.$2.state == DiaryStateEnum.lastDayFinished)
                         .lastOrNull;
                     if (lastActiveDay != null) {
-                      GoRouter.of(context).push(UserDiaryScreen.path, extra: {
-                        'diaryId': lastActiveDay.$2.id,
-                        'currentDiaryDay': lastActiveDay.$1,
-                      });
-                      GoRouter.of(context).push(UserDiaryScreen.path, extra: lastActiveDay.$2.id);
+                      GoRouter.of(context).push(UserDiaryScreen.path, extra: {'diaryId': lastActiveDay.$2.id, 'currentDiaryDay': lastActiveDay.$1});
                       return;
                     }
-                    showErrorDialog(context,
-                        title: s.you_can_not_open_this_day, description: '${widget.consultationsModel.userName} ${s.has_not_filled_it_yet}');
+                    showErrorDialog(
+                      context,
+                      title: s.you_can_not_open_this_day,
+                      description: '${widget.consultationsModel.userName} ${s.has_not_filled_it_yet}',
+                    );
                   },
                   child: Ink(
                     width: MediaQuery.of(context).size.width - 32 - 52 - 8,
                     padding: const EdgeInsets.all(16),
-                    decoration: BoxDecoration(
-                      borderRadius: BorderRadius.circular(20),
-                      color: appTheme.blueA400,
-                    ),
+                    decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: appTheme.blueA400),
                     child: const Center(
                       child: Text(
                         'Комментировать отчёт',
-                        style: TextStyle(
-                          color: Colors.white,
-                          fontSize: 16,
-                          fontWeight: FontWeight.w600,
-                        ),
+                        style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w600),
                       ),
                     ),
                   ),
@@ -334,16 +278,8 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
                   child: Ink(
                     height: 52,
                     width: 52,
-                    decoration: BoxDecoration(
-                      borderRadius: BorderRadius.circular(20),
-                      color: const Color(0xFFF6F6F6),
-                    ),
-                    child: const Center(
-                      child: Icon(
-                        Icons.chat_outlined,
-                        size: 24,
-                      ),
-                    ),
+                    decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: const Color(0xFFF6F6F6)),
+                    child: const Center(child: Icon(Icons.chat_outlined, size: 24)),
                   ),
                 ),
               ],
@@ -354,28 +290,20 @@ class _ConsultationCardWidgetState extends State<ConsultationCardWidget> {
     );
   }
 
-  _legendTitle(String text, Color color) {
+  Row _legendTitle(String text, Color color) {
     return Row(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Container(
           height: 20,
           width: 20,
-          decoration: BoxDecoration(
-            shape: BoxShape.circle,
-            color: color,
-          ),
+          decoration: BoxDecoration(shape: BoxShape.circle, color: color),
         ),
         const SizedBox(width: 12),
         Flexible(
           child: Text(
             text,
-            style: const TextStyle(
-              height: 1,
-              fontSize: 16,
-              fontWeight: FontWeight.w500,
-              color: Color(0xFF323F4B),
-            ),
+            style: const TextStyle(height: 1, fontSize: 16, fontWeight: FontWeight.w500, color: Color(0xFF323F4B)),
           ),
         ),
       ],
diff --git a/lib/features/consultations/services/consultation_service.dart b/lib/features/consultations/services/consultation_service.dart
index f0a89220..8f09e4a1 100644
--- a/lib/features/consultations/services/consultation_service.dart
+++ b/lib/features/consultations/services/consultation_service.dart
@@ -50,6 +50,7 @@ class ConsultationService {
           else if (state != null && stateComparison != null)
             'filters[last_state][${stateComparison.value}]': state,
           if (dateComparison != null && date != null) 'filters[start_date][${dateComparison.value}]': date,
+          'sort[]': 'created_at:desc',
         },
       );
       return ConsultationPaginationModel.fromJson(response.data);
@@ -77,7 +78,8 @@ class ConsultationService {
       final response = await dio.get(
         '/api/finances/my_finances',
         queryParameters: {
-          if (dateComparison != null && date != null) 'filters[end_date]': date,
+          if (date != null && dateComparison != null) 'filters[start_date][${dateComparison.value}]': date,
+          'sort[]': 'start_date:desc',
         },
       );
       final data = response.data as Map<String, dynamic>;
@@ -96,7 +98,8 @@ class ConsultationService {
       final response = await dio.get(
         '/api/finances/my_purchases',
         queryParameters: {
-          if (dateComparison != null && date != null) 'filters[start_date]': date,
+          if (date != null && dateComparison != null) 'filters[start_date][${dateComparison.value}]': date,
+          'sort[]': 'start_date:desc',
         },
       );
       final data = response.data as Map<String, dynamic>;
diff --git a/lib/features/create_diet/presentation/diet_preview_screen.dart b/lib/features/create_diet/presentation/diet_preview_screen.dart
index fa88e9d8..6c337142 100644
--- a/lib/features/create_diet/presentation/diet_preview_screen.dart
+++ b/lib/features/create_diet/presentation/diet_preview_screen.dart
@@ -348,7 +348,7 @@ class _DietPreviewScreenState extends State<DietPreviewScreen> {
     );
   }
 
-  _dayOfPlan(Map<int, Map<int, DailySchedule>> day, int dayNumber, S s) {
+  Padding _dayOfPlan(Map<int, Map<int, DailySchedule>> day, int dayNumber, S s) {
     choiceChipWidget(int index) {
       return ChoiceChip(
         selectedColor: appTheme.blueA400,
@@ -435,7 +435,7 @@ class _DietPreviewScreenState extends State<DietPreviewScreen> {
     );
   }
 
-  _daily(DailySchedule? daily, S s) {
+  SingleChildRenderObjectWidget _daily(DailySchedule? daily, S s) {
     if (daily == null) return const SizedBox.shrink();
     return Padding(
       padding: const EdgeInsets.only(bottom: 12),
diff --git a/lib/features/create_diet/presentation/widgets/day_widget.dart b/lib/features/create_diet/presentation/widgets/day_widget.dart
index 68b4424b..9e5fe5fb 100644
--- a/lib/features/create_diet/presentation/widgets/day_widget.dart
+++ b/lib/features/create_diet/presentation/widgets/day_widget.dart
@@ -289,7 +289,7 @@ class _DayWidgetState extends State<DayWidget> {
     );
   }
 
-  _product(int index, String product, int quantity, String portion, int dayIndex, int mealIndex) {
+  Material _product(int index, String product, int quantity, String portion, int dayIndex, int mealIndex) {
     return Material(
       child: ListTile(
         onTap: () {
@@ -313,7 +313,7 @@ class _DayWidgetState extends State<DayWidget> {
     );
   }
 
-  _modalBottomSheet({
+  Future _modalBottomSheet({
     required CreateDietCubit createDietCubit,
     required int dayIndex,
     required int mealIndex,
diff --git a/lib/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart b/lib/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart
index f13d3d02..4ca081d4 100644
--- a/lib/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart
+++ b/lib/features/create_recipe/presentation/bloc/create_recipe_cubit/create_recipe_cubit.dart
@@ -32,7 +32,7 @@ class CreateRecipeCubit extends Cubit<CreateRecipeState> {
           ),
         );
 
-  addStep() {
+  void addStep() {
     emit(
       state.copyWith.entity(
         steps: [
@@ -43,13 +43,13 @@ class CreateRecipeCubit extends Cubit<CreateRecipeState> {
     );
   }
 
-  removeStep(StepEntity step) {
+  void removeStep(StepEntity step) {
     List<StepEntity> steps = [...state.entity.steps];
     steps.remove(step);
     emit(state.copyWith.entity(steps: steps));
   }
 
-  addIngredient(i.Ingredient entity) {
+  void addIngredient(i.Ingredient entity) {
     emit(
       state.copyWith.entity(
         ingredients: [
@@ -60,7 +60,7 @@ class CreateRecipeCubit extends Cubit<CreateRecipeState> {
     );
   }
 
-  removeIngredient(int index) {
+  void removeIngredient(int index) {
     List<i.Ingredient> ingredients = [...state.entity.ingredients];
     ingredients.removeAt(index);
 
@@ -73,26 +73,26 @@ class CreateRecipeCubit extends Cubit<CreateRecipeState> {
     emit(state.copyWith.entity(ingredients: ingredients));
   }
 
-  replaceIngredientPosition(int oldIndex, int newIndex) {
+  void replaceIngredientPosition(int oldIndex, int newIndex) {
     List<i.Ingredient> ingredients = [...state.entity.ingredients];
     final item = ingredients.removeAt(oldIndex);
     ingredients.insert(newIndex, item);
     emit(state.copyWith.entity(ingredients: ingredients));
   }
 
-  replaceTitle(String title) {
+  void replaceTitle(String title) {
     emit(state.copyWith.entity(title: title == '' ? null : title));
   }
 
-  replaceDescription(String description) {
+  void replaceDescription(String description) {
     emit(state.copyWith.entity(description: description == '' ? null : description));
   }
 
-  changeType(TypeOfRecipe typeOfRecipe) {
+  void changeType(TypeOfRecipe typeOfRecipe) {
     emit(state.copyWith.entity(typeOfRecipe: typeOfRecipe));
   }
 
-  addTag(String tag) {
+  void addTag(String tag) {
     emit(
       state.copyWith.entity(
         tags: [
@@ -103,46 +103,46 @@ class CreateRecipeCubit extends Cubit<CreateRecipeState> {
     );
   }
 
-  removeTag(String tag) {
+  void removeTag(String tag) {
     List<String> tags = [...state.entity.tags];
     tags.remove(tag);
 
     emit(state.copyWith.entity(tags: tags));
   }
 
-  replacePortionsCount(int count) {
+  void replacePortionsCount(int count) {
     emit(state.copyWith.entity(countOfPortions: count));
   }
 
-  replaceEnegryInPortion(double energy) {
+  void replaceEnegryInPortion(double energy) {
     emit(state.copyWith.entity(energyInOnePortion: energy));
   }
 
-  setTotalCookingMinutes(int minutes) {
+  void setTotalCookingMinutes(int minutes) {
     emit(state.copyWith.entity(totalCookMinutes: minutes));
   }
 
-  setTotalCookingHours(int hours) {
+  void setTotalCookingHours(int hours) {
     emit(state.copyWith.entity(totalCookHours: hours));
   }
 
-  setActiveCookingMinutes(int minutes) {
+  void setActiveCookingMinutes(int minutes) {
     emit(state.copyWith.entity(activeCookMinutes: minutes));
   }
 
-  setActiveCookingHours(int hours) {
+  void setActiveCookingHours(int hours) {
     emit(state.copyWith.entity(activeCookHours: hours));
   }
 
-  replaceVideoUrl(String videoUrl) {
+  void replaceVideoUrl(String videoUrl) {
     emit(state.copyWith.entity(videoUrl: videoUrl));
   }
 
-  replaceImage(File? image) {
+  void replaceImage(File? image) {
     emit(state.copyWith.entity(image: image));
   }
 
-  replaceDescriptionInStep(String description, int index) {
+  void replaceDescriptionInStep(String description, int index) {
     List<StepEntity> steps = [...state.entity.steps];
 
     steps[index] = steps[index].copyWith(description: description);
@@ -150,7 +150,7 @@ class CreateRecipeCubit extends Cubit<CreateRecipeState> {
     emit(state.copyWith.entity(steps: steps));
   }
 
-  replaceImageInStep(File? image, int index) {
+  void replaceImageInStep(File? image, int index) {
     List<StepEntity> steps = [...state.entity.steps];
 
     steps[index] = steps[index].copyWith(image: image);
@@ -182,7 +182,7 @@ class CreateRecipeCubit extends Cubit<CreateRecipeState> {
     }
   }
 
-  disableLoading() {
+  void disableLoading() {
     emit(state.copyWith(loading: false));
   }
 
diff --git a/lib/features/create_recipe/presentation/widgets/image_widget.dart b/lib/features/create_recipe/presentation/widgets/image_widget.dart
index eb444b8e..bbb93c35 100644
--- a/lib/features/create_recipe/presentation/widgets/image_widget.dart
+++ b/lib/features/create_recipe/presentation/widgets/image_widget.dart
@@ -69,7 +69,7 @@ class _ImageWidgetState extends State<ImageWidget> {
     );
   }
 
-  _showImagePicker() {
+  void _showImagePicker() {
     showCupertinoModalPopup<void>(
       context: context,
       builder: (context) {
diff --git a/lib/features/create_recipe/presentation/widgets/ingredients_widget.dart b/lib/features/create_recipe/presentation/widgets/ingredients_widget.dart
index 633bd2e7..06cc7c1f 100644
--- a/lib/features/create_recipe/presentation/widgets/ingredients_widget.dart
+++ b/lib/features/create_recipe/presentation/widgets/ingredients_widget.dart
@@ -112,7 +112,7 @@ class _IngredientsWidgetState extends State<IngredientsWidget> {
     );
   }
 
-  _modalBottomSheet({
+  Future _modalBottomSheet({
     required CreateRecipeCubit createRecipeCubit,
     int? portionIndex,
     String? productNameControllerText,
diff --git a/lib/features/create_recipe/presentation/widgets/step_image_widget.dart b/lib/features/create_recipe/presentation/widgets/step_image_widget.dart
index d00d08c7..8c18b185 100644
--- a/lib/features/create_recipe/presentation/widgets/step_image_widget.dart
+++ b/lib/features/create_recipe/presentation/widgets/step_image_widget.dart
@@ -82,7 +82,7 @@ class _StepImageWidgetState extends State<StepImageWidget> {
     );
   }
 
-  _showImagePicker() {
+  void _showImagePicker() {
     showCupertinoModalPopup<void>(
       context: context,
       builder: (context) {
diff --git a/lib/features/create_recipe/reporitories/recipe_repository.dart b/lib/features/create_recipe/reporitories/recipe_repository.dart
index f0f860e9..289233a2 100644
--- a/lib/features/create_recipe/reporitories/recipe_repository.dart
+++ b/lib/features/create_recipe/reporitories/recipe_repository.dart
@@ -57,7 +57,7 @@ class RecipeRepository {
         'type': recipe.type,
         'state': 'active',
         'title': recipe.title,
-        'tags': recipe.tags,
+        'tags[]': recipe.tags ?? [],
         'description_md': recipe.description,
         'video_url': recipe.videoUrl,
         'ingredients': ingredientsMap,
diff --git a/lib/features/dev_tools/presentation/dev_tools_screen.dart b/lib/features/dev_tools/presentation/dev_tools_screen.dart
index a57e7580..4922a87d 100644
--- a/lib/features/dev_tools/presentation/dev_tools_screen.dart
+++ b/lib/features/dev_tools/presentation/dev_tools_screen.dart
@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:dio/dio.dart';
+import 'package:eatvio_app/core/app_router.dart';
 import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/core/firebase_api.dart';
 import 'package:eatvio_app/core/locator_service.dart';
@@ -8,6 +9,7 @@ import 'package:eatvio_app/core/utils/toasts.dart';
 import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
 import 'package:eatvio_app/core/widgets/custom_text_form_field.dart';
 import 'package:eatvio_app/features/dev_tools/test_cases.dart';
+import 'package:eatvio_app/core/env_config.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
@@ -51,6 +53,29 @@ class _DevToolsScreenContentState extends State<DevToolsScreenContent> {
     GetPlansComments(),
     SendPlansComment(),
     GetRecipesComments(),
+    AuthServiceTest(),
+    DiaryServiceTest(),
+    BlockedUserServiceTest(),
+    PlanServiceTest(),
+    AboutRecipeServiceTest(),
+    BlogPostServiceTest(),
+    CalendarServiceTest(),
+    CardsServiceTest(),
+    ConsultantServiceTest(),
+    ConsultationServiceTest(),
+    CreateDietServiceTest(),
+    CreatePlanServiceTest(),
+    GlossaryServiceTest(),
+    MyDietsServiceTest(),
+    MyPlansServiceTest(),
+    MyRecipesServiceTest(),
+    NotificationsServiceTest(),
+    PlansServiceTest(),
+    ProfileServiceTest(),
+    RegistrationServiceTest(),
+    ResetPasswordServiceTest(),
+    SettingsServiceTest(),
+    WsServiceTest(),
   ];
   final controller = TextEditingController();
   late final List<TestState> testsStates;
@@ -73,10 +98,15 @@ class _DevToolsScreenContentState extends State<DevToolsScreenContent> {
           padding: const EdgeInsets.symmetric(horizontal: 10),
           child: Column(
             children: [
-              Padding(padding: const EdgeInsets.all(8.0), child: Row(children: [Text('BaseUrl: $baseUrlForTest')])),
+              Padding(
+                padding: const EdgeInsets.all(8.0),
+                child: Row(children: [Text('BaseUrl: $baseUrlForTest')]),
+              ),
               Row(
                 children: [
-                  Expanded(child: CustomTextFormField(controller: controller, hintText: 'type new base url')),
+                  Expanded(
+                    child: CustomTextFormField(controller: controller, hintText: 'type new base url'),
+                  ),
                   IconButton(
                     onPressed: () {
                       setState(() {
@@ -92,13 +122,13 @@ class _DevToolsScreenContentState extends State<DevToolsScreenContent> {
               ),
               const SizedBox(height: 10),
               CustomOutlinedButton(
-                text: baseUrl == 'https://dev2.eatvio.com' ? 'Set production base url' : 'Set dev2 base url',
+                text: baseUrl == EnvConfig.devBaseUrl ? 'Set production base url' : 'Set dev2 base url',
                 onPressed: () {
                   setState(() {
-                    if (baseUrl == 'https://eatvio.ru') {
-                      baseUrlForTest = 'https://dev2.eatvio.com';
+                    if (baseUrl == EnvConfig.baseUrl) {
+                      baseUrlForTest = EnvConfig.devBaseUrl;
                     } else {
-                      baseUrlForTest = 'https://eatvio.ru';
+                      baseUrlForTest = EnvConfig.baseUrl;
                     }
                     baseUrl = baseUrlForTest.toLowerCase();
                     sl<Dio>().options.baseUrl = baseUrl;
@@ -108,7 +138,7 @@ class _DevToolsScreenContentState extends State<DevToolsScreenContent> {
                 buttonStyle: const ButtonStyle(),
               ),
               SizedBox(height: baseUrlForTest != baseUrl ? 40 : 10),
-              if (baseUrl.toLowerCase() != 'https://eatvio.ru')
+              if (baseUrl.toLowerCase() != EnvConfig.baseUrl.toLowerCase())
                 ListView.builder(
                   shrinkWrap: true,
                   itemCount: testCases.length,
@@ -132,17 +162,46 @@ class _DevToolsScreenContentState extends State<DevToolsScreenContent> {
                                 setState(() {
                                   testsStates[index] = TestState.loading;
                                 });
-                                final result = await testCases[index].run(baseUrl: baseUrlForTest);
-                                if (result) {
-                                  setState(() {
-                                    testsStates[index] = TestState.success;
-                                  });
-                                  showSuccessToast('${testCases[index].name} passed');
-                                } else {
+                                try {
+                                  final result = await testCases[index].run(baseUrl: baseUrlForTest);
+                                  if (result.success) {
+                                    setState(() {
+                                      testsStates[index] = TestState.success;
+                                    });
+                                    showSuccessToast('${testCases[index].name} passed');
+                                  } else {
+                                    setState(() {
+                                      testsStates[index] = TestState.fail;
+                                    });
+                                    showErrorToast('${testCases[index].name} failed');
+                                    // Show AlertDialog with error description
+                                    if (context.mounted) {
+                                      showDialog(
+                                        context: AppRouter.navigatorKey.currentContext!,
+                                        builder: (context) => AlertDialog(
+                                          title: const Text('Test Failed'),
+                                          content: SingleChildScrollView(child: Text(result.error ?? 'No error details.')),
+                                          actions: [TextButton(onPressed: () => Navigator.of(context).pop(), child: const Text('OK'))],
+                                        ),
+                                      );
+                                    }
+                                  }
+                                } catch (e, stack) {
                                   setState(() {
                                     testsStates[index] = TestState.fail;
                                   });
                                   showErrorToast('${testCases[index].name} failed');
+                                  // Show AlertDialog with error description
+                                  if (context.mounted) {
+                                    showDialog(
+                                      context: AppRouter.navigatorKey.currentContext!,
+                                      builder: (context) => AlertDialog(
+                                        title: const Text('Test Failed'),
+                                        content: SingleChildScrollView(child: Text('$e\n$stack')),
+                                        actions: [TextButton(onPressed: () => Navigator.of(context).pop(), child: const Text('OK'))],
+                                      ),
+                                    );
+                                  }
                                 }
                               },
                               buttonStyle: const ButtonStyle(),
@@ -153,10 +212,10 @@ class _DevToolsScreenContentState extends State<DevToolsScreenContent> {
                               TestState.fail => Container(width: 20, height: 20, color: Colors.red),
                               TestState.notRun => Container(width: 20, height: 20, color: Colors.grey),
                               TestState.loading => const SizedBox(
-                                  width: 20,
-                                  height: 20,
-                                  child: SizedBox(height: 20, width: 20, child: Center(child: CircularProgressIndicator())),
-                                ),
+                                width: 20,
+                                height: 20,
+                                child: SizedBox(height: 20, width: 20, child: Center(child: CircularProgressIndicator())),
+                              ),
                             },
                           ],
                         ),
diff --git a/lib/features/dev_tools/test_cases.dart b/lib/features/dev_tools/test_cases.dart
index 1b2f8961..3d43bd2a 100644
--- a/lib/features/dev_tools/test_cases.dart
+++ b/lib/features/dev_tools/test_cases.dart
@@ -4,19 +4,49 @@ import 'dart:developer';
 import 'package:dio/dio.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/utils/date_time_utils.dart';
+import 'package:eatvio_app/core/websockets/ws_service.dart';
+import 'package:eatvio_app/features/auth/models/credentials_model.dart';
+import 'package:eatvio_app/features/auth/services/reset_password_service.dart';
+import 'package:eatvio_app/features/blog_post_create/services/blog_post_service.dart';
+import 'package:eatvio_app/features/calendar/services/calendar_service.dart';
 import 'package:eatvio_app/features/chat/services/chat_service.dart';
+import 'package:eatvio_app/features/consultant/become_consultant/services/consultant_service.dart';
+import 'package:eatvio_app/features/consultations/services/consultation_service.dart';
+import 'package:eatvio_app/features/create_diet/services/create_diet_service.dart';
+import 'package:eatvio_app/features/create_plan/services/create_plan_service.dart';
 import 'package:eatvio_app/features/create_recipe/models/recipe_model.dart';
 import 'package:eatvio_app/features/create_recipe/models/step.dart';
 import 'package:eatvio_app/features/create_recipe/reporitories/recipe_repository.dart';
 import 'package:eatvio_app/features/diets/services/diet_service.dart';
 import 'package:eatvio_app/features/feed/services/feed_service.dart';
+import 'package:eatvio_app/features/glossary/services/glossary_service.dart';
+import 'package:eatvio_app/features/menu/services/blocked_users_service.dart';
+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/plans/services/plan_service.dart';
+import 'package:eatvio_app/features/plans/services/plans_service.dart';
 import 'package:eatvio_app/features/profile/services/profile_service.dart';
 import 'package:eatvio_app/features/create_recipe/services/recipe_service.dart';
+import 'package:eatvio_app/features/auth/services/auth_service.dart';
+import 'package:eatvio_app/features/diary/services/diary_service.dart';
+import 'package:eatvio_app/features/recipe/services/about_recipe_service.dart';
+import 'package:eatvio_app/features/recipe/services/my_recipes_service.dart';
+import 'package:eatvio_app/features/registration/services/registration_service.dart';
+import 'package:eatvio_app/features/settings/services/settings_service.dart';
+import 'package:eatvio_app/core/env_config.dart';
+
+class TestResult {
+  final bool success;
+  final String? error;
+  TestResult(this.success, [this.error]);
+}
 
 sealed class TestCases {
   String get name => throw UnimplementedError();
 
-  Future<bool> run({required String baseUrl}) async => throw UnimplementedError();
+  Future<TestResult> run({required String baseUrl}) async => throw UnimplementedError();
 }
 
 class CreateRecipeTask implements TestCases {
@@ -24,7 +54,7 @@ class CreateRecipeTask implements TestCases {
   String get name => 'api/recipes/create';
 
   @override
-  Future<bool> run({required String baseUrl}) async {
+  Future<TestResult> run({required String baseUrl}) async {
     try {
       final dio = sl<Dio>();
       final recipeRepository = RecipeRepository(recipeService: CreateRecipeService(dio, baseUrl: baseUrl));
@@ -41,10 +71,16 @@ class CreateRecipeTask implements TestCases {
           steps: [Step(description: 'desc')],
         ),
       );
-    } catch (e) {
-      return false;
+    } on DioException catch (e) {
+      final res = e.response;
+      if (res != null && (res.statusCode == null || res.statusCode! < 200 || res.statusCode! >= 300)) {
+        return TestResult(false, 'DioError: statusCode=${res.statusCode}\n${res.data}');
+      }
+      return TestResult(false, e.toString());
+    } catch (e, stack) {
+      return TestResult(false, '$e\n$stack');
     }
-    return true;
+    return TestResult(true);
   }
 }
 
@@ -53,69 +89,54 @@ class Test850task implements TestCases {
   String get name => 'task #850';
 
   @override
-  Future<bool> run({required String baseUrl}) async {
+  Future<TestResult> run({required String baseUrl}) async {
     try {
-      // get all of needed services
       final dio = sl<Dio>();
       final feedService = FeedService(dio, baseUrl: baseUrl);
       final profileService = ProfileService(dio, baseUrl: baseUrl);
       final dietsService = DietService(dio, baseUrl: baseUrl);
-
-      // get all of needed data
       final dietsPaginationModel = await feedService.getDiets(page: 1);
       final chosenDietsPaginationModel = await profileService.getChosenDiets();
       final lastChosenDiet = chosenDietsPaginationModel.diets.firstOrNull;
       final today = DateTime.now();
       final yesterday = today.subtract(const Duration(days: 1));
       final tomorrow = today.add(const Duration(days: 1));
-
-      // run test case
       for (final diet in dietsPaginationModel.data) {
         if (!diet.author.authorIsMe) {
           if (lastChosenDiet?.state == 'started' || lastChosenDiet?.state == 'inited') {
             try {
               await dietsService.cancelDiet(id: lastChosenDiet?.dietId ?? 0);
-            } catch (e) {
+            } catch (e, stack) {
               log('unexpected error7: $e');
-              return false;
+              return TestResult(false, '$e\n$stack');
             }
             await Future.delayed(const Duration(seconds: 3));
           }
           try {
             await dietsService.startDiet(id: diet.id, body: {'date': yesterday.format('yyyy-MM-dd')});
-
-            return false;
+            return TestResult(false, 'Expected error but got success');
           } catch (e) {
             log('expect ot have error: $e');
           }
-
-          // test start diet with correct date
           try {
             await dietsService.startDiet(id: diet.id, body: {'date': today.format('yyyy-MM-dd')});
-          } catch (e) {
+          } catch (e, stack) {
             log('unexpected error2: $e');
-            return false;
+            return TestResult(false, '$e\n$stack');
           }
-
-          // test cancelation of diet
           try {
             await dietsService.cancelDiet(id: diet.id);
-          } catch (e) {
+          } catch (e, stack) {
             log('unexpected error3: $e');
-            return false;
+            return TestResult(false, '$e\n$stack');
           }
-
           await Future.delayed(const Duration(seconds: 3));
-
-          // test start diet with correct date
           try {
             await dietsService.startDiet(id: diet.id, body: {'date': tomorrow.format('yyyy-MM-dd')});
-          } catch (e) {
+          } catch (e, stack) {
             log('unexpected error4: $e');
-            return false;
+            return TestResult(false, '$e\n$stack');
           }
-
-          // test cancelation of diet
           try {
             await dietsService.cancelDiet(id: diet.id);
           } catch (e) {
@@ -124,11 +145,10 @@ class Test850task implements TestCases {
           break;
         }
       }
-
-      return true;
-    } catch (e) {
+      return TestResult(true);
+    } catch (e, stack) {
       log('unexpected error6: $e');
-      return false;
+      return TestResult(false, '$e\n$stack');
     }
   }
 }
@@ -139,16 +159,16 @@ class GetChatRoomPreviews implements TestCases {
   String get name => '/api/chat/index';
 
   @override
-  Future<bool> run({required String baseUrl}) async {
+  Future<TestResult> run({required String baseUrl}) async {
     try {
       // get all of needed services
       // final dio = sl<Dio>();
       // final chatService = ChatService(dio, baseUrl: baseUrl);
 
       // await chatService.getChatRooms();
-      return true;
+      return TestResult(true);
     } catch (e) {
-      return false;
+      return TestResult(false, e.toString());
     }
   }
 }
@@ -158,16 +178,16 @@ class GetChatRoom implements TestCases {
   String get name => '/api/chat/show/{id}';
 
   @override
-  Future<bool> run({required String baseUrl}) async {
+  Future<TestResult> run({required String baseUrl}) async {
     try {
       // final dio = sl<Dio>();
       // final chatService = ChatService(dio, baseUrl: baseUrl);
 
       // final chatRoomsModels = await chatService.getChatRoomPreviews();
       // await chatService.getChatRoom(id: chatRoomsModels.chatRooms.firstOrNull?.id ?? '');
-      return true;
+      return TestResult(true);
     } catch (e) {
-      return false;
+      return TestResult(false, e.toString());
     }
   }
 }
@@ -177,16 +197,16 @@ class SendMessage implements TestCases {
   String get name => '/api/chat/{id}/message/send';
 
   @override
-  Future<bool> run({required String baseUrl}) async {
+  Future<TestResult> run({required String baseUrl}) async {
     try {
       // final dio = sl<Dio>();
       // final chatService = ChatService(dio, baseUrl: baseUrl);
 
       // final chatRoomsModels = await chatService.getChatRoomPreviews();
       // await chatService.sendMessage(id: chatRoomsModels.chatRooms.firstOrNull?.id ?? '', data: 'test message');
-      return true;
+      return TestResult(true);
     } catch (e) {
-      return false;
+      return TestResult(false, e.toString());
     }
   }
 }
@@ -196,16 +216,16 @@ class GetChatMessages implements TestCases {
   String get name => '/api/chat/show/{id}/messages?page={page}';
 
   @override
-  Future<bool> run({required String baseUrl}) async {
+  Future<TestResult> run({required String baseUrl}) async {
     try {
       // final dio = sl<Dio>();
       // final chatService = ChatService(dio, baseUrl: baseUrl);
 
       // final chatRoomsModels = await chatService.getChatRoomPreviews();
       // await chatService.getChatMessages(id: chatRoomsModels.chatRooms.firstOrNull?.id ?? '', page: 1);
-      return true;
+      return TestResult(true);
     } catch (e) {
-      return false;
+      return TestResult(false, e.toString());
     }
   }
 }
@@ -215,7 +235,7 @@ class GetChatRoomIdByUserSlug implements TestCases {
   String get name => '/api/chat/get_by_user/{user}';
 
   @override
-  Future<bool> run({required String baseUrl}) async {
+  Future<TestResult> run({required String baseUrl}) async {
     try {
       final dio = sl<Dio>();
       final chatService = ChatService(dio, baseUrl: baseUrl);
@@ -230,9 +250,9 @@ class GetChatRoomIdByUserSlug implements TestCases {
           break;
         }
       }
-      return true;
+      return TestResult(true);
     } catch (e) {
-      return false;
+      return TestResult(false, e.toString());
     }
   }
 }
@@ -243,14 +263,14 @@ class GetBlogPostList implements TestCases {
   String get name => '/api/blogPosts/index';
 
   @override
-  Future<bool> run({required String baseUrl}) async {
+  Future<TestResult> run({required String baseUrl}) async {
     try {
       final dio = sl<Dio>();
       final feedService = FeedService(dio, baseUrl: baseUrl);
       await feedService.getBlogPostList(page: 1);
-      return true;
+      return TestResult(true);
     } catch (e) {
-      return false;
+      return TestResult(false, e.toString());
     }
   }
 }
@@ -260,7 +280,7 @@ class GetRecipes implements TestCases {
   String get name => '/api/recipes/index';
 
   @override
-  Future<bool> run({required String baseUrl}) async {
+  Future<TestResult> run({required String baseUrl}) async {
     try {
       final dio = sl<Dio>();
       final feedService = FeedService(dio, baseUrl: baseUrl);
@@ -269,9 +289,9 @@ class GetRecipes implements TestCases {
       final tags = tagsModel.data;
       final tagsIds = tags.map((e) => e.id).toList();
       await feedService.getRecipes(page: 1, tags: tagsIds, query: null);
-      return true;
+      return TestResult(true);
     } catch (e) {
-      return false;
+      return TestResult(false, e.toString());
     }
   }
 }
@@ -281,14 +301,14 @@ class GetDiets implements TestCases {
   String get name => '/api/diets/index';
 
   @override
-  Future<bool> run({required String baseUrl}) async {
+  Future<TestResult> run({required String baseUrl}) async {
     try {
       final dio = sl<Dio>();
       final feedService = FeedService(dio, baseUrl: baseUrl);
       await feedService.getDiets(page: 1, query: null);
-      return true;
+      return TestResult(true);
     } catch (e) {
-      return false;
+      return TestResult(false, e.toString());
     }
   }
 }
@@ -298,14 +318,14 @@ class GetPlans implements TestCases {
   String get name => '/api/plans/index';
 
   @override
-  Future<bool> run({required String baseUrl}) async {
+  Future<TestResult> run({required String baseUrl}) async {
     try {
       final dio = sl<Dio>();
       final feedService = FeedService(dio, baseUrl: baseUrl);
       await feedService.getPlans(page: 1, query: null);
-      return true;
+      return TestResult(true);
     } catch (e) {
-      return false;
+      return TestResult(false, e.toString());
     }
   }
 }
@@ -315,16 +335,16 @@ class GetBlogPostComments implements TestCases {
   String get name => '/api/blogPosts/{id}/comments/show';
 
   @override
-  Future<bool> run({required String baseUrl}) async {
+  Future<TestResult> run({required String baseUrl}) async {
     try {
       final dio = sl<Dio>();
       final feedService = FeedService(dio, baseUrl: baseUrl);
       final blogPostsModel = await feedService.getBlogPostList(page: 1, query: null);
       final blogPosts = blogPostsModel.feedBlogPostList;
       await feedService.getBlogPostComments(id: blogPosts.first.id.toString());
-      return true;
+      return TestResult(true);
     } catch (e) {
-      return false;
+      return TestResult(false, e.toString());
     }
   }
 }
@@ -334,16 +354,16 @@ class SendBlogPostComment implements TestCases {
   String get name => '/api/blogPosts/{id}/comment/create';
 
   @override
-  Future<bool> run({required String baseUrl}) async {
+  Future<TestResult> run({required String baseUrl}) async {
     try {
       final dio = sl<Dio>();
       final feedService = FeedService(dio, baseUrl: baseUrl);
       final blogPostsModel = await feedService.getBlogPostList(page: 1, query: null);
       final blogPosts = blogPostsModel.feedBlogPostList;
       await feedService.sendBlogPostComment(id: blogPosts.first.id.toString(), body: 'auto test message');
-      return true;
+      return TestResult(true);
     } catch (e) {
-      return false;
+      return TestResult(false, e.toString());
     }
   }
 }
@@ -353,16 +373,16 @@ class GetDietsComments implements TestCases {
   String get name => '/api/diets/{id}/comments/show';
 
   @override
-  Future<bool> run({required String baseUrl}) async {
+  Future<TestResult> run({required String baseUrl}) async {
     try {
       final dio = sl<Dio>();
       final feedService = FeedService(dio, baseUrl: baseUrl);
       final dietsModel = await feedService.getDiets(page: 1, query: null);
       final diets = dietsModel.data;
       await feedService.getDietsComments(id: diets.first.id.toString());
-      return true;
+      return TestResult(true);
     } catch (e) {
-      return false;
+      return TestResult(false, e.toString());
     }
   }
 }
@@ -372,16 +392,16 @@ class SendDietsComment implements TestCases {
   String get name => '/api/diets/{id}/comment/create';
 
   @override
-  Future<bool> run({required String baseUrl}) async {
+  Future<TestResult> run({required String baseUrl}) async {
     try {
       final dio = sl<Dio>();
       final feedService = FeedService(dio, baseUrl: baseUrl);
       final dietsModel = await feedService.getDiets(page: 1, query: null);
       final diets = dietsModel.data;
       await feedService.sendDietsComment(id: diets.first.id.toString(), body: 'auto test message');
-      return true;
+      return TestResult(true);
     } catch (e) {
-      return false;
+      return TestResult(false, e.toString());
     }
   }
 }
@@ -391,16 +411,16 @@ class GetPlansComments implements TestCases {
   String get name => '/api/plans/{slug}/comments/show';
 
   @override
-  Future<bool> run({required String baseUrl}) async {
+  Future<TestResult> run({required String baseUrl}) async {
     try {
       final dio = sl<Dio>();
       final feedService = FeedService(dio, baseUrl: baseUrl);
       final plansModel = await feedService.getPlans(page: 1, query: null);
       final plans = plansModel.data;
       await feedService.getPlansComments(slug: plans.first.slug);
-      return true;
+      return TestResult(true);
     } catch (e) {
-      return false;
+      return TestResult(false, e.toString());
     }
   }
 }
@@ -410,16 +430,16 @@ class SendPlansComment implements TestCases {
   String get name => '/api/plans/{slug}/comment/create';
 
   @override
-  Future<bool> run({required String baseUrl}) async {
+  Future<TestResult> run({required String baseUrl}) async {
     try {
       final dio = sl<Dio>();
       final feedService = FeedService(dio, baseUrl: baseUrl);
       final plansModel = await feedService.getPlans(page: 1, query: null);
       final plans = plansModel.data;
       await feedService.sendPlansComment(slug: plans.first.slug, body: 'auto test message');
-      return true;
+      return TestResult(true);
     } catch (e) {
-      return false;
+      return TestResult(false, e.toString());
     }
   }
 }
@@ -429,7 +449,7 @@ class GetRecipesComments implements TestCases {
   String get name => '/api/recipes/{id}/comments/show';
 
   @override
-  Future<bool> run({required String baseUrl}) async {
+  Future<TestResult> run({required String baseUrl}) async {
     try {
       final dio = sl<Dio>();
       final feedService = FeedService(dio, baseUrl: baseUrl);
@@ -440,9 +460,428 @@ class GetRecipesComments implements TestCases {
       final recipesModel = await feedService.getRecipes(page: 1, tags: tagsIds, query: null);
       final recipes = recipesModel.recipesList;
       await feedService.getRecipesComments(id: recipes.first.id.toString());
-      return true;
+      return TestResult(true);
     } catch (e) {
-      return false;
+      return TestResult(false, e.toString());
+    }
+  }
+}
+
+// AuthService
+class AuthServiceTest implements TestCases {
+  @override
+  String get name => 'AuthService: getTokenByCredentials';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final authService = AuthService(dio, baseUrl: baseUrl);
+      // Use dummy credentials, expecting failure but no crash
+      await authService.getTokenByCredentials(
+        credentials: CredentialsModel(email: EnvConfig.testEmail, password: EnvConfig.testPassword),
+      );
+      return TestResult(false, 'Should not succeed');
+    } catch (e) {
+      return TestResult(true, 'Exception expected for dummy credentials');
+    }
+  }
+}
+
+// DiaryService
+class DiaryServiceTest implements TestCases {
+  @override
+  String get name => 'DiaryService: getDiaryIndexByDate';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final diaryService = DiaryService(dio, baseUrl: baseUrl);
+      await diaryService.getDiaryIndexByDate(date: '2023-01-01');
+      return TestResult(true);
+    } catch (e) {
+      return TestResult(false, e.toString());
+    }
+  }
+}
+
+// BlockedUserService
+class BlockedUserServiceTest implements TestCases {
+  @override
+  String get name => 'BlockedUserService: getBlockedUsers';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final blockedUserService = BlockedUserService(dio, baseUrl: baseUrl);
+      await blockedUserService.getBlockedUsers();
+      return TestResult(true);
+    } catch (e) {
+      return TestResult(false, e.toString());
+    }
+  }
+}
+
+// PlanService
+class PlanServiceTest implements TestCases {
+  @override
+  String get name => 'PlanService: getPlan';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final planService = PlanService(dio, baseUrl: baseUrl);
+      // Use a dummy slug, expecting failure but no crash
+      await planService.getPlan('dummy-slug');
+      return TestResult(false, 'Should not succeed');
+    } catch (e) {
+      return TestResult(true, 'Exception expected for dummy slug');
+    }
+  }
+}
+
+// AboutRecipeService
+class AboutRecipeServiceTest implements TestCases {
+  @override
+  String get name => 'AboutRecipeService: getRecipe';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final aboutRecipeService = AboutRecipeService(dio, baseUrl: baseUrl);
+      await aboutRecipeService.getRecipe('dummy-id');
+      return TestResult(false, 'Expected failure but got success');
+    } catch (e) {
+      return TestResult(true, 'Exception expected for dummy id');
+    }
+  }
+}
+
+// BlogPostService
+class BlogPostServiceTest implements TestCases {
+  @override
+  String get name => 'BlogPostService: createBlogPost';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final blogPostService = BlogPostService(dio, baseUrl: baseUrl);
+      // Use empty FormData, expecting failure but no crash
+      await blogPostService.createBlogPost(formData: FormData());
+      return TestResult(false, 'Expected failure but got success');
+    } catch (e) {
+      return TestResult(true, 'Exception expected for empty FormData');
+    }
+  }
+}
+
+// CalendarService
+class CalendarServiceTest implements TestCases {
+  @override
+  String get name => 'CalendarService: getCalendar';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final calendarService = CalendarService(dio, baseUrl: baseUrl);
+      await calendarService.getCalendar();
+      return TestResult(true);
+    } catch (e) {
+      return TestResult(false, e.toString());
+    }
+  }
+}
+
+// CardsService
+class CardsServiceTest implements TestCases {
+  @override
+  String get name => 'CardsService: getCards';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final cardsService = CardsService(dio, baseUrl: baseUrl);
+      await cardsService.getCards();
+      return TestResult(true);
+    } catch (e) {
+      return TestResult(false, e.toString());
+    }
+  }
+}
+
+// ConsultantService
+class ConsultantServiceTest implements TestCases {
+  @override
+  String get name => 'ConsultantService: getMyRequestStatus';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final consultantService = ConsultantService(dio, baseUrl: baseUrl);
+      await consultantService.getMyRequestStatus(slug: 'dummy-slug');
+      return TestResult(false, 'Expected failure but got success');
+    } catch (e) {
+      return TestResult(true, 'Exception expected for dummy slug');
+    }
+  }
+}
+
+// ConsultationService
+class ConsultationServiceTest implements TestCases {
+  @override
+  String get name => 'ConsultationService: getConsultations';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final consultationService = ConsultationService(dio);
+      await consultationService.getConsultations();
+      return TestResult(true);
+    } catch (e) {
+      return TestResult(false, e.toString());
+    }
+  }
+}
+
+// CreateDietService
+class CreateDietServiceTest implements TestCases {
+  @override
+  String get name => 'CreateDietService: getDietPortionsNutrition';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final createDietService = CreateDietService(dio, baseUrl: baseUrl);
+      await createDietService.getDietPortionsNutrition(diet: 0);
+      return TestResult(false, 'Expected failure but got success');
+    } catch (e) {
+      return TestResult(true, 'Exception expected for diet: 0');
+    }
+  }
+}
+
+// CreatePlanService
+class CreatePlanServiceTest implements TestCases {
+  @override
+  String get name => 'CreatePlanService: createPlan';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final createPlanService = CreatePlanService(dio, baseUrl: baseUrl);
+      await createPlanService.createPlan(formData: FormData());
+      return TestResult(false, 'Expected failure but got success');
+    } catch (e) {
+      return TestResult(true, 'Exception expected for empty FormData');
+    }
+  }
+}
+
+// GlossaryService
+class GlossaryServiceTest implements TestCases {
+  @override
+  String get name => 'GlossaryService: getGlossaryByQuery';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final glossaryService = GlossaryService(dio, baseUrl: baseUrl);
+      await glossaryService.getGlossaryByQuery(query: 'test');
+      return TestResult(true);
+    } catch (e) {
+      return TestResult(false, e.toString());
+    }
+  }
+}
+
+// MyDietsService
+class MyDietsServiceTest implements TestCases {
+  @override
+  String get name => 'MyDietsService: getDiets';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final myDietsService = MyDietsService(dio, baseUrl: baseUrl);
+      await myDietsService.getDiets(page: 1);
+      return TestResult(true);
+    } catch (e) {
+      return TestResult(false, e.toString());
+    }
+  }
+}
+
+// MyPlansService
+class MyPlansServiceTest implements TestCases {
+  @override
+  String get name => 'MyPlansService: getPlans';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final myPlansService = MyPlansService(dio, baseUrl: baseUrl);
+      await myPlansService.getPlans(page: 1);
+      return TestResult(true);
+    } catch (e) {
+      return TestResult(false, e.toString());
+    }
+  }
+}
+
+// MyRecipesService
+class MyRecipesServiceTest implements TestCases {
+  @override
+  String get name => 'MyRecipesService: getMyRecipes';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final myRecipesService = MyRecipesService(dio, baseUrl: baseUrl);
+      await myRecipesService.getMyRecipes();
+      return TestResult(true);
+    } catch (e) {
+      return TestResult(false, e.toString());
+    }
+  }
+}
+
+// NotificationsService
+class NotificationsServiceTest implements TestCases {
+  @override
+  String get name => 'NotificationsService: getNotifications';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final notificationsService = NotificationsService(dio);
+      await notificationsService.getNotifications(page: 1);
+      return TestResult(true);
+    } catch (e) {
+      return TestResult(false, e.toString());
+    }
+  }
+}
+
+// PlansService
+class PlansServiceTest implements TestCases {
+  @override
+  String get name => 'PlansService: getPlansBySlug';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final plansService = PlansService(dio, baseUrl: baseUrl);
+      await plansService.getPlansBySlug(author: 'dummy-author');
+      return TestResult(false, 'Expected failure but got success');
+    } catch (e) {
+      return TestResult(true, 'Exception expected for dummy author');
+    }
+  }
+}
+
+// ProfileService
+class ProfileServiceTest implements TestCases {
+  @override
+  String get name => 'ProfileService: getMyProfile';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final profileService = ProfileService(dio, baseUrl: baseUrl);
+      await profileService.getMyProfile();
+      return TestResult(true);
+    } catch (e) {
+      return TestResult(false, e.toString());
+    }
+  }
+}
+
+// RegistrationService
+class RegistrationServiceTest implements TestCases {
+  @override
+  String get name => 'RegistrationService: getLocationsByAddress';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final registrationService = RegistrationService(dio, baseUrl: baseUrl);
+      await registrationService.getLocationsByAddress(query: 'test');
+      return TestResult(true);
+    } catch (e) {
+      return TestResult(false, e.toString());
+    }
+  }
+}
+
+// ResetPasswordService
+class ResetPasswordServiceTest implements TestCases {
+  @override
+  String get name => 'ResetPasswordService: sendEmailCodeForPasswordChange';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final resetPasswordService = ResetPasswordService(dio, baseUrl: baseUrl);
+      await resetPasswordService.sendEmailCodeForPasswordChange(data: {'email': 'test@example.com'});
+      return TestResult(false, 'Expected failure but got success');
+    } catch (e) {
+      return TestResult(true, 'Exception expected for test@example.com');
+    }
+  }
+}
+
+// SettingsService
+class SettingsServiceTest implements TestCases {
+  @override
+  String get name => 'SettingsService: getProfileSettings';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final settingsService = SettingsService(dio, baseUrl: baseUrl);
+      await settingsService.getProfileSettings();
+      return TestResult(true);
+    } catch (e) {
+      return TestResult(false, e.toString());
+    }
+  }
+}
+
+// WsService
+class WsServiceTest implements TestCases {
+  @override
+  String get name => 'WsService: getWebsocket';
+
+  @override
+  Future<TestResult> run({required String baseUrl}) async {
+    try {
+      final dio = sl<Dio>();
+      final wsService = WsService(dio, baseUrl: baseUrl);
+      await wsService.getWebsocket();
+      return TestResult(true);
+    } catch (e) {
+      return TestResult(false, e.toString());
     }
   }
 }
diff --git a/lib/features/diary/models/consultant_review_model.freezed.dart b/lib/features/diary/models/consultant_review_model.freezed.dart
deleted file mode 100644
index a6f79469..00000000
--- a/lib/features/diary/models/consultant_review_model.freezed.dart
+++ /dev/null
@@ -1,784 +0,0 @@
-// dart format width=80
-// coverage:ignore-file
-// GENERATED CODE - DO NOT MODIFY BY HAND
-// ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
-
-part of 'consultant_review_model.dart';
-
-// **************************************************************************
-// FreezedGenerator
-// **************************************************************************
-
-// dart format off
-T _$identity<T>(T value) => value;
-
-/// @nodoc
-mixin _$ConsultantReviewModel {
-  String get planName;
-  int get planDuration;
-  int get currentPlanDay;
-  ConsultantComments get consultantComments;
-
-  /// Create a copy of ConsultantReviewModel
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @pragma('vm:prefer-inline')
-  $ConsultantReviewModelCopyWith<ConsultantReviewModel> get copyWith =>
-      _$ConsultantReviewModelCopyWithImpl<ConsultantReviewModel>(
-          this as ConsultantReviewModel, _$identity);
-
-  /// Serializes this ConsultantReviewModel to a JSON map.
-  Map<String, dynamic> toJson();
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is ConsultantReviewModel &&
-            (identical(other.planName, planName) ||
-                other.planName == planName) &&
-            (identical(other.planDuration, planDuration) ||
-                other.planDuration == planDuration) &&
-            (identical(other.currentPlanDay, currentPlanDay) ||
-                other.currentPlanDay == currentPlanDay) &&
-            (identical(other.consultantComments, consultantComments) ||
-                other.consultantComments == consultantComments));
-  }
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @override
-  int get hashCode => Object.hash(
-      runtimeType, planName, planDuration, currentPlanDay, consultantComments);
-
-  @override
-  String toString() {
-    return 'ConsultantReviewModel(planName: $planName, planDuration: $planDuration, currentPlanDay: $currentPlanDay, consultantComments: $consultantComments)';
-  }
-}
-
-/// @nodoc
-abstract mixin class $ConsultantReviewModelCopyWith<$Res> {
-  factory $ConsultantReviewModelCopyWith(ConsultantReviewModel value,
-          $Res Function(ConsultantReviewModel) _then) =
-      _$ConsultantReviewModelCopyWithImpl;
-  @useResult
-  $Res call(
-      {String planName,
-      int planDuration,
-      int currentPlanDay,
-      ConsultantComments consultantComments});
-
-  $ConsultantCommentsCopyWith<$Res> get consultantComments;
-}
-
-/// @nodoc
-class _$ConsultantReviewModelCopyWithImpl<$Res>
-    implements $ConsultantReviewModelCopyWith<$Res> {
-  _$ConsultantReviewModelCopyWithImpl(this._self, this._then);
-
-  final ConsultantReviewModel _self;
-  final $Res Function(ConsultantReviewModel) _then;
-
-  /// Create a copy of ConsultantReviewModel
-  /// with the given fields replaced by the non-null parameter values.
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? planName = null,
-    Object? planDuration = null,
-    Object? currentPlanDay = null,
-    Object? consultantComments = null,
-  }) {
-    return _then(_self.copyWith(
-      planName: null == planName
-          ? _self.planName
-          : planName // ignore: cast_nullable_to_non_nullable
-              as String,
-      planDuration: null == planDuration
-          ? _self.planDuration
-          : planDuration // ignore: cast_nullable_to_non_nullable
-              as int,
-      currentPlanDay: null == currentPlanDay
-          ? _self.currentPlanDay
-          : currentPlanDay // ignore: cast_nullable_to_non_nullable
-              as int,
-      consultantComments: null == consultantComments
-          ? _self.consultantComments
-          : consultantComments // ignore: cast_nullable_to_non_nullable
-              as ConsultantComments,
-    ));
-  }
-
-  /// Create a copy of ConsultantReviewModel
-  /// with the given fields replaced by the non-null parameter values.
-  @override
-  @pragma('vm:prefer-inline')
-  $ConsultantCommentsCopyWith<$Res> get consultantComments {
-    return $ConsultantCommentsCopyWith<$Res>(_self.consultantComments, (value) {
-      return _then(_self.copyWith(consultantComments: value));
-    });
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _ConsultantReviewModel implements ConsultantReviewModel {
-  _ConsultantReviewModel(
-      {required this.planName,
-      required this.planDuration,
-      required this.currentPlanDay,
-      required this.consultantComments});
-  factory _ConsultantReviewModel.fromJson(Map<String, dynamic> json) =>
-      _$ConsultantReviewModelFromJson(json);
-
-  @override
-  final String planName;
-  @override
-  final int planDuration;
-  @override
-  final int currentPlanDay;
-  @override
-  final ConsultantComments consultantComments;
-
-  /// Create a copy of ConsultantReviewModel
-  /// with the given fields replaced by the non-null parameter values.
-  @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @pragma('vm:prefer-inline')
-  _$ConsultantReviewModelCopyWith<_ConsultantReviewModel> get copyWith =>
-      __$ConsultantReviewModelCopyWithImpl<_ConsultantReviewModel>(
-          this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$ConsultantReviewModelToJson(
-      this,
-    );
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _ConsultantReviewModel &&
-            (identical(other.planName, planName) ||
-                other.planName == planName) &&
-            (identical(other.planDuration, planDuration) ||
-                other.planDuration == planDuration) &&
-            (identical(other.currentPlanDay, currentPlanDay) ||
-                other.currentPlanDay == currentPlanDay) &&
-            (identical(other.consultantComments, consultantComments) ||
-                other.consultantComments == consultantComments));
-  }
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @override
-  int get hashCode => Object.hash(
-      runtimeType, planName, planDuration, currentPlanDay, consultantComments);
-
-  @override
-  String toString() {
-    return 'ConsultantReviewModel(planName: $planName, planDuration: $planDuration, currentPlanDay: $currentPlanDay, consultantComments: $consultantComments)';
-  }
-}
-
-/// @nodoc
-abstract mixin class _$ConsultantReviewModelCopyWith<$Res>
-    implements $ConsultantReviewModelCopyWith<$Res> {
-  factory _$ConsultantReviewModelCopyWith(_ConsultantReviewModel value,
-          $Res Function(_ConsultantReviewModel) _then) =
-      __$ConsultantReviewModelCopyWithImpl;
-  @override
-  @useResult
-  $Res call(
-      {String planName,
-      int planDuration,
-      int currentPlanDay,
-      ConsultantComments consultantComments});
-
-  @override
-  $ConsultantCommentsCopyWith<$Res> get consultantComments;
-}
-
-/// @nodoc
-class __$ConsultantReviewModelCopyWithImpl<$Res>
-    implements _$ConsultantReviewModelCopyWith<$Res> {
-  __$ConsultantReviewModelCopyWithImpl(this._self, this._then);
-
-  final _ConsultantReviewModel _self;
-  final $Res Function(_ConsultantReviewModel) _then;
-
-  /// Create a copy of ConsultantReviewModel
-  /// with the given fields replaced by the non-null parameter values.
-  @override
-  @pragma('vm:prefer-inline')
-  $Res call({
-    Object? planName = null,
-    Object? planDuration = null,
-    Object? currentPlanDay = null,
-    Object? consultantComments = null,
-  }) {
-    return _then(_ConsultantReviewModel(
-      planName: null == planName
-          ? _self.planName
-          : planName // ignore: cast_nullable_to_non_nullable
-              as String,
-      planDuration: null == planDuration
-          ? _self.planDuration
-          : planDuration // ignore: cast_nullable_to_non_nullable
-              as int,
-      currentPlanDay: null == currentPlanDay
-          ? _self.currentPlanDay
-          : currentPlanDay // ignore: cast_nullable_to_non_nullable
-              as int,
-      consultantComments: null == consultantComments
-          ? _self.consultantComments
-          : consultantComments // ignore: cast_nullable_to_non_nullable
-              as ConsultantComments,
-    ));
-  }
-
-  /// Create a copy of ConsultantReviewModel
-  /// with the given fields replaced by the non-null parameter values.
-  @override
-  @pragma('vm:prefer-inline')
-  $ConsultantCommentsCopyWith<$Res> get consultantComments {
-    return $ConsultantCommentsCopyWith<$Res>(_self.consultantComments, (value) {
-      return _then(_self.copyWith(consultantComments: value));
-    });
-  }
-}
-
-/// @nodoc
-mixin _$ConsultantComments {
-  String? get dayComment;
-  List<MealComment> get mealsComments;
-  List<PortionComment> get portionsComments;
-
-  /// Create a copy of ConsultantComments
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @pragma('vm:prefer-inline')
-  $ConsultantCommentsCopyWith<ConsultantComments> get copyWith =>
-      _$ConsultantCommentsCopyWithImpl<ConsultantComments>(
-          this as ConsultantComments, _$identity);
-
-  /// Serializes this ConsultantComments to a JSON map.
-  Map<String, dynamic> toJson();
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is ConsultantComments &&
-            (identical(other.dayComment, dayComment) ||
-                other.dayComment == dayComment) &&
-            const DeepCollectionEquality()
-                .equals(other.mealsComments, mealsComments) &&
-            const DeepCollectionEquality()
-                .equals(other.portionsComments, portionsComments));
-  }
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @override
-  int get hashCode => Object.hash(
-      runtimeType,
-      dayComment,
-      const DeepCollectionEquality().hash(mealsComments),
-      const DeepCollectionEquality().hash(portionsComments));
-
-  @override
-  String toString() {
-    return 'ConsultantComments(dayComment: $dayComment, mealsComments: $mealsComments, portionsComments: $portionsComments)';
-  }
-}
-
-/// @nodoc
-abstract mixin class $ConsultantCommentsCopyWith<$Res> {
-  factory $ConsultantCommentsCopyWith(
-          ConsultantComments value, $Res Function(ConsultantComments) _then) =
-      _$ConsultantCommentsCopyWithImpl;
-  @useResult
-  $Res call(
-      {String? dayComment,
-      List<MealComment> mealsComments,
-      List<PortionComment> portionsComments});
-}
-
-/// @nodoc
-class _$ConsultantCommentsCopyWithImpl<$Res>
-    implements $ConsultantCommentsCopyWith<$Res> {
-  _$ConsultantCommentsCopyWithImpl(this._self, this._then);
-
-  final ConsultantComments _self;
-  final $Res Function(ConsultantComments) _then;
-
-  /// Create a copy of ConsultantComments
-  /// with the given fields replaced by the non-null parameter values.
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? dayComment = freezed,
-    Object? mealsComments = null,
-    Object? portionsComments = null,
-  }) {
-    return _then(_self.copyWith(
-      dayComment: freezed == dayComment
-          ? _self.dayComment
-          : dayComment // ignore: cast_nullable_to_non_nullable
-              as String?,
-      mealsComments: null == mealsComments
-          ? _self.mealsComments
-          : mealsComments // ignore: cast_nullable_to_non_nullable
-              as List<MealComment>,
-      portionsComments: null == portionsComments
-          ? _self.portionsComments
-          : portionsComments // ignore: cast_nullable_to_non_nullable
-              as List<PortionComment>,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _ConsultantComments implements ConsultantComments {
-  _ConsultantComments(
-      {required this.dayComment,
-      required final List<MealComment> mealsComments,
-      required final List<PortionComment> portionsComments})
-      : _mealsComments = mealsComments,
-        _portionsComments = portionsComments;
-  factory _ConsultantComments.fromJson(Map<String, dynamic> json) =>
-      _$ConsultantCommentsFromJson(json);
-
-  @override
-  final String? dayComment;
-  final List<MealComment> _mealsComments;
-  @override
-  List<MealComment> get mealsComments {
-    if (_mealsComments is EqualUnmodifiableListView) return _mealsComments;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_mealsComments);
-  }
-
-  final List<PortionComment> _portionsComments;
-  @override
-  List<PortionComment> get portionsComments {
-    if (_portionsComments is EqualUnmodifiableListView)
-      return _portionsComments;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_portionsComments);
-  }
-
-  /// Create a copy of ConsultantComments
-  /// with the given fields replaced by the non-null parameter values.
-  @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @pragma('vm:prefer-inline')
-  _$ConsultantCommentsCopyWith<_ConsultantComments> get copyWith =>
-      __$ConsultantCommentsCopyWithImpl<_ConsultantComments>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$ConsultantCommentsToJson(
-      this,
-    );
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _ConsultantComments &&
-            (identical(other.dayComment, dayComment) ||
-                other.dayComment == dayComment) &&
-            const DeepCollectionEquality()
-                .equals(other._mealsComments, _mealsComments) &&
-            const DeepCollectionEquality()
-                .equals(other._portionsComments, _portionsComments));
-  }
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @override
-  int get hashCode => Object.hash(
-      runtimeType,
-      dayComment,
-      const DeepCollectionEquality().hash(_mealsComments),
-      const DeepCollectionEquality().hash(_portionsComments));
-
-  @override
-  String toString() {
-    return 'ConsultantComments(dayComment: $dayComment, mealsComments: $mealsComments, portionsComments: $portionsComments)';
-  }
-}
-
-/// @nodoc
-abstract mixin class _$ConsultantCommentsCopyWith<$Res>
-    implements $ConsultantCommentsCopyWith<$Res> {
-  factory _$ConsultantCommentsCopyWith(
-          _ConsultantComments value, $Res Function(_ConsultantComments) _then) =
-      __$ConsultantCommentsCopyWithImpl;
-  @override
-  @useResult
-  $Res call(
-      {String? dayComment,
-      List<MealComment> mealsComments,
-      List<PortionComment> portionsComments});
-}
-
-/// @nodoc
-class __$ConsultantCommentsCopyWithImpl<$Res>
-    implements _$ConsultantCommentsCopyWith<$Res> {
-  __$ConsultantCommentsCopyWithImpl(this._self, this._then);
-
-  final _ConsultantComments _self;
-  final $Res Function(_ConsultantComments) _then;
-
-  /// Create a copy of ConsultantComments
-  /// with the given fields replaced by the non-null parameter values.
-  @override
-  @pragma('vm:prefer-inline')
-  $Res call({
-    Object? dayComment = freezed,
-    Object? mealsComments = null,
-    Object? portionsComments = null,
-  }) {
-    return _then(_ConsultantComments(
-      dayComment: freezed == dayComment
-          ? _self.dayComment
-          : dayComment // ignore: cast_nullable_to_non_nullable
-              as String?,
-      mealsComments: null == mealsComments
-          ? _self._mealsComments
-          : mealsComments // ignore: cast_nullable_to_non_nullable
-              as List<MealComment>,
-      portionsComments: null == portionsComments
-          ? _self._portionsComments
-          : portionsComments // ignore: cast_nullable_to_non_nullable
-              as List<PortionComment>,
-    ));
-  }
-}
-
-/// @nodoc
-mixin _$MealComment {
-  String get comment;
-  int get typeNo;
-
-  /// Create a copy of MealComment
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @pragma('vm:prefer-inline')
-  $MealCommentCopyWith<MealComment> get copyWith =>
-      _$MealCommentCopyWithImpl<MealComment>(this as MealComment, _$identity);
-
-  /// Serializes this MealComment to a JSON map.
-  Map<String, dynamic> toJson();
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is MealComment &&
-            (identical(other.comment, comment) || other.comment == comment) &&
-            (identical(other.typeNo, typeNo) || other.typeNo == typeNo));
-  }
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @override
-  int get hashCode => Object.hash(runtimeType, comment, typeNo);
-
-  @override
-  String toString() {
-    return 'MealComment(comment: $comment, typeNo: $typeNo)';
-  }
-}
-
-/// @nodoc
-abstract mixin class $MealCommentCopyWith<$Res> {
-  factory $MealCommentCopyWith(
-          MealComment value, $Res Function(MealComment) _then) =
-      _$MealCommentCopyWithImpl;
-  @useResult
-  $Res call({String comment, int typeNo});
-}
-
-/// @nodoc
-class _$MealCommentCopyWithImpl<$Res> implements $MealCommentCopyWith<$Res> {
-  _$MealCommentCopyWithImpl(this._self, this._then);
-
-  final MealComment _self;
-  final $Res Function(MealComment) _then;
-
-  /// Create a copy of MealComment
-  /// with the given fields replaced by the non-null parameter values.
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? comment = null,
-    Object? typeNo = null,
-  }) {
-    return _then(_self.copyWith(
-      comment: null == comment
-          ? _self.comment
-          : comment // ignore: cast_nullable_to_non_nullable
-              as String,
-      typeNo: null == typeNo
-          ? _self.typeNo
-          : typeNo // ignore: cast_nullable_to_non_nullable
-              as int,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _MealComment implements MealComment {
-  _MealComment({required this.comment, required this.typeNo});
-  factory _MealComment.fromJson(Map<String, dynamic> json) =>
-      _$MealCommentFromJson(json);
-
-  @override
-  final String comment;
-  @override
-  final int typeNo;
-
-  /// Create a copy of MealComment
-  /// with the given fields replaced by the non-null parameter values.
-  @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @pragma('vm:prefer-inline')
-  _$MealCommentCopyWith<_MealComment> get copyWith =>
-      __$MealCommentCopyWithImpl<_MealComment>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$MealCommentToJson(
-      this,
-    );
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _MealComment &&
-            (identical(other.comment, comment) || other.comment == comment) &&
-            (identical(other.typeNo, typeNo) || other.typeNo == typeNo));
-  }
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @override
-  int get hashCode => Object.hash(runtimeType, comment, typeNo);
-
-  @override
-  String toString() {
-    return 'MealComment(comment: $comment, typeNo: $typeNo)';
-  }
-}
-
-/// @nodoc
-abstract mixin class _$MealCommentCopyWith<$Res>
-    implements $MealCommentCopyWith<$Res> {
-  factory _$MealCommentCopyWith(
-          _MealComment value, $Res Function(_MealComment) _then) =
-      __$MealCommentCopyWithImpl;
-  @override
-  @useResult
-  $Res call({String comment, int typeNo});
-}
-
-/// @nodoc
-class __$MealCommentCopyWithImpl<$Res> implements _$MealCommentCopyWith<$Res> {
-  __$MealCommentCopyWithImpl(this._self, this._then);
-
-  final _MealComment _self;
-  final $Res Function(_MealComment) _then;
-
-  /// Create a copy of MealComment
-  /// with the given fields replaced by the non-null parameter values.
-  @override
-  @pragma('vm:prefer-inline')
-  $Res call({
-    Object? comment = null,
-    Object? typeNo = null,
-  }) {
-    return _then(_MealComment(
-      comment: null == comment
-          ? _self.comment
-          : comment // ignore: cast_nullable_to_non_nullable
-              as String,
-      typeNo: null == typeNo
-          ? _self.typeNo
-          : typeNo // ignore: cast_nullable_to_non_nullable
-              as int,
-    ));
-  }
-}
-
-/// @nodoc
-mixin _$PortionComment {
-  @JsonKey(name: 'id')
-  int get portionId;
-  String get comment;
-
-  /// Create a copy of PortionComment
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @pragma('vm:prefer-inline')
-  $PortionCommentCopyWith<PortionComment> get copyWith =>
-      _$PortionCommentCopyWithImpl<PortionComment>(
-          this as PortionComment, _$identity);
-
-  /// Serializes this PortionComment to a JSON map.
-  Map<String, dynamic> toJson();
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is PortionComment &&
-            (identical(other.portionId, portionId) ||
-                other.portionId == portionId) &&
-            (identical(other.comment, comment) || other.comment == comment));
-  }
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @override
-  int get hashCode => Object.hash(runtimeType, portionId, comment);
-
-  @override
-  String toString() {
-    return 'PortionComment(portionId: $portionId, comment: $comment)';
-  }
-}
-
-/// @nodoc
-abstract mixin class $PortionCommentCopyWith<$Res> {
-  factory $PortionCommentCopyWith(
-          PortionComment value, $Res Function(PortionComment) _then) =
-      _$PortionCommentCopyWithImpl;
-  @useResult
-  $Res call({@JsonKey(name: 'id') int portionId, String comment});
-}
-
-/// @nodoc
-class _$PortionCommentCopyWithImpl<$Res>
-    implements $PortionCommentCopyWith<$Res> {
-  _$PortionCommentCopyWithImpl(this._self, this._then);
-
-  final PortionComment _self;
-  final $Res Function(PortionComment) _then;
-
-  /// Create a copy of PortionComment
-  /// with the given fields replaced by the non-null parameter values.
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? portionId = null,
-    Object? comment = null,
-  }) {
-    return _then(_self.copyWith(
-      portionId: null == portionId
-          ? _self.portionId
-          : portionId // ignore: cast_nullable_to_non_nullable
-              as int,
-      comment: null == comment
-          ? _self.comment
-          : comment // ignore: cast_nullable_to_non_nullable
-              as String,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _PortionComment implements PortionComment {
-  _PortionComment(
-      {@JsonKey(name: 'id') required this.portionId, required this.comment});
-  factory _PortionComment.fromJson(Map<String, dynamic> json) =>
-      _$PortionCommentFromJson(json);
-
-  @override
-  @JsonKey(name: 'id')
-  final int portionId;
-  @override
-  final String comment;
-
-  /// Create a copy of PortionComment
-  /// with the given fields replaced by the non-null parameter values.
-  @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @pragma('vm:prefer-inline')
-  _$PortionCommentCopyWith<_PortionComment> get copyWith =>
-      __$PortionCommentCopyWithImpl<_PortionComment>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$PortionCommentToJson(
-      this,
-    );
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _PortionComment &&
-            (identical(other.portionId, portionId) ||
-                other.portionId == portionId) &&
-            (identical(other.comment, comment) || other.comment == comment));
-  }
-
-  @JsonKey(includeFromJson: false, includeToJson: false)
-  @override
-  int get hashCode => Object.hash(runtimeType, portionId, comment);
-
-  @override
-  String toString() {
-    return 'PortionComment(portionId: $portionId, comment: $comment)';
-  }
-}
-
-/// @nodoc
-abstract mixin class _$PortionCommentCopyWith<$Res>
-    implements $PortionCommentCopyWith<$Res> {
-  factory _$PortionCommentCopyWith(
-          _PortionComment value, $Res Function(_PortionComment) _then) =
-      __$PortionCommentCopyWithImpl;
-  @override
-  @useResult
-  $Res call({@JsonKey(name: 'id') int portionId, String comment});
-}
-
-/// @nodoc
-class __$PortionCommentCopyWithImpl<$Res>
-    implements _$PortionCommentCopyWith<$Res> {
-  __$PortionCommentCopyWithImpl(this._self, this._then);
-
-  final _PortionComment _self;
-  final $Res Function(_PortionComment) _then;
-
-  /// Create a copy of PortionComment
-  /// with the given fields replaced by the non-null parameter values.
-  @override
-  @pragma('vm:prefer-inline')
-  $Res call({
-    Object? portionId = null,
-    Object? comment = null,
-  }) {
-    return _then(_PortionComment(
-      portionId: null == portionId
-          ? _self.portionId
-          : portionId // ignore: cast_nullable_to_non_nullable
-              as int,
-      comment: null == comment
-          ? _self.comment
-          : comment // ignore: cast_nullable_to_non_nullable
-              as String,
-    ));
-  }
-}
-
-// dart format on
diff --git a/lib/features/diary/models/consultant_review_model.g.dart b/lib/features/diary/models/consultant_review_model.g.dart
deleted file mode 100644
index ad7fa537..00000000
--- a/lib/features/diary/models/consultant_review_model.g.dart
+++ /dev/null
@@ -1,67 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'consultant_review_model.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-_ConsultantReviewModel _$ConsultantReviewModelFromJson(
-        Map<String, dynamic> json) =>
-    _ConsultantReviewModel(
-      planName: json['planName'] as String,
-      planDuration: (json['planDuration'] as num).toInt(),
-      currentPlanDay: (json['currentPlanDay'] as num).toInt(),
-      consultantComments: ConsultantComments.fromJson(
-          json['consultantComments'] as Map<String, dynamic>),
-    );
-
-Map<String, dynamic> _$ConsultantReviewModelToJson(
-        _ConsultantReviewModel instance) =>
-    <String, dynamic>{
-      'planName': instance.planName,
-      'planDuration': instance.planDuration,
-      'currentPlanDay': instance.currentPlanDay,
-      'consultantComments': instance.consultantComments,
-    };
-
-_ConsultantComments _$ConsultantCommentsFromJson(Map<String, dynamic> json) =>
-    _ConsultantComments(
-      dayComment: json['dayComment'] as String?,
-      mealsComments: (json['mealsComments'] as List<dynamic>)
-          .map((e) => MealComment.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      portionsComments: (json['portionsComments'] as List<dynamic>)
-          .map((e) => PortionComment.fromJson(e as Map<String, dynamic>))
-          .toList(),
-    );
-
-Map<String, dynamic> _$ConsultantCommentsToJson(_ConsultantComments instance) =>
-    <String, dynamic>{
-      'dayComment': instance.dayComment,
-      'mealsComments': instance.mealsComments,
-      'portionsComments': instance.portionsComments,
-    };
-
-_MealComment _$MealCommentFromJson(Map<String, dynamic> json) => _MealComment(
-      comment: json['comment'] as String,
-      typeNo: (json['typeNo'] as num).toInt(),
-    );
-
-Map<String, dynamic> _$MealCommentToJson(_MealComment instance) =>
-    <String, dynamic>{
-      'comment': instance.comment,
-      'typeNo': instance.typeNo,
-    };
-
-_PortionComment _$PortionCommentFromJson(Map<String, dynamic> json) =>
-    _PortionComment(
-      portionId: (json['id'] as num).toInt(),
-      comment: json['comment'] as String,
-    );
-
-Map<String, dynamic> _$PortionCommentToJson(_PortionComment instance) =>
-    <String, dynamic>{
-      'id': instance.portionId,
-      'comment': instance.comment,
-    };
diff --git a/lib/features/diary/models/diary_day_model.dart b/lib/features/diary/models/diary_day_model.dart
index 58a68bdd..6e08f6d0 100644
--- a/lib/features/diary/models/diary_day_model.dart
+++ b/lib/features/diary/models/diary_day_model.dart
@@ -64,7 +64,7 @@ abstract class DiaryFutureDietDayModel with _$DiaryFutureDietDayModel {
   factory DiaryFutureDietDayModel.fromJson(Map<String, dynamic> json) => _$DiaryFutureDietDayModelFromJson(json);
 }
 
-DiaryDietModel? _parseDiet(json) {
+DiaryDietModel? _parseDiet(dynamic json) {
   if (json == null) return null;
   return DiaryDietModel.fromJson(json['diet']);
 }
@@ -80,7 +80,7 @@ abstract class DiaryDietModel with _$DiaryDietModel {
   factory DiaryDietModel.fromJson(Map<String, dynamic> json) => _$DiaryDietModelFromJson(json);
 }
 
-TypeOfDiaryModel _parseDayTypeForFutureDay(json) {
+TypeOfDiaryModel _parseDayTypeForFutureDay(dynamic json) {
   return TypeOfDiaryModel(
     hasChosenDiet: json['has_chosen_diet'] as bool,
     hasChosenPlan: json['has_chosen_plan'] as bool,
diff --git a/lib/features/diary/presentation/bloc/diary_cubit.dart b/lib/features/diary/presentation/bloc/diary_cubit.dart
index 7216ed1c..6e6f8891 100644
--- a/lib/features/diary/presentation/bloc/diary_cubit.dart
+++ b/lib/features/diary/presentation/bloc/diary_cubit.dart
@@ -55,7 +55,7 @@ class DiaryCubit extends Cubit<DiaryState> {
     return null;
   }
 
-  setSelectedMeal(int meal) {
+  void setSelectedMeal(int meal) {
     selectedMeal = meal;
     final currentState = state;
     if (currentState is DiaryStateLoaded) {
@@ -136,15 +136,7 @@ class DiaryCubit extends Cubit<DiaryState> {
       final fifthMeal = MealModel(id: 0, time: '0', typeNumber: 5, satiety: 0, mood: 0, portions: fifthMealPortions ?? [], photos: []);
       emit(
         DiaryState.loadedTomorrowWithDiet(
-          diary: diaryDay.copyWith(
-            meals: [
-              firstMeal,
-              secondMeal,
-              thirdMeal,
-              fourthMeal,
-              fifthMeal,
-            ],
-          ),
+          diary: diaryDay.copyWith(meals: [firstMeal, secondMeal, thirdMeal, fourthMeal, fifthMeal]),
           selectedDay: selectedDay,
           selectedMeal: selectedMeal,
         ),
@@ -154,9 +146,9 @@ class DiaryCubit extends Cubit<DiaryState> {
     return false;
   }
 
-  fetchDiary([bool needLoading = false, int? diaryId, int? currentDay]) async {
+  Future<void> fetchDiary([bool needLoading = false, int? diaryId, int? currentDay]) async {
     this.diaryId ??= diaryId;
-
+    final isConsultantView = this.diaryId != null;
     if (needLoading) {
       emit(const DiaryState.loading());
       selectedMeal = 1;
@@ -179,17 +171,22 @@ class DiaryCubit extends Cubit<DiaryState> {
       int? currentPlanDay;
       String? planName;
       if (diaryDay.chosenPlanId != null) {
-        consultantReview = await diaryRepository.getDiaryComments(planId: diaryDay.chosenPlanId!, diaryId: diaryDay.id);
         final chosenPlanModel = await chatRepository.getChosenPlan(id: diaryDay.chosenPlanId!);
+        if (!isConsultantView &&
+            (diaryDay.typeOfDiary.diaryState == DiaryStateEnum.lastDayCommented || diaryDay.typeOfDiary.diaryState == DiaryStateEnum.commented)) {
+          await diaryRepository.viewCommentOfDiaryDayByConsultant(diaryId: diaryDay.id);
+        }
+        consultantReview = await diaryRepository.getDiaryComments(planId: diaryDay.chosenPlanId!, diaryId: diaryDay.id);
         planDuration = chosenPlanModel.plan.duration;
         planName = chosenPlanModel.plan.name;
-        currentPlanDay = currentDay ?? DateTime.now().difference(chosenPlanModel.startDate).inDays + 1;
+        currentPlanDay = consultantReview.currentPlanDay;
       }
       final nutrition = await getNutrition(diaryDay.id);
 
       final isDiaryFinished = diaryDay.typeOfDiary.diaryState == DiaryStateEnum.finished || diaryDay.typeOfDiary.diaryState == DiaryStateEnum.lastDayFinished;
 
-      final isDiaryCommented = diaryDay.typeOfDiary.diaryState == DiaryStateEnum.commented ||
+      final isDiaryCommented =
+          diaryDay.typeOfDiary.diaryState == DiaryStateEnum.commented ||
           diaryDay.typeOfDiary.diaryState == DiaryStateEnum.lastDayCommented ||
           diaryDay.typeOfDiary.diaryState == DiaryStateEnum.reviewedByUser;
       emit(
@@ -198,7 +195,7 @@ class DiaryCubit extends Cubit<DiaryState> {
           nutrition: nutrition,
           selectedDay: selectedDay,
           selectedMeal: selectedMeal,
-          isConsultantView: this.diaryId != null,
+          isConsultantView: isConsultantView,
           consultantReview: consultantReview,
           isDiaryFinished: isDiaryFinished,
           isDiaryCommented: isDiaryCommented,
@@ -206,7 +203,7 @@ class DiaryCubit extends Cubit<DiaryState> {
           chosenPlanDuration: planDuration,
           chosenPlanName: planName,
           isMoodEnabled: isMoodEnabled,
-          isWakeUpAndRetireEnabled: isWakeUpAndRetireTimeEnabled
+          isWakeUpAndRetireEnabled: isWakeUpAndRetireTimeEnabled,
         ),
       );
     } catch (e, st) {
@@ -215,17 +212,8 @@ class DiaryCubit extends Cubit<DiaryState> {
     }
   }
 
-  finishDiaryDay({
-    required int diaryId,
-    required String wakeUp,
-    required String retire,
-  }) async {
-    await diaryRepository.finishDiaryDay(
-      diaryId: diaryId,
-      wakeUp: wakeUp,
-      retire: retire,
-      comment: comment.isEmpty ? null : comment,
-    );
+  Future<void> finishDiaryDay({required int diaryId, required String wakeUp, required String retire}) async {
+    await diaryRepository.finishDiaryDay(diaryId: diaryId, wakeUp: wakeUp, retire: retire, comment: comment.isEmpty ? null : comment);
     await fetchDiary();
   }
 
@@ -233,7 +221,7 @@ class DiaryCubit extends Cubit<DiaryState> {
     return (await diaryRepository.getNutritionData(index));
   }
 
-  addProductToMeal({
+  Future<void> addProductToMeal({
     required int diaryId,
     required int mealId,
     required String productName,
@@ -241,6 +229,7 @@ class DiaryCubit extends Cubit<DiaryState> {
     required int quantity,
     int? productNutritionalValueId,
   }) async {
+    emit((state as DiaryStateLoaded).copyWith(isLoadingAddingProductInMeal: true));
     await diaryRepository.addPortionToMeal(
       diaryId: diaryId,
       mealId: mealId,
@@ -252,7 +241,7 @@ class DiaryCubit extends Cubit<DiaryState> {
     await fetchDiary();
   }
 
-  updateProductInMeal({
+  Future<void> updateProductInMeal({
     required int diaryId,
     required int mealId,
     required int portionId,
@@ -286,22 +275,22 @@ class DiaryCubit extends Cubit<DiaryState> {
     await fetchDiary();
   }
 
-  markEaten({required int diaryId, required int mealId, required int portionId}) async {
+  Future<void> markEaten({required int diaryId, required int mealId, required int portionId}) async {
     await diaryRepository.markEaten(diaryId: diaryId, mealId: mealId, portionId: portionId);
     await fetchDiary();
   }
 
-  unmarkEaten({required int diaryId, required int mealId, required int portionId}) async {
+  Future<void> unmarkEaten({required int diaryId, required int mealId, required int portionId}) async {
     await diaryRepository.unmarkEaten(diaryId: diaryId, mealId: mealId, portionId: portionId);
     await fetchDiary();
   }
 
-  restore({required int diaryId, required int mealId, required int portionId}) async {
+  Future<void> restore({required int diaryId, required int mealId, required int portionId}) async {
     await diaryRepository.restore(diaryId: diaryId, mealId: mealId, portionId: portionId);
     await fetchDiary();
   }
 
-  deleteProductFromMeal({required int diaryId, required int mealId, required int portionId}) async {
+  Future<void> deleteProductFromMeal({required int diaryId, required int mealId, required int portionId}) async {
     await diaryRepository.deleteProductFromMeal(diaryId: diaryId, mealId: mealId, portionId: portionId);
     await fetchDiary();
   }
@@ -310,12 +299,12 @@ class DiaryCubit extends Cubit<DiaryState> {
     return await glossaryRepository.getGlossaryListByQuery(query);
   }
 
-  uploadPhotos({required List<File> files, required int diaryId}) async {
+  Future<void> uploadPhotos({required List<File> files, required int diaryId}) async {
     await diaryRepository.uploadPhotos(files: await ImageCompressUtility.compressFilesList(files), diaryId: diaryId, mealId: selectedMeal);
     await fetchDiary();
   }
 
-  deletePhoto({required DiaryPhotoModel photo, required int diaryId}) async {
+  Future<void> deletePhoto({required DiaryPhotoModel photo, required int diaryId}) async {
     await diaryRepository.deletePhoto(photo: photo, diaryId: diaryId, mealId: selectedMeal);
     await fetchDiary();
   }
@@ -335,32 +324,32 @@ class DiaryCubit extends Cubit<DiaryState> {
     return null;
   }
 
-  fillTime({required int diaryId, required String time}) async {
+  Future<void> fillTime({required int diaryId, required String time}) async {
     await diaryRepository.fillTime(diaryId: diaryId, mealId: selectedMeal, time: time);
     await fetchDiary();
   }
 
-  fillWakeup({required int diaryId, required String time}) async {
+  Future<void> fillWakeup({required int diaryId, required String time}) async {
     await diaryRepository.fillWakeup(diaryId: diaryId, time: time);
     await fetchDiary();
   }
 
-  fillRetire({required int diaryId, required String time}) async {
+  Future<void> fillRetire({required int diaryId, required String time}) async {
     await diaryRepository.fillRetire(diaryId: diaryId, time: time);
     await fetchDiary();
   }
 
-  fillSatiety({required int diaryId, required int satiety}) async {
+  Future<void> fillSatiety({required int diaryId, required int satiety}) async {
     await diaryRepository.fillSatiety(diaryId: diaryId, mealId: selectedMeal, satiety: satiety);
     await fetchDiary();
   }
 
-  fillMood({required int diaryId, required int mood}) async {
+  Future<void> fillMood({required int diaryId, required int mood}) async {
     await diaryRepository.fillMood(diaryId: diaryId, mealId: selectedMeal, mood: mood);
     await fetchDiary();
   }
 
-  fillComment(String comment) {
+  void fillComment(String comment) {
     this.comment = comment;
   }
 }
diff --git a/lib/features/diary/presentation/bloc/diary_state.dart b/lib/features/diary/presentation/bloc/diary_state.dart
index d5e8e39d..4779e2ea 100644
--- a/lib/features/diary/presentation/bloc/diary_state.dart
+++ b/lib/features/diary/presentation/bloc/diary_state.dart
@@ -29,6 +29,7 @@ abstract class DiaryState with _$DiaryState {
     @Default(false) bool isDiaryCommented,
     @Default(false) bool isWakeUpAndRetireEnabled,
     @Default(false) bool isMoodEnabled,
+    @Default(false) bool isLoadingAddingProductInMeal,
   }) = DiaryStateLoaded;
 
   const factory DiaryState.loadedTomorrowWithDiet({
diff --git a/lib/features/diary/presentation/widgets/add_product_button_widget.dart b/lib/features/diary/presentation/widgets/add_product_button_widget.dart
index 0c7534b1..b804989a 100644
--- a/lib/features/diary/presentation/widgets/add_product_button_widget.dart
+++ b/lib/features/diary/presentation/widgets/add_product_button_widget.dart
@@ -21,7 +21,7 @@ class _AddProductButtonWidgetState extends State<AddProductButtonWidget> {
     diaryCubit = context.read<DiaryCubit>();
   }
 
-  addProductInMeal(DiaryStateLoaded state, [int? portionId]) {
+  Future addProductInMeal(DiaryStateLoaded state, [int? portionId]) {
     return showModalBottomSheet(
       useRootNavigator: true,
       context: context,
diff --git a/lib/features/diary/presentation/widgets/calendar_widget.dart b/lib/features/diary/presentation/widgets/calendar_widget.dart
index 2d584eb2..b0e5c442 100644
--- a/lib/features/diary/presentation/widgets/calendar_widget.dart
+++ b/lib/features/diary/presentation/widgets/calendar_widget.dart
@@ -134,13 +134,13 @@ class _CalendarWidgetState extends State<CalendarWidget> {
     );
   }
 
-  _nextCalendarFormat() {
+  void _nextCalendarFormat() {
     setState(() {
       _calendarFormat = CalendarFormat.values[(_calendarFormat.index - 1) % CalendarFormat.values.length];
     });
   }
 
-  _arrowDown() {
+  GestureDetector _arrowDown() {
     return GestureDetector(
       behavior: HitTestBehavior.translucent,
       onVerticalDragStart: (_) {
diff --git a/lib/features/diary/presentation/widgets/calories_chart_widget.dart b/lib/features/diary/presentation/widgets/calories_chart_widget.dart
index 817508af..4aca0334 100644
--- a/lib/features/diary/presentation/widgets/calories_chart_widget.dart
+++ b/lib/features/diary/presentation/widgets/calories_chart_widget.dart
@@ -242,7 +242,7 @@ class CaloriesChartWidget extends StatelessWidget {
     );
   }
 
-  _chartData(String title, String value) {
+  Row _chartData(String title, String value) {
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
       children: [
diff --git a/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart b/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart
index f4991494..69b316a7 100644
--- a/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart
+++ b/lib/features/diary/presentation/widgets/glossary_moderation_request_modal_widget.dart
@@ -46,7 +46,7 @@ class _GlossaryModerationRequestModalWidgetState extends State<GlossaryModeratio
     productNameController.text = widget.productName;
   }
 
-  _alert() {
+  Padding _alert() {
     return Padding(
       padding: const EdgeInsets.all(16),
       child: Column(
@@ -137,7 +137,7 @@ class _GlossaryModerationRequestModalWidgetState extends State<GlossaryModeratio
     );
   }
 
-  _success() {
+  Padding _success() {
     return Padding(
       padding: const EdgeInsets.all(16),
       child: Column(
@@ -189,7 +189,7 @@ class _GlossaryModerationRequestModalWidgetState extends State<GlossaryModeratio
     );
   }
 
-  _addNewGlossaryProduct() {
+  Padding _addNewGlossaryProduct() {
     return Padding(
       padding: const EdgeInsets.all(16),
       child: Column(
diff --git a/lib/features/diary/presentation/widgets/photo_gallery_widget.dart b/lib/features/diary/presentation/widgets/photo_gallery_widget.dart
index 7a89d466..352b6519 100644
--- a/lib/features/diary/presentation/widgets/photo_gallery_widget.dart
+++ b/lib/features/diary/presentation/widgets/photo_gallery_widget.dart
@@ -34,7 +34,7 @@ class _PhotoGalleryWidgetState extends State<PhotoGalleryWidget> {
     diaryCubit = context.read<DiaryCubit>();
   }
 
-  showImagePicker(DiaryDayModel diaryDay) {
+  void showImagePicker(DiaryDayModel diaryDay) {
     showCupertinoModalPopup<void>(
       context: context,
       builder: (context) {
diff --git a/lib/features/diary/presentation/widgets/product_loader_widget.dart b/lib/features/diary/presentation/widgets/product_loader_widget.dart
new file mode 100644
index 00000000..7b679354
--- /dev/null
+++ b/lib/features/diary/presentation/widgets/product_loader_widget.dart
@@ -0,0 +1,26 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+
+class ProductLoaderWidget extends StatefulWidget {
+  const ProductLoaderWidget({
+    super.key,
+  });
+
+  @override
+  State<ProductLoaderWidget> createState() => _ProductLoaderWidgetState();
+}
+
+class _ProductLoaderWidgetState extends State<ProductLoaderWidget> {
+  @override
+  Widget build(BuildContext context) {
+    return ListTile(
+      horizontalTitleGap: 0,
+      contentPadding: const EdgeInsets.only(right: 24, left: 12),
+      title: const CupertinoActivityIndicator(),
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(20),
+      ),
+      tileColor: const Color(0xFFF6FAFF),
+    );
+  }
+}
diff --git a/lib/features/diary/presentation/widgets/product_widget.dart b/lib/features/diary/presentation/widgets/product_widget.dart
index f5040d47..a221ffc6 100644
--- a/lib/features/diary/presentation/widgets/product_widget.dart
+++ b/lib/features/diary/presentation/widgets/product_widget.dart
@@ -44,7 +44,7 @@ class _ProductWidgetState extends State<ProductWidget> {
     isEaten = widget.portion.portionState == PortionState.eatenFromDiet ? true : false;
   }
 
-  updateProductInMeal(DiaryStateLoaded state, PortionModel portion) {
+  Future updateProductInMeal(DiaryStateLoaded state, PortionModel portion) {
     return showModalBottomSheet(
       useRootNavigator: true,
       context: context,
diff --git a/lib/features/diary/presentation/widgets/products_list_widget.dart b/lib/features/diary/presentation/widgets/products_list_widget.dart
index 13bbe7fc..6882af08 100644
--- a/lib/features/diary/presentation/widgets/products_list_widget.dart
+++ b/lib/features/diary/presentation/widgets/products_list_widget.dart
@@ -1,5 +1,6 @@
 import 'package:eatvio_app/features/diary/presentation/bloc/diary_cubit.dart';
 import 'package:eatvio_app/features/diary/presentation/bloc/diary_state.dart';
+import 'package:eatvio_app/features/diary/presentation/widgets/product_loader_widget.dart';
 import 'package:eatvio_app/features/diary/presentation/widgets/product_widget.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -25,6 +26,11 @@ class _ProductsListWidgetState extends State<ProductsListWidget> {
                 ProductWidget(portion: state.diary.meals[mealIndex].portions[i]),
                 i < state.diary.meals[mealIndex].portions.length - 1 ? const SizedBox(height: 8) : const SizedBox.shrink(),
               ],
+              if (state.isLoadingAddingProductInMeal)
+                const Padding(
+                  padding: EdgeInsets.only(top: 8),
+                  child: ProductLoaderWidget(),
+                ),
             ],
           );
         }
diff --git a/lib/features/diary/presentation/widgets/time_of_meal_picker_widget.dart b/lib/features/diary/presentation/widgets/time_of_meal_picker_widget.dart
index c9da23ed..a9086d88 100644
--- a/lib/features/diary/presentation/widgets/time_of_meal_picker_widget.dart
+++ b/lib/features/diary/presentation/widgets/time_of_meal_picker_widget.dart
@@ -23,7 +23,7 @@ class _TimeOfMealPickerWidgetState extends State<TimeOfMealPickerWidget> {
     diaryCubit = context.read<DiaryCubit>();
   }
 
-  showTimePicker(int diaryId) {
+  void showTimePicker(int diaryId) {
     showModalBottomSheet<void>(
       context: context,
       useRootNavigator: true,
diff --git a/lib/features/diary/presentation/widgets/wakeup_and_retire_widget.dart b/lib/features/diary/presentation/widgets/wakeup_and_retire_widget.dart
index 1dbe9925..6e74f5ec 100644
--- a/lib/features/diary/presentation/widgets/wakeup_and_retire_widget.dart
+++ b/lib/features/diary/presentation/widgets/wakeup_and_retire_widget.dart
@@ -26,7 +26,7 @@ class _WakeupAndRetireWidgetState extends State<WakeupAndRetireWidget> {
     diaryCubit = context.read<DiaryCubit>();
   }
 
-  showTimePicker(int diaryId, bool isWakeup) {
+  void showTimePicker(int diaryId, bool isWakeup) {
     showModalBottomSheet<void>(
       context: context,
       useRootNavigator: true,
diff --git a/lib/features/diary/repositories/diary_repository.dart b/lib/features/diary/repositories/diary_repository.dart
index e807e3d0..2ac30803 100644
--- a/lib/features/diary/repositories/diary_repository.dart
+++ b/lib/features/diary/repositories/diary_repository.dart
@@ -297,4 +297,12 @@ class DiaryRepository {
       rethrow;
     }
   }
+
+  Future<void> viewCommentOfDiaryDayByConsultant({required int diaryId}) async {
+    try {
+      await diaryService.viewCommentOfDiaryDayByConsultant(diaryId: diaryId);
+    } catch (e) {
+      rethrow;
+    }
+  }
 }
diff --git a/lib/features/diary/services/diary_service.dart b/lib/features/diary/services/diary_service.dart
index bb6672d3..d9967200 100644
--- a/lib/features/diary/services/diary_service.dart
+++ b/lib/features/diary/services/diary_service.dart
@@ -150,4 +150,9 @@ abstract class DiaryService {
     @Path() required int planId,
     @Path() required int diaryId,
   });
+
+  @POST('/api/diary/{diaryId}/consultant/comment/view')
+  Future<void> viewCommentOfDiaryDayByConsultant({
+    @Path() required int diaryId,
+  });
 }
diff --git a/lib/features/diets/presentation/cubit/about_diet_cubit.dart b/lib/features/diets/presentation/cubit/about_diet_cubit.dart
index a257a0e9..9d02534e 100644
--- a/lib/features/diets/presentation/cubit/about_diet_cubit.dart
+++ b/lib/features/diets/presentation/cubit/about_diet_cubit.dart
@@ -6,6 +6,7 @@ import 'package:eatvio_app/core/utils/date_time_utils.dart';
 import 'package:eatvio_app/core/utils/toasts.dart';
 import 'package:eatvio_app/features/diets/repositories/diet_repository.dart';
 import 'package:eatvio_app/features/diets/presentation/cubit/about_diet_state.dart';
+import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
@@ -16,10 +17,11 @@ class AboutDietCubit extends Cubit<AboutDietState> {
   bool isCurrentDietStarted = false;
   bool hasStartedDiet = false;
   String? userStartedDietName;
+  List<int> _selectedIndexes = [];
 
-  Future<void> getDiet(int id, {int? index}) async {
+  Future<void> getDiet(String slug, {int? index}) async {
     try {
-      final diet = await dietsRepository.getDiet(id);
+      final diet = await dietsRepository.getDietBySlug(slug);
       if (index != null) {
         dietsRepository.emitCommentsStateToFeed(CommentsState(index: index, totalComments: diet.totalComments));
       }
@@ -30,10 +32,10 @@ class AboutDietCubit extends Cubit<AboutDietState> {
     }
   }
 
-  Future<void> initDietPage(int id) async {
+  Future<void> initDietPage(String slug) async {
     try {
       emit(const AboutDietState.loading());
-      final diet = await dietsRepository.getDiet(id);
+      final diet = await dietsRepository.getDietBySlug(slug);
       final chosenDiets = await profileRepository.getChosenDiets();
       final lastChosenDiet = chosenDiets.firstOrNull;
       if (lastChosenDiet != null && ['inited', 'started'].contains(lastChosenDiet.state)) {
@@ -47,7 +49,13 @@ class AboutDietCubit extends Cubit<AboutDietState> {
           }
         }
       }
-      emit(AboutDietState.loaded(diet: diet, isStarted: isCurrentDietStarted, hasStartedDiet: hasStartedDiet));
+      _selectedIndexes = List.generate(diet.dailySchedule.length, (index) => 0);
+      emit(AboutDietState.loaded(
+        diet: diet,
+        isStarted: isCurrentDietStarted,
+        hasStartedDiet: hasStartedDiet,
+        selectedIndexes: _selectedIndexes,
+      ));
     } catch (e) {
       log(e.toString());
       emit(AboutDietState.error(message: e.toString()));
@@ -67,7 +75,7 @@ class AboutDietCubit extends Cubit<AboutDietState> {
       if (dietIndexInFeed != null) {
         dietsRepository.emitLikesStateToFeed(LikesState(wasLikedByMe: updatedDiet.wasLikedByMe, totalLikes: updatedDiet.totalLikes, index: dietIndexInFeed));
       }
-      emit(AboutDietState.loaded(diet: updatedDiet, isStarted: isCurrentDietStarted, hasStartedDiet: hasStartedDiet));
+      emit(AboutDietState.loaded(diet: updatedDiet, isStarted: isCurrentDietStarted, hasStartedDiet: hasStartedDiet, selectedIndexes: _selectedIndexes));
     } else {
       final updatedDiet = currentDiet.copyWith(
         totalLikes: currentDiet.totalLikes + 1,
@@ -76,7 +84,7 @@ class AboutDietCubit extends Cubit<AboutDietState> {
       if (dietIndexInFeed != null) {
         dietsRepository.emitLikesStateToFeed(LikesState(wasLikedByMe: updatedDiet.wasLikedByMe, totalLikes: updatedDiet.totalLikes, index: dietIndexInFeed));
       }
-      emit(AboutDietState.loaded(diet: updatedDiet, isStarted: isCurrentDietStarted, hasStartedDiet: hasStartedDiet));
+      emit(AboutDietState.loaded(diet: updatedDiet, isStarted: isCurrentDietStarted, hasStartedDiet: hasStartedDiet, selectedIndexes: _selectedIndexes));
     }
 
     EasyDebounce.debounce(
@@ -91,7 +99,7 @@ class AboutDietCubit extends Cubit<AboutDietState> {
             dietsRepository
                 .emitLikesStateToFeed(LikesState(wasLikedByMe: currentDiet.wasLikedByMe, totalLikes: currentDiet.totalLikes, index: dietIndexInFeed));
           }
-          emit(AboutDietState.loaded(diet: currentDiet, isStarted: isCurrentDietStarted, hasStartedDiet: hasStartedDiet));
+          emit(AboutDietState.loaded(selectedIndexes: _selectedIndexes,diet: currentDiet, isStarted: isCurrentDietStarted, hasStartedDiet: hasStartedDiet));
         }
       },
     );
@@ -108,7 +116,7 @@ class AboutDietCubit extends Cubit<AboutDietState> {
     if (dietIndex != null) {
       dietsRepository.emitFavoriteStateToFeed(FavoriteState(isFavorite: updatedDiet.isFavorite, index: dietIndex));
     }
-    emit(AboutDietState.loaded(diet: updatedDiet, isStarted: isCurrentDietStarted, hasStartedDiet: hasStartedDiet));
+    emit(AboutDietState.loaded(selectedIndexes: _selectedIndexes,diet: updatedDiet, isStarted: isCurrentDietStarted, hasStartedDiet: hasStartedDiet));
 
     EasyDebounce.debounce(
       'add_or_remove_diet_to_favorites',
@@ -122,7 +130,7 @@ class AboutDietCubit extends Cubit<AboutDietState> {
           if (dietIndex != null) {
             dietsRepository.emitFavoriteStateToFeed(FavoriteState(isFavorite: currentDiet.isFavorite, index: dietIndex));
           }
-          emit(AboutDietState.loaded(diet: currentDiet, isStarted: isCurrentDietStarted, hasStartedDiet: hasStartedDiet));
+          emit(AboutDietState.loaded(selectedIndexes: _selectedIndexes,diet: currentDiet, isStarted: isCurrentDietStarted, hasStartedDiet: hasStartedDiet));
         }
       },
     );
@@ -139,7 +147,7 @@ class AboutDietCubit extends Cubit<AboutDietState> {
     if (dietIndex != null) {
       dietsRepository.emitFavoriteStateToFeed(FavoriteState(isFavorite: updatedDiet.isFavorite, index: dietIndex));
     }
-    emit(AboutDietState.loaded(diet: updatedDiet, isStarted: isCurrentDietStarted, hasStartedDiet: hasStartedDiet));
+    emit(AboutDietState.loaded(selectedIndexes: _selectedIndexes,diet: updatedDiet, isStarted: isCurrentDietStarted, hasStartedDiet: hasStartedDiet));
 
     EasyDebounce.debounce(
       'add_or_remove_diet_to_favorites',
@@ -153,7 +161,7 @@ class AboutDietCubit extends Cubit<AboutDietState> {
           if (dietIndex != null) {
             dietsRepository.emitFavoriteStateToFeed(FavoriteState(isFavorite: currentDiet.isFavorite, index: dietIndex));
           }
-          emit(AboutDietState.loaded(diet: currentDiet, isStarted: isCurrentDietStarted, hasStartedDiet: hasStartedDiet));
+          emit(AboutDietState.loaded(selectedIndexes: _selectedIndexes,diet: currentDiet, isStarted: isCurrentDietStarted, hasStartedDiet: hasStartedDiet));
         }
       },
     );
@@ -191,12 +199,31 @@ class AboutDietCubit extends Cubit<AboutDietState> {
   void clearStartedDietsState() {
     if (state is! DietStateLoaded) return;
     final diet = (state as DietStateLoaded).diet;
-    emit(AboutDietState.loaded(diet: diet));
+    emit(AboutDietState.loaded(selectedIndexes: _selectedIndexes,diet: diet));
   }
 
   void emitCurrentStartedDietsState() {
     if (state is! DietStateLoaded) return;
     final diet = (state as DietStateLoaded).diet;
-    emit(AboutDietState.loaded(diet: diet, isStarted: true));
+    emit(AboutDietState.loaded(selectedIndexes: _selectedIndexes,diet: diet, isStarted: true));
+  }
+
+  Future<Diet?> getDietBySlug(String slug) async {
+    try {
+      return await dietsRepository.getDietBySlug(slug);
+    } catch (e) {
+      log(e.toString());
+    }
+    return null;
+  }
+
+  void setSelectedIndex({required int dayNumber, required int index}) {
+    final currentState = state;
+    if (currentState is DietStateLoaded) {
+      final updatedSelectedIndexes = [...currentState.selectedIndexes];
+      updatedSelectedIndexes[dayNumber] = index;
+      _selectedIndexes = updatedSelectedIndexes;
+      emit(currentState.copyWith(selectedIndexes: _selectedIndexes));
+    }
   }
 }
diff --git a/lib/features/diets/presentation/cubit/about_diet_state.dart b/lib/features/diets/presentation/cubit/about_diet_state.dart
index a861330c..63917801 100644
--- a/lib/features/diets/presentation/cubit/about_diet_state.dart
+++ b/lib/features/diets/presentation/cubit/about_diet_state.dart
@@ -11,6 +11,7 @@ abstract class AboutDietState with _$AboutDietState {
   const factory AboutDietState.loading() = DietStateLoading;
   const factory AboutDietState.loaded({
     required Diet diet,
+    @Default([]) List<int> selectedIndexes,
     @Default(false) bool isStarted,
     @Default(false) bool hasStartedDiet,
   }) = DietStateLoaded;
diff --git a/lib/features/diets/presentation/pages/about_diet_screen.dart b/lib/features/diets/presentation/pages/about_diet_screen.dart
index f8c8fa97..e4dd4a75 100644
--- a/lib/features/diets/presentation/pages/about_diet_screen.dart
+++ b/lib/features/diets/presentation/pages/about_diet_screen.dart
@@ -21,8 +21,8 @@ import 'package:eatvio_app/features/diets/presentation/widgets/info_bouble.dart'
 import 'package:eatvio_app/core/widgets/main_background_bouble.dart';
 import 'package:eatvio_app/features/diets/presentation/widgets/start_diet_bottom_sheet.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
-import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart';
-import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_state.dart';
+import 'package:eatvio_app/core/comments/comments_cubit/comments_cubit.dart';
+import 'package:eatvio_app/core/comments/comments_cubit/comments_state.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/comments_widget.dart';
 import 'package:eatvio_app/generated/l10n.dart';
@@ -32,16 +32,14 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:go_router/go_router.dart';
 
 class AboutDietScreen extends StatefulWidget {
-  final Diet diet;
+  final String slug;
   final int? index;
   final bool navigateToComments;
-  late final List<int> selectedIndexes;
 
-  AboutDietScreen({super.key, required this.diet, required this.index, required this.navigateToComments}) {
-    selectedIndexes = List.generate(diet.dailySchedule.length, (_) => 0);
-  }
+  const AboutDietScreen({super.key, required this.index, required this.navigateToComments, required this.slug});
 
   @override
   State<AboutDietScreen> createState() => _AboutDietScreenState();
@@ -55,11 +53,11 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
   final textEditingController = TextEditingController();
   bool isMoreOptionsVisible = false;
   bool _jumped = false;
+  bool _isFirstLaunch = true;
 
   @override
   void initState() {
     super.initState();
-    context.read<FeedCubit>().viewDiet(widget.diet.id);
     scrollController.addListener(() {
       if (isMoreOptionsVisible) {
         setState(() {
@@ -79,15 +77,11 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
   @override
   Widget build(BuildContext context) {
     final s = S.of(context);
+
     return BlocProvider(
-      create: (context) => dietsCubit..initDietPage(widget.diet.id),
+      create: (context) => dietsCubit..initDietPage(widget.slug),
       child: BlocProvider<CommentsCubit>(
-        create: (BuildContext context) => commentsCubit
-          ..getComments(
-            widget.diet.id.toString(),
-            CommentSourceType.diet,
-            true,
-          ),
+        create: (BuildContext context) => commentsCubit,
         child: BlocConsumer<CommentsCubit, CommentsState>(
           listener: (BuildContext context, CommentsState commentsState) {
             if (commentsState is CommentsStateLoaded) {
@@ -100,6 +94,15 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
             return BlocBuilder<AboutDietCubit, AboutDietState>(
               builder: (context, dietState) {
                 if (dietState is DietStateLoaded) {
+                  if (_isFirstLaunch) {
+                    context.read<FeedCubit>().viewDiet(dietState.diet.id);
+                    context.read<CommentsCubit>().getComments(
+                          dietState.diet.id.toString(),
+                          CommentSourceType.diet,
+                          true,
+                        );
+                    _isFirstLaunch = false;
+                  }
                   Future.delayed(const Duration(milliseconds: 500), () {
                     if (widget.navigateToComments && !_jumped) {
                       _scrollToBottom();
@@ -176,9 +179,9 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
                                   isFavorite: dietState.diet.isFavorite,
                                   onTap: () {
                                     if (dietState.diet.isFavorite) {
-                                      dietsCubit.removeFromFavorite(widget.diet.id, widget.index);
+                                      dietsCubit.removeFromFavorite(dietState.diet.id, widget.index);
                                     } else {
-                                      dietsCubit.addToFavorite(widget.diet.id, widget.index);
+                                      dietsCubit.addToFavorite(dietState.diet.id, widget.index);
                                     }
                                   },
                                   width: 52,
@@ -269,7 +272,7 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
                                   onTap: () {
                                     if (textEditingController.text.length > 2) {
                                       commentsCubit.sendComment(
-                                        id: widget.diet.id.toString(),
+                                        id: dietState.diet.id.toString(),
                                         commentText: textEditingController.text,
                                         parentCommentId: replyId,
                                         commentSourceType: CommentSourceType.diet,
@@ -280,7 +283,7 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
                                         replyId = null;
                                       });
                                       Future.delayed(const Duration(milliseconds: 500), () {
-                                        dietsCubit.getDiet(widget.diet.id, index: widget.index);
+                                        dietsCubit.getDiet(dietState.diet.slug, index: widget.index);
                                       });
                                       FocusManager.instance.primaryFocus?.unfocus();
                                     }
@@ -307,8 +310,17 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
                     ),
                     appBar: AppBar(
                       centerTitle: true,
+                      leading: BackButton(
+                      onPressed: () {
+                        if (context.canPop()) {
+                          GoRouter.of(context).pop();
+                          return;
+                        }
+                        GoRouter.of(context).go('/feed-screen');
+                      },
+                    ),
                       title: Text(
-                        widget.diet.name,
+                        dietState.diet.name,
                         maxLines: 2,
                         textAlign: TextAlign.center,
                         overflow: TextOverflow.ellipsis,
@@ -317,12 +329,12 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
                       ),
                       actions: [
                         CustomPopup(
-                          isAuthor: widget.diet.author.authorIsMe,
-                          path: 'diet/${widget.diet.slug}',
+                          isAuthor: dietState.diet.author.authorIsMe,
+                          path: 'diet/${dietState.diet.slug}',
                           complainedContentType: ComplainedContent.diet,
-                          id: widget.diet.id,
-                          diet: widget.diet,
-                          userSlug: widget.diet.author.authorSlug,
+                          id: dietState.diet.id,
+                          diet: dietState.diet,
+                          userSlug: dietState.diet.author.authorSlug,
                         ),
                         const SizedBox(width: 16),
                       ],
@@ -341,7 +353,7 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
                                 Stack(
                                   children: [
                                     CachedNetworkImage(
-                                      imageUrl: '$baseUrl/storage/${widget.diet.image}',
+                                      imageUrl: '$baseUrl/storage/${dietState.diet.image}',
                                       height: 300,
                                       width: MediaQuery.sizeOf(context).width,
                                       fit: BoxFit.fill,
@@ -367,7 +379,7 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
                                           const SizedBox(width: 12),
                                           GestureDetector(
                                             onTap: () {
-                                              dietsCubit.likeDiet(widget.diet.id, widget.index);
+                                              dietsCubit.likeDiet(dietState.diet.id, widget.index);
                                             },
                                             child: InfoBouble(
                                               backgroundColor: appTheme.whiteA700,
@@ -413,17 +425,17 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
                                 ),
                                 const SizedBox(height: 12),
                                 InfoRow(
-                                  diet: widget.diet,
+                                  diet: dietState.diet,
                                   type: ProductType.diet,
                                 ),
                                 ExpandableText(
-                                  text: widget.diet.details,
+                                  text: dietState.diet.details,
                                 ),
                                 const SizedBox(height: 20),
                                 Padding(
                                   padding: const EdgeInsets.symmetric(horizontal: 16),
                                   child: AuthorCard(
-                                    author: widget.diet.author,
+                                    author: dietState.diet.author,
                                     title: s.diet_author,
                                   ),
                                 ),
@@ -437,7 +449,7 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
                               padding: const EdgeInsets.symmetric(vertical: 16.0),
                               child: Center(
                                 child: Text(
-                                  '${s.diet_plan}(${widget.diet.duration.toString()} ${getDayForm(widget.diet.duration, s)})',
+                                  '${s.diet_plan}(${dietState.diet.duration.toString()} ${getDayForm(dietState.diet.duration, s)})',
                                   style: TextStyles.headingXLSemibold.copyWith(
                                     color: appTheme.black,
                                   ),
@@ -450,9 +462,15 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
                             physics: const NeverScrollableScrollPhysics(),
                             shrinkWrap: true,
                             itemBuilder: (context, index) {
-                              return _dayOfPlan(widget.diet.dailySchedule[index + 1] ?? {}, index, s);
+                              return _dayOfPlan(
+                                dietState.diet.dailySchedule[index + 1] ?? {},
+                                index,
+                                s,
+                                dietState.selectedIndexes,
+                                dietState.diet,
+                              );
                             },
-                            itemCount: widget.diet.dailySchedule.length,
+                            itemCount: dietState.diet.dailySchedule.length,
                           ),
                           MainBackgroundBouble(
                             padding: const EdgeInsets.symmetric(vertical: 16),
@@ -472,7 +490,7 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
                                 if (state is CommentsStateLoading) const Loader(),
                                 if (state is CommentsStateLoaded)
                                   CommentsWidget(
-                                    id: widget.diet.id.toString(),
+                                    id: dietState.diet.id.toString(),
                                     commentSourceType: CommentSourceType.diet,
                                     comment: state.comment,
                                     replyId: replyId,
@@ -489,53 +507,49 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
                   return Scaffold(
                     appBar: AppBar(
                       centerTitle: true,
+                      leading: BackButton(
+                      onPressed: () {
+                        if (context.canPop()) {
+                          GoRouter.of(context).pop();
+                          return;
+                        }
+                        GoRouter.of(context).go('/feed-screen');
+                      },
+                    ),
                       title: Text(
-                        widget.diet.name,
+                        '',
                         maxLines: 2,
                         textAlign: TextAlign.center,
                         overflow: TextOverflow.ellipsis,
                         softWrap: true,
                         style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
                       ),
-                      actions: [
-                        CustomPopup(
-                          isAuthor: widget.diet.author.authorIsMe,
-                          path: 'diet/${widget.diet.slug}',
-                          complainedContentType: ComplainedContent.diet,
-                          id: widget.diet.id,
-                          diet: widget.diet,
-                          userSlug: widget.diet.author.authorSlug,
-                        ),
-                        const SizedBox(width: 16),
-                      ],
                     ),
                     body: DataErrorWidget(
-                      onReload: () => context.read<AboutDietCubit>().getDiet(widget.diet.id, index: widget.index),
+                      onReload: () => context.read<AboutDietCubit>().getDiet(widget.slug, index: widget.index),
                     ),
                   );
                 }
                 return Scaffold(
                   appBar: AppBar(
                     centerTitle: true,
+                    leading: BackButton(
+                      onPressed: () {
+                        if (context.canPop()) {
+                          GoRouter.of(context).pop();
+                          return;
+                        }
+                        GoRouter.of(context).go('/feed-screen');
+                      },
+                    ),
                     title: Text(
-                      widget.diet.name,
+                      '',
                       maxLines: 2,
                       textAlign: TextAlign.center,
                       overflow: TextOverflow.ellipsis,
                       softWrap: true,
                       style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
                     ),
-                    actions: [
-                      CustomPopup(
-                        isAuthor: widget.diet.author.authorIsMe,
-                        path: 'diet/${widget.diet.slug}',
-                        complainedContentType: ComplainedContent.diet,
-                        id: widget.diet.id,
-                        diet: widget.diet,
-                        userSlug: widget.diet.author.authorSlug,
-                      ),
-                      const SizedBox(width: 16),
-                    ],
                   ),
                   body: const Loader(),
                 );
@@ -547,7 +561,7 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
     );
   }
 
-  _dayOfPlan(Map<int, Map<int, DailySchedule>> day, int dayNumber, S s) {
+  Padding _dayOfPlan(Map<int, Map<int, DailySchedule>> day, int dayNumber, S s, List<int> selectedIndexes, Diet diet) {
     choiceChipWidget(int index) {
       return ChoiceChip(
         selectedColor: appTheme.blueA400,
@@ -560,14 +574,12 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
         padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
         label: Text((index + 1).toString()),
         labelStyle: TextStyles.textXSSemibold.copyWith(
-          color: index == widget.selectedIndexes[dayNumber] ? Colors.white : appTheme.gray600,
+          color: index == selectedIndexes[dayNumber] ? Colors.white : appTheme.gray600,
         ),
-        selected: widget.selectedIndexes[dayNumber] == index,
+        selected: selectedIndexes[dayNumber] == index,
         backgroundColor: appTheme.gray100,
         onSelected: (bool selected) {
-          setState(() {
-            widget.selectedIndexes[dayNumber] = index;
-          });
+          dietsCubit.setSelectedIndex(dayNumber: dayNumber, index: index);          
         },
       );
     }
@@ -615,18 +627,18 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
                   ListView.builder(
                     shrinkWrap: true,
                     physics: const NeverScrollableScrollPhysics(),
-                    itemBuilder: (context, index) => _daily(day[widget.selectedIndexes[dayNumber] + 1]?[index + 1], s),
-                    itemCount: day[widget.selectedIndexes[dayNumber] + 1]?.length ?? 0,
+                    itemBuilder: (context, index) => _daily(day[selectedIndexes[dayNumber] + 1]?[index + 1], s),
+                    itemCount: day[selectedIndexes[dayNumber] + 1]?.length ?? 0,
                   ),
                   const SizedBox(height: 8),
                 ],
               ),
             ),
             CpfcContainer(
-              calories: widget.diet.dailyNutrition[dayNumber].energy,
-              proteins: widget.diet.dailyNutrition[dayNumber].proteins,
-              fats: widget.diet.dailyNutrition[dayNumber].fats,
-              carbohydrates: widget.diet.dailyNutrition[dayNumber].carbohydrates,
+              calories: diet.dailyNutrition[dayNumber].energy,
+              proteins: diet.dailyNutrition[dayNumber].proteins,
+              fats: diet.dailyNutrition[dayNumber].fats,
+              carbohydrates: diet.dailyNutrition[dayNumber].carbohydrates,
             ),
           ],
         ),
@@ -634,7 +646,7 @@ class _AboutDietScreenState extends State<AboutDietScreen> {
     );
   }
 
-  _daily(DailySchedule? daily, S s) {
+  SingleChildRenderObjectWidget _daily(DailySchedule? daily, S s) {
     if (daily == null) return const SizedBox();
     return Padding(
       padding: const EdgeInsets.only(bottom: 12),
diff --git a/lib/features/diets/presentation/widgets/expandable_text.dart b/lib/features/diets/presentation/widgets/expandable_text.dart
index 18de6ae5..5832ec86 100644
--- a/lib/features/diets/presentation/widgets/expandable_text.dart
+++ b/lib/features/diets/presentation/widgets/expandable_text.dart
@@ -10,7 +10,11 @@ class ExpandableText extends StatefulWidget {
   final String text;
   final int maxLines;
 
-  const ExpandableText({super.key, required this.text, this.maxLines = 3});
+  const ExpandableText({
+    super.key,
+    required this.text,
+    this.maxLines = 5, // по умолчанию 5 строк
+  });
 
   @override
   State<ExpandableText> createState() => _ExpandableTextState();
@@ -18,6 +22,29 @@ class ExpandableText extends StatefulWidget {
 
 class _ExpandableTextState extends State<ExpandableText> {
   bool isExpanded = false;
+  bool showExpandButton = false;
+
+  final GlobalKey _textKey = GlobalKey();
+
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    WidgetsBinding.instance.addPostFrameCallback((_) => _checkTextOverflow());
+  }
+
+  void _checkTextOverflow() {
+    final textRenderObject = _textKey.currentContext?.findRenderObject();
+    if (textRenderObject is RenderBox) {
+      final maxLinesHeight = widget.maxLines * TextStyles.textMMediumAuto.fontSize! * 1.2;
+      final actualHeight = textRenderObject.size.height;
+
+      if (actualHeight > maxLinesHeight && !showExpandButton) {
+        setState(() {
+          showExpandButton = true;
+        });
+      }
+    }
+  }
 
   void toggleExpansion() {
     setState(() {
@@ -33,52 +60,63 @@ class _ExpandableTextState extends State<ExpandableText> {
       children: [
         Padding(
           padding: const EdgeInsets.symmetric(horizontal: 16),
-          child: Stack(
-            children: [
-              Text(
-                widget.text,
-                style: TextStyles.textMMediumAuto.copyWith(color: appTheme.black),
-                // style: {
-                //   "*": Style(
-                //     margin: Margins.all(0),
-                //     color: Colors.black87,
-                //     maxLines: isExpanded ? null : widget.maxLines,
-                //     textOverflow: TextOverflow.clip,
-                //   ),
-                // },
-              ),
-              if (!isExpanded)
-                Positioned.fill(
-                  child: Align(
-                    alignment: Alignment.bottomCenter,
-                    child: Container(
-                      height: 35,
-                      decoration: BoxDecoration(
-                        gradient: LinearGradient(
-                          begin: Alignment.topCenter,
-                          end: Alignment.bottomCenter,
-                          colors: [Colors.white.withValues(alpha: 0.0), Colors.white.withValues(alpha: 0.6), Colors.white],
+          child: AnimatedSize(
+            duration: const Duration(milliseconds: 200),
+            curve: Curves.easeInOut,
+            child: Stack(
+              children: [
+                Text(
+                  widget.text,
+                  key: _textKey,
+                  style: TextStyles.textMMediumAuto.copyWith(color: appTheme.black),
+                  maxLines: isExpanded ? null : widget.maxLines,
+                  overflow: TextOverflow.clip,
+                ),
+                if (!isExpanded && showExpandButton)
+                  Positioned.fill(
+                    child: Align(
+                      alignment: Alignment.bottomCenter,
+                      child: Container(
+                        height: 35,
+                        decoration: BoxDecoration(
+                          gradient: LinearGradient(
+                            begin: Alignment.topCenter,
+                            end: Alignment.bottomCenter,
+                            colors: [
+                              Colors.white.withAlpha(0),
+                              Colors.white.withAlpha((255 * 0.6).toInt()),
+                              Colors.white,
+                            ],
+                          ),
                         ),
                       ),
                     ),
                   ),
-                ),
-            ],
-          ),
-        ),
-        Align(
-          alignment: Alignment.bottomCenter,
-          child: GestureDetector(
-            onTap: toggleExpansion,
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                Text(isExpanded ? s.hide : s.expand, style: TextStyles.textMMedium.copyWith(color: appTheme.blueA400)),
-                Transform.rotate(angle: isExpanded ? math.pi : 0, child: SvgPicture.asset('assets/icons/arrow_down.svg', width: 12, height: 12)),
               ],
             ),
           ),
         ),
+        if (showExpandButton)
+          Align(
+            alignment: Alignment.bottomCenter,
+            child: GestureDetector(
+              onTap: toggleExpansion,
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Text(
+                    isExpanded ? s.hide : s.expand,
+                    style: TextStyles.textMMedium.copyWith(color: appTheme.blueA400),
+                  ),
+                  const SizedBox(width: 4),
+                  Transform.rotate(
+                    angle: isExpanded ? math.pi : 0,
+                    child: SvgPicture.asset('assets/icons/arrow_down.svg', width: 12, height: 12),
+                  ),
+                ],
+              ),
+            ),
+          ),
       ],
     );
   }
diff --git a/lib/features/diets/repositories/diet_repository.dart b/lib/features/diets/repositories/diet_repository.dart
index a3bbbbb3..91116b3a 100644
--- a/lib/features/diets/repositories/diet_repository.dart
+++ b/lib/features/diets/repositories/diet_repository.dart
@@ -33,6 +33,15 @@ class DietRepository {
     }
   }
 
+  Future<Diet> getDietBySlug(String slug) async {
+    try {
+      final diet = await dietsService.getDietBySlug(slug: slug);
+      return diet;
+    } catch (e) {
+      rethrow;
+    }
+  }
+
   Future<Diet> addToFavorite(int id) async {
     try {
       return await dietsService.addToFavorite(id: id);
diff --git a/lib/features/diets/services/diet_service.dart b/lib/features/diets/services/diet_service.dart
index 59c2c977..b25b8054 100644
--- a/lib/features/diets/services/diet_service.dart
+++ b/lib/features/diets/services/diet_service.dart
@@ -29,6 +29,11 @@ abstract class DietService {
     @Path() required int id,
   });
 
+  @GET('/api/diets/show_by_slug/{slug}')
+  Future<Diet> getDietBySlug({
+    @Path() required String slug,
+  });
+
   @POST('/api/diets/{id}/start')
   Future<void> startDiet({
     @Path() required int id,
diff --git a/lib/features/feed/models/plan_pagination_model.dart b/lib/features/feed/models/plan_pagination_model.dart
index 21b53ed6..728ff0b7 100644
--- a/lib/features/feed/models/plan_pagination_model.dart
+++ b/lib/features/feed/models/plan_pagination_model.dart
@@ -46,7 +46,7 @@ abstract class PlanModel with _$PlanModel {
   factory PlanModel.fromJson(Map<String, dynamic> json) => _$PlanModelFromJson(json);
 }
 
-PacketOptions? parseOption(json) {
+PacketOptions? parseOption(dynamic json) {
   if (json is Map<String, dynamic>) {
     return PacketOptions.fromJson(json);
   }
@@ -74,7 +74,7 @@ abstract class PacketOptions with _$PacketOptions {
   factory PacketOptions.empty() => PacketOptions(items: [], price: double.parse('1200'), short: '', description: '');
 }
 
-List<String> _parseItems(json) {
+List<String> _parseItems(dynamic json) {
   if (json is Map<String, dynamic>) {
     return json.values.map((e) => e as String).toList();
   }
diff --git a/lib/features/feed/models/recipes_model.dart b/lib/features/feed/models/recipes_model.dart
index dcb4d2ea..27aec217 100644
--- a/lib/features/feed/models/recipes_model.dart
+++ b/lib/features/feed/models/recipes_model.dart
@@ -53,7 +53,7 @@ abstract class Ingredient with _$Ingredient {
 
   factory Ingredient.fromJson(Map<String, Object?> json) => _$IngredientFromJson(json);
 }
-int _parseProductId(json) {
+int _parseProductId(dynamic json) {
   if (json is String) {
     return int.parse(json);
   }
diff --git a/lib/features/feed/presentation/bloc/consultants_cubit/consultants_cubit.dart b/lib/features/feed/presentation/bloc/consultants_cubit/consultants_cubit.dart
index 660c7560..2c3473bd 100644
--- a/lib/features/feed/presentation/bloc/consultants_cubit/consultants_cubit.dart
+++ b/lib/features/feed/presentation/bloc/consultants_cubit/consultants_cubit.dart
@@ -11,7 +11,7 @@ class ConsultantsCubit extends Cubit<ConsultantsState> {
     required this.feedRepository,
   }) : super(const ConsultantsState());
 
-  getConsultants() async {
+  Future<void> getConsultants() async {
     emit(const ConsultantsState.loading());
     try {
       emit(
diff --git a/lib/features/feed/presentation/bloc/diets_cubit/diets_cubit.dart b/lib/features/feed/presentation/bloc/diets_cubit/diets_cubit.dart
index 3f1ea0b0..e2f9b95b 100644
--- a/lib/features/feed/presentation/bloc/diets_cubit/diets_cubit.dart
+++ b/lib/features/feed/presentation/bloc/diets_cubit/diets_cubit.dart
@@ -86,7 +86,7 @@ class DietsCubit extends Cubit<DietsState> {
     );
   }
 
-  loadDiets({
+  Future<void> loadDiets({
     String? query,
   }) async {
     try {
diff --git a/lib/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart b/lib/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart
index 17c435cb..d124a9f9 100644
--- a/lib/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart
+++ b/lib/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart
@@ -16,7 +16,8 @@ class FeedCubit extends Cubit<FeedState> {
     required this.feedRepository,
   }) : super(const FeedState.loading());
 
-  updateFeedBlogPostList(FeedBlogPostModel feedBlogPostModel, bool wasLikedByMe) {
+  void updateFeedBlogPostList(FeedBlogPostModel? feedBlogPostModel, bool wasLikedByMe) {
+    if (feedBlogPostModel == null) return;
     List<FeedBlogPostModel> feedBlogPostList = [...(state as FeedStateLoaded).feedBlogPostList];
     final int index = feedBlogPostList.indexOf(feedBlogPostModel);
     feedBlogPostList[index] = feedBlogPostModel.copyWith(
@@ -31,7 +32,7 @@ class FeedCubit extends Cubit<FeedState> {
     );
   }
 
-  loadFeedBlogPostList({
+  Future<void> loadFeedBlogPostList({
     String? query,
   }) async {
     try {
@@ -79,7 +80,7 @@ class FeedCubit extends Cubit<FeedState> {
     }
   }
 
-  likePost(int id) async {
+  Future<void> likePost(int id) async {
     try {
       await feedRepository.likeBlogPost(id: id);
     } catch (e, st) {
@@ -87,10 +88,10 @@ class FeedCubit extends Cubit<FeedState> {
     }
   }
 
-  unlikedPost(int id) async => await feedRepository.unlikedBlogPost(id: id);
+  Future<void> unlikedPost(int id) async => await feedRepository.unlikedBlogPost(id: id);
 
-  viewPost(int id) async => await feedRepository.viewPost(id);
-  viewRecipe(String slug) async => await feedRepository.viewRecipe(slug);
-  viewDiet(int id) async => await feedRepository.viewDiet(id);
-  viewPlan(String slug) async => await feedRepository.viewPlan(slug);
+  Future<void> viewPost(int id) async => await feedRepository.viewPost(id);
+  Future<void> viewRecipe(String slug) async => await feedRepository.viewRecipe(slug);
+  Future<void> viewDiet(int id) async => await feedRepository.viewDiet(id);
+  Future<void> viewPlan(String slug) async => await feedRepository.viewPlan(slug);
 }
diff --git a/lib/features/feed/presentation/bloc/plans_cubit/plans_cubit.dart b/lib/features/feed/presentation/bloc/plans_cubit/plans_cubit.dart
index 356c832b..99432c22 100644
--- a/lib/features/feed/presentation/bloc/plans_cubit/plans_cubit.dart
+++ b/lib/features/feed/presentation/bloc/plans_cubit/plans_cubit.dart
@@ -132,7 +132,7 @@ class PlansCubit extends Cubit<PlansState> {
     );
   }
 
-  loadPlans({
+  Future<void> loadPlans({
     String? query,
   }) async {
     try {
diff --git a/lib/features/feed/presentation/bloc/recipes_cubit/recipes_cubit.dart b/lib/features/feed/presentation/bloc/recipes_cubit/recipes_cubit.dart
index 866d4abb..001a7ec2 100644
--- a/lib/features/feed/presentation/bloc/recipes_cubit/recipes_cubit.dart
+++ b/lib/features/feed/presentation/bloc/recipes_cubit/recipes_cubit.dart
@@ -40,7 +40,7 @@ class RecipesCubit extends Cubit<RecipesState> {
     });
   }
 
-  loadRecipesList({
+  Future<void> loadRecipesList({
     String? query,
   }) async {
     try {
@@ -99,7 +99,7 @@ class RecipesCubit extends Cubit<RecipesState> {
     }
   }
 
-  updateTags(RecipeTag tag) {
+  void updateTags(RecipeTag tag) {
     _selectedTags.contains(tag.id) ? _selectedTags.remove(tag.id) : _selectedTags.add(tag.id);
     emit(
       state.copyWith(
diff --git a/lib/features/feed/presentation/pages/feed_screen.dart b/lib/features/feed/presentation/pages/feed_screen.dart
index a18cb9a7..ce29b884 100644
--- a/lib/features/feed/presentation/pages/feed_screen.dart
+++ b/lib/features/feed/presentation/pages/feed_screen.dart
@@ -1,4 +1,5 @@
 import 'package:easy_debounce/easy_debounce.dart';
+import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/core/widgets/add_item_button.dart';
 import 'package:eatvio_app/core/widgets/custom_search_bar.dart';
 import 'package:eatvio_app/features/create_diet/presentation/create_diet_screen.dart';
@@ -32,24 +33,12 @@ class FeedScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     return MultiBlocProvider(
       providers: [
-        BlocProvider<RecipesCubit>(
-          create: (context) => sl<RecipesCubit>()..loadRecipesList(),
-        ),
-        BlocProvider<FeedProfileCubit>(
-          create: (context) => sl<FeedProfileCubit>()..getProfile(),
-        ),
-        BlocProvider<FeedCubit>(
-          create: (context) => sl<FeedCubit>()..loadFeedBlogPostList(),
-        ),
-        BlocProvider<DietsCubit>(
-          create: (context) => sl<DietsCubit>()..loadDiets(),
-        ),
-        BlocProvider<PlansCubit>(
-          create: (context) => sl<PlansCubit>()..loadPlans(),
-        ),
-        BlocProvider<ConsultantsCubit>(
-          create: (context) => sl<ConsultantsCubit>()..getConsultants(),
-        ),
+        BlocProvider<RecipesCubit>(create: (context) => sl<RecipesCubit>()..loadRecipesList()),
+        BlocProvider<FeedProfileCubit>(create: (context) => sl<FeedProfileCubit>()..getProfile()),
+        BlocProvider<FeedCubit>(create: (context) => sl<FeedCubit>()..loadFeedBlogPostList()),
+        BlocProvider<DietsCubit>(create: (context) => sl<DietsCubit>()..loadDiets()),
+        if (!hidePlans) BlocProvider<PlansCubit>(create: (context) => sl<PlansCubit>()..loadPlans()),
+        BlocProvider<ConsultantsCubit>(create: (context) => sl<ConsultantsCubit>()..getConsultants()),
       ],
       child: const FeedScreenContent(),
     );
@@ -69,7 +58,8 @@ class _FeedScreenContentState extends State<FeedScreenContent> {
   final dietsController = TextEditingController();
   final plansController = TextEditingController();
   final consultantsController = TextEditingController();
-  final List<String> chipsLabelList = ['Все', 'Рецепты', 'Диеты', 'Планы питания', 'Консультанты'];
+
+  late final List<String> chipsLabelList;
   int _selectedChipIndex = 0;
   final blogPostsScrollController = ScrollController();
   final recipesScrollController = ScrollController();
@@ -78,14 +68,15 @@ class _FeedScreenContentState extends State<FeedScreenContent> {
   final consultantsScrollController = ScrollController();
 
   @override
-  void initState() {       
+  void initState() {
+    // Initialize chipsLabelList based on hidePlans setting
+    chipsLabelList = hidePlans ? ['Все', 'Рецепты', 'Диеты', 'Консультанты'] : ['Все', 'Рецепты', 'Диеты', 'Планы питания', 'Консультанты'];
+
     consultantsScrollController.addListener(_onScrollConsultants);
     super.initState();
-  }  
+  }
 
-
-
-  _onScrollConsultants() {
+  void _onScrollConsultants() {
     if (consultantsScrollController.offset >= consultantsScrollController.position.maxScrollExtent && !consultantsScrollController.position.outOfRange) {}
   }
 
@@ -108,45 +99,36 @@ class _FeedScreenContentState extends State<FeedScreenContent> {
               heroTag: 'recipesTagsFilter',
               backgroundColor: appTheme.blueA400,
               shape: const CircleBorder(),
-              child: const Icon(
-                Icons.filter_list_rounded,
-                color: Colors.white,
-              ),
+              child: const Icon(Icons.filter_list_rounded, color: Colors.white),
               onPressed: () async {
                 final recipesCubit = context.read<RecipesCubit>();
                 await showModalBottomSheet(
                   useRootNavigator: true,
                   context: context,
-                  builder: (context) => TagsModalWidget(
-                    recipesCubit: recipesCubit,
-                  ),
+                  builder: (context) => TagsModalWidget(recipesCubit: recipesCubit),
                 );
                 recipesCubit.loadRecipesList();
               },
             )
           : null,
-      appBar: AppBar(
-        backgroundColor: Colors.white,
-        toolbarHeight: 0,
-      ),
+      appBar: AppBar(backgroundColor: Colors.white, toolbarHeight: 0),
       backgroundColor: Colors.grey.shade200,
       body: NestedScrollView(
         controller: switch (_selectedChipIndex) {
           0 => blogPostsScrollController,
           1 => recipesScrollController,
           2 => dietsScrollController,
-          3 => plansScrollController,
-          4 => consultantsScrollController,
-          _ => blogPostsScrollController
+          3 when !hidePlans => plansScrollController,
+          3 when hidePlans => consultantsScrollController,
+          4 when !hidePlans => consultantsScrollController,
+          _ => blogPostsScrollController,
         },
         headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
           return [
             BlocBuilder<FeedProfileCubit, ProfileState>(
               builder: (context, state) {
                 return SliverAppBar(
-                  shape: const RoundedRectangleBorder(
-                    borderRadius: BorderRadius.vertical(bottom: Radius.circular(12)),
-                  ),
+                  shape: const RoundedRectangleBorder(borderRadius: BorderRadius.vertical(bottom: Radius.circular(12))),
                   backgroundColor: Colors.white,
                   foregroundColor: Colors.white,
                   automaticallyImplyLeading: false,
@@ -172,78 +154,71 @@ class _FeedScreenContentState extends State<FeedScreenContent> {
                         searchController: switch (_selectedChipIndex) {
                           1 => recipesController,
                           2 => dietsController,
-                          3 => plansController,
-                          4 => consultantsController,
+                          3 when !hidePlans => plansController,
+                          3 when hidePlans => consultantsController,
+                          4 when !hidePlans => consultantsController,
                           _ => postsController,
                         },
                         onChanged: (query) {
                           if (query.length > 2) {
-                            EasyDebounce.debounce(
-                              'searchFeed',
-                              const Duration(milliseconds: 500),
-                              () {
-                                switch (_selectedChipIndex) {
-                                  case 0:
-                                    context.read<FeedCubit>().loadFeedBlogPostList(query: query);
-                                    break;
-                                  case 1:
-                                    context.read<RecipesCubit>().loadRecipesList(query: query);
-                                    break;
-                                  case 2:
-                                    context.read<DietsCubit>().loadDiets(query: query);
-                                    break;
-                                  case 3:
-                                    context.read<PlansCubit>().loadPlans(query: query);
-                                    break;
-                                  case 4:
-                                    context.read<ConsultantsCubit>().getConsultants();
-                                    break;
-                                }
-                              },
-                            );
+                            EasyDebounce.debounce('searchFeed', const Duration(milliseconds: 500), () {
+                              switch (_selectedChipIndex) {
+                                case 0:
+                                  context.read<FeedCubit>().loadFeedBlogPostList(query: query);
+                                  break;
+                                case 1:
+                                  context.read<RecipesCubit>().loadRecipesList(query: query);
+                                  break;
+                                case 2:
+                                  context.read<DietsCubit>().loadDiets(query: query);
+                                  break;
+                                case 3 when !hidePlans:
+                                  context.read<PlansCubit>().loadPlans(query: query);
+                                  break;
+                                case 3 when hidePlans:
+                                case 4 when !hidePlans:
+                                  context.read<ConsultantsCubit>().getConsultants();
+                                  break;
+                              }
+                            });
                           } else {
-                            EasyDebounce.debounce(
-                              'searchFeed',
-                              const Duration(milliseconds: 500),
-                              () {
-                                switch (_selectedChipIndex) {
-                                  case 0:
-                                    context.read<FeedCubit>().loadFeedBlogPostList();
-                                    break;
-                                  case 1:
-                                    context.read<RecipesCubit>().loadRecipesList();
-                                    break;
-                                  case 2:
-                                    context.read<DietsCubit>().loadDiets();
-                                    break;
-                                  case 3:
-                                    context.read<PlansCubit>().loadPlans();
-                                    break;
-                                  case 4:
-                                    context.read<ConsultantsCubit>().getConsultants();
-                                    break;
-                                }
-                              },
-                            );
+                            EasyDebounce.debounce('searchFeed', const Duration(milliseconds: 500), () {
+                              switch (_selectedChipIndex) {
+                                case 0:
+                                  context.read<FeedCubit>().loadFeedBlogPostList();
+                                  break;
+                                case 1:
+                                  context.read<RecipesCubit>().loadRecipesList();
+                                  break;
+                                case 2:
+                                  context.read<DietsCubit>().loadDiets();
+                                  break;
+                                case 3 when !hidePlans:
+                                  context.read<PlansCubit>().loadPlans();
+                                  break;
+                                case 3 when hidePlans:
+                                case 4 when !hidePlans:
+                                  context.read<ConsultantsCubit>().getConsultants();
+                                  break;
+                              }
+                            });
                           }
                         },
                       ),
                       const SizedBox(width: 12),
                       switch (_selectedChipIndex) {
-                        1 => AddItemButton(
-                            onTap: () => GoRouter.of(context).pushNamed(RecipeCreateScreen.name),
-                          ),
+                        1 => AddItemButton(onTap: () => GoRouter.of(context).pushNamed(RecipeCreateScreen.name)),
                         2 => AddItemButton(
-                            onTap: state.profile?.roles.contains('consultant') ?? false
-                                ? () async {
-                                    await GoRouter.of(context).pushNamed(CreateDietScreen.name);
-                                  }
-                                : null,
-                          ),
-                        3 => AddItemButton(
-                            onTap: state.profile?.roles.contains('consultant') ?? false ? () => GoRouter.of(context).pushNamed(CreatePlanScreen.name) : null,
-                          ),
-                        _ => const AddItemButton()
+                          onTap: state.profile?.roles.contains('consultant') ?? false
+                              ? () async {
+                                  await GoRouter.of(context).pushNamed(CreateDietScreen.name);
+                                }
+                              : null,
+                        ),
+                        3 when !hidePlans => AddItemButton(
+                          onTap: state.profile?.roles.contains('consultant') ?? false ? () => GoRouter.of(context).pushNamed(CreatePlanScreen.name) : null,
+                        ),
+                        _ => const AddItemButton(),
                       },
                     ],
                   ),
@@ -256,8 +231,9 @@ class _FeedScreenContentState extends State<FeedScreenContent> {
           0 => const BlogPosts(),
           1 => const Recipes(),
           2 => const Diets(),
-          3 => const Plans(),
-          4 => const Consultants(),
+          3 when !hidePlans => const Plans(),
+          3 when hidePlans => const Consultants(),
+          4 when !hidePlans => const Consultants(),
           _ => Center(child: Text(chipsLabelList[_selectedChipIndex])),
         },
       ),
diff --git a/lib/features/feed/presentation/widgets/blog_post_widget.dart b/lib/features/feed/presentation/widgets/blog_post_widget.dart
index c6eac244..6479d0d9 100644
--- a/lib/features/feed/presentation/widgets/blog_post_widget.dart
+++ b/lib/features/feed/presentation/widgets/blog_post_widget.dart
@@ -46,7 +46,7 @@ class _BlogPostWidgetState extends State<BlogPostWidget> {
             borderRadius: BorderRadius.circular(12),
             onTap: () => GoRouter.of(context).pushNamed(
               'blogPostScreen',
-              extra: state.feedBlogPostList[widget.index],
+              extra: state.feedBlogPostList[widget.index].id,
             ),
             child: Material(
               borderRadius: BorderRadius.circular(12),
@@ -156,9 +156,9 @@ class _BlogPostWidgetState extends State<BlogPostWidget> {
                     Padding(
                       padding: const EdgeInsets.symmetric(horizontal: 4),
                       child: Html(
-                        data: state.feedBlogPostList[widget.index].description.length > 200
+                        data: (state.feedBlogPostList[widget.index].description.length > 200
                             ? state.feedBlogPostList[widget.index].description.substring(0, 200)
-                            : state.feedBlogPostList[widget.index].description,
+                            : state.feedBlogPostList[widget.index].description).replaceAll('\n', '<br>'),
                         style: {
                           "*": Style(
                             fontSize: FontSize(16),
@@ -239,7 +239,7 @@ class _BlogPostWidgetState extends State<BlogPostWidget> {
                           text: state.feedBlogPostList[widget.index].totalComments.toString(),
                           onTap: () => GoRouter.of(context).pushNamed(
                             'blogPostScreen',
-                            extra: state.feedBlogPostList[widget.index],
+                            extra: state.feedBlogPostList[widget.index].id,
                           ),
                         ),
                         const SizedBox(width: 8),
diff --git a/lib/features/feed/presentation/widgets/chip_group.dart b/lib/features/feed/presentation/widgets/chip_group.dart
index a8d88da1..183a5a76 100644
--- a/lib/features/feed/presentation/widgets/chip_group.dart
+++ b/lib/features/feed/presentation/widgets/chip_group.dart
@@ -2,12 +2,7 @@ import 'package:eatvio_app/features/feed/presentation/widgets/choice_chip_widget
 import 'package:flutter/widgets.dart';
 
 class ChipGroup extends StatelessWidget {
-  const ChipGroup({
-    super.key,
-    required this.selectedChipIndex,
-    required this.chipsLabelList,
-    required this.setSelectedChipIndex,
-  });
+  const ChipGroup({super.key, required this.selectedChipIndex, required this.chipsLabelList, required this.setSelectedChipIndex});
   final int selectedChipIndex;
   final List<String> chipsLabelList;
   final void Function(int) setSelectedChipIndex;
@@ -22,7 +17,7 @@ class ChipGroup extends StatelessWidget {
         child: Row(
           children: [
             ...List.generate(
-              5,
+              chipsLabelList.length,
               (index) => Padding(
                 padding: const EdgeInsets.only(right: 8.0),
                 child: ChoiceChipWidget(
diff --git a/lib/features/feed/presentation/widgets/comments_widget.dart b/lib/features/feed/presentation/widgets/comments_widget.dart
index 1e1a90d5..e36bdf52 100644
--- a/lib/features/feed/presentation/widgets/comments_widget.dart
+++ b/lib/features/feed/presentation/widgets/comments_widget.dart
@@ -1,14 +1,19 @@
+import 'package:eatvio_app/core/comments/presentation/comments_actions_bottom_sheet.dart';
 import 'package:eatvio_app/core/const.dart';
+import 'package:eatvio_app/core/enums/complained_content.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/utils/date_time_utils.dart';
+import 'package:eatvio_app/core/utils/toasts.dart';
 import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_cubit.dart';
 import 'package:eatvio_app/features/bottom_navigation_bar/presentation/bloc/profile_avatar_cubit/profile_avatar_state.dart';
+import 'package:eatvio_app/features/complaining/presentation/complaining_bottom_sheet.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/presentation/bloc/comments_cubit/comments_cubit.dart';
+import 'package:eatvio_app/core/comments/comments_cubit/comments_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
 
@@ -53,98 +58,133 @@ class _CommentsWidgetState extends State<CommentsWidget> {
     );
   }
 
-  _comment(S s, Comment comment, [double radius = 18, bool isChild = false]) {
-    return Container(
-      width: MediaQuery.of(context).size.width,
-      decoration: BoxDecoration(
-        color: widget.replyId == comment.id ? appTheme.blueA400.withValues(alpha: 0.1) : Colors.white,
-        borderRadius: BorderRadius.circular(16),
-      ),
-      child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 16),
-        child: Row(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            GestureDetector(
-              onTap: () {
-                GoRouter.of(context).pushNamed(
-                  'profileScreen',
-                  extra: Author(
-                    authorSlug: comment.authorSlug,
-                    authorName: comment.authorName,
-                    authorProfileIcon: comment.authorProfileIcon.contains('https') ? comment.authorProfileIcon : baseUrl + comment.authorProfileIcon,
-                    authorIsMe: (sl<ProfileAvatarCubit>().state as ProfileAvatarStateLoaded).profile.slug == comment.authorSlug ? true : false,
-                  ),
-                );
-              },
-              child: CircleAvatar(
-                foregroundImage: NetworkImage(
-                  comment.authorProfileIcon.contains('https') ? comment.authorProfileIcon : baseUrl + comment.authorProfileIcon,
-                ),
-                backgroundImage: const AssetImage('assets/images/no_avatar.png'),
-                radius: radius,
+  Widget _comment(S s, Comment comment, [double radius = 18, bool isChild = false]) {
+    final isMe = (sl<ProfileAvatarCubit>().state as ProfileAvatarStateLoaded).profile.slug == comment.authorSlug;
+    return GestureDetector(
+      onTap: () {
+        showCommentsActionsBottomSheet(
+          context,
+          commentText: comment.body,
+          reply: !isChild
+              ? () {
+                  context.read<CommentsCubit>().setReplyId(comment.id);
+                }
+              : null,
+          copy: () {
+            Clipboard.setData(ClipboardData(text: comment.body));
+            showInfoToast(s.link_was_copied);
+          },
+          edit: (String text) {
+            context.read<CommentsCubit>().updateComment(id: comment.id, body: text);
+          },
+          delete: () {
+            context.read<CommentsCubit>().deleteComment(id: comment.id);
+          },
+          complain: () {
+            showModalBottomSheet(
+              context: context,
+              isScrollControlled: true,
+              builder: (context) => ComplainingBottomSheet(
+                complainedContentType: ComplainedContent.comment,
+                id: comment.id,
               ),
-            ),
-            const SizedBox(width: 8),
-            Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              mainAxisAlignment: MainAxisAlignment.start,
-              children: [
-                Text(
-                  comment.authorName,
-                  style: TextStyle(
-                    height: 1,
-                    color: appTheme.gray,
-                    fontSize: 14,
-                    fontWeight: FontWeight.w500,
+            );
+          },
+          isMyComment: isMe,
+        );
+      },
+      child: Container(
+        width: MediaQuery.of(context).size.width,
+        decoration: BoxDecoration(
+          color: widget.replyId == comment.id ? appTheme.blueA400.withValues(alpha: 0.1) : Colors.white,
+          borderRadius: BorderRadius.circular(16),
+        ),
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 16),
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              GestureDetector(
+                onTap: () {
+                  GoRouter.of(context).pushNamed(
+                    'profileScreen',
+                    extra: Author(
+                      authorSlug: comment.authorSlug,
+                      authorName: comment.authorName,
+                      authorProfileIcon: comment.authorProfileIcon.contains('https') ? comment.authorProfileIcon : baseUrl + comment.authorProfileIcon,
+                      authorIsMe: isMe,
+                    ),
+                  );
+                },
+                child: CircleAvatar(
+                  foregroundImage: NetworkImage(
+                    comment.authorProfileIcon.contains('https') ? comment.authorProfileIcon : baseUrl + comment.authorProfileIcon,
                   ),
+                  backgroundImage: const AssetImage('assets/images/no_avatar.png'),
+                  radius: radius,
                 ),
-                const SizedBox(height: 4),
-                SizedBox(
-                  width: isChild ? MediaQuery.of(context).size.width * 0.72 : MediaQuery.of(context).size.width * 0.8,
-                  child: Text(
-                    comment.body,
+              ),
+              const SizedBox(width: 8),
+              Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                mainAxisAlignment: MainAxisAlignment.start,
+                children: [
+                  Text(
+                    comment.authorName,
                     style: TextStyle(
                       height: 1,
-                      color: appTheme.black,
-                      fontSize: 16,
+                      color: appTheme.gray,
+                      fontSize: 14,
                       fontWeight: FontWeight.w500,
                     ),
                   ),
-                ),
-                const SizedBox(height: 4),
-                Row(
-                  children: [
-                    Text(
-                      comment.createdAt.format('dd MMMM', 'ru'),
+                  const SizedBox(height: 4),
+                  SizedBox(
+                    width: isChild ? MediaQuery.of(context).size.width * 0.72 : MediaQuery.of(context).size.width * 0.8,
+                    child: Text(
+                      comment.body,
                       style: TextStyle(
                         height: 1,
-                        color: appTheme.gray,
-                        fontSize: 14,
+                        color: appTheme.black,
+                        fontSize: 16,
                         fontWeight: FontWeight.w500,
                       ),
                     ),
-                    const SizedBox(width: 16),
-                    if (!isChild)
-                      GestureDetector(
-                        onTap: () {
-                          context.read<CommentsCubit>().setReplyId(comment.id);
-                        },
-                        child: Text(
-                          s.answer,
-                          style: TextStyle(
-                            height: 1,
-                            color: appTheme.gray,
-                            fontSize: 14,
-                            fontWeight: FontWeight.w600,
-                          ),
+                  ),
+                  const SizedBox(height: 4),
+                  Row(
+                    children: [
+                      Text(
+                        comment.createdAt.format('dd MMMM', 'ru'),
+                        style: TextStyle(
+                          height: 1,
+                          color: appTheme.gray,
+                          fontSize: 14,
+                          fontWeight: FontWeight.w500,
                         ),
                       ),
-                  ],
-                ),
-              ],
-            ),
-          ],
+                      const SizedBox(width: 16),
+                      if (!isChild)
+                        GestureDetector(
+                          onTap: () {
+                            context.read<CommentsCubit>().setReplyId(comment.id);
+                          },
+                          child: Text(
+                            s.answer,
+                            style: TextStyle(
+                              height: 1,
+                              color: appTheme.gray,
+                              fontSize: 14,
+                              fontWeight: FontWeight.w600,
+                            ),
+                          ),
+                        ),
+                    ],
+                  ),
+                ],
+              ),
+            ],
+          ),
         ),
       ),
     );
diff --git a/lib/features/feed/presentation/widgets/consultant_widget.dart b/lib/features/feed/presentation/widgets/consultant_widget.dart
index 6e8562f3..3b4a4b80 100644
--- a/lib/features/feed/presentation/widgets/consultant_widget.dart
+++ b/lib/features/feed/presentation/widgets/consultant_widget.dart
@@ -121,7 +121,7 @@ class ConsultantWidget extends StatelessWidget {
     );
   }
 
-  _badges(List<BadgeModel> badges, BuildContext context) {
+  SingleChildScrollView _badges(List<BadgeModel> badges, BuildContext context) {
     return SingleChildScrollView(
       scrollDirection: Axis.horizontal,
       child: Row(
diff --git a/lib/features/feed/presentation/widgets/diets_widget.dart b/lib/features/feed/presentation/widgets/diets_widget.dart
index d008e3c4..34964d1a 100644
--- a/lib/features/feed/presentation/widgets/diets_widget.dart
+++ b/lib/features/feed/presentation/widgets/diets_widget.dart
@@ -39,7 +39,7 @@ class _DietsWidgetState extends State<DietsWidget> {
       onTap: () => GoRouter.of(context).pushNamed(
         'aboutDietScreen',
         extra: {
-          'diet': widget.diet,
+          'slug': widget.diet.slug,
           'index': widget.index,
           'navigateToComments': false,
         },
@@ -131,7 +131,7 @@ class _DietsWidgetState extends State<DietsWidget> {
                   Padding(
                     padding: const EdgeInsets.symmetric(horizontal: 16),
                     child: Html(
-                      data: widget.diet.details.length > 200 ? '${widget.diet.details.substring(0, 200)}...' : widget.diet.details,
+                      data: widget.diet.details.length > 200 ? '${widget.diet.details.substring(0, 200).replaceAll('\n', '<br>')}...' : widget.diet.details.replaceAll('\n', '<br>'),
                       style: {
                         "*": Style(
                           margin: Margins.zero,
@@ -178,7 +178,7 @@ class _DietsWidgetState extends State<DietsWidget> {
                     icon: Icons.chat_bubble_outline,
                     text: widget.diet.totalComments.toString(),
                     onTap: () =>
-                        GoRouter.of(context).pushNamed('aboutDietScreen', extra: {'diet': widget.diet, 'index': widget.index, 'navigateToComments': true}),
+                        GoRouter.of(context).pushNamed('aboutDietScreen', extra: {'slug': widget.diet.slug, 'index': widget.index, 'navigateToComments': true}),
                   ),
                   const SizedBox(
                     width: 12,
diff --git a/lib/features/feed/presentation/widgets/plan_widget.dart b/lib/features/feed/presentation/widgets/plan_widget.dart
index 35bd9d63..588d61d0 100644
--- a/lib/features/feed/presentation/widgets/plan_widget.dart
+++ b/lib/features/feed/presentation/widgets/plan_widget.dart
@@ -44,7 +44,7 @@ class _PlanWidgetState extends State<PlanWidget> {
       onTap: () => GoRouter.of(context).pushNamed(
         'aboutPlanScreen',
         extra: {
-          'plan': widget.plan,
+          'slug': widget.plan.slug,
           'index': widget.index,
           'navigateToComments': false,
         },
@@ -137,7 +137,7 @@ class _PlanWidgetState extends State<PlanWidget> {
                   Padding(
                     padding: const EdgeInsets.symmetric(horizontal: 16),
                     child: Html(
-                      data: widget.plan.details.length > 200 ? '${widget.plan.details.substring(0, 200)}...' : widget.plan.details,
+                      data: widget.plan.details.length > 200 ? '${widget.plan.details.substring(0, 200).replaceAll('\n', '<br>')}...' : widget.plan.details.replaceAll('\n', '<br>'),
                       style: {
                         "*": Style(
                           margin: Margins.zero,
@@ -249,8 +249,10 @@ class _PlanWidgetState extends State<PlanWidget> {
                   FeedIconButton(
                     icon: Icons.chat_bubble_outline,
                     text: widget.plan.totalComments.toString(),
-                    onTap: () =>
-                        GoRouter.of(context).pushNamed('aboutPlanScreen', extra: {'plan': widget.plan, 'index': widget.index, 'navigateToComments': true}),
+                    onTap: () {                      
+                      return GoRouter.of(context)
+                          .pushNamed('aboutPlanScreen', extra: {'slug': widget.plan.slug, 'index': widget.index, 'navigateToComments': true});
+                    },
                   ),
                   const SizedBox(
                     width: 12,
diff --git a/lib/features/feed/presentation/widgets/recipes_widget.dart b/lib/features/feed/presentation/widgets/recipes_widget.dart
index 797c0599..7720c6cd 100644
--- a/lib/features/feed/presentation/widgets/recipes_widget.dart
+++ b/lib/features/feed/presentation/widgets/recipes_widget.dart
@@ -58,7 +58,7 @@ class _RecipesWidgetState extends State<RecipesWidget> {
           onTap: () => GoRouter.of(context).pushNamed(
             'aboutRecipesScreen',
             extra: {
-              'recipe': widget.recipe,
+              'recipe': widget.recipe.slug,
               'index': widget.index,
               'navigateToComments': false,
             },
@@ -164,7 +164,9 @@ class _RecipesWidgetState extends State<RecipesWidget> {
                   Padding(
                     padding: const EdgeInsets.symmetric(horizontal: 16),
                     child: Html(
-                      data: widget.recipe.description.length > 200 ? widget.recipe.description.substring(0, 200) : widget.recipe.description,
+                      data: widget.recipe.description.length > 200
+                          ? widget.recipe.description.substring(0, 200).replaceAll('\n', '<br>')
+                          : widget.recipe.description.replaceAll('\n', '<br>'),
                       style: {
                         "*": Style(
                           color: appTheme.black,
@@ -211,7 +213,7 @@ class _RecipesWidgetState extends State<RecipesWidget> {
                         onTap: () => GoRouter.of(context).pushNamed(
                           'aboutRecipesScreen',
                           extra: {
-                            'recipe': widget.recipe,
+                            'recipe': widget.recipe.slug,
                             'index': widget.index,
                             'navigateToComments': true,
                           },
@@ -262,7 +264,7 @@ class _RecipesWidgetState extends State<RecipesWidget> {
     );
   }
 
-  _iconButton(String iconPath, [String? text]) {
+  Container _iconButton(String iconPath, [String? text]) {
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
       decoration: BoxDecoration(
diff --git a/lib/features/feed/presentation/widgets/tags_modal_widget.dart b/lib/features/feed/presentation/widgets/tags_modal_widget.dart
index b81b17a0..640f5ac0 100644
--- a/lib/features/feed/presentation/widgets/tags_modal_widget.dart
+++ b/lib/features/feed/presentation/widgets/tags_modal_widget.dart
@@ -42,7 +42,7 @@ class _TagsModalWidgetState extends State<TagsModalWidget> {
     );
   }
 
-  _tagChip({
+  ChoiceChip _tagChip({
     required RecipeTag tag,
     required bool isSelected,
   }) {
diff --git a/lib/features/feed/repositories/feed_repository.dart b/lib/features/feed/repositories/feed_repository.dart
index c974407c..e6e95969 100644
--- a/lib/features/feed/repositories/feed_repository.dart
+++ b/lib/features/feed/repositories/feed_repository.dart
@@ -1,5 +1,6 @@
 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';
@@ -27,6 +28,18 @@ class FeedRepository {
     }
   }
 
+  Future<FeedBlogPostModel> getBlogPost({
+    required int id
+  }) async {
+    try {
+      return await feedService.getBlogPost(
+        postId: id
+      );
+    } catch (e) {
+      rethrow;
+    }
+  }
+
   Future<List<Recipe>> getRecipes({
     String? query,
     List<int>? tags,
diff --git a/lib/features/feed/services/feed_service.dart b/lib/features/feed/services/feed_service.dart
index fded5033..cb5de3d0 100644
--- a/lib/features/feed/services/feed_service.dart
+++ b/lib/features/feed/services/feed_service.dart
@@ -1,6 +1,7 @@
 import 'package:dio/dio.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';
@@ -19,6 +20,11 @@ abstract class FeedService {
     @Query('query_search') String? query,
   });
 
+  @GET('/api/blogPosts/show/{postId}')
+  Future<FeedBlogPostModel> getBlogPost({
+    @Path('postId') required int postId,
+  });
+
   @GET('/api/recipes/index')
   Future<RecipesPagination> getRecipes({
     @Query('page') required int page,
diff --git a/lib/features/finances_and_consultations_archive/cubit/archive/consultations_archive_cubit.dart b/lib/features/finances_and_consultations_archive/cubit/archive/consultations_archive_cubit.dart
index dd6c713e..a2f6daf0 100644
--- a/lib/features/finances_and_consultations_archive/cubit/archive/consultations_archive_cubit.dart
+++ b/lib/features/finances_and_consultations_archive/cubit/archive/consultations_archive_cubit.dart
@@ -31,9 +31,7 @@ class ConsultationsArchiveCubit extends Cubit<ConsultationsArchiveState> {
         dateComparison: state.periodFilterStatus == PeriodFilterStatus.all ? null : FiltersComparisonEnum.greaterThanOrEqual,
         stateComparison: state.consultationFilterStatus == ConsultationFilterStatus.all
             ? null
-            : state.consultationFilterStatus == ConsultationFilterStatus.inProgress
-                ? FiltersComparisonEnum.notInArray
-                : FiltersComparisonEnum.equal,
+            : FiltersComparisonEnum.equal,
       );
       emit(state.copyWith(consultations: consultations, isLoading: false));
     } catch (e) {
@@ -67,20 +65,17 @@ class ConsultationsArchiveCubit extends Cubit<ConsultationsArchiveState> {
 enum ConsultationFilterStatus {
   all,
   canceled,
-  finished,
-  inProgress;
+  finished;
 
   String get name => switch (this) {
         ConsultationFilterStatus.all => 'Все консультации',
         ConsultationFilterStatus.canceled => 'Отменён',
         ConsultationFilterStatus.finished => 'Завершён',
-        ConsultationFilterStatus.inProgress => 'В процессе',
       };
 
   String? get value => switch (this) {
         ConsultationFilterStatus.all => null,
         ConsultationFilterStatus.canceled => 'canceled_by_the_initiator',
         ConsultationFilterStatus.finished => 'charge_was_collected',
-        ConsultationFilterStatus.inProgress => 'active',
       };
 }
diff --git a/lib/features/finances_and_consultations_archive/cubit/archive/consultations_archive_state.dart b/lib/features/finances_and_consultations_archive/cubit/archive/consultations_archive_state.dart
index c54f8073..dfe84a55 100644
--- a/lib/features/finances_and_consultations_archive/cubit/archive/consultations_archive_state.dart
+++ b/lib/features/finances_and_consultations_archive/cubit/archive/consultations_archive_state.dart
@@ -14,7 +14,7 @@ abstract class ConsultationsArchiveState with _$ConsultationsArchiveState {
     @Default([]) List<ConsultationModel> consultations,
     @Default(false) isLoading,
     @Default(null) String? error,
-    @Default(null) PeriodFilterStatus? periodFilterStatus,
+    @Default(PeriodFilterStatus.all) PeriodFilterStatus? periodFilterStatus,
     @Default(null) ConsultationFilterStatus? consultationFilterStatus,
     required StatisticModel statisticModel,
   }) = _ConsultationsArchiveState;
diff --git a/lib/features/finances_and_consultations_archive/cubit/consultant_finances/consultant_finances_state.dart b/lib/features/finances_and_consultations_archive/cubit/consultant_finances/consultant_finances_state.dart
index fff61e45..4e1123e1 100644
--- a/lib/features/finances_and_consultations_archive/cubit/consultant_finances/consultant_finances_state.dart
+++ b/lib/features/finances_and_consultations_archive/cubit/consultant_finances/consultant_finances_state.dart
@@ -10,7 +10,7 @@ abstract class ConsultantFinancesState with _$ConsultantFinancesState {
     @Default([]) List<ConsultantFinanceModel> financesModels,
     @Default(false) isLoading,
     @Default(null) String? error,
-    @Default(null) PeriodFilterStatus? periodFilterStatus,
+    @Default(PeriodFilterStatus.all) PeriodFilterStatus? periodFilterStatus,
   }) = _ConsultantFinancesState;
   
 }
diff --git a/lib/features/finances_and_consultations_archive/cubit/user_purchases/user_purchases_state.dart b/lib/features/finances_and_consultations_archive/cubit/user_purchases/user_purchases_state.dart
index 7ae22c03..65a53842 100644
--- a/lib/features/finances_and_consultations_archive/cubit/user_purchases/user_purchases_state.dart
+++ b/lib/features/finances_and_consultations_archive/cubit/user_purchases/user_purchases_state.dart
@@ -10,6 +10,6 @@ abstract class UserPurchasesState with _$UserPurchasesState {
     @Default([]) List<UserPurchasesModel> purchasesModels,
     @Default(false) isLoading,
     @Default(null) String? error,
-    @Default(null) PeriodFilterStatus? periodFilterStatus,
+    @Default(PeriodFilterStatus.all) PeriodFilterStatus? periodFilterStatus,
   }) = _UserPurchasesState;
 }
diff --git a/lib/features/finances_and_consultations_archive/models/consultant_finance_model.dart b/lib/features/finances_and_consultations_archive/models/consultant_finance_model.dart
index 9e8cc751..ede4ccb2 100644
--- a/lib/features/finances_and_consultations_archive/models/consultant_finance_model.dart
+++ b/lib/features/finances_and_consultations_archive/models/consultant_finance_model.dart
@@ -19,7 +19,7 @@ abstract class ConsultantFinanceModel with _$ConsultantFinanceModel {
   factory ConsultantFinanceModel.fromJson(Map<String, dynamic> json) => _$ConsultantFinanceModelFromJson(json);
 }
 
-String _parsePayment(json) {
+String _parsePayment(dynamic json) {
   return ((json as int) / 100).toStringAsFixed(2);
 }
 
diff --git a/lib/features/finances_and_consultations_archive/presentation/consultant_finances_screen.dart b/lib/features/finances_and_consultations_archive/presentation/consultant_finances_screen.dart
index 7e731474..085e9fa6 100644
--- a/lib/features/finances_and_consultations_archive/presentation/consultant_finances_screen.dart
+++ b/lib/features/finances_and_consultations_archive/presentation/consultant_finances_screen.dart
@@ -96,7 +96,7 @@ class _ConsultantFinancesScreenState extends State<ConsultantFinancesScreen> {
                                       if (value == null) return;
                                       context.read<ConsultantFinancesCubit>().setFinancesPeriod(value);
                                     },
-                                    value: state.periodFilterStatus ?? PeriodFilterStatus.values.first,
+                                    value: state.periodFilterStatus ?? PeriodFilterStatus.all,
                                   ),
                                   const SizedBox(height: 12),
                                   if (state.financesModels.isNotEmpty)
@@ -129,7 +129,7 @@ class _ConsultantFinancesScreenState extends State<ConsultantFinancesScreen> {
                                                       );
                                                     }),
                                                     Text(
-                                                      state.financesModels[index].startDate.format('yyyy.MM.dd'),
+                                                      state.financesModels[index].startDate.format('dd.MM.yy'),
                                                       style: const TextStyle(
                                                         color: Color(0xFF6D6F71),
                                                         height: 1,
diff --git a/lib/features/finances_and_consultations_archive/presentation/consultations_archive_screen.dart b/lib/features/finances_and_consultations_archive/presentation/consultations_archive_screen.dart
index ec2d4900..c356e9fb 100644
--- a/lib/features/finances_and_consultations_archive/presentation/consultations_archive_screen.dart
+++ b/lib/features/finances_and_consultations_archive/presentation/consultations_archive_screen.dart
@@ -195,7 +195,7 @@ class _ConsultationsArchiveScreenState extends State<ConsultationsArchiveScreen>
                                                       ),
                                                     ),
                                                     Text(
-                                                      state.consultations[index].startDate.format('yyyy.MM.dd'),
+                                                      state.consultations[index].startDate.format('dd.MM.yy'),
                                                       style: const TextStyle(
                                                         color: Color(0xFF6D6F71),
                                                         height: 1,
diff --git a/lib/features/internet_connection_checker/internet_connection_checker_screen.dart b/lib/features/internet_connection_checker/internet_connection_checker_screen.dart
index 3aa1bc34..576eb891 100644
--- a/lib/features/internet_connection_checker/internet_connection_checker_screen.dart
+++ b/lib/features/internet_connection_checker/internet_connection_checker_screen.dart
@@ -10,6 +10,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:http/http.dart' as http;
+import 'package:eatvio_app/core/env_config.dart';
 
 class InternetConnectionCheckerScreen extends StatefulWidget {
   const InternetConnectionCheckerScreen({super.key, required this.child});
@@ -66,12 +67,7 @@ class _InternetConnectionCheckerScreenState extends State<InternetConnectionChec
       return false;
     }
 
-    final uris = [
-      Uri.parse('https://google.com'),
-      Uri.parse('https://yandex.ru'),
-      Uri.parse('https://dev2.eatvio.com'),
-      Uri.parse('https://eatvio.ru'),
-    ];
+    final uris = [Uri.parse(EnvConfig.googleCheckUrl), Uri.parse(EnvConfig.yandexCheckUrl), Uri.parse(EnvConfig.devBaseUrl), Uri.parse(EnvConfig.baseUrl)];
     for (final uri in uris) {
       try {
         final response = await http.get(uri).timeout(const Duration(seconds: 3));
@@ -98,13 +94,9 @@ class _InternetConnectionCheckerScreenState extends State<InternetConnectionChec
         if (!_hasInternet)
           NoInternetScreen(
             onTryAgain: () async {
-              EasyDebounce.debounce(
-                'internet connection check',
-                const Duration(seconds: 2),
-                () async {
-                  await _checkConnection();
-                },
-              );
+              EasyDebounce.debounce('internet connection check', const Duration(seconds: 2), () async {
+                await _checkConnection();
+              });
             },
           ),
       ],
@@ -129,9 +121,7 @@ class NoInternetScreen extends StatelessWidget {
             child: Text(
               'Отсутствует подключение \nк интернету',
               textAlign: TextAlign.center,
-              style: TextStyles.headingXLSemibold.copyWith(
-                color: appTheme.black,
-              ),
+              style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
             ),
           ),
           const SizedBox(height: 16),
@@ -140,9 +130,7 @@ class NoInternetScreen extends StatelessWidget {
             child: Text(
               'Проверьте соединение с сетью\nи попробуйте ещё раз',
               textAlign: TextAlign.center,
-              style: TextStyles.textMMedium.copyWith(
-                color: appTheme.gray,
-              ),
+              style: TextStyles.textMMedium.copyWith(color: appTheme.gray),
             ),
           ),
           const SizedBox(height: 20),
@@ -153,10 +141,7 @@ class NoInternetScreen extends StatelessWidget {
               height: 52,
               text: 'Попробовать ещё раз',
               buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
-              buttonStyle: ButtonStyle(
-                backgroundColor: WidgetStatePropertyAll(appTheme.blueA400),
-                side: const WidgetStatePropertyAll(BorderSide.none),
-              ),
+              buttonStyle: ButtonStyle(backgroundColor: WidgetStatePropertyAll(appTheme.blueA400), side: const WidgetStatePropertyAll(BorderSide.none)),
             ),
           ),
           const Spacer(),
diff --git a/lib/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart b/lib/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart
index bd2a156d..3954e248 100644
--- a/lib/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart
+++ b/lib/features/menu/presentation/blocked_user_cubit/blocked_users_cubit.dart
@@ -9,7 +9,7 @@ class BlockedUsersCubit extends Cubit<BlockedUsersState> {
     required this.blockedUsersRepository,
   }) : super(const BlockedUsersState());
 
-  getBlockedUsers() async {
+  Future<void> getBlockedUsers() async {
     try {
       emit(BlockedUsersState.loaded(profilesList: await blockedUsersRepository.getBlockedUsers()));
     } catch (e, st) {
@@ -17,12 +17,12 @@ class BlockedUsersCubit extends Cubit<BlockedUsersState> {
     }
   }
 
-  blockUser(String slug) async {
+  Future<void> blockUser(String slug) async {
     await blockedUsersRepository.blockUserBySlug(slug);
     await getBlockedUsers();
   }
 
-  unblockUser(String slug) async {
+  Future<void> unblockUser(String slug) async {
     await blockedUsersRepository.unblockUserBySlug(slug);
     await getBlockedUsers();
   }
diff --git a/lib/features/menu/presentation/pages/menu_screen.dart b/lib/features/menu/presentation/pages/menu_screen.dart
index 0449113b..7e4c358a 100644
--- a/lib/features/menu/presentation/pages/menu_screen.dart
+++ b/lib/features/menu/presentation/pages/menu_screen.dart
@@ -1,5 +1,6 @@
 import 'package:dio/dio.dart';
 import 'package:eatvio_app/core/const.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.dart';
 import 'package:eatvio_app/core/token_storage.dart';
 import 'package:eatvio_app/core/utils/image_constant.dart';
 import 'package:eatvio_app/core/locator_service.dart';
@@ -14,6 +15,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:go_router/go_router.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 
 class MenuScreen extends StatelessWidget {
   final ProfileModel profileModel;
@@ -37,18 +39,20 @@ class MenuScreen extends StatelessWidget {
             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: 'assets/icons/finance.svg',
-              title: 'Мои финансы',
-              onTap: () {
-                if (profileModel.roles.contains('consultant')) {
-                  GoRouter.of(context).push(ConsultantFinancesScreen.path);
-                  return;
-                }
-                GoRouter.of(context).push(UserPurchasesScreen.path);
-              },
-            ),
+            if (!hidePlans) ...[
+              _divider(context),
+              _tile(
+                leading: 'assets/icons/finance.svg',
+                title: 'Мои финансы',
+                onTap: () {
+                  if (profileModel.roles.contains('consultant')) {
+                    GoRouter.of(context).push(ConsultantFinancesScreen.path);
+                    return;
+                  }
+                  GoRouter.of(context).push(UserPurchasesScreen.path);
+                },
+              ),
+            ],
             _divider(context),
             _tile(leading: ImageConstant.icnGlossary, title: 'Глоссарий', onTap: () => GoRouter.of(context).push('/glossary-screen')),
             _divider(context),
@@ -65,13 +69,15 @@ class MenuScreen extends StatelessWidget {
             // ),
             _divider(context),
             _tile(leading: ImageConstant.icnExit, title: 'Выход', onTap: _onTapLogout(context)),
+            const SizedBox(height: 10),
+            const AppInfo(),
           ],
         ),
       ),
     );
   }
 
-  _tile({required String title, required String leading, required Function() onTap}) {
+  ListTile _tile({required String title, required String leading, required Function() onTap}) {
     return ListTile(
       onTap: onTap,
       leading: SvgPicture.asset(leading, height: 24, width: 24, colorFilter: ColorFilter.mode(appTheme.blueA400, BlendMode.srcIn)),
@@ -80,7 +86,7 @@ class MenuScreen extends StatelessWidget {
     );
   }
 
-  _divider(BuildContext context) {
+  Container _divider(BuildContext context) {
     return Container(
       height: 0.4,
       width: MediaQuery.of(context).size.width - 32,
@@ -88,7 +94,7 @@ class MenuScreen extends StatelessWidget {
     );
   }
 
-  _onTapLogout(BuildContext context) {
+  Future<Null> Function() _onTapLogout(BuildContext context) {
     return () async {
       showDialog(
         context: context,
@@ -122,3 +128,42 @@ class MenuScreen extends StatelessWidget {
     };
   }
 }
+
+class AppInfo extends StatefulWidget {
+  const AppInfo({super.key});
+
+  @override
+  State<AppInfo> createState() => _AppInfoState();
+}
+
+class _AppInfoState extends State<AppInfo> {
+  String version = '';
+  String buildNumber = '';
+  @override
+  void didChangeDependencies() {
+    PackageInfo.fromPlatform().then((PackageInfo packageInfo) {
+      setState(() {
+        version = packageInfo.version;
+        buildNumber = packageInfo.buildNumber;
+      });
+    });
+    super.didChangeDependencies();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Align(
+      alignment: Alignment.centerLeft,
+      child: Padding(
+        padding: const EdgeInsetsGeometry.only(left: 16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text('Версия приложения: $version ($buildNumber)', style: TextStyles.textXSSemibold.copyWith(color: appTheme.gray)),
+            if (buildDate != '') Text('Дата сборки: $buildDate', style: TextStyles.textXSSemibold.copyWith(color: appTheme.gray)),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/features/menu/presentation/repositories/blocked_users_repository.dart b/lib/features/menu/presentation/repositories/blocked_users_repository.dart
index 96c072c4..27dfafad 100644
--- a/lib/features/menu/presentation/repositories/blocked_users_repository.dart
+++ b/lib/features/menu/presentation/repositories/blocked_users_repository.dart
@@ -19,7 +19,7 @@ class BlockedUsersRepository {
     }
   }
 
-  blockUserBySlug(String slug) async {
+  Future<void> blockUserBySlug(String slug) async {
     try {
       return await blockedUserService.blockUser(
         data: {
@@ -32,7 +32,7 @@ class BlockedUsersRepository {
     }
   }
 
-  unblockUserBySlug(String slug) async {
+  Future<void> unblockUserBySlug(String slug) async {
     try {
       return await blockedUserService.unblockUser(
         data: {
diff --git a/lib/features/my_diets/presentation/widgets/my_diet_widget.dart b/lib/features/my_diets/presentation/widgets/my_diet_widget.dart
index 587e05ca..965bd088 100644
--- a/lib/features/my_diets/presentation/widgets/my_diet_widget.dart
+++ b/lib/features/my_diets/presentation/widgets/my_diet_widget.dart
@@ -52,7 +52,7 @@ class _MyDietWidgetState extends State<MyDietWidget> {
           Stack(
             children: [
               InkWell(
-                onTap: () => GoRouter.of(context).pushNamed('aboutDietScreen', extra: {'diet': widget.diet, 'navigateToComments': false}),
+                onTap: () => GoRouter.of(context).pushNamed('aboutDietScreen', extra: {'slug': widget.diet.slug, 'navigateToComments': false}),
                 child: ClipRRect(
                   borderRadius: const BorderRadius.vertical(top: Radius.circular(12)),
                   child: CachedNetworkImage(
@@ -89,7 +89,7 @@ class _MyDietWidgetState extends State<MyDietWidget> {
                 Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 16),
                   child: Html(
-                    data: widget.diet.details.length > 200 ? '${widget.diet.details.substring(0, 200)}...' : widget.diet.details,
+                    data: widget.diet.details.length > 200 ? '${widget.diet.details.substring(0, 200).replaceAll('\n', '<br>')}...' : widget.diet.details.replaceAll('\n', '<br>'),
                     style: {
                       "*": Style(
                         margin: Margins.zero,
diff --git a/lib/features/my_finance/models/card_model.dart b/lib/features/my_finance/models/card_model.dart
index 0f9ca40d..0435ea56 100644
--- a/lib/features/my_finance/models/card_model.dart
+++ b/lib/features/my_finance/models/card_model.dart
@@ -14,7 +14,7 @@ abstract class CardModel with _$CardModel {
   factory CardModel.fromJson(Map<String, dynamic> json) => _$CardModelFromJson(json);
 }
 
-bool parseBool(json) {
+bool parseBool(dynamic json) {
   if (json == 1 || json == true || json == '1') {
     return true;
   }
diff --git a/lib/features/my_plans/presentation/widgets/my_plan_widget.dart b/lib/features/my_plans/presentation/widgets/my_plan_widget.dart
index baea0c01..ce91acdc 100644
--- a/lib/features/my_plans/presentation/widgets/my_plan_widget.dart
+++ b/lib/features/my_plans/presentation/widgets/my_plan_widget.dart
@@ -45,7 +45,7 @@ class _MyPlanWidgetState extends State<MyPlanWidget> {
           Stack(
             children: [
               InkWell(
-                onTap: () => GoRouter.of(context).pushNamed('aboutPlanScreen', extra: {'plan': widget.plan, 'navigateToComments': false}),
+                onTap: () => GoRouter.of(context).pushNamed('aboutPlanScreen', extra: {'slug': widget.plan.slug, 'navigateToComments': false}),
                 child: ClipRRect(
                   borderRadius: const BorderRadius.vertical(top: Radius.circular(12)),
                   child: CachedNetworkImage(
@@ -87,7 +87,7 @@ class _MyPlanWidgetState extends State<MyPlanWidget> {
                 Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 16),
                   child: Html(
-                    data: widget.plan.details.length > 200 ? '${widget.plan.details.substring(0, 200)}...' : widget.plan.details,
+                    data: widget.plan.details.length > 200 ? '${widget.plan.details.substring(0, 200).replaceAll('\n', '<br>')}...' : widget.plan.details.replaceAll('\n', '<br>'),
                     style: {
                       "*": Style(
                         margin: Margins.zero,
diff --git a/lib/features/notifications/models/notification_model.dart b/lib/features/notifications/models/notification_model.dart
index 766f6ddb..55c79e51 100644
--- a/lib/features/notifications/models/notification_model.dart
+++ b/lib/features/notifications/models/notification_model.dart
@@ -1,8 +1,7 @@
-import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
-
 sealed class BaseNotificationModel {
   abstract final NotificationType type;
   abstract final bool isRead;
+  abstract final DateTime createdAt;
 }
 
 class PlanSubscriptionStartedToAuthorNotification implements BaseNotificationModel {
@@ -13,6 +12,8 @@ class PlanSubscriptionStartedToAuthorNotification implements BaseNotificationMod
   final String planName;
   final String customerName;
   final String chatId;
+  @override
+  final DateTime createdAt;
 
   PlanSubscriptionStartedToAuthorNotification({
     required this.type,
@@ -20,15 +21,17 @@ class PlanSubscriptionStartedToAuthorNotification implements BaseNotificationMod
     required this.customerName,
     required this.chatId,
     required this.isRead,
+    required this.createdAt,
   });
 
-  factory PlanSubscriptionStartedToAuthorNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead}) {
+  factory PlanSubscriptionStartedToAuthorNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
     return PlanSubscriptionStartedToAuthorNotification(
       type: type,
       planName: json['plan_name'],
       customerName: json['user_name'],
       chatId: json['chat_id'],
       isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
     );
   }
 }
@@ -40,20 +43,24 @@ class PlanSubscriptionCanceledToAuthorNotification implements BaseNotificationMo
   final bool isRead;
   final String planName;
   final String customerName;
+  @override
+  final DateTime createdAt;
 
   PlanSubscriptionCanceledToAuthorNotification({
     required this.type,
     required this.planName,
     required this.customerName,
     required this.isRead,
+    required this.createdAt,
   });
 
-  factory PlanSubscriptionCanceledToAuthorNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead}) {
+  factory PlanSubscriptionCanceledToAuthorNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
     return PlanSubscriptionCanceledToAuthorNotification(
       type: type,
       planName: json['plan_name'],
       customerName: json['user_name'],
       isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
     );
   }
 }
@@ -65,20 +72,18 @@ class ChosenPlanStartedToClientNotification implements BaseNotificationModel {
   final bool isRead;
   final String planName;
   final int planId;
+  @override
+  final DateTime createdAt;
 
-  ChosenPlanStartedToClientNotification({
-    required this.type,
-    required this.planName,
-    required this.planId,
-    required this.isRead,
-  });
+  ChosenPlanStartedToClientNotification({required this.type, required this.planName, required this.planId, required this.isRead, required this.createdAt});
 
-  factory ChosenPlanStartedToClientNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead}) {
+  factory ChosenPlanStartedToClientNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
     return ChosenPlanStartedToClientNotification(
       type: type,
       planName: json['plan_name'],
       planId: json['plan_id'],
       isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
     );
   }
 }
@@ -89,15 +94,18 @@ class ChosenPlanTomorrowReminderToClientNotification implements BaseNotification
   @override
   final bool isRead;
   final String planName;
+  @override
+  final DateTime createdAt;
 
-  ChosenPlanTomorrowReminderToClientNotification({
-    required this.type,
-    required this.planName,
-    required this.isRead,
-  });
+  ChosenPlanTomorrowReminderToClientNotification({required this.type, required this.planName, required this.isRead, required this.createdAt});
 
-  factory ChosenPlanTomorrowReminderToClientNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead}) {
-    return ChosenPlanTomorrowReminderToClientNotification(type: type, planName: json['plan_name'], isRead: isRead ?? false);
+  factory ChosenPlanTomorrowReminderToClientNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ChosenPlanTomorrowReminderToClientNotification(
+      type: type,
+      planName: json['plan_name'],
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
   }
 }
 
@@ -106,10 +114,17 @@ class DiaryReminderNotification implements BaseNotificationModel {
   final NotificationType type;
   @override
   final bool isRead;
-  DiaryReminderNotification({required this.type, required this.isRead});
+  @override
+  final DateTime createdAt;
 
-  factory DiaryReminderNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead}) {
-    return DiaryReminderNotification(type: type, isRead: isRead ?? false);
+  DiaryReminderNotification({required this.type, required this.isRead, required this.createdAt});
+
+  factory DiaryReminderNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return DiaryReminderNotification(
+      type: type,
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
   }
 }
 
@@ -119,18 +134,17 @@ class ConsultantLeftCommentNotification implements BaseNotificationModel {
   @override
   final bool isRead;
   final DateTime date;
+  @override
+  final DateTime createdAt;
 
-  ConsultantLeftCommentNotification({
-    required this.type,
-    required this.date,
-    required this.isRead,
-  });
+  ConsultantLeftCommentNotification({required this.type, required this.date, required this.isRead, required this.createdAt});
 
-  factory ConsultantLeftCommentNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead}) {
+  factory ConsultantLeftCommentNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
     return ConsultantLeftCommentNotification(
       type: type,
-      date: parseDate(json['diary_date']),
+      date: parseDate(json['diary_date'] ?? DateTime.now().toIso8601String()),
       isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
     );
   }
 }
@@ -140,16 +154,16 @@ class PersonalizedDietIsDefinedNotification implements BaseNotificationModel {
   final NotificationType type;
   @override
   final bool isRead;
+  @override
+  final DateTime createdAt;
 
-  PersonalizedDietIsDefinedNotification({
-    required this.type,
-    required this.isRead,
-  });
+  PersonalizedDietIsDefinedNotification({required this.type, required this.isRead, required this.createdAt});
 
-  factory PersonalizedDietIsDefinedNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead}) {
+  factory PersonalizedDietIsDefinedNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
     return PersonalizedDietIsDefinedNotification(
       type: type,
       isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
     );
   }
 }
@@ -160,17 +174,16 @@ class ChosenPlanFinishedToClientNotification implements BaseNotificationModel {
   @override
   final bool isRead;
   final String planName;
-  ChosenPlanFinishedToClientNotification({
-    required this.type,
-    required this.planName,
-    required this.isRead,
-  });
+  @override
+  final DateTime createdAt;
+  ChosenPlanFinishedToClientNotification({required this.type, required this.planName, required this.isRead, required this.createdAt});
 
-  factory ChosenPlanFinishedToClientNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead}) {
+  factory ChosenPlanFinishedToClientNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
     return ChosenPlanFinishedToClientNotification(
       type: type,
       planName: json['plan_name'],
       isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
     );
   }
 }
@@ -181,17 +194,16 @@ class PlanSubscriptionCanceledToCustomerNotification implements BaseNotification
   @override
   final bool isRead;
   final String planName;
-  PlanSubscriptionCanceledToCustomerNotification({
-    required this.type,
-    required this.planName,
-    required this.isRead,
-  });
+  @override
+  final DateTime createdAt;
+  PlanSubscriptionCanceledToCustomerNotification({required this.type, required this.planName, required this.isRead, required this.createdAt});
 
-  factory PlanSubscriptionCanceledToCustomerNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead}) {
+  factory PlanSubscriptionCanceledToCustomerNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
     return PlanSubscriptionCanceledToCustomerNotification(
       type: type,
       planName: json['plan_name'],
       isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
     );
   }
 }
@@ -203,19 +215,23 @@ class ChosenPlanStartedToConsultantNotification implements BaseNotificationModel
   final bool isRead;
   final String planName;
   final String customerName;
+  @override
+  final DateTime createdAt;
   ChosenPlanStartedToConsultantNotification({
     required this.type,
     required this.isRead,
     required this.planName,
     required this.customerName,
+    required this.createdAt,
   });
 
-  factory ChosenPlanStartedToConsultantNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead}) {
+  factory ChosenPlanStartedToConsultantNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
     return ChosenPlanStartedToConsultantNotification(
       type: type,
       isRead: isRead ?? false,
       planName: json['plan_name'],
       customerName: json['client_name'],
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
     );
   }
 }
@@ -227,19 +243,23 @@ class ChosenPlanTomorrowReminderToConsultantNotification implements BaseNotifica
   final bool isRead;
   final String planName;
   final String customerName;
+  @override
+  final DateTime createdAt;
   ChosenPlanTomorrowReminderToConsultantNotification({
     required this.type,
     required this.planName,
     required this.customerName,
     required this.isRead,
+    required this.createdAt,
   });
 
-  factory ChosenPlanTomorrowReminderToConsultantNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead}) {
+  factory ChosenPlanTomorrowReminderToConsultantNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
     return ChosenPlanTomorrowReminderToConsultantNotification(
       type: type,
       planName: json['plan_name'],
       customerName: json['client_name'],
       isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
     );
   }
 }
@@ -251,19 +271,23 @@ class PlanSubscriptionPaidToAuthorNotification implements BaseNotificationModel
   final bool isRead;
   final String planName;
   final String customerName;
+  @override
+  final DateTime createdAt;
   PlanSubscriptionPaidToAuthorNotification({
     required this.type,
     required this.isRead,
     required this.planName,
     required this.customerName,
+    required this.createdAt,
   });
 
-  factory PlanSubscriptionPaidToAuthorNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead}) {
+  factory PlanSubscriptionPaidToAuthorNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
     return PlanSubscriptionPaidToAuthorNotification(
       type: type,
       isRead: isRead ?? false,
       planName: json['plan_name'],
       customerName: json['user_name'],
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
     );
   }
 }
@@ -276,21 +300,525 @@ class ChosenPlanFinishedToConsultantNotification implements BaseNotificationMode
   final String planName;
   final String customerName;
   final int planId;
+  @override
+  final DateTime createdAt;
   ChosenPlanFinishedToConsultantNotification({
     required this.type,
     required this.planName,
     required this.customerName,
     required this.planId,
     required this.isRead,
+    required this.createdAt,
   });
 
-  factory ChosenPlanFinishedToConsultantNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead}) {
+  factory ChosenPlanFinishedToConsultantNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
     return ChosenPlanFinishedToConsultantNotification(
       type: type,
       planName: json['plan_name'],
       customerName: json['client_name'],
       planId: json['plan_id'],
       isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ChosenPlanLastDayFinishedForUser implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  @override
+  final DateTime createdAt;
+
+  ChosenPlanLastDayFinishedForUser({required this.type, required this.isRead, required this.createdAt});
+
+  factory ChosenPlanLastDayFinishedForUser.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ChosenPlanLastDayFinishedForUser(
+      type: type,
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ChosenPlanConsultantLastDayStarted implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  final int planId;
+  final String chatId;
+  final String chatUrl;
+  @override
+  final DateTime createdAt;
+
+  ChosenPlanConsultantLastDayStarted({
+    required this.type,
+    required this.planName,
+    required this.planId,
+    required this.chatId,
+    required this.chatUrl,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory ChosenPlanConsultantLastDayStarted.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ChosenPlanConsultantLastDayStarted(
+      type: type,
+      planName: json['plan_name'],
+      planId: json['plan_id'],
+      chatId: json['chat_id'],
+      chatUrl: json['chat_url'],
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ComplaintToModerationForUser implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String message;
+  final int entityId;
+  final String entityType;
+  @override
+  final DateTime createdAt;
+
+  ComplaintToModerationForUser({
+    required this.type,
+    required this.message,
+    required this.entityId,
+    required this.entityType,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory ComplaintToModerationForUser.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ComplaintToModerationForUser(
+      type: type,
+      message: json['message'],
+      entityId: json['entity_id'],
+      entityType: json['entity_type'],
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class CommentReplied implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String entityName;
+  final int commentedEntityId;
+  final String commentedEntityType;
+  final String author;
+  final int authorId;
+  final int parentCommentId;
+  @override
+  final DateTime createdAt;
+
+  CommentReplied({
+    required this.type,
+    required this.entityName,
+    required this.commentedEntityId,
+    required this.commentedEntityType,
+    required this.author,
+    required this.authorId,
+    required this.parentCommentId,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory CommentReplied.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return CommentReplied(
+      type: type,
+      entityName: json['entity_name'],
+      commentedEntityId: json['commented_entity_id'],
+      commentedEntityType: json['commented_entity_type'],
+      author: json['author'],
+      authorId: json['author_id'],
+      parentCommentId: json['parrent_comment_id'],
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ScoreAdded implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String scoreKey;
+  final int scorableId;
+  final String scorableType;
+  final String scorableName;
+  final String scorableSlug;
+  final int scoreValue;
+  @override
+  final DateTime createdAt;
+
+  ScoreAdded({
+    required this.type,
+    required this.scoreKey,
+    required this.scorableId,
+    required this.scorableType,
+    required this.scorableName,
+    required this.scorableSlug,
+    required this.scoreValue,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory ScoreAdded.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ScoreAdded(
+      type: type,
+      scoreKey: json['score_key'],
+      scorableId: json['scorable_id'],
+      scorableType: json['scorable_type'],
+      scorableName: json['scorable_name'] ?? '',
+      scorableSlug: json['scorable_slug'] ?? '',
+      scoreValue: json['score_value'],
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class EntityCommented implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String entityName;
+  final int entityId;
+  final String entityType;
+  final String entityTranslatedType;
+  final String entityUrl;
+  final String authorName;
+  final int authorId;
+  final String authorSlug;
+  @override
+  final DateTime createdAt;
+
+  EntityCommented({
+    required this.type,
+    required this.entityName,
+    required this.entityId,
+    required this.entityType,
+    required this.entityTranslatedType,
+    required this.entityUrl,
+    required this.authorName,
+    required this.authorId,
+    required this.authorSlug,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory EntityCommented.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return EntityCommented(
+      type: type,
+      entityName: json['entity_name'],
+      entityId: json['entity_id'],
+      entityType: json['entity_type'],
+      entityTranslatedType: json['entity_traslated_type'],
+      entityUrl: json['entity_url'],
+      authorName: json['author_name'],
+      authorId: json['author_id'],
+      authorSlug: json['author_slug'],
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class PlanSubscriptionExpiredNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  final String customerName;
+  @override
+  final DateTime createdAt;
+
+  PlanSubscriptionExpiredNotification({required this.type, required this.planName, required this.customerName, required this.isRead, required this.createdAt});
+
+  factory PlanSubscriptionExpiredNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return PlanSubscriptionExpiredNotification(
+      type: type,
+      planName: json['plan_name'],
+      customerName: json['user_name'],
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class PlanSubscriptionRenewedNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  final String customerName;
+  final String renewalDate;
+  @override
+  final DateTime createdAt;
+
+  PlanSubscriptionRenewedNotification({
+    required this.type,
+    required this.planName,
+    required this.customerName,
+    required this.renewalDate,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory PlanSubscriptionRenewedNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return PlanSubscriptionRenewedNotification(
+      type: type,
+      planName: json['plan_name'],
+      customerName: json['user_name'],
+      renewalDate: json['renewal_date'],
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ConsultantAssignedNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String consultantName;
+  final String planName;
+  final int planId;
+  @override
+  final DateTime createdAt;
+
+  ConsultantAssignedNotification({
+    required this.type,
+    required this.consultantName,
+    required this.planName,
+    required this.planId,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory ConsultantAssignedNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ConsultantAssignedNotification(
+      type: type,
+      consultantName: json['consultant_name'],
+      planName: json['plan_name'],
+      planId: json['plan_id'],
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ConsultantUnassignedNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String consultantName;
+  final String planName;
+  final int planId;
+  @override
+  final DateTime createdAt;
+
+  ConsultantUnassignedNotification({
+    required this.type,
+    required this.consultantName,
+    required this.planName,
+    required this.planId,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory ConsultantUnassignedNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ConsultantUnassignedNotification(
+      type: type,
+      consultantName: json['consultant_name'],
+      planName: json['plan_name'],
+      planId: json['plan_id'],
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class PaymentFailedNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  final String errorMessage;
+  final String paymentMethod;
+  @override
+  final DateTime createdAt;
+
+  PaymentFailedNotification({
+    required this.type,
+    required this.planName,
+    required this.errorMessage,
+    required this.paymentMethod,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory PaymentFailedNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return PaymentFailedNotification(
+      type: type,
+      planName: json['plan_name'],
+      errorMessage: json['error_message'],
+      paymentMethod: json['payment_method'],
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class PaymentSuccessfulNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  final double amount;
+  final String currency;
+  final String transactionId;
+  @override
+  final DateTime createdAt;
+
+  PaymentSuccessfulNotification({
+    required this.type,
+    required this.planName,
+    required this.amount,
+    required this.currency,
+    required this.transactionId,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory PaymentSuccessfulNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return PaymentSuccessfulNotification(
+      type: type,
+      planName: json['plan_name'],
+      amount: (json['amount'] as num).toDouble(),
+      currency: json['currency'],
+      transactionId: json['transaction_id'],
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class GoalAchievedNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String goalName;
+  final String goalType;
+  final double achievedValue;
+  final double targetValue;
+  @override
+  final DateTime createdAt;
+
+  GoalAchievedNotification({
+    required this.type,
+    required this.goalName,
+    required this.goalType,
+    required this.achievedValue,
+    required this.targetValue,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory GoalAchievedNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return GoalAchievedNotification(
+      type: type,
+      goalName: json['goal_name'],
+      goalType: json['goal_type'],
+      achievedValue: (json['achieved_value'] as num).toDouble(),
+      targetValue: (json['target_value'] as num).toDouble(),
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class WorkoutReminderNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String workoutName;
+  final String workoutType;
+  final int duration;
+  @override
+  final DateTime createdAt;
+
+  WorkoutReminderNotification({
+    required this.type,
+    required this.workoutName,
+    required this.workoutType,
+    required this.duration,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory WorkoutReminderNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return WorkoutReminderNotification(
+      type: type,
+      workoutName: json['workout_name'],
+      workoutType: json['workout_type'],
+      duration: json['duration'],
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class MealReminderNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String mealName;
+  final String mealType;
+  final int calories;
+  @override
+  final DateTime createdAt;
+
+  MealReminderNotification({
+    required this.type,
+    required this.mealName,
+    required this.mealType,
+    required this.calories,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory MealReminderNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return MealReminderNotification(
+      type: type,
+      mealName: json['meal_name'],
+      mealType: json['meal_type'],
+      calories: json['calories'],
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
     );
   }
 }
@@ -300,14 +828,943 @@ class UnknownNotification implements BaseNotificationModel {
   final NotificationType type;
   @override
   final bool isRead;
+  @override
+  final DateTime createdAt;
 
-  UnknownNotification({
+  UnknownNotification({required this.type, this.isRead = true, DateTime? createdAt}) : createdAt = createdAt ?? DateTime.fromMillisecondsSinceEpoch(0);
+}
+
+class DietCancelledNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String dietName;
+  @override
+  final DateTime createdAt;
+
+  DietCancelledNotification({required this.type, required this.dietName, required this.isRead, required this.createdAt});
+
+  factory DietCancelledNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return DietCancelledNotification(
+      type: type,
+      dietName: json['diet_name'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class DietStartedNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String dietName;
+  @override
+  final DateTime createdAt;
+
+  DietStartedNotification({required this.type, required this.dietName, required this.isRead, required this.createdAt});
+
+  factory DietStartedNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return DietStartedNotification(
+      type: type,
+      dietName: json['diet_name'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class DietExpiredNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String dietName;
+  @override
+  final DateTime createdAt;
+
+  DietExpiredNotification({required this.type, required this.dietName, required this.isRead, required this.createdAt});
+
+  factory DietExpiredNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return DietExpiredNotification(
+      type: type,
+      dietName: json['diet_name'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class DietWillStartedInNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String dietName;
+  final String startDate;
+  @override
+  final DateTime createdAt;
+
+  DietWillStartedInNotification({required this.type, required this.dietName, required this.startDate, required this.isRead, required this.createdAt});
+
+  factory DietWillStartedInNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return DietWillStartedInNotification(
+      type: type,
+      dietName: json['diet_name'] ?? '',
+      startDate: json['start_date'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class DietCanNotBeStartedNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String dietName;
+  final String reason;
+  @override
+  final DateTime createdAt;
+
+  DietCanNotBeStartedNotification({required this.type, required this.dietName, required this.reason, required this.isRead, required this.createdAt});
+
+  factory DietCanNotBeStartedNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return DietCanNotBeStartedNotification(
+      type: type,
+      dietName: json['diet_name'] ?? '',
+      reason: json['reason'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class PersonalDietCreationNeededNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  final String clientName;
+  @override
+  final DateTime createdAt;
+
+  PersonalDietCreationNeededNotification({required this.type, required this.planName, required this.clientName, required this.isRead, required this.createdAt});
+
+  factory PersonalDietCreationNeededNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return PersonalDietCreationNeededNotification(
+      type: type,
+      planName: json['plan_name'] ?? '',
+      clientName: json['client_name'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ChosenPlanClientLastDayFinishedNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  @override
+  final DateTime createdAt;
+
+  ChosenPlanClientLastDayFinishedNotification({required this.type, required this.planName, required this.isRead, required this.createdAt});
+
+  factory ChosenPlanClientLastDayFinishedNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ChosenPlanClientLastDayFinishedNotification(
+      type: type,
+      planName: json['plan_name'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ChosenPlanClientLastDayStartedNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  @override
+  final DateTime createdAt;
+
+  ChosenPlanClientLastDayStartedNotification({required this.type, required this.planName, required this.isRead, required this.createdAt});
+
+  factory ChosenPlanClientLastDayStartedNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ChosenPlanClientLastDayStartedNotification(
+      type: type,
+      planName: json['plan_name'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class StayOnTrackToAuthorNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  final String clientName;
+  @override
+  final DateTime createdAt;
+
+  StayOnTrackToAuthorNotification({required this.type, required this.planName, required this.clientName, required this.isRead, required this.createdAt});
+
+  factory StayOnTrackToAuthorNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return StayOnTrackToAuthorNotification(
+      type: type,
+      planName: json['plan_name'] ?? '',
+      clientName: json['client_name'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ClientStartPlanSubscriptionToSubscriberNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  @override
+  final DateTime createdAt;
+
+  ClientStartPlanSubscriptionToSubscriberNotification({required this.type, required this.planName, required this.isRead, required this.createdAt});
+
+  factory ClientStartPlanSubscriptionToSubscriberNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ClientStartPlanSubscriptionToSubscriberNotification(
+      type: type,
+      planName: json['plan_name'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ConsultantConfirmPlanSubscriptionToSubscriberNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  final String consultantName;
+  @override
+  final DateTime createdAt;
+
+  ConsultantConfirmPlanSubscriptionToSubscriberNotification({
     required this.type,
-    this.isRead = true,
+    required this.planName,
+    required this.consultantName,
+    required this.isRead,
+    required this.createdAt,
   });
+
+  factory ConsultantConfirmPlanSubscriptionToSubscriberNotification.fromJson(
+    Map<String, dynamic> json,
+    NotificationType type, {
+    bool? isRead,
+    String? createdAt,
+  }) {
+    return ConsultantConfirmPlanSubscriptionToSubscriberNotification(
+      type: type,
+      planName: json['plan_name'] ?? '',
+      consultantName: json['consultant_name'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ClientPaidPlanSubscriptionToAuthorNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  final String clientName;
+  final double amount;
+  @override
+  final DateTime createdAt;
+
+  ClientPaidPlanSubscriptionToAuthorNotification({
+    required this.type,
+    required this.planName,
+    required this.clientName,
+    required this.amount,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory ClientPaidPlanSubscriptionToAuthorNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ClientPaidPlanSubscriptionToAuthorNotification(
+      type: type,
+      planName: json['plan_name'] ?? '',
+      clientName: json['client_name'] ?? '',
+      amount: (json['amount'] as num?)?.toDouble() ?? 0.0,
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ConsultantLeftDiaryCommentNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  final String consultantName;
+  final DateTime diaryDate;
+  @override
+  final DateTime createdAt;
+
+  ConsultantLeftDiaryCommentNotification({
+    required this.type,
+    required this.planName,
+    required this.consultantName,
+    required this.diaryDate,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory ConsultantLeftDiaryCommentNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ConsultantLeftDiaryCommentNotification(
+      type: type,
+      planName: json['plan_name'] ?? '',
+      consultantName: json['consultant_name'] ?? '',
+      diaryDate: parseDate(json['diary_date'] ?? DateTime.now().toIso8601String()),
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ConsultantConfirmPlanSubscriptionToAuthorNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  final String consultantName;
+  @override
+  final DateTime createdAt;
+
+  ConsultantConfirmPlanSubscriptionToAuthorNotification({
+    required this.type,
+    required this.planName,
+    required this.consultantName,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory ConsultantConfirmPlanSubscriptionToAuthorNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ConsultantConfirmPlanSubscriptionToAuthorNotification(
+      type: type,
+      planName: json['plan_name'] ?? '',
+      consultantName: json['consultant_name'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ClientPaidPlanSubscriptionToSubscriberNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  final double amount;
+  @override
+  final DateTime createdAt;
+
+  ClientPaidPlanSubscriptionToSubscriberNotification({
+    required this.type,
+    required this.planName,
+    required this.amount,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory ClientPaidPlanSubscriptionToSubscriberNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ClientPaidPlanSubscriptionToSubscriberNotification(
+      type: type,
+      planName: json['plan_name'] ?? '',
+      amount: (json['amount'] as num?)?.toDouble() ?? 0.0,
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ClientStartPlanSubscriptionToAuthorNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  final String clientName;
+  @override
+  final DateTime createdAt;
+
+  ClientStartPlanSubscriptionToAuthorNotification({
+    required this.type,
+    required this.planName,
+    required this.clientName,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory ClientStartPlanSubscriptionToAuthorNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ClientStartPlanSubscriptionToAuthorNotification(
+      type: type,
+      planName: json['plan_name'] ?? '',
+      clientName: json['client_name'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ClientCancelPlanSubscriptionToAuthorNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  final String clientName;
+  @override
+  final DateTime createdAt;
+
+  ClientCancelPlanSubscriptionToAuthorNotification({
+    required this.type,
+    required this.planName,
+    required this.clientName,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory ClientCancelPlanSubscriptionToAuthorNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ClientCancelPlanSubscriptionToAuthorNotification(
+      type: type,
+      planName: json['plan_name'] ?? '',
+      clientName: json['client_name'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ClientCancelPlanSubscriptionToSubscriberNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  @override
+  final DateTime createdAt;
+
+  ClientCancelPlanSubscriptionToSubscriberNotification({required this.type, required this.planName, required this.isRead, required this.createdAt});
+
+  factory ClientCancelPlanSubscriptionToSubscriberNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ClientCancelPlanSubscriptionToSubscriberNotification(
+      type: type,
+      planName: json['plan_name'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class UserDailyReportCompletedNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  final String clientName;
+  final DateTime reportDate;
+  @override
+  final DateTime createdAt;
+
+  UserDailyReportCompletedNotification({
+    required this.type,
+    required this.planName,
+    required this.clientName,
+    required this.reportDate,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory UserDailyReportCompletedNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return UserDailyReportCompletedNotification(
+      type: type,
+      planName: json['plan_name'] ?? '',
+      clientName: json['client_name'] ?? '',
+      reportDate: parseDate(json['report_date'] ?? DateTime.now().toIso8601String()),
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class StayOnTrackToCustomerNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  final String consultantName;
+  @override
+  final DateTime createdAt;
+
+  StayOnTrackToCustomerNotification({required this.type, required this.planName, required this.consultantName, required this.isRead, required this.createdAt});
+
+  factory StayOnTrackToCustomerNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return StayOnTrackToCustomerNotification(
+      type: type,
+      planName: json['plan_name'] ?? '',
+      consultantName: json['consultant_name'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class PhoneChangedNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String oldPhone;
+  final String newPhone;
+  @override
+  final DateTime createdAt;
+
+  PhoneChangedNotification({required this.type, required this.oldPhone, required this.newPhone, required this.isRead, required this.createdAt});
+
+  factory PhoneChangedNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return PhoneChangedNotification(
+      type: type,
+      oldPhone: json['old_phone'] ?? '',
+      newPhone: json['new_phone'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class SubscriptionNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String subscriptionType;
+  final String planName;
+  @override
+  final DateTime createdAt;
+
+  SubscriptionNotification({required this.type, required this.subscriptionType, required this.planName, required this.isRead, required this.createdAt});
+
+  factory SubscriptionNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return SubscriptionNotification(
+      type: type,
+      subscriptionType: json['subscription_type'] ?? '',
+      planName: json['plan_name'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class BadgeAwardedNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String badgeName;
+  final String badgeDescription;
+  @override
+  final DateTime createdAt;
+
+  BadgeAwardedNotification({required this.type, required this.badgeName, required this.badgeDescription, required this.isRead, required this.createdAt});
+
+  factory BadgeAwardedNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return BadgeAwardedNotification(
+      type: type,
+      badgeName: json['badge_name'] ?? '',
+      badgeDescription: json['badge_description'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class BadgeRevokedNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String badgeName;
+  final String reason;
+  @override
+  final DateTime createdAt;
+
+  BadgeRevokedNotification({required this.type, required this.badgeName, required this.reason, required this.isRead, required this.createdAt});
+
+  factory BadgeRevokedNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return BadgeRevokedNotification(
+      type: type,
+      badgeName: json['badge_name'] ?? '',
+      reason: json['reason'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ConsultantRequestStartedNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String consultantName;
+  @override
+  final DateTime createdAt;
+
+  ConsultantRequestStartedNotification({required this.type, required this.consultantName, required this.isRead, required this.createdAt});
+
+  factory ConsultantRequestStartedNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ConsultantRequestStartedNotification(
+      type: type,
+      consultantName: json['consultant_name'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ClientCloseComplaintSuccessNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String complaintType;
+  final String entityName;
+  @override
+  final DateTime createdAt;
+
+  ClientCloseComplaintSuccessNotification({
+    required this.type,
+    required this.complaintType,
+    required this.entityName,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory ClientCloseComplaintSuccessNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ClientCloseComplaintSuccessNotification(
+      type: type,
+      complaintType: json['complaint_type'] ?? '',
+      entityName: json['entity_name'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ClientRefundSuccessNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  final double amount;
+  final String reason;
+  @override
+  final DateTime createdAt;
+
+  ClientRefundSuccessNotification({
+    required this.type,
+    required this.planName,
+    required this.amount,
+    required this.reason,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory ClientRefundSuccessNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ClientRefundSuccessNotification(
+      type: type,
+      planName: json['plan_name'] ?? '',
+      amount: (json['amount'] as num?)?.toDouble() ?? 0.0,
+      reason: json['reason'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ConsultantRefundSuccessNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  final String clientName;
+  final double amount;
+  @override
+  final DateTime createdAt;
+
+  ConsultantRefundSuccessNotification({
+    required this.type,
+    required this.planName,
+    required this.clientName,
+    required this.amount,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory ConsultantRefundSuccessNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ConsultantRefundSuccessNotification(
+      type: type,
+      planName: json['plan_name'] ?? '',
+      clientName: json['client_name'] ?? '',
+      amount: (json['amount'] as num?)?.toDouble() ?? 0.0,
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ClientRejectSuccessNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  final String reason;
+  @override
+  final DateTime createdAt;
+
+  ClientRejectSuccessNotification({required this.type, required this.planName, required this.reason, required this.isRead, required this.createdAt});
+
+  factory ClientRejectSuccessNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ClientRejectSuccessNotification(
+      type: type,
+      planName: json['plan_name'] ?? '',
+      reason: json['reason'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ConsultantRejectSuccessNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String planName;
+  final String clientName;
+  final String reason;
+  @override
+  final DateTime createdAt;
+
+  ConsultantRejectSuccessNotification({
+    required this.type,
+    required this.planName,
+    required this.clientName,
+    required this.reason,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory ConsultantRejectSuccessNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ConsultantRejectSuccessNotification(
+      type: type,
+      planName: json['plan_name'] ?? '',
+      clientName: json['client_name'] ?? '',
+      reason: json['reason'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ScoreSubstractedNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String scoreKey;
+  final int scorableId;
+  final String scorableType;
+  final String scorableName;
+  final String scorableSlug;
+  final int scoreValue;
+  @override
+  final DateTime createdAt;
+
+  ScoreSubstractedNotification({
+    required this.type,
+    required this.scoreKey,
+    required this.scorableId,
+    required this.scorableType,
+    required this.scorableName,
+    required this.scorableSlug,
+    required this.scoreValue,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory ScoreSubstractedNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ScoreSubstractedNotification(
+      type: type,
+      scoreKey: json['score_key'],
+      scorableId: json['scorable_id'],
+      scorableType: json['scorable_type'],
+      scorableName: json['scorable_name'] ?? '',
+      scorableSlug: json['scorable_slug'] ?? '',
+      scoreValue: json['score_value'],
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class ProductStatusUpdatedForAuthorNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  final String productName;
+  final String oldStatus;
+  final String newStatus;
+  @override
+  final DateTime createdAt;
+
+  ProductStatusUpdatedForAuthorNotification({
+    required this.type,
+    required this.productName,
+    required this.oldStatus,
+    required this.newStatus,
+    required this.isRead,
+    required this.createdAt,
+  });
+
+  factory ProductStatusUpdatedForAuthorNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return ProductStatusUpdatedForAuthorNotification(
+      type: type,
+      productName: json['product_name'] ?? '',
+      oldStatus: json['old_status'] ?? '',
+      newStatus: json['new_status'] ?? '',
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
+}
+
+class DiaryReminderForUsersNotification implements BaseNotificationModel {
+  @override
+  final NotificationType type;
+  @override
+  final bool isRead;
+  @override
+  final DateTime createdAt;
+
+  DiaryReminderForUsersNotification({required this.type, required this.isRead, required this.createdAt});
+
+  factory DiaryReminderForUsersNotification.fromJson(Map<String, dynamic> json, NotificationType type, {bool? isRead, String? createdAt}) {
+    return DiaryReminderForUsersNotification(
+      type: type,
+      isRead: isRead ?? false,
+      createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()),
+    );
+  }
 }
 
 enum NotificationType {
+  // Diet related
+  dietCancelled,
+  dietStarted,
+  dietExpired,
+  dietWillStartedIn,
+  dietCanNotBeStarted,
+
+  // Plan related
+  personalDietCreationNeeded,
+  chosenPlanClientLastDayFinished,
+  chosenPlanConsultantLastDayStarted,
+  chosenPlanClientLastDayStarted,
+  stayOnTrackToAuthor,
+  chosenPlanStartedToClient,
+  clientStartPlanSubscriptionToSubscriber,
+  consultantConfirmPlanSubscriptionToSubscriber,
+  clientPaidPlanSubscriptionToAuthor,
+  chosenPlanTomorrowReminderToClient,
+  chosenPlanTomorrowReminderToConsultant,
+  chosenPlanStartedToConsultant,
+  consultantLeftDiaryComment,
+  chosenPlanFinishedToClient,
+  consultantConfirmPlanSubscriptionToAuthor,
+  clientPaidPlanSubscriptionToSubscriber,
+  clientStartPlanSubscriptionToAuthor,
+  clientCancelPlanSubscriptionToAuthor,
+  clientCancelPlanSubscriptionToSubscriber,
+  userDailyReportCompleted,
+  chosenPlanFinishedToConsultant,
+  stayOnTrackToCustomer,
+
+  // Comments
+  entityCommented,
+  commentReplied,
+
+  // Profile
+  phoneChanged,
+
+  // Subscription
+  subscription,
+
+  // Badges
+  badgeAwarded,
+  badgeRevoked,
+
+  // Consultant
+  consultantRequestStarted,
+
+  // Complaints
+  clientCloseComplaintSuccess,
+  complaintToModerationForUser,
+
+  // Finance
+  clientRefundSuccess,
+  consultantRefundSuccess,
+  clientRejectSuccess,
+  consultantRejectSuccess,
+
+  // Score
+  scoreAdded,
+  scoreSubstracted,
+
+  // Product
+  productStatusUpdatedForAuthor,
+
+  // Diary
+  diaryReminderForUsers,
+
+  // Legacy types (keeping for backward compatibility)
   planSubscriptionStartedToAuthor,
   planSubscriptionCanceledToAuthor,
   chosenPlanStartedToClientNotification,
@@ -315,28 +1772,100 @@ enum NotificationType {
   diaryReminderNotification,
   consultantLeftComment,
   personalizedDietIsDefined,
-  chosenPlanFinishedToClient,
   planSubscriptionCanceledToCustomer,
   chosenPlanStartedToConsultantNotification,
   chosenPlanTomorrowReminderToConsultantNotification,
   planSubscriptionPaidToAuthor,
-  chosenPlanFinishedToConsultant,
+  chosenPlanLastDayFinishedForUser,
+  planSubscriptionExpired,
+  planSubscriptionRenewed,
+  consultantAssigned,
+  consultantUnassigned,
+  paymentFailed,
+  paymentSuccessful,
+  goalAchieved,
+  workoutReminder,
+  mealReminder,
   unknown;
 
   static NotificationType getTypeFromString(String type) => switch (type) {
-        'App\\Notifications\\Plan\\PlanSubscriptionStartedToAuthor' => NotificationType.planSubscriptionStartedToAuthor,
-        'App\\Notifications\\Plan\\PlanSubscriptionCanceledToAuthor' => NotificationType.planSubscriptionCanceledToAuthor,
-        'App\\Notifications\\Plan\\ChosenPlanStartedToClientNotification' => NotificationType.chosenPlanStartedToClientNotification,
-        'App\\Notifications\\Plan\\ChosenPlanTomorrowReminderToClientNotification' => NotificationType.chosenPlanStartedToClientNotification,
-        'App\\Notifications\\DiaryReminderNotification' => NotificationType.diaryReminderNotification,
-        'App\\Notifications\\Plan\\ConsultantLeftComment' => NotificationType.consultantLeftComment,
-        'App\\Notifications\\Plan\\PersonalizedDietIsDefined' => NotificationType.personalizedDietIsDefined,
-        'App\\Notifications\\Plan\\ChosenPlanFinishedToClient' => NotificationType.chosenPlanFinishedToClient,
-        'App\\Notifications\\Plan\\PlanSubscriptionCanceledToCustomer' => NotificationType.planSubscriptionCanceledToCustomer,
-        'App\\Notifications\\Plan\\ChosenPlanStartedToConsultantNotification' => NotificationType.chosenPlanStartedToConsultantNotification,
-        'App\\Notifications\\Plan\\ChosenPlanTomorrowReminderToConsultantNotification' => NotificationType.chosenPlanTomorrowReminderToConsultantNotification,
-        'App\\Notifications\\Plan\\PlanSubscriptionPaidToAuthor' => NotificationType.planSubscriptionPaidToAuthor,
-        'App\\Notifications\\Plan\\ChosenPlanFinishedToConsultant' => NotificationType.chosenPlanFinishedToConsultant,
-        _ => NotificationType.unknown,
-      };
+    // New type-based mapping
+    'diet-cancelled' => NotificationType.dietCancelled,
+    'entity-commented' => NotificationType.entityCommented,
+    'comment-replied' => NotificationType.commentReplied,
+    'phone-changed' => NotificationType.phoneChanged,
+    'diet-started' => NotificationType.dietStarted,
+    'personal-diet-creation-needed-to-author' => NotificationType.personalDietCreationNeeded,
+    'chosen-plan-client-last-day-finished' => NotificationType.chosenPlanClientLastDayFinished,
+    'chosen-plan-consultant-last-day-started' => NotificationType.chosenPlanConsultantLastDayStarted,
+    'chosen-plan-client-last-day-started' => NotificationType.chosenPlanClientLastDayStarted,
+    'subscription' => NotificationType.subscription,
+    'badge-awarded' => NotificationType.badgeAwarded,
+    'badge-revoked' => NotificationType.badgeRevoked,
+    'diet-expired' => NotificationType.dietExpired,
+    'consultant-request-started' => NotificationType.consultantRequestStarted,
+    'diet-will-started-in' => NotificationType.dietWillStartedIn,
+    'client-close-complaint-success' => NotificationType.clientCloseComplaintSuccess,
+    'complaint-to-moderation-for-user' => NotificationType.complaintToModerationForUser,
+    'client-refund-success' => NotificationType.clientRefundSuccess,
+    'consultant-refund-success' => NotificationType.consultantRefundSuccess,
+    'client-reject-success' => NotificationType.clientRejectSuccess,
+    'consultant-reject-success' => NotificationType.consultantRejectSuccess,
+    'score-added' => NotificationType.scoreAdded,
+    'score-substracted' => NotificationType.scoreSubstracted,
+    'product-status-updated-for-author' => NotificationType.productStatusUpdatedForAuthor,
+    'diet-can-not-started' => NotificationType.dietCanNotBeStarted,
+    'stay-on-track-to-author' => NotificationType.stayOnTrackToAuthor,
+    'chosen-plan-started-to-client' => NotificationType.chosenPlanStartedToClient,
+    'client-start-plan-subscription-to-subscriber' => NotificationType.clientStartPlanSubscriptionToSubscriber,
+    'consultant-confirm-plan-subscription-to-subscriber' => NotificationType.consultantConfirmPlanSubscriptionToSubscriber,
+    'client-paid-plan-subscription-to-author' => NotificationType.clientPaidPlanSubscriptionToAuthor,
+    'chosen-plan-tomorrow-reminder-to-client' => NotificationType.chosenPlanTomorrowReminderToClient,
+    'chosen-plan-tomorrow-reminder-to-consultant' => NotificationType.chosenPlanTomorrowReminderToConsultant,
+    'chosen-plan-started-to-consultant' => NotificationType.chosenPlanStartedToConsultant,
+    'consultant-left-diary-comment' => NotificationType.consultantLeftDiaryComment,
+    'chosen-plan-finished-to-client' => NotificationType.chosenPlanFinishedToClient,
+    'consultant-confirm-plan-subscription-to-author' => NotificationType.consultantConfirmPlanSubscriptionToAuthor,
+    'client-paid-plan-subscription-to-subscriber' => NotificationType.clientPaidPlanSubscriptionToSubscriber,
+    'client-start-plan-subscription-to-author' => NotificationType.clientStartPlanSubscriptionToAuthor,
+    'client-cancel-plan-subscription-to-author' => NotificationType.clientCancelPlanSubscriptionToAuthor,
+    'client-cancel-plan-subscription-to-subscriber' => NotificationType.clientCancelPlanSubscriptionToSubscriber,
+    'user-daily-report-completed' => NotificationType.userDailyReportCompleted,
+    'chosen-plan-finished-to-consultant' => NotificationType.chosenPlanFinishedToConsultant,
+    'stay-on-track-to-customer' => NotificationType.stayOnTrackToCustomer,
+    'diary-reminder-for-users' => NotificationType.diaryReminderForUsers,
+
+    // Legacy mapping
+    'App\\Notifications\\Plan\\PlanSubscriptionStartedToAuthor' => NotificationType.planSubscriptionStartedToAuthor,
+    'App\\Notifications\\Plan\\PlanSubscriptionCanceledToAuthor' => NotificationType.planSubscriptionCanceledToAuthor,
+    'App\\Notifications\\Plan\\ChosenPlanStartedToClientNotification' => NotificationType.chosenPlanStartedToClientNotification,
+    'App\\Notifications\\Plan\\ChosenPlanTomorrowReminderToClientNotification' => NotificationType.chosenPlanTomorrowReminderToClientNotification,
+    'App\\Notifications\\DiaryReminderNotification' => NotificationType.diaryReminderNotification,
+    'App\\Notifications\\Plan\\ConsultantLeftComment' => NotificationType.consultantLeftComment,
+    'App\\Notifications\\Plan\\PersonalizedDietIsDefined' => NotificationType.personalizedDietIsDefined,
+    'App\\Notifications\\Plan\\ChosenPlanFinishedToClient' => NotificationType.chosenPlanFinishedToClient,
+    'App\\Notifications\\Plan\\PlanSubscriptionCanceledToCustomer' => NotificationType.planSubscriptionCanceledToCustomer,
+    'App\\Notifications\\Plan\\ChosenPlanStartedToConsultantNotification' => NotificationType.chosenPlanStartedToConsultantNotification,
+    'App\\Notifications\\Plan\\ChosenPlanTomorrowReminderToConsultantNotification' => NotificationType.chosenPlanTomorrowReminderToConsultantNotification,
+    'App\\Notifications\\Plan\\PlanSubscriptionPaidToAuthor' => NotificationType.planSubscriptionPaidToAuthor,
+    'App\\Notifications\\Plan\\ChosenPlanFinishedToConsultant' => NotificationType.chosenPlanFinishedToConsultant,
+    'App\\Notifications\\ChosenPlan\\LastDayFinishedForUser' => NotificationType.chosenPlanLastDayFinishedForUser,
+    'App\\Notifications\\ChosenPlan\\LastDayStartedForConsultant' => NotificationType.chosenPlanConsultantLastDayStarted,
+    'App\\Notifications\\ComplaintToModerationNotify' => NotificationType.complaintToModerationForUser,
+    'App\\Notifications\\Comment\\Replied' => NotificationType.commentReplied,
+    'App\\Notifications\\Score\\ScoreAdded' => NotificationType.scoreAdded,
+    'App\\Notifications\\Comment\\EntityCommented' => NotificationType.entityCommented,
+    'App\\Notifications\\Plan\\PlanSubscriptionExpired' => NotificationType.planSubscriptionExpired,
+    'App\\Notifications\\Plan\\PlanSubscriptionRenewed' => NotificationType.planSubscriptionRenewed,
+    'App\\Notifications\\Plan\\ConsultantAssigned' => NotificationType.consultantAssigned,
+    'App\\Notifications\\Plan\\ConsultantUnassigned' => NotificationType.consultantUnassigned,
+    'App\\Notifications\\Payment\\PaymentFailed' => NotificationType.paymentFailed,
+    'App\\Notifications\\Payment\\PaymentSuccessful' => NotificationType.paymentSuccessful,
+    'App\\Notifications\\Goal\\GoalAchieved' => NotificationType.goalAchieved,
+    'App\\Notifications\\Workout\\WorkoutReminder' => NotificationType.workoutReminder,
+    'App\\Notifications\\Meal\\MealReminder' => NotificationType.mealReminder,
+    _ => NotificationType.unknown,
+  };
 }
+
+DateTime parseDate(String date) => DateTime.parse(date).toLocal();
diff --git a/lib/features/notifications/presentation/notifications_cubit/notifications_cubit.dart b/lib/features/notifications/presentation/notifications_cubit/notifications_cubit.dart
index 16cf1f40..8c8c5aaa 100644
--- a/lib/features/notifications/presentation/notifications_cubit/notifications_cubit.dart
+++ b/lib/features/notifications/presentation/notifications_cubit/notifications_cubit.dart
@@ -13,10 +13,7 @@ class NotificationsCubit extends Cubit<NotificationsState> {
   final WsManager wsManager;
   final NotificationsRepository notificationsRepository;
   StreamSubscription? _newNotificationsSubscription;
-  NotificationsCubit({
-    required this.wsManager,
-    required this.notificationsRepository,
-  }) : super(const NotificationsState.empty());
+  NotificationsCubit({required this.wsManager, required this.notificationsRepository}) : super(const NotificationsState.empty());
 
   Future<void> connectToWebSocket() async {
     await _newNotificationsSubscription?.cancel();
@@ -27,21 +24,243 @@ class NotificationsCubit extends Cubit<NotificationsState> {
 
   BaseNotificationModel _parseNotification(Map<String, dynamic> notificationJson, NotificationType type) {
     try {
+      final createdAt = notificationJson['created_at'];
+      final isRead = notificationJson['read_at'] != null;
+
       return switch (type) {
-        NotificationType.planSubscriptionStartedToAuthor => PlanSubscriptionStartedToAuthorNotification.fromJson(notificationJson, type),
-        NotificationType.planSubscriptionCanceledToAuthor => PlanSubscriptionCanceledToAuthorNotification.fromJson(notificationJson, type),
-        NotificationType.chosenPlanStartedToClientNotification => ChosenPlanStartedToClientNotification.fromJson(notificationJson, type),
-        NotificationType.chosenPlanTomorrowReminderToClientNotification => ChosenPlanTomorrowReminderToClientNotification.fromJson(notificationJson, type),
-        NotificationType.diaryReminderNotification => DiaryReminderNotification.fromJson(notificationJson, type),
-        NotificationType.consultantLeftComment => ConsultantLeftCommentNotification.fromJson(notificationJson, type),
-        NotificationType.personalizedDietIsDefined => PersonalizedDietIsDefinedNotification.fromJson(notificationJson, type),
-        NotificationType.chosenPlanFinishedToClient => ChosenPlanFinishedToClientNotification.fromJson(notificationJson, type),
-        NotificationType.planSubscriptionCanceledToCustomer => PlanSubscriptionCanceledToAuthorNotification.fromJson(notificationJson, type),
-        NotificationType.chosenPlanStartedToConsultantNotification => ChosenPlanStartedToConsultantNotification.fromJson(notificationJson, type),
-        NotificationType.chosenPlanTomorrowReminderToConsultantNotification =>
-          ChosenPlanTomorrowReminderToConsultantNotification.fromJson(notificationJson, type),
-        NotificationType.planSubscriptionPaidToAuthor => PlanSubscriptionPaidToAuthorNotification.fromJson(notificationJson, type),
-        NotificationType.chosenPlanFinishedToConsultant => ChosenPlanFinishedToConsultantNotification.fromJson(notificationJson, type),
+        NotificationType.planSubscriptionStartedToAuthor => PlanSubscriptionStartedToAuthorNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.planSubscriptionCanceledToAuthor => PlanSubscriptionCanceledToAuthorNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.chosenPlanStartedToClientNotification => ChosenPlanStartedToClientNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.chosenPlanTomorrowReminderToClientNotification => ChosenPlanTomorrowReminderToClientNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.chosenPlanConsultantLastDayStarted => ChosenPlanConsultantLastDayStarted.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.diaryReminderNotification => DiaryReminderNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.consultantLeftComment => ConsultantLeftCommentNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.personalizedDietIsDefined => PersonalizedDietIsDefinedNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.planSubscriptionCanceledToCustomer => PlanSubscriptionCanceledToAuthorNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.chosenPlanStartedToConsultantNotification => ChosenPlanStartedToConsultantNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.chosenPlanTomorrowReminderToConsultantNotification => ChosenPlanTomorrowReminderToConsultantNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.planSubscriptionPaidToAuthor => PlanSubscriptionPaidToAuthorNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.chosenPlanLastDayFinishedForUser => ChosenPlanLastDayFinishedForUser.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        // New notification types
+        NotificationType.complaintToModerationForUser => ComplaintToModerationForUser.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.commentReplied => CommentReplied.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.scoreAdded => ScoreAdded.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.entityCommented => EntityCommented.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        // Новые типы уведомлений
+        NotificationType.planSubscriptionExpired => PlanSubscriptionExpiredNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.planSubscriptionRenewed => PlanSubscriptionRenewedNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.consultantAssigned => ConsultantAssignedNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.consultantUnassigned => ConsultantUnassignedNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.paymentFailed => PaymentFailedNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.paymentSuccessful => PaymentSuccessfulNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.goalAchieved => GoalAchievedNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.workoutReminder => WorkoutReminderNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.mealReminder => MealReminderNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        // New notification types
+        NotificationType.dietCancelled => DietCancelledNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.dietStarted => DietStartedNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.dietExpired => DietExpiredNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.dietWillStartedIn => DietWillStartedInNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.dietCanNotBeStarted => DietCanNotBeStartedNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.personalDietCreationNeeded => PersonalDietCreationNeededNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.chosenPlanClientLastDayFinished => ChosenPlanClientLastDayFinishedNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.chosenPlanClientLastDayStarted => ChosenPlanClientLastDayStartedNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.stayOnTrackToAuthor => StayOnTrackToAuthorNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.chosenPlanStartedToClient => ChosenPlanStartedToClientNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.clientStartPlanSubscriptionToSubscriber => ClientStartPlanSubscriptionToSubscriberNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.consultantConfirmPlanSubscriptionToSubscriber => ConsultantConfirmPlanSubscriptionToSubscriberNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.clientPaidPlanSubscriptionToAuthor => ClientPaidPlanSubscriptionToAuthorNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.chosenPlanTomorrowReminderToClient => ChosenPlanTomorrowReminderToClientNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.chosenPlanTomorrowReminderToConsultant => ChosenPlanTomorrowReminderToConsultantNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.chosenPlanStartedToConsultant => ChosenPlanStartedToConsultantNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.consultantLeftDiaryComment => ConsultantLeftDiaryCommentNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.chosenPlanFinishedToClient => ChosenPlanFinishedToClientNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.consultantConfirmPlanSubscriptionToAuthor => ConsultantConfirmPlanSubscriptionToAuthorNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.clientPaidPlanSubscriptionToSubscriber => ClientPaidPlanSubscriptionToSubscriberNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.clientStartPlanSubscriptionToAuthor => ClientStartPlanSubscriptionToAuthorNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.clientCancelPlanSubscriptionToAuthor => ClientCancelPlanSubscriptionToAuthorNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.clientCancelPlanSubscriptionToSubscriber => ClientCancelPlanSubscriptionToSubscriberNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.userDailyReportCompleted => UserDailyReportCompletedNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.chosenPlanFinishedToConsultant => ChosenPlanFinishedToConsultantNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.stayOnTrackToCustomer => StayOnTrackToCustomerNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.phoneChanged => PhoneChangedNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.subscription => SubscriptionNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.badgeAwarded => BadgeAwardedNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.badgeRevoked => BadgeRevokedNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.consultantRequestStarted => ConsultantRequestStartedNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.clientCloseComplaintSuccess => ClientCloseComplaintSuccessNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.clientRefundSuccess => ClientRefundSuccessNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.consultantRefundSuccess => ConsultantRefundSuccessNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.clientRejectSuccess => ClientRejectSuccessNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.consultantRejectSuccess => ConsultantRejectSuccessNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.scoreSubstracted => ScoreSubstractedNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
+        NotificationType.productStatusUpdatedForAuthor => ProductStatusUpdatedForAuthorNotification.fromJson(
+          notificationJson,
+          type,
+          isRead: isRead,
+          createdAt: createdAt,
+        ),
+        NotificationType.diaryReminderForUsers => DiaryReminderForUsersNotification.fromJson(notificationJson, type, isRead: isRead, createdAt: createdAt),
         NotificationType.unknown => UnknownNotification(type: type),
       };
     } catch (e) {
@@ -51,36 +270,112 @@ class NotificationsCubit extends Cubit<NotificationsState> {
 
   void _handleNotification(String notificationData) {
     final json = jsonDecode(notificationData) as Map<String, dynamic>;
-    final stringifiedType = json['notification_class_name'];
-    final type = NotificationType.getTypeFromString(stringifiedType);
+
+    // Улучшенная логика определения типа уведомления
+    String? stringifiedType;
+
+    // Сначала проверяем поле 'type' в корне JSON
+    if (json.containsKey('type') && json['type'] != null) {
+      stringifiedType = json['type'].toString();
+      log('Found type in root: $stringifiedType');
+    }
+    // Затем проверяем поле 'notification_class_name' в корне JSON
+    else if (json.containsKey('notification_class_name') && json['notification_class_name'] != null) {
+      stringifiedType = json['notification_class_name'].toString();
+      log('Found notification_class_name in root: $stringifiedType');
+    }
+    // Если есть поле 'data', проверяем внутри него
+    else if (json.containsKey('data') && json['data'] is Map<String, dynamic>) {
+      final data = json['data'] as Map<String, dynamic>;
+      if (data.containsKey('type') && data['type'] != null) {
+        stringifiedType = data['type'].toString();
+        log('Found type in data: $stringifiedType');
+      } else if (data.containsKey('notification_class_name') && data['notification_class_name'] != null) {
+        stringifiedType = data['notification_class_name'].toString();
+        log('Found notification_class_name in data: $stringifiedType');
+      }
+    }
+
+    // Если тип не найден, используем unknown
+    final type = stringifiedType != null ? NotificationType.getTypeFromString(stringifiedType) : NotificationType.unknown;
+    log('Final type: $type, stringifiedType: $stringifiedType');
+
     final notification = _parseNotification(json, type);
     _notifications.insert(0, notification);
-    emit(
-      NotificationsState.loaded(
-        notifications: _notifications,
-        notificationsCount: _notifications.length,
-        hasUnreadNotifications: true,
-      ),
-    );
+
+    final currentState = state;
+    if (currentState is NotificationsStateLoaded) {
+      emit(currentState.copyWith(notifications: _notifications, notificationsCount: _notifications.length, hasUnreadNotifications: true));
+    }
   }
 
   Future<void> getNotifications() async {
     try {
-      final notifications = await notificationsRepository.getNotifications(page: 1);
-      _notifications.clear();
-      _notifications.addAll(notifications ?? []);
-      emit(
-        NotificationsState.loaded(
-          notifications: _notifications,
-          notificationsCount: _notifications.length,
-          hasUnreadNotifications: (notifications ?? []).where((elem) => elem.isRead == false).isNotEmpty,
-        ),
-      );
+      final result = await notificationsRepository.getNotifications(page: 1);
+      if (result != null) {
+        final notifications = result['notifications'] as List<BaseNotificationModel>;
+        final pagination = result['pagination'] as Map<String, dynamic>;
+
+        _notifications.clear();
+        _notifications.addAll(notifications);
+
+        final currentPage = pagination['current_page'] as int;
+        final lastPage = pagination['last_page'] as int;
+        final hasNextPage = currentPage < lastPage;
+
+        emit(
+          NotificationsState.loaded(
+            notifications: _notifications,
+            notificationsCount: _notifications.length,
+            hasUnreadNotifications: notifications.where((elem) => elem.isRead == false).isNotEmpty,
+            currentPage: currentPage,
+            hasNextPage: hasNextPage,
+          ),
+        );
+      }
     } catch (e, st) {
       log(e.toString(), stackTrace: st);
     }
   }
 
+  Future<void> loadMoreNotifications() async {
+    final currentState = state;
+    if (currentState is NotificationsStateLoaded && currentState.hasNextPage && !currentState.isLoadingMore) {
+      try {
+        emit(currentState.copyWith(isLoadingMore: true));
+
+        final nextPage = currentState.currentPage + 1;
+        final result = await notificationsRepository.getNotifications(page: nextPage);
+
+        if (result != null) {
+          final newNotifications = result['notifications'] as List<BaseNotificationModel>;
+          final pagination = result['pagination'] as Map<String, dynamic>;
+
+          _notifications.addAll(newNotifications);
+
+          final currentPage = pagination['current_page'] as int;
+          final lastPage = pagination['last_page'] as int;
+          final hasNextPage = currentPage < lastPage;
+
+          emit(
+            currentState.copyWith(
+              notifications: _notifications,
+              notificationsCount: _notifications.length,
+              currentPage: currentPage,
+              hasNextPage: hasNextPage,
+              isLoadingMore: false,
+            ),
+          );
+        } else {
+          emit(currentState.copyWith(isLoadingMore: false));
+        }
+      } catch (e, st) {
+        log(e.toString(), stackTrace: st);
+        emit(currentState.copyWith(isLoadingMore: false));
+      }
+    }
+  }
+
   Future<void> markNotificationsAsRead() async {
     final currentState = state;
     if (currentState is NotificationsStateLoaded) {
diff --git a/lib/features/notifications/presentation/notifications_cubit/notifications_state.dart b/lib/features/notifications/presentation/notifications_cubit/notifications_state.dart
index 9c221b31..391e199e 100644
--- a/lib/features/notifications/presentation/notifications_cubit/notifications_state.dart
+++ b/lib/features/notifications/presentation/notifications_cubit/notifications_state.dart
@@ -14,6 +14,9 @@ abstract class NotificationsState with _$NotificationsState {
     required int notificationsCount,
     @Default(false) bool isLoading,
     @Default(false) bool hasUnreadNotifications,
+    @Default(1) int currentPage,
+    @Default(true) bool hasNextPage,
+    @Default(false) bool isLoadingMore,
   }) = NotificationsStateLoaded;
 
   const factory NotificationsState.error({
diff --git a/lib/features/notifications/presentation/notifications_screen.dart b/lib/features/notifications/presentation/notifications_screen.dart
index ff48617f..58e3c65f 100644
--- a/lib/features/notifications/presentation/notifications_screen.dart
+++ b/lib/features/notifications/presentation/notifications_screen.dart
@@ -10,9 +10,38 @@ import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
-class NotificationsScreen extends StatelessWidget {
+class NotificationsScreen extends StatefulWidget {
   const NotificationsScreen({super.key});
 
+  @override
+  State<NotificationsScreen> createState() => _NotificationsScreenState();
+}
+
+class _NotificationsScreenState extends State<NotificationsScreen> {
+  final ScrollController _scrollController = ScrollController();
+
+  @override
+  void initState() {
+    super.initState();
+    _scrollController.addListener(_onScroll);
+  }
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  void _onScroll() {
+    if (_scrollController.position.pixels >= _scrollController.position.maxScrollExtent - 200) {
+      final cubit = context.read<NotificationsCubit>();
+      final state = cubit.state;
+      if (state is NotificationsStateLoaded && state.hasNextPage && !state.isLoadingMore) {
+        cubit.loadMoreNotifications();
+      }
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     final s = S.of(context);
@@ -20,62 +49,65 @@ class NotificationsScreen extends StatelessWidget {
       builder: (BuildContext context, NotificationsState state) {
         return Scaffold(
           backgroundColor: appTheme.gray100,
-          appBar: AppBar(
-            title: const Text('Уведомления'),
-          ),
+          appBar: AppBar(title: const Text('Уведомления')),
           body: state is NotificationsStateLoaded
-              ? Stack(children: [
-                  Padding(
-                    padding: const EdgeInsets.only(top: 8.0),
-                    child: Container(
-                      padding: const EdgeInsets.only(top: 16),
-                      decoration: BoxDecoration(
-                        color: appTheme.whiteA700,
-                        borderRadius: const BorderRadius.only(
-                          topLeft: Radius.circular(12),
-                          topRight: Radius.circular(12),
+              ? Stack(
+                  children: [
+                    Padding(
+                      padding: const EdgeInsets.only(top: 8.0),
+                      child: Container(
+                        padding: const EdgeInsets.only(top: 16),
+                        decoration: BoxDecoration(
+                          color: appTheme.whiteA700,
+                          borderRadius: const BorderRadius.only(topLeft: Radius.circular(12), topRight: Radius.circular(12)),
+                        ),
+                        child: state.isLoading
+                            ? const Center(child: Loader())
+                            : CustomScrollView(
+                                controller: _scrollController,
+                                slivers: [
+                                  SliverList.separated(
+                                    separatorBuilder: (context, index) =>
+                                        const Padding(padding: EdgeInsets.symmetric(vertical: 12, horizontal: 16), child: CustomDivider()),
+                                    itemBuilder: (context, index) {
+                                      return Padding(
+                                        padding: const EdgeInsets.symmetric(horizontal: 16),
+                                        child: NotificationWidget(notification: state.notifications[index]),
+                                      );
+                                    },
+                                    itemCount: state.notifications.length,
+                                  ),
+                                  if (state.isLoadingMore)
+                                    const SliverToBoxAdapter(
+                                      child: Padding(
+                                        padding: EdgeInsets.all(16.0),
+                                        child: Center(child: Loader()),
+                                      ),
+                                    ),
+                                ],
+                              ),
+                      ),
+                    ),
+                    Align(
+                      alignment: Alignment.bottomCenter,
+                      child: Padding(
+                        padding: const EdgeInsets.only(left: 16, right: 16, bottom: 16),
+                        child: CustomOutlinedButton(
+                          text: s.markAsRead,
+                          height: 52,
+                          buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
+                          buttonStyle: ButtonStyle(
+                            side: const WidgetStatePropertyAll(BorderSide.none),
+                            backgroundColor: WidgetStatePropertyAll(appTheme.blueA400),
+                          ),
+                          onPressed: () async {
+                            context.read<NotificationsCubit>().markNotificationsAsRead();
+                          },
                         ),
                       ),
-                      child: state.isLoading
-                          ? const Center(child: Loader())
-                          : CustomScrollView(
-                              slivers: [
-                                SliverList.separated(
-                                  separatorBuilder: (context, index) => const Padding(
-                                    padding: EdgeInsets.symmetric(vertical: 12, horizontal: 16),
-                                    child: CustomDivider(),
-                                  ),
-                                  itemBuilder: (context, index) {
-                                    return Padding(
-                                      padding: const EdgeInsets.symmetric(horizontal: 16),
-                                      child: NotificationWidget(
-                                        notification: state.notifications[index],
-                                      ),
-                                    );
-                                  },
-                                  itemCount: state.notifications.length,
-                                )
-                              ],
-                            ),
                     ),
-                  ),
-                  Align(
-                    alignment: Alignment.bottomCenter,
-                    child: Padding(
-                      padding: const EdgeInsets.only(left: 16, right: 16, bottom: 16),
-                      child: CustomOutlinedButton(
-                        text: s.markAsRead,
-                        height: 52,
-                        buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
-                        buttonStyle:
-                            ButtonStyle(side: const WidgetStatePropertyAll(BorderSide.none), backgroundColor: WidgetStatePropertyAll(appTheme.blueA400)),
-                        onPressed: () async {
-                          context.read<NotificationsCubit>().markNotificationsAsRead();
-                        },
-                      ),
-                    ),
-                  )
-                ])
+                  ],
+                )
               : const Placeholder(),
         );
       },
diff --git a/lib/features/notifications/presentation/widgets/notification_widget.dart b/lib/features/notifications/presentation/widgets/notification_widget.dart
index 4ff0faff..ed196b00 100644
--- a/lib/features/notifications/presentation/widgets/notification_widget.dart
+++ b/lib/features/notifications/presentation/widgets/notification_widget.dart
@@ -15,45 +15,105 @@ class NotificationWidget extends StatelessWidget {
   Widget build(BuildContext context) {
     return switch (notification) {
       PlanSubscriptionStartedToAuthorNotification() => _PlanSubscriptionStartedToAuthorWidget(
-          notification: notification as PlanSubscriptionStartedToAuthorNotification,
-        ),
+        notification: notification as PlanSubscriptionStartedToAuthorNotification,
+      ),
       PlanSubscriptionCanceledToAuthorNotification() => _PlanSubscriptionCanceledToAuthorWidget(
-          notification: notification as PlanSubscriptionCanceledToAuthorNotification,
-        ),
-      ChosenPlanStartedToClientNotification() => _ChosenPlanStartedToClientWidget(
-          notification: notification as ChosenPlanStartedToClientNotification,
-        ),
+        notification: notification as PlanSubscriptionCanceledToAuthorNotification,
+      ),
+      ChosenPlanStartedToClientNotification() => _ChosenPlanStartedToClientWidget(notification: notification as ChosenPlanStartedToClientNotification),
       ChosenPlanTomorrowReminderToClientNotification() => _ChosenPlanTomorrowReminderToClientWidget(
-          notification: notification as ChosenPlanTomorrowReminderToClientNotification,
-        ),
-      DiaryReminderNotification() => _DiaryReminderWidget(
-          notification: notification as DiaryReminderNotification,
-        ),
-      ConsultantLeftCommentNotification() => _ConsultantLeftCommentWidget(
-          notification: notification as ConsultantLeftCommentNotification,
-        ),
-      PersonalizedDietIsDefinedNotification() => _PersonalizedDietIsDefinedWidget(
-          notification: notification as PersonalizedDietIsDefinedNotification,
-        ),
-      ChosenPlanFinishedToClientNotification() => _ChosenPlanFinishedToClientWidget(
-          notification: notification as ChosenPlanFinishedToClientNotification,
-        ),
+        notification: notification as ChosenPlanTomorrowReminderToClientNotification,
+      ),
+      DiaryReminderNotification() => _DiaryReminderWidget(notification: notification as DiaryReminderNotification),
+      ConsultantLeftCommentNotification() => _ConsultantLeftCommentWidget(notification: notification as ConsultantLeftCommentNotification),
+      PersonalizedDietIsDefinedNotification() => _PersonalizedDietIsDefinedWidget(notification: notification as PersonalizedDietIsDefinedNotification),
+      ChosenPlanFinishedToClientNotification() => _ChosenPlanFinishedToClientWidget(notification: notification as ChosenPlanFinishedToClientNotification),
       PlanSubscriptionCanceledToCustomerNotification() => _PlanSubscriptionCanceledToCustomerWidget(
-          notification: notification as PlanSubscriptionCanceledToCustomerNotification,
-        ),
+        notification: notification as PlanSubscriptionCanceledToCustomerNotification,
+      ),
       ChosenPlanStartedToConsultantNotification() => _ChosenPlanStartedToConsultantWidget(
-          notification: notification as ChosenPlanStartedToConsultantNotification,
-        ),
+        notification: notification as ChosenPlanStartedToConsultantNotification,
+      ),
       ChosenPlanTomorrowReminderToConsultantNotification() => _ChosenPlanTomorrowReminderToConsultantWidget(
-          notification: notification as ChosenPlanTomorrowReminderToConsultantNotification,
-        ),
-      PlanSubscriptionPaidToAuthorNotification() => _PlanSubscriptionPaidToAuthorWidget(
-          notification: notification as PlanSubscriptionPaidToAuthorNotification,
-        ),
+        notification: notification as ChosenPlanTomorrowReminderToConsultantNotification,
+      ),
+      PlanSubscriptionPaidToAuthorNotification() => _PlanSubscriptionPaidToAuthorWidget(notification: notification as PlanSubscriptionPaidToAuthorNotification),
       ChosenPlanFinishedToConsultantNotification() => _ChosenPlanFinishedToConsultantWidget(
-          notification: notification as ChosenPlanFinishedToConsultantNotification,
-        ),
-      UnknownNotification() => const SizedBox.shrink(),
+        notification: notification as ChosenPlanFinishedToConsultantNotification,
+      ),
+      ChosenPlanLastDayFinishedForUser() => _ChosenPlanLastDayFinishedForUserWidget(notification: notification as ChosenPlanLastDayFinishedForUser),
+      ChosenPlanConsultantLastDayStarted() => _ChosenPlanConsultantLastDayStartedWidget(notification: notification as ChosenPlanConsultantLastDayStarted),
+      ComplaintToModerationForUser() => _ComplaintToModerationForUserWidget(notification: notification as ComplaintToModerationForUser),
+      CommentReplied() => _CommentRepliedWidget(notification: notification as CommentReplied),
+      ScoreAdded() => _ScoreAddedWidget(notification: notification as ScoreAdded),
+      EntityCommented() => _EntityCommentedWidget(notification: notification as EntityCommented),
+      // Новые типы уведомлений
+      PlanSubscriptionExpiredNotification() => _PlanSubscriptionExpiredWidget(notification: notification as PlanSubscriptionExpiredNotification),
+      PlanSubscriptionRenewedNotification() => _PlanSubscriptionRenewedWidget(notification: notification as PlanSubscriptionRenewedNotification),
+      ConsultantAssignedNotification() => _ConsultantAssignedWidget(notification: notification as ConsultantAssignedNotification),
+      ConsultantUnassignedNotification() => _ConsultantUnassignedWidget(notification: notification as ConsultantUnassignedNotification),
+      PaymentFailedNotification() => _PaymentFailedWidget(notification: notification as PaymentFailedNotification),
+      PaymentSuccessfulNotification() => _PaymentSuccessfulWidget(notification: notification as PaymentSuccessfulNotification),
+      GoalAchievedNotification() => _GoalAchievedWidget(notification: notification as GoalAchievedNotification),
+      WorkoutReminderNotification() => _WorkoutReminderWidget(notification: notification as WorkoutReminderNotification),
+      MealReminderNotification() => _MealReminderWidget(notification: notification as MealReminderNotification),
+      // New notification types
+      DietCancelledNotification() => _DietCancelledWidget(notification: notification as DietCancelledNotification),
+      DietStartedNotification() => _DietStartedWidget(notification: notification as DietStartedNotification),
+      DietExpiredNotification() => _DietExpiredWidget(notification: notification as DietExpiredNotification),
+      DietWillStartedInNotification() => _DietWillStartedInWidget(notification: notification as DietWillStartedInNotification),
+      DietCanNotBeStartedNotification() => _DietCanNotBeStartedWidget(notification: notification as DietCanNotBeStartedNotification),
+      PersonalDietCreationNeededNotification() => _PersonalDietCreationNeededWidget(notification: notification as PersonalDietCreationNeededNotification),
+      ChosenPlanClientLastDayFinishedNotification() => _ChosenPlanClientLastDayFinishedWidget(
+        notification: notification as ChosenPlanClientLastDayFinishedNotification,
+      ),
+      ChosenPlanClientLastDayStartedNotification() => _ChosenPlanClientLastDayStartedWidget(
+        notification: notification as ChosenPlanClientLastDayStartedNotification,
+      ),
+      StayOnTrackToAuthorNotification() => _StayOnTrackToAuthorWidget(notification: notification as StayOnTrackToAuthorNotification),
+      ClientStartPlanSubscriptionToSubscriberNotification() => _ClientStartPlanSubscriptionToSubscriberWidget(
+        notification: notification as ClientStartPlanSubscriptionToSubscriberNotification,
+      ),
+      ConsultantConfirmPlanSubscriptionToSubscriberNotification() => _ConsultantConfirmPlanSubscriptionToSubscriberWidget(
+        notification: notification as ConsultantConfirmPlanSubscriptionToSubscriberNotification,
+      ),
+      ClientPaidPlanSubscriptionToAuthorNotification() => _ClientPaidPlanSubscriptionToAuthorWidget(
+        notification: notification as ClientPaidPlanSubscriptionToAuthorNotification,
+      ),
+      ConsultantLeftDiaryCommentNotification() => _ConsultantLeftDiaryCommentWidget(notification: notification as ConsultantLeftDiaryCommentNotification),
+      ConsultantConfirmPlanSubscriptionToAuthorNotification() => _ConsultantConfirmPlanSubscriptionToAuthorWidget(
+        notification: notification as ConsultantConfirmPlanSubscriptionToAuthorNotification,
+      ),
+      ClientPaidPlanSubscriptionToSubscriberNotification() => _ClientPaidPlanSubscriptionToSubscriberWidget(
+        notification: notification as ClientPaidPlanSubscriptionToSubscriberNotification,
+      ),
+      ClientStartPlanSubscriptionToAuthorNotification() => _ClientStartPlanSubscriptionToAuthorWidget(
+        notification: notification as ClientStartPlanSubscriptionToAuthorNotification,
+      ),
+      ClientCancelPlanSubscriptionToAuthorNotification() => _ClientCancelPlanSubscriptionToAuthorWidget(
+        notification: notification as ClientCancelPlanSubscriptionToAuthorNotification,
+      ),
+      ClientCancelPlanSubscriptionToSubscriberNotification() => _ClientCancelPlanSubscriptionToSubscriberWidget(
+        notification: notification as ClientCancelPlanSubscriptionToSubscriberNotification,
+      ),
+      UserDailyReportCompletedNotification() => _UserDailyReportCompletedWidget(notification: notification as UserDailyReportCompletedNotification),
+      StayOnTrackToCustomerNotification() => _StayOnTrackToCustomerWidget(notification: notification as StayOnTrackToCustomerNotification),
+      PhoneChangedNotification() => _PhoneChangedWidget(notification: notification as PhoneChangedNotification),
+      SubscriptionNotification() => _SubscriptionWidget(notification: notification as SubscriptionNotification),
+      BadgeAwardedNotification() => _BadgeAwardedWidget(notification: notification as BadgeAwardedNotification),
+      BadgeRevokedNotification() => _BadgeRevokedWidget(notification: notification as BadgeRevokedNotification),
+      ConsultantRequestStartedNotification() => _ConsultantRequestStartedWidget(notification: notification as ConsultantRequestStartedNotification),
+      ClientCloseComplaintSuccessNotification() => _ClientCloseComplaintSuccessWidget(notification: notification as ClientCloseComplaintSuccessNotification),
+      ClientRefundSuccessNotification() => _ClientRefundSuccessWidget(notification: notification as ClientRefundSuccessNotification),
+      ConsultantRefundSuccessNotification() => _ConsultantRefundSuccessWidget(notification: notification as ConsultantRefundSuccessNotification),
+      ClientRejectSuccessNotification() => _ClientRejectSuccessWidget(notification: notification as ClientRejectSuccessNotification),
+      ConsultantRejectSuccessNotification() => _ConsultantRejectSuccessWidget(notification: notification as ConsultantRejectSuccessNotification),
+      ScoreSubstractedNotification() => _ScoreSubstractedWidget(notification: notification as ScoreSubstractedNotification),
+      ProductStatusUpdatedForAuthorNotification() => _ProductStatusUpdatedForAuthorWidget(
+        notification: notification as ProductStatusUpdatedForAuthorNotification,
+      ),
+      DiaryReminderForUsersNotification() => _DiaryReminderForUsersWidget(notification: notification as DiaryReminderForUsersNotification),
+      UnknownNotification() => _UnknownNotificationWidget(notification: notification as UnknownNotification),
     };
   }
 }
@@ -67,7 +127,8 @@ class _PlanSubscriptionStartedToAuthorWidget extends StatelessWidget {
 
     return _BaseNotificationWidget(
       isRead: notification.isRead,
-      notificationsText: s.fillYasterday,
+      notificationsText: s.userSubscribedToPlan(notification.customerName, notification.planName),
+      createdAt: notification.createdAt,
     );
   }
 }
@@ -81,7 +142,8 @@ class _PlanSubscriptionCanceledToAuthorWidget extends StatelessWidget {
 
     return _BaseNotificationWidget(
       isRead: notification.isRead,
-      notificationsText: s.fillYasterday,
+      notificationsText: s.userCanceldThePlanSubscription(notification.customerName, notification.planName),
+      createdAt: notification.createdAt,
     );
   }
 }
@@ -93,10 +155,7 @@ class _ChosenPlanStartedToClientWidget extends StatelessWidget {
   Widget build(BuildContext context) {
     final s = S.of(context);
 
-    return _BaseNotificationWidget(
-      isRead: notification.isRead,
-      notificationsText: s.fillYasterday,
-    );
+    return _BaseNotificationWidget(isRead: notification.isRead, notificationsText: s.planStarted(notification.planName), createdAt: notification.createdAt);
   }
 }
 
@@ -109,7 +168,8 @@ class _ChosenPlanTomorrowReminderToClientWidget extends StatelessWidget {
 
     return _BaseNotificationWidget(
       isRead: notification.isRead,
-      notificationsText: s.fillYasterday,
+      notificationsText: s.tomorrowYourPlanWillStart(notification.planName),
+      createdAt: notification.createdAt,
     );
   }
 }
@@ -120,10 +180,7 @@ class _DiaryReminderWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final s = S.of(context);
-    return _BaseNotificationWidget(
-      isRead: notification.isRead,
-      notificationsText: s.fillYasterday,
-    );
+    return _BaseNotificationWidget(isRead: notification.isRead, notificationsText: s.fillYasterday, createdAt: notification.createdAt);
   }
 }
 
@@ -137,6 +194,7 @@ class _ConsultantLeftCommentWidget extends StatelessWidget {
     return _BaseNotificationWidget(
       isRead: notification.isRead,
       notificationsText: s.consultantLeftComment(notification.date.format('dd.MM.yyyy')),
+      createdAt: notification.createdAt,
     );
   }
 }
@@ -146,7 +204,7 @@ class _PersonalizedDietIsDefinedWidget extends StatelessWidget {
   final PersonalizedDietIsDefinedNotification notification;
   @override
   Widget build(BuildContext context) {
-    return Container();
+    return _BaseNotificationWidget(isRead: notification.isRead, notificationsText: 'Персональная диета определена', createdAt: notification.createdAt);
   }
 }
 
@@ -160,6 +218,7 @@ class _ChosenPlanFinishedToClientWidget extends StatelessWidget {
     return _BaseNotificationWidget(
       isRead: notification.isRead,
       notificationsText: '${s.congratsYouHaveFinishedPlan} «${notification.planName}»',
+      createdAt: notification.createdAt,
     );
   }
 }
@@ -174,6 +233,7 @@ class _PlanSubscriptionCanceledToCustomerWidget extends StatelessWidget {
     return _BaseNotificationWidget(
       isRead: notification.isRead,
       notificationsText: s.youCanceledSubscriptionToPlan(notification.planName),
+      createdAt: notification.createdAt,
     );
   }
 }
@@ -188,6 +248,7 @@ class _ChosenPlanStartedToConsultantWidget extends StatelessWidget {
     return _BaseNotificationWidget(
       isRead: notification.isRead,
       notificationsText: s.planWithUserStarted(notification.planName, notification.customerName),
+      createdAt: notification.createdAt,
     );
   }
 }
@@ -202,6 +263,7 @@ class _ChosenPlanTomorrowReminderToConsultantWidget extends StatelessWidget {
     return _BaseNotificationWidget(
       isRead: notification.isRead,
       notificationsText: s.tommorowPlanWithUserWillStart(notification.planName, notification.customerName),
+      createdAt: notification.createdAt,
     );
   }
 }
@@ -216,6 +278,7 @@ class _PlanSubscriptionPaidToAuthorWidget extends StatelessWidget {
     return _BaseNotificationWidget(
       isRead: notification.isRead,
       notificationsText: s.userPaidThePlan(notification.customerName, notification.planName),
+      createdAt: notification.createdAt,
     );
   }
 }
@@ -226,58 +289,767 @@ class _ChosenPlanFinishedToConsultantWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final s = S.of(context);
-    return Column(children: [
-      Text(
-        '${s.congratsYouHaveFinishedPlan} «${notification.planName}»',
-        style: TextStyles.textMSemibold.copyWith(color: appTheme.black),
-      ),
-      const SizedBox(height: 12),
-      Text(
-        s.userConfirmedPlanCompletionWithoutSum,
-        style: TextStyles.textSMedium.copyWith(color: appTheme.black),
-      ),
-      const SizedBox(height: 12),
-      CustomOutlinedButton(
-        text: s.collectCharge,
-        buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
-        buttonStyle: ButtonStyle(side: const WidgetStatePropertyAll(BorderSide.none), backgroundColor: WidgetStatePropertyAll(appTheme.green)),
-        onPressed: () {
-          GoRouter.of(context).pushNamed(CardSettingsScreen.name, extra: notification.planId);
-        },
-      ),
-      const SizedBox(height: 12),
-    ]);
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Row(
+          children: [
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text('${s.congratsYouHaveFinishedPlan} «${notification.planName}»', style: TextStyles.textMSemibold.copyWith(color: appTheme.black)),
+                  const SizedBox(height: 12),
+                  Text(s.userConfirmedPlanCompletionWithoutSum, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
+                  const SizedBox(height: 12),
+                  CustomOutlinedButton(
+                    text: s.collectCharge,
+                    buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
+                    buttonStyle: ButtonStyle(side: const WidgetStatePropertyAll(BorderSide.none), backgroundColor: WidgetStatePropertyAll(appTheme.green)),
+                    onPressed: () {
+                      GoRouter.of(context).pushNamed(CardSettingsScreen.name, extra: notification.planId);
+                    },
+                  ),
+                ],
+              ),
+            ),
+            if (!notification.isRead)
+              Container(
+                decoration: BoxDecoration(color: appTheme.blueA400, shape: BoxShape.circle),
+                width: 8,
+                height: 8,
+              ),
+          ],
+        ),
+        const SizedBox(height: 4),
+        Text(
+          '${notification.createdAt.day} ${_getMonthName(notification.createdAt.month)} ${notification.createdAt.hour.toString().padLeft(2, '0')}:${notification.createdAt.minute.toString().padLeft(2, '0')}',
+          style: TextStyles.textSMedium.copyWith(color: appTheme.gray600),
+        ),
+      ],
+    );
+  }
+
+  String _getMonthName(int month) {
+    switch (month) {
+      case 1:
+        return 'янв';
+      case 2:
+        return 'фев';
+      case 3:
+        return 'мар';
+      case 4:
+        return 'апр';
+      case 5:
+        return 'май';
+      case 6:
+        return 'июн';
+      case 7:
+        return 'июл';
+      case 8:
+        return 'авг';
+      case 9:
+        return 'сен';
+      case 10:
+        return 'окт';
+      case 11:
+        return 'ноя';
+      case 12:
+        return 'дек';
+      default:
+        return '';
+    }
   }
 }
 
 // CardSettingsScreen
 class _BaseNotificationWidget extends StatelessWidget {
-  const _BaseNotificationWidget({required this.notificationsText, required this.isRead});
+  const _BaseNotificationWidget({required this.notificationsText, required this.isRead, required this.createdAt});
   final String notificationsText;
   final bool isRead;
+  final DateTime createdAt;
   @override
   Widget build(BuildContext context) {
-    return Row(
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        SizedBox(
-          width: MediaQuery.sizeOf(context).width * 0.6,
-          child: Text(
-            notificationsText,
-            style: TextStyles.textMMedium.copyWith(color: appTheme.black),
-          ),
-        ),
-        if (!isRead) ...[
-          const Spacer(),
-          Container(
-            decoration: BoxDecoration(
-              color: appTheme.blueA400,
-              shape: BoxShape.circle,
+        Row(
+          children: [
+            Expanded(
+              child: Text(notificationsText, style: TextStyles.textMMedium.copyWith(color: appTheme.black)),
             ),
-            width: 8,
-            height: 8,
-          )
-        ]
+            if (!isRead)
+              Container(
+                decoration: BoxDecoration(color: appTheme.blueA400, shape: BoxShape.circle),
+                width: 8,
+                height: 8,
+              ),
+          ],
+        ),
+        const SizedBox(height: 4),
+        Text(
+          '${createdAt.day} ${_getMonthName(createdAt.month)} ${createdAt.hour.toString().padLeft(2, '0')}:${createdAt.minute.toString().padLeft(2, '0')}',
+          style: TextStyles.textSMedium.copyWith(color: appTheme.gray600),
+        ),
       ],
     );
   }
+
+  String _getMonthName(int month) {
+    switch (month) {
+      case 1:
+        return 'янв';
+      case 2:
+        return 'фев';
+      case 3:
+        return 'мар';
+      case 4:
+        return 'апр';
+      case 5:
+        return 'май';
+      case 6:
+        return 'июн';
+      case 7:
+        return 'июл';
+      case 8:
+        return 'авг';
+      case 9:
+        return 'сен';
+      case 10:
+        return 'окт';
+      case 11:
+        return 'ноя';
+      case 12:
+        return 'дек';
+      default:
+        return '';
+    }
+  }
+}
+
+class _ChosenPlanLastDayFinishedForUserWidget extends StatelessWidget {
+  const _ChosenPlanLastDayFinishedForUserWidget({required this.notification});
+  final ChosenPlanLastDayFinishedForUser notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(isRead: notification.isRead, notificationsText: 'Последний день плана завершен', createdAt: notification.createdAt);
+  }
+}
+
+class _ChosenPlanConsultantLastDayStartedWidget extends StatelessWidget {
+  const _ChosenPlanConsultantLastDayStartedWidget({required this.notification});
+  final ChosenPlanConsultantLastDayStarted notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Последний день плана начался: ${notification.planName}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ComplaintToModerationForUserWidget extends StatelessWidget {
+  const _ComplaintToModerationForUserWidget({required this.notification});
+  final ComplaintToModerationForUser notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(isRead: notification.isRead, notificationsText: 'Жалоба отправлена на модерацию', createdAt: notification.createdAt);
+  }
+}
+
+class _CommentRepliedWidget extends StatelessWidget {
+  const _CommentRepliedWidget({required this.notification});
+  final CommentReplied notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Ответ на комментарий: ${notification.entityName}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ScoreAddedWidget extends StatelessWidget {
+  const _ScoreAddedWidget({required this.notification});
+  final ScoreAdded notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Добавлены баллы: ${notification.scoreValue}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _EntityCommentedWidget extends StatelessWidget {
+  const _EntityCommentedWidget({required this.notification});
+  final EntityCommented notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Комментарий к ${notification.entityTranslatedType}: ${notification.entityName}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _UnknownNotificationWidget extends StatelessWidget {
+  const _UnknownNotificationWidget({required this.notification});
+  final UnknownNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Неизвестное уведомление: ${notification.type.toString()}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+// Новые виджеты для дополнительных типов уведомлений
+class _PlanSubscriptionExpiredWidget extends StatelessWidget {
+  const _PlanSubscriptionExpiredWidget({required this.notification});
+  final PlanSubscriptionExpiredNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Подписка на план "${notification.planName}" истекла',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _PlanSubscriptionRenewedWidget extends StatelessWidget {
+  const _PlanSubscriptionRenewedWidget({required this.notification});
+  final PlanSubscriptionRenewedNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Подписка на план "${notification.planName}" продлена до ${notification.renewalDate}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ConsultantAssignedWidget extends StatelessWidget {
+  const _ConsultantAssignedWidget({required this.notification});
+  final ConsultantAssignedNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'К плану "${notification.planName}" назначен консультант ${notification.consultantName}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ConsultantUnassignedWidget extends StatelessWidget {
+  const _ConsultantUnassignedWidget({required this.notification});
+  final ConsultantUnassignedNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Консультант ${notification.consultantName} отстранен от плана "${notification.planName}"',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _PaymentFailedWidget extends StatelessWidget {
+  const _PaymentFailedWidget({required this.notification});
+  final PaymentFailedNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Ошибка оплаты плана "${notification.planName}": ${notification.errorMessage}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _PaymentSuccessfulWidget extends StatelessWidget {
+  const _PaymentSuccessfulWidget({required this.notification});
+  final PaymentSuccessfulNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Успешная оплата плана "${notification.planName}" на сумму ${notification.amount} ${notification.currency}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _GoalAchievedWidget extends StatelessWidget {
+  const _GoalAchievedWidget({required this.notification});
+  final GoalAchievedNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Достигнута цель "${notification.goalName}": ${notification.achievedValue}/${notification.targetValue}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _WorkoutReminderWidget extends StatelessWidget {
+  const _WorkoutReminderWidget({required this.notification});
+  final WorkoutReminderNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Напоминание о тренировке "${notification.workoutName}" (${notification.duration} мин)',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _MealReminderWidget extends StatelessWidget {
+  const _MealReminderWidget({required this.notification});
+  final MealReminderNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Напоминание о приеме пищи "${notification.mealName}" (${notification.calories} ккал)',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+// New notification widget classes
+class _DietCancelledWidget extends StatelessWidget {
+  const _DietCancelledWidget({required this.notification});
+  final DietCancelledNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Диета "${notification.dietName}" отменена',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _DietStartedWidget extends StatelessWidget {
+  const _DietStartedWidget({required this.notification});
+  final DietStartedNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Диета "${notification.dietName}" началась',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _DietExpiredWidget extends StatelessWidget {
+  const _DietExpiredWidget({required this.notification});
+  final DietExpiredNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Диета "${notification.dietName}" истекла',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _DietWillStartedInWidget extends StatelessWidget {
+  const _DietWillStartedInWidget({required this.notification});
+  final DietWillStartedInNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Диета "${notification.dietName}" начнется ${notification.startDate}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _DietCanNotBeStartedWidget extends StatelessWidget {
+  const _DietCanNotBeStartedWidget({required this.notification});
+  final DietCanNotBeStartedNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Диета "${notification.dietName}" не может быть начата: ${notification.reason}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _PersonalDietCreationNeededWidget extends StatelessWidget {
+  const _PersonalDietCreationNeededWidget({required this.notification});
+  final PersonalDietCreationNeededNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Требуется создание персональной диеты для клиента ${notification.clientName} по плану "${notification.planName}"',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ChosenPlanClientLastDayFinishedWidget extends StatelessWidget {
+  const _ChosenPlanClientLastDayFinishedWidget({required this.notification});
+  final ChosenPlanClientLastDayFinishedNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Последний день плана "${notification.planName}" завершен',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ChosenPlanClientLastDayStartedWidget extends StatelessWidget {
+  const _ChosenPlanClientLastDayStartedWidget({required this.notification});
+  final ChosenPlanClientLastDayStartedNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Последний день плана "${notification.planName}" начался',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _StayOnTrackToAuthorWidget extends StatelessWidget {
+  const _StayOnTrackToAuthorWidget({required this.notification});
+  final StayOnTrackToAuthorNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Клиент ${notification.clientName} остается на плане "${notification.planName}"',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ClientStartPlanSubscriptionToSubscriberWidget extends StatelessWidget {
+  const _ClientStartPlanSubscriptionToSubscriberWidget({required this.notification});
+  final ClientStartPlanSubscriptionToSubscriberNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Подписка на план "${notification.planName}" началась',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ConsultantConfirmPlanSubscriptionToSubscriberWidget extends StatelessWidget {
+  const _ConsultantConfirmPlanSubscriptionToSubscriberWidget({required this.notification});
+  final ConsultantConfirmPlanSubscriptionToSubscriberNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Консультант ${notification.consultantName} подтвердил подписку на план "${notification.planName}"',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ClientPaidPlanSubscriptionToAuthorWidget extends StatelessWidget {
+  const _ClientPaidPlanSubscriptionToAuthorWidget({required this.notification});
+  final ClientPaidPlanSubscriptionToAuthorNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Клиент ${notification.clientName} оплатил подписку на план "${notification.planName}" на сумму ${notification.amount}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ConsultantLeftDiaryCommentWidget extends StatelessWidget {
+  const _ConsultantLeftDiaryCommentWidget({required this.notification});
+  final ConsultantLeftDiaryCommentNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Консультант ${notification.consultantName} оставил комментарий к дневнику по плану "${notification.planName}"',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ConsultantConfirmPlanSubscriptionToAuthorWidget extends StatelessWidget {
+  const _ConsultantConfirmPlanSubscriptionToAuthorWidget({required this.notification});
+  final ConsultantConfirmPlanSubscriptionToAuthorNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Консультант ${notification.consultantName} подтвердил подписку на план "${notification.planName}"',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ClientPaidPlanSubscriptionToSubscriberWidget extends StatelessWidget {
+  const _ClientPaidPlanSubscriptionToSubscriberWidget({required this.notification});
+  final ClientPaidPlanSubscriptionToSubscriberNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Оплачена подписка на план "${notification.planName}" на сумму ${notification.amount}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ClientStartPlanSubscriptionToAuthorWidget extends StatelessWidget {
+  const _ClientStartPlanSubscriptionToAuthorWidget({required this.notification});
+  final ClientStartPlanSubscriptionToAuthorNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Клиент ${notification.clientName} начал подписку на план "${notification.planName}"',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ClientCancelPlanSubscriptionToAuthorWidget extends StatelessWidget {
+  const _ClientCancelPlanSubscriptionToAuthorWidget({required this.notification});
+  final ClientCancelPlanSubscriptionToAuthorNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Клиент ${notification.clientName} отменил подписку на план "${notification.planName}"',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ClientCancelPlanSubscriptionToSubscriberWidget extends StatelessWidget {
+  const _ClientCancelPlanSubscriptionToSubscriberWidget({required this.notification});
+  final ClientCancelPlanSubscriptionToSubscriberNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Подписка на план "${notification.planName}" отменена',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _UserDailyReportCompletedWidget extends StatelessWidget {
+  const _UserDailyReportCompletedWidget({required this.notification});
+  final UserDailyReportCompletedNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Клиент ${notification.clientName} завершил ежедневный отчет по плану "${notification.planName}"',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _StayOnTrackToCustomerWidget extends StatelessWidget {
+  const _StayOnTrackToCustomerWidget({required this.notification});
+  final StayOnTrackToCustomerNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Консультант ${notification.consultantName} остается на плане "${notification.planName}"',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _PhoneChangedWidget extends StatelessWidget {
+  const _PhoneChangedWidget({required this.notification});
+  final PhoneChangedNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Номер телефона изменен с ${notification.oldPhone} на ${notification.newPhone}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _SubscriptionWidget extends StatelessWidget {
+  const _SubscriptionWidget({required this.notification});
+  final SubscriptionNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Подписка ${notification.subscriptionType} на план "${notification.planName}"',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _BadgeAwardedWidget extends StatelessWidget {
+  const _BadgeAwardedWidget({required this.notification});
+  final BadgeAwardedNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Получен значок "${notification.badgeName}": ${notification.badgeDescription}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _BadgeRevokedWidget extends StatelessWidget {
+  const _BadgeRevokedWidget({required this.notification});
+  final BadgeRevokedNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Отозван значок "${notification.badgeName}": ${notification.reason}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ConsultantRequestStartedWidget extends StatelessWidget {
+  const _ConsultantRequestStartedWidget({required this.notification});
+  final ConsultantRequestStartedNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Запрос к консультанту ${notification.consultantName} начат',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ClientCloseComplaintSuccessWidget extends StatelessWidget {
+  const _ClientCloseComplaintSuccessWidget({required this.notification});
+  final ClientCloseComplaintSuccessNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Жалоба на ${notification.complaintType} "${notification.entityName}" успешно закрыта',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ClientRefundSuccessWidget extends StatelessWidget {
+  const _ClientRefundSuccessWidget({required this.notification});
+  final ClientRefundSuccessNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Возврат средств по плану "${notification.planName}" на сумму ${notification.amount}: ${notification.reason}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ConsultantRefundSuccessWidget extends StatelessWidget {
+  const _ConsultantRefundSuccessWidget({required this.notification});
+  final ConsultantRefundSuccessNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Возврат средств клиенту ${notification.clientName} по плану "${notification.planName}" на сумму ${notification.amount}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ClientRejectSuccessWidget extends StatelessWidget {
+  const _ClientRejectSuccessWidget({required this.notification});
+  final ClientRejectSuccessNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Отклонение по плану "${notification.planName}": ${notification.reason}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ConsultantRejectSuccessWidget extends StatelessWidget {
+  const _ConsultantRejectSuccessWidget({required this.notification});
+  final ConsultantRejectSuccessNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Отклонение клиентом ${notification.clientName} по плану "${notification.planName}": ${notification.reason}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ScoreSubstractedWidget extends StatelessWidget {
+  const _ScoreSubstractedWidget({required this.notification});
+  final ScoreSubstractedNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Вычтено ${notification.scoreValue} баллов за ${notification.scorableName}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _ProductStatusUpdatedForAuthorWidget extends StatelessWidget {
+  const _ProductStatusUpdatedForAuthorWidget({required this.notification});
+  final ProductStatusUpdatedForAuthorNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(
+      isRead: notification.isRead,
+      notificationsText: 'Статус продукта "${notification.productName}" изменен с ${notification.oldStatus} на ${notification.newStatus}',
+      createdAt: notification.createdAt,
+    );
+  }
+}
+
+class _DiaryReminderForUsersWidget extends StatelessWidget {
+  const _DiaryReminderForUsersWidget({required this.notification});
+  final DiaryReminderForUsersNotification notification;
+  @override
+  Widget build(BuildContext context) {
+    return _BaseNotificationWidget(isRead: notification.isRead, notificationsText: 'Напоминание о заполнении дневника', createdAt: notification.createdAt);
+  }
 }
diff --git a/lib/features/notifications/repository/notifications_repository.dart b/lib/features/notifications/repository/notifications_repository.dart
index beef645f..267faa89 100644
--- a/lib/features/notifications/repository/notifications_repository.dart
+++ b/lib/features/notifications/repository/notifications_repository.dart
@@ -1,14 +1,15 @@
-import 'package:eatvio_app/features/notifications/models/notification_model.dart';
+import 'dart:developer';
 import 'package:eatvio_app/features/notifications/service/notifications_service.dart';
 
 class NotificationsRepository {
   final NotificationsService notificationsService;
   NotificationsRepository({required this.notificationsService});
 
-  Future<List<BaseNotificationModel>?> getNotifications({required int page}) {
+  Future<Map<String, dynamic>?> getNotifications({required int page}) {
     try {
       return notificationsService.getNotifications(page: page);
     } catch (e) {
+      log(e.toString());
       rethrow;
     }
   }
diff --git a/lib/features/notifications/service/notifications_service.dart b/lib/features/notifications/service/notifications_service.dart
index 860aab55..5b3ca78b 100644
--- a/lib/features/notifications/service/notifications_service.dart
+++ b/lib/features/notifications/service/notifications_service.dart
@@ -5,48 +5,425 @@ class NotificationsService {
   final Dio dio;
   NotificationsService(this.dio);
 
-  Future<List<BaseNotificationModel>?> getNotifications({required int page}) async {
+  Future<Map<String, dynamic>?> getNotifications({required int page}) async {
     try {
       final response = await dio.get('/api/profile/notifications?page=$page');
       if (response.statusCode == 200) {
         final data = response.data['data'] as List<dynamic>;
+
         final notifications = data.map((notificationJson) {
           try {
-            final stringifiedType = notificationJson['data']['notification_class_name'];
+            // Улучшенная логика определения типа уведомления
+            String? stringifiedType;
+
+            // Сначала проверяем поле 'type' в корне JSON
+            if (notificationJson.containsKey('type') && notificationJson['type'] != null) {
+              stringifiedType = notificationJson['type'].toString();
+            }
+            // Затем проверяем поле 'notification_class_name' в корне JSON
+            else if (notificationJson.containsKey('notification_class_name') && notificationJson['notification_class_name'] != null) {
+              stringifiedType = notificationJson['notification_class_name'].toString();
+            }
+            // Если есть поле 'data', проверяем внутри него
+            else if (notificationJson.containsKey('data') && notificationJson['data'] is Map<String, dynamic>) {
+              final data = notificationJson['data'] as Map<String, dynamic>;
+              if (data.containsKey('type') && data['type'] != null) {
+                stringifiedType = data['type'].toString();
+              } else if (data.containsKey('notification_class_name') && data['notification_class_name'] != null) {
+                stringifiedType = data['notification_class_name'].toString();
+              }
+            }
+
             final readDate = notificationJson['read_at'];
-            final type = NotificationType.getTypeFromString(stringifiedType);
+            final createdAt = notificationJson['created_at'];
+            final type = stringifiedType != null ? NotificationType.getTypeFromString(stringifiedType) : NotificationType.unknown;
+
             return switch (type) {
-              NotificationType.planSubscriptionStartedToAuthor =>
-                PlanSubscriptionStartedToAuthorNotification.fromJson(notificationJson['data'], type, isRead: readDate != null),
-              NotificationType.planSubscriptionCanceledToAuthor =>
-                PlanSubscriptionCanceledToAuthorNotification.fromJson(notificationJson['data'], type, isRead: readDate != null),
-              NotificationType.chosenPlanStartedToClientNotification =>
-                ChosenPlanStartedToClientNotification.fromJson(notificationJson['data'], type, isRead: readDate != null),
-              NotificationType.chosenPlanTomorrowReminderToClientNotification =>
-                ChosenPlanTomorrowReminderToClientNotification.fromJson(notificationJson['data'], type, isRead: readDate != null),
-              NotificationType.diaryReminderNotification => DiaryReminderNotification.fromJson(notificationJson['data'], type, isRead: readDate != null),
-              NotificationType.consultantLeftComment => ConsultantLeftCommentNotification.fromJson(notificationJson['data'], type, isRead: readDate != null),
-              NotificationType.personalizedDietIsDefined =>
-                PersonalizedDietIsDefinedNotification.fromJson(notificationJson['data'], type, isRead: readDate != null),
-              NotificationType.chosenPlanFinishedToClient =>
-                ChosenPlanFinishedToClientNotification.fromJson(notificationJson['data'], type, isRead: readDate != null),
-              NotificationType.planSubscriptionCanceledToCustomer =>
-                PlanSubscriptionCanceledToAuthorNotification.fromJson(notificationJson['data'], type, isRead: readDate != null),
-              NotificationType.chosenPlanStartedToConsultantNotification =>
-                ChosenPlanStartedToConsultantNotification.fromJson(notificationJson['data'], type, isRead: readDate != null),
-              NotificationType.chosenPlanTomorrowReminderToConsultantNotification =>
-                ChosenPlanTomorrowReminderToConsultantNotification.fromJson(notificationJson['data'], type, isRead: readDate != null),
-              NotificationType.planSubscriptionPaidToAuthor =>
-                PlanSubscriptionPaidToAuthorNotification.fromJson(notificationJson['data'], type, isRead: readDate != null),
-              NotificationType.chosenPlanFinishedToConsultant =>
-                ChosenPlanFinishedToConsultantNotification.fromJson(notificationJson['data'], type, isRead: readDate != null),
-              NotificationType.unknown => UnknownNotification(type: type),
+              NotificationType.planSubscriptionStartedToAuthor => PlanSubscriptionStartedToAuthorNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.planSubscriptionCanceledToAuthor => PlanSubscriptionCanceledToAuthorNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.chosenPlanStartedToClientNotification => ChosenPlanStartedToClientNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.chosenPlanTomorrowReminderToClientNotification => ChosenPlanTomorrowReminderToClientNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.diaryReminderNotification => DiaryReminderNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.consultantLeftComment => ConsultantLeftCommentNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.personalizedDietIsDefined => PersonalizedDietIsDefinedNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.chosenPlanFinishedToClient => ChosenPlanFinishedToClientNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.planSubscriptionCanceledToCustomer => PlanSubscriptionCanceledToAuthorNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.chosenPlanStartedToConsultantNotification => ChosenPlanStartedToConsultantNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.chosenPlanTomorrowReminderToConsultantNotification => ChosenPlanTomorrowReminderToConsultantNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.planSubscriptionPaidToAuthor => PlanSubscriptionPaidToAuthorNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.chosenPlanFinishedToConsultant => ChosenPlanFinishedToConsultantNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.chosenPlanLastDayFinishedForUser => ChosenPlanLastDayFinishedForUser.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              // Новые типы уведомлений
+              NotificationType.chosenPlanConsultantLastDayStarted => ChosenPlanConsultantLastDayStarted.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.complaintToModerationForUser => ComplaintToModerationForUser.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.commentReplied => CommentReplied.fromJson(notificationJson['data'], type, isRead: readDate != null, createdAt: createdAt),
+              NotificationType.scoreAdded => ScoreAdded.fromJson(notificationJson['data'], type, isRead: readDate != null, createdAt: createdAt),
+              NotificationType.entityCommented => EntityCommented.fromJson(notificationJson['data'], type, isRead: readDate != null, createdAt: createdAt),
+              // Новые типы уведомлений
+              NotificationType.planSubscriptionExpired => PlanSubscriptionExpiredNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.planSubscriptionRenewed => PlanSubscriptionRenewedNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.consultantAssigned => ConsultantAssignedNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.consultantUnassigned => ConsultantUnassignedNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.paymentFailed => PaymentFailedNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.paymentSuccessful => PaymentSuccessfulNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.goalAchieved => GoalAchievedNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.workoutReminder => WorkoutReminderNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.mealReminder => MealReminderNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              // New notification types
+              NotificationType.dietCancelled => DietCancelledNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.dietStarted => DietStartedNotification.fromJson(notificationJson['data'], type, isRead: readDate != null, createdAt: createdAt),
+              NotificationType.dietExpired => DietExpiredNotification.fromJson(notificationJson['data'], type, isRead: readDate != null, createdAt: createdAt),
+              NotificationType.dietWillStartedIn => DietWillStartedInNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.dietCanNotBeStarted => DietCanNotBeStartedNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.personalDietCreationNeeded => PersonalDietCreationNeededNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.chosenPlanClientLastDayFinished => ChosenPlanClientLastDayFinishedNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.chosenPlanClientLastDayStarted => ChosenPlanClientLastDayStartedNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.stayOnTrackToAuthor => StayOnTrackToAuthorNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.chosenPlanStartedToClient => ChosenPlanStartedToClientNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.clientStartPlanSubscriptionToSubscriber => ClientStartPlanSubscriptionToSubscriberNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.consultantConfirmPlanSubscriptionToSubscriber => ConsultantConfirmPlanSubscriptionToSubscriberNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.clientPaidPlanSubscriptionToAuthor => ClientPaidPlanSubscriptionToAuthorNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.chosenPlanTomorrowReminderToClient => ChosenPlanTomorrowReminderToClientNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.chosenPlanTomorrowReminderToConsultant => ChosenPlanTomorrowReminderToConsultantNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.chosenPlanStartedToConsultant => ChosenPlanStartedToConsultantNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.consultantLeftDiaryComment => ConsultantLeftDiaryCommentNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.consultantConfirmPlanSubscriptionToAuthor => ConsultantConfirmPlanSubscriptionToAuthorNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.clientPaidPlanSubscriptionToSubscriber => ClientPaidPlanSubscriptionToSubscriberNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.clientStartPlanSubscriptionToAuthor => ClientStartPlanSubscriptionToAuthorNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.clientCancelPlanSubscriptionToAuthor => ClientCancelPlanSubscriptionToAuthorNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.clientCancelPlanSubscriptionToSubscriber => ClientCancelPlanSubscriptionToSubscriberNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.userDailyReportCompleted => UserDailyReportCompletedNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.stayOnTrackToCustomer => StayOnTrackToCustomerNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.phoneChanged => PhoneChangedNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.subscription => SubscriptionNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.badgeAwarded => BadgeAwardedNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.badgeRevoked => BadgeRevokedNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.consultantRequestStarted => ConsultantRequestStartedNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.clientCloseComplaintSuccess => ClientCloseComplaintSuccessNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.clientRefundSuccess => ClientRefundSuccessNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.consultantRefundSuccess => ConsultantRefundSuccessNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.clientRejectSuccess => ClientRejectSuccessNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.consultantRejectSuccess => ConsultantRejectSuccessNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.scoreSubstracted => ScoreSubstractedNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.productStatusUpdatedForAuthor => ProductStatusUpdatedForAuthorNotification.fromJson(
+                notificationJson['data'],
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.diaryReminderForUsers => DiaryReminderForUsersNotification.fromJson(
+                notificationJson,
+                type,
+                isRead: readDate != null,
+                createdAt: createdAt,
+              ),
+              NotificationType.unknown => UnknownNotification(type: type, createdAt: parseDate(createdAt)),
             };
           } catch (e) {
-            return UnknownNotification(type: NotificationType.unknown);
+            return UnknownNotification(type: NotificationType.unknown, createdAt: DateTime.now());
           }
         }).toList();
-        return notifications.where((notification) => notification.type != NotificationType.unknown).toList();
+
+        // Извлекаем информацию о пагинации из корня ответа
+        final currentPage = response.data['current_page'] as int;
+        final lastPage = response.data['last_page'] as int;
+        final perPage = response.data['per_page'] as int;
+        final total = response.data['total'] as int;
+
+        return {
+          'notifications': notifications,
+          'pagination': {'current_page': currentPage, 'last_page': lastPage, 'per_page': perPage, 'total': total},
+        };
       }
       return null;
     } catch (e) {
@@ -62,3 +439,5 @@ class NotificationsService {
     }
   }
 }
+
+DateTime parseDate(String date) => DateTime.parse(date).toLocal();
diff --git a/lib/features/plans/models/chosen_plan_model.dart b/lib/features/plans/models/chosen_plan_model.dart
index 429cf78f..f70f1cd2 100644
--- a/lib/features/plans/models/chosen_plan_model.dart
+++ b/lib/features/plans/models/chosen_plan_model.dart
@@ -21,7 +21,7 @@ abstract class ChosenPlanModel with _$ChosenPlanModel {
   factory ChosenPlanModel.fromJson(Map<String, dynamic> json) => _$ChosenPlanModelFromJson(json);
 }
 
-ChosenPlanModel? parseChosenPlan(json) {
+ChosenPlanModel? parseChosenPlan(dynamic json) {
   if (json is Map<String, dynamic>) {
     return ChosenPlanModel.fromJson(json);
   }
diff --git a/lib/features/plans/presentation/pages/about_plan_screen.dart b/lib/features/plans/presentation/pages/about_plan_screen.dart
index 4e33f0df..b5905664 100644
--- a/lib/features/plans/presentation/pages/about_plan_screen.dart
+++ b/lib/features/plans/presentation/pages/about_plan_screen.dart
@@ -15,9 +15,8 @@ import 'package:eatvio_app/features/diets/presentation/widgets/author_card.dart'
 import 'package:eatvio_app/features/diets/presentation/widgets/expandable_text.dart';
 import 'package:eatvio_app/features/diets/presentation/widgets/info_bouble.dart';
 import 'package:eatvio_app/core/widgets/main_background_bouble.dart';
-import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
-import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart';
-import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_state.dart';
+import 'package:eatvio_app/core/comments/comments_cubit/comments_cubit.dart';
+import 'package:eatvio_app/core/comments/comments_cubit/comments_state.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/comments_widget.dart';
 import 'package:eatvio_app/features/plans/presentation/cubit/about_plan_cubit.dart';
@@ -35,8 +34,8 @@ import 'package:go_router/go_router.dart';
 import '../../../../core/widgets/option_widget.dart';
 
 class AboutPlanScreen extends StatefulWidget {
-  const AboutPlanScreen({super.key, required this.plan, required this.navigateToComments, required this.index});
-  final PlanModel plan;
+  const AboutPlanScreen({super.key, required this.slug, required this.navigateToComments, required this.index});
+  final String slug;
   final bool navigateToComments;
   final int? index;
   @override
@@ -53,7 +52,7 @@ class _AboutPlanScreenState extends State<AboutPlanScreen> {
   @override
   void initState() {
     super.initState();
-    context.read<FeedCubit>().viewPlan(widget.plan.slug);
+    context.read<FeedCubit>().viewPlan(widget.slug);
     scrollController.addListener(() {
       if (isMoreOptionsVisible) {
         setState(() {
@@ -73,464 +72,484 @@ class _AboutPlanScreenState extends State<AboutPlanScreen> {
   @override
   Widget build(BuildContext context) {
     final s = S.of(context);
-    return MultiBlocProvider(
-      providers: [
-        BlocProvider<CommentsCubit>(
-          create: (context) => commentsCubit
-            ..getComments(
-              widget.plan.slug,
-              CommentSourceType.plan,
-              true,
-            ),
-        ),
-        BlocProvider<AboutPlanCubit>(
-          create: (context) => sl<AboutPlanCubit>()..getPlanWithLoading(widget.plan.slug),
-        ),
-      ],
-      child: BlocConsumer<CommentsCubit, CommentsState>(
-        listener: (BuildContext context, CommentsState commentsState) {
-          if (commentsState is CommentsStateLoaded) {
-            setState(() {
-              replyId = commentsState.replyId;
-            });
-          }
-        },
-        builder: (BuildContext context, CommentsState commentsState) {
-          return BlocBuilder<AboutPlanCubit, AboutPlanState>(
-            builder: (context, state) {
-              if (state.isLoading) {
-                return Scaffold(
-                  appBar: AppBar(
-                    centerTitle: true,
-                    title: Text(
-                      widget.plan.name,
-                      maxLines: 2,
-                      textAlign: TextAlign.center,
-                      overflow: TextOverflow.ellipsis,
-                      softWrap: true,
-                      style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
-                    ),
-                    actions: [
-                      CustomPopup(
-                        isAuthor: widget.plan.author.authorIsMe,
-                        path: 'plan/${widget.plan.slug}',
-                        complainedContentType: ComplainedContent.plan,
-                        slug: widget.plan.slug,
-                        userSlug: widget.plan.author.authorSlug,
-                      ),
-                      const SizedBox(width: 16),
-                    ],
-                  ),
-                  body: const Loader(),
-                );
-              }
-              WidgetsBinding.instance.addPostFrameCallback((_) {
-                if (widget.navigateToComments && !_jumped) {
-                  _scrollToBottom();
-                }
+    return PopScope(
+      child: MultiBlocProvider(
+        providers: [
+          BlocProvider<CommentsCubit>(
+            create: (context) => commentsCubit
+              ..getComments(
+                widget.slug,
+                CommentSourceType.plan,
+                true,
+              ),
+          ),
+          BlocProvider<AboutPlanCubit>(
+            create: (context) => sl<AboutPlanCubit>()..getPlanWithLoading(widget.slug),
+          ),
+        ],
+        child: BlocConsumer<CommentsCubit, CommentsState>(
+          listener: (BuildContext context, CommentsState commentsState) {
+            if (commentsState is CommentsStateLoaded) {
+              setState(() {
+                replyId = commentsState.replyId;
               });
-              if (state.error != null) {
+            }
+          },
+          builder: (BuildContext context, CommentsState commentsState) {
+            return BlocBuilder<AboutPlanCubit, AboutPlanState>(
+              builder: (context, state) {
+                if (state.isLoading) {
+                  return Scaffold(
+                    appBar: AppBar(
+                      leading: BackButton(
+                        onPressed: () {
+                          if (context.canPop()) {
+                            GoRouter.of(context).pop();
+                            return;
+                          }
+                          GoRouter.of(context).go('/feed-screen');
+                        },
+                      ),
+                      centerTitle: true,
+                      title: Text(
+                        '',
+                        maxLines: 2,
+                        textAlign: TextAlign.center,
+                        overflow: TextOverflow.ellipsis,
+                        softWrap: true,
+                        style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+                      ),
+                    ),
+                    body: const Loader(),
+                  );
+                }
+                WidgetsBinding.instance.addPostFrameCallback((_) {
+                  if (widget.navigateToComments && !_jumped) {
+                    _scrollToBottom();
+                  }
+                });
+                if (state.error != null) {
+                  return Scaffold(
+                    appBar: AppBar(
+                      leading: BackButton(
+                        onPressed: () {
+                          if (context.canPop()) {
+                            GoRouter.of(context).pop();
+                            return;
+                          }
+                          GoRouter.of(context).go('/feed-screen');
+                        },
+                      ),
+                      centerTitle: true,
+                      title: Text(
+                        state.planModel?.name ?? '',
+                        maxLines: 2,
+                        textAlign: TextAlign.center,
+                        overflow: TextOverflow.ellipsis,
+                        softWrap: true,
+                        style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+                      ),
+                      actions: [
+                        CustomPopup(
+                          isAuthor: state.planModel?.author.authorIsMe ?? false,
+                          path: 'plan/${widget.slug}',
+                          complainedContentType: ComplainedContent.plan,
+                          userSlug: state.planModel?.author.authorSlug ?? '',
+                        ),
+                        const SizedBox(width: 16),
+                      ],
+                    ),
+                    body: DataErrorWidget(onReload: () => context.read<AboutPlanCubit>().getPlan(widget.slug)),
+                  );
+                }
                 return Scaffold(
-                  appBar: AppBar(
-                    centerTitle: true,
-                    title: Text(
-                      widget.plan.name,
-                      maxLines: 2,
-                      textAlign: TextAlign.center,
-                      overflow: TextOverflow.ellipsis,
-                      softWrap: true,
-                      style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
-                    ),
-                    actions: [
-                      CustomPopup(
-                        isAuthor: widget.plan.author.authorIsMe,
-                        path: 'plan/${widget.plan.slug}',
-                        complainedContentType: ComplainedContent.plan,
-                        slug: widget.plan.slug,
-                        userSlug: widget.plan.author.authorSlug,
-                      ),
-                      const SizedBox(width: 16),
-                    ],
-                  ),
-                  body: DataErrorWidget(onReload: () => context.read<AboutPlanCubit>().getPlan(widget.plan.slug)),
-                );
-              }
-              return Scaffold(
-                backgroundColor: appTheme.gray100,
-                resizeToAvoidBottomInset: true,
-                bottomSheet: Container(
-                  padding: const EdgeInsets.symmetric(vertical: 12) + (Platform.isIOS ? const EdgeInsets.only(bottom: 16) : EdgeInsets.zero),
-                  decoration: BoxDecoration(
-                    color: Colors.white,
-                    border: Border(
-                      top: BorderSide(
-                        color: Colors.black.withValues(alpha: 0.1),
+                  backgroundColor: appTheme.gray100,
+                  resizeToAvoidBottomInset: true,
+                  bottomSheet: Container(
+                    padding: const EdgeInsets.symmetric(vertical: 12) + (Platform.isIOS ? const EdgeInsets.only(bottom: 16) : EdgeInsets.zero),
+                    decoration: BoxDecoration(
+                      color: Colors.white,
+                      border: Border(
+                        top: BorderSide(
+                          color: Colors.black.withValues(alpha: 0.1),
+                        ),
                       ),
                     ),
-                  ),
-                  child: Padding(
-                    padding: const EdgeInsets.symmetric(horizontal: 16),
-                    child: Column(
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        Row(
-                          children: [
-                            Expanded(
-                              child: SizedBox(
-                                child: FloatingActionButton.extended(
-                                  heroTag: 'nextButtonRegistration',
-                                  highlightElevation: 0,
-                                  elevation: 0,
-                                  focusElevation: 0,
-                                  shape: RoundedRectangleBorder(
-                                    borderRadius: BorderRadius.circular(16),
-                                  ),
-                                  backgroundColor: appTheme.greenA700,
-                                  onPressed: () async {
-                                    final (chosenPlan, error) = await context.read<AboutPlanCubit>().chosePlan();
-                                    if (error == 'hasPlan') {
-                                      showErrorDialog(context, title: s.end_previous_plan, description: s.you_can_not_start_plan_until_end_of_prev_one);
-                                      return;
-                                    }
-                                    if (chosenPlan == null) {
+                    child: Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 16),
+                      child: Column(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          Row(
+                            children: [
+                              Expanded(
+                                child: SizedBox(
+                                  child: FloatingActionButton.extended(
+                                    heroTag: 'nextButtonRegistration',
+                                    highlightElevation: 0,
+                                    elevation: 0,
+                                    focusElevation: 0,
+                                    shape: RoundedRectangleBorder(
+                                      borderRadius: BorderRadius.circular(16),
+                                    ),
+                                    backgroundColor: appTheme.greenA700,
+                                    onPressed: () async {
+                                      final (chosenPlan, error) = await context.read<AboutPlanCubit>().chosePlan();
+                                      if (error == 'hasPlan') {
+                                        showErrorDialog(context, title: s.end_previous_plan, description: s.you_can_not_start_plan_until_end_of_prev_one);
+                                        return;
+                                      }
+                                      if (chosenPlan == null) {
+                                        if (!context.mounted) return;
+                                        showErrorDialog(context, title: 'Не удалось заказать план');
+                                        return;
+                                      }
                                       if (!context.mounted) return;
-                                      showErrorDialog(context, title: 'Не удалось заказать план');
-                                      return;
-                                    }
-                                    if (!context.mounted) return;
-                                    GoRouter.of(context).pushReplacementNamed(
-                                      'chatScreen',
-                                      extra: {
-                                        'chatId': chosenPlan.chatId,
-                                        'sendInitialMessage': true,
-                                      },
-                                    );
-                                  },
-                                  label: Text(
-                                    s.to_order,
-                                    style: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
+                                      GoRouter.of(context).pushReplacementNamed(
+                                        'chatScreen',
+                                        extra: {
+                                          'uuid': chosenPlan.chatId,
+                                          'sendInitialMessage': true,
+                                        },
+                                      );
+                                    },
+                                    label: Text(
+                                      s.to_order,
+                                      style: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
+                                    ),
                                   ),
                                 ),
                               ),
-                            ),
-                            const SizedBox(width: 8),
-                            BookmarkButton(
-                              isFavorite: state.planModel?.isFavorite ?? false,
-                              onTap: () {
-                                final planModel = state.planModel;
-                                if (planModel == null) return;
-                                if (planModel.isFavorite) {
-                                  context.read<AboutPlanCubit>().removeFromFavorite(slug: planModel.slug, index: widget.index);
-                                } else {
-                                  context.read<AboutPlanCubit>().addToFavorite(slug: planModel.slug, index: widget.index);
-                                }
-                              },
-                              width: 52,
-                              height: 52,
-                              size: 24,
-                              shape: BoxShape.circle,
-                              color: appTheme.gray50,
-                            ),
-                          ],
-                        ),
-                        const SizedBox(height: 8),
-                        Row(
-                          mainAxisAlignment: MainAxisAlignment.center,
-                          children: [
-                            if (replyId != null)
+                              const SizedBox(width: 8),
+                              BookmarkButton(
+                                isFavorite: state.planModel?.isFavorite ?? false,
+                                onTap: () {
+                                  final planModel = state.planModel;
+                                  if (planModel == null) return;
+                                  if (planModel.isFavorite) {
+                                    context.read<AboutPlanCubit>().removeFromFavorite(slug: planModel.slug, index: widget.index);
+                                  } else {
+                                    context.read<AboutPlanCubit>().addToFavorite(slug: planModel.slug, index: widget.index);
+                                  }
+                                },
+                                width: 52,
+                                height: 52,
+                                size: 24,
+                                shape: BoxShape.circle,
+                                color: appTheme.gray50,
+                              ),
+                            ],
+                          ),
+                          const SizedBox(height: 8),
+                          Row(
+                            mainAxisAlignment: MainAxisAlignment.center,
+                            children: [
+                              if (replyId != null)
+                                GestureDetector(
+                                  onTap: () {
+                                    context.read<CommentsCubit>().setReplyId(null);
+                                    setState(() {
+                                      replyId = null;
+                                      textEditingController.clear();
+                                    });
+                                    FocusManager.instance.primaryFocus?.unfocus();
+                                  },
+                                  child: Container(
+                                    decoration: BoxDecoration(
+                                      color: appTheme.blueA400,
+                                      shape: BoxShape.circle,
+                                    ),
+                                    height: 32,
+                                    width: 32,
+                                    child: const Icon(
+                                      Icons.close_rounded,
+                                      size: 18,
+                                      color: Colors.white,
+                                    ),
+                                  ),
+                                ),
+                              if (replyId != null) const SizedBox(width: 8),
+                              Expanded(
+                                child: ConstrainedBox(
+                                  constraints: const BoxConstraints(minHeight: 52),
+                                  child: TextFormField(
+                                    textCapitalization: TextCapitalization.sentences,
+                                    onChanged: (_) {
+                                      setState(() {});
+                                    },
+                                    controller: textEditingController,
+                                    maxLines: 5,
+                                    minLines: 1,
+                                    keyboardType: TextInputType.multiline,
+                                    style: const TextStyle(
+                                      fontSize: 16,
+                                      fontWeight: FontWeight.w400,
+                                      color: Colors.black,
+                                      height: 1.2,
+                                    ),
+                                    decoration: InputDecoration(
+                                      isDense: false, // убираем true, чтобы padding учитывался корректно
+                                      contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16), // вертикальный паддинг увеличен
+                                      hintText: 'Комментарий',
+                                      hintStyle: const TextStyle(
+                                        fontSize: 16,
+                                        fontWeight: FontWeight.w400,
+                                        height: 1.2,
+                                        color: Color(0xFFAEAEB2),
+                                      ),
+                                      filled: true,
+                                      border: OutlineInputBorder(
+                                        borderRadius: BorderRadius.circular(16),
+                                        borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
+                                      ),
+                                      enabledBorder: OutlineInputBorder(
+                                        borderRadius: BorderRadius.circular(16),
+                                        borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
+                                      ),
+                                      focusedBorder: OutlineInputBorder(
+                                        borderRadius: BorderRadius.circular(16),
+                                        borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                              ),
+                              const SizedBox(width: 8),
                               GestureDetector(
                                 onTap: () {
-                                  context.read<CommentsCubit>().setReplyId(null);
-                                  setState(() {
-                                    replyId = null;
-                                    textEditingController.clear();
-                                  });
-                                  FocusManager.instance.primaryFocus?.unfocus();
+                                  if (textEditingController.text.length > 2) {
+                                    commentsCubit.sendComment(
+                                      id: widget.slug,
+                                      commentText: textEditingController.text,
+                                      parentCommentId: replyId,
+                                      commentSourceType: CommentSourceType.plan,
+                                    );
+                                    context.read<CommentsCubit>().setReplyId(null);
+                                    setState(() {
+                                      textEditingController.clear();
+                                      replyId = null;
+                                    });
+
+                                    Future.delayed(const Duration(milliseconds: 500), () {
+                                      if (context.mounted) {
+                                        context.read<AboutPlanCubit>().getPlan(widget.slug);
+                                      }
+                                    });
+                                    FocusManager.instance.primaryFocus?.unfocus();
+                                  }
                                 },
                                 child: Container(
                                   decoration: BoxDecoration(
-                                    color: appTheme.blueA400,
+                                    color: textEditingController.text.length > 2 ? appTheme.blueA400 : appTheme.gray50,
                                     shape: BoxShape.circle,
                                   ),
                                   height: 32,
                                   width: 32,
-                                  child: const Icon(
-                                    Icons.close_rounded,
+                                  child: Icon(
+                                    Icons.send_rounded,
                                     size: 18,
-                                    color: Colors.white,
+                                    color: textEditingController.text.length > 2 ? appTheme.whiteA700 : appTheme.black,
                                   ),
                                 ),
                               ),
-                            if (replyId != null) const SizedBox(width: 8),
-                            Expanded(
-                              child: ConstrainedBox(
-                                constraints: const BoxConstraints(minHeight: 52),
-                                child: TextFormField(
-                                  textCapitalization: TextCapitalization.sentences,
-                                  onChanged: (_) {
-                                    setState(() {});
-                                  },
-                                  controller: textEditingController,
-                                  maxLines: 5,
-                                  minLines: 1,
-                                  keyboardType: TextInputType.multiline,
-                                  style: const TextStyle(
-                                    fontSize: 16,
-                                    fontWeight: FontWeight.w400,
-                                    color: Colors.black,
-                                    height: 1.2,
-                                  ),
-                                  decoration: InputDecoration(
-                                    isDense: false, // убираем true, чтобы padding учитывался корректно
-                                    contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16), // вертикальный паддинг увеличен
-                                    hintText: 'Комментарий',
-                                    hintStyle: const TextStyle(
-                                      fontSize: 16,
-                                      fontWeight: FontWeight.w400,
-                                      height: 1.2,
-                                      color: Color(0xFFAEAEB2),
-                                    ),
-                                    filled: true,
-                                    border: OutlineInputBorder(
-                                      borderRadius: BorderRadius.circular(16),
-                                      borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
-                                    ),
-                                    enabledBorder: OutlineInputBorder(
-                                      borderRadius: BorderRadius.circular(16),
-                                      borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
-                                    ),
-                                    focusedBorder: OutlineInputBorder(
-                                      borderRadius: BorderRadius.circular(16),
-                                      borderSide: const BorderSide(color: Color(0xFFD1D1D6), width: 1),
-                                    ),
-                                  ),
-                                ),
-                              ),
-                            ),
-                            const SizedBox(width: 8),
-                            GestureDetector(
-                              onTap: () {
-                                if (textEditingController.text.length > 2) {
-                                  commentsCubit.sendComment(
-                                    id: widget.plan.slug,
-                                    commentText: textEditingController.text,
-                                    parentCommentId: replyId,
-                                    commentSourceType: CommentSourceType.plan,
-                                  );
-                                  context.read<CommentsCubit>().setReplyId(null);
-                                  setState(() {
-                                    textEditingController.clear();
-                                    replyId = null;
-                                  });
-
-                                  Future.delayed(const Duration(milliseconds: 500), () {
-                                    if (context.mounted) {
-                                      context.read<AboutPlanCubit>().getPlan(widget.plan.slug);
-                                    }
-                                  });
-                                  FocusManager.instance.primaryFocus?.unfocus();
-                                }
-                              },
-                              child: Container(
-                                decoration: BoxDecoration(
-                                  color: textEditingController.text.length > 2 ? appTheme.blueA400 : appTheme.gray50,
-                                  shape: BoxShape.circle,
-                                ),
-                                height: 32,
-                                width: 32,
-                                child: Icon(
-                                  Icons.send_rounded,
-                                  size: 18,
-                                  color: textEditingController.text.length > 2 ? appTheme.whiteA700 : appTheme.black,
-                                ),
-                              ),
-                            ),
-                          ],
-                        ),
-                      ],
+                            ],
+                          ),
+                        ],
+                      ),
                     ),
                   ),
-                ),
-                appBar: AppBar(
-                  centerTitle: true,
-                  title: Text(
-                    widget.plan.name,
-                    maxLines: 2,
-                    textAlign: TextAlign.center,
-                    overflow: TextOverflow.ellipsis,
-                    softWrap: true,
-                    style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
-                  ),
-                  actions: [
-                    CustomPopup(
-                      isAuthor: widget.plan.author.authorIsMe,
-                      path: 'plan/${widget.plan.slug}',
-                      complainedContentType: ComplainedContent.plan,
-                      slug: widget.plan.slug,
-                      userSlug: widget.plan.author.authorSlug,
+                  appBar: AppBar(
+                    centerTitle: true,
+                    leading: BackButton(
+                      onPressed: () {
+                        if (context.canPop()) {
+                          GoRouter.of(context).pop();
+                          return;
+                        }
+                        GoRouter.of(context).go('/feed-screen');
+                      },
                     ),
-                    const SizedBox(width: 16),
-                  ],
-                ),
-                body: SingleChildScrollView(
-                  controller: scrollController,
-                  padding: const EdgeInsets.only(bottom: 160),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      const SizedBox(height: 8),
-                      MainBackgroundBouble(
-                        child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: [
-                            Stack(
-                              children: [
-                                CachedNetworkImage(
-                                  imageUrl: '$baseUrl/storage/${widget.plan.image}',
-                                  height: 300,
-                                  width: MediaQuery.sizeOf(context).width,
-                                  fit: BoxFit.fill,
-                                ),
-                                Positioned(
-                                  bottom: 16,
-                                  left: 0,
-                                  right: 0,
-                                  child: Row(
-                                    mainAxisAlignment: MainAxisAlignment.center,
-                                    children: [
-                                      InfoBouble(
-                                        backgroundColor: appTheme.whiteA700,
-                                        children: [
-                                          SvgPicture.asset('assets/icons/eye.svg', width: 18, height: 12),
-                                          const SizedBox(width: 8),
-                                          Text(
-                                            widget.plan.totalViews.toString(),
-                                            style: TextStyles.textXSSemibold.copyWith(color: appTheme.black),
-                                          ),
-                                        ],
-                                      ),
-                                      const SizedBox(width: 12),
-                                      GestureDetector(
-                                        onTap: () {
-                                          context.read<AboutPlanCubit>().likePlan(slug: widget.plan.slug, index: widget.index);
-                                        },
-                                        child: InfoBouble(
+                    title: Text(
+                      state.planModel?.name ?? '',
+                      maxLines: 2,
+                      textAlign: TextAlign.center,
+                      overflow: TextOverflow.ellipsis,
+                      softWrap: true,
+                      style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+                    ),
+                    actions: [
+                      CustomPopup(
+                        isAuthor: state.planModel?.author.authorIsMe ?? false,
+                        path: 'plan/${widget.slug}',
+                        complainedContentType: ComplainedContent.plan,
+                        userSlug: state.planModel?.author.authorSlug ?? '',
+                      ),
+                      const SizedBox(width: 16),
+                    ],
+                  ),
+                  body: SingleChildScrollView(
+                    controller: scrollController,
+                    padding: const EdgeInsets.only(bottom: 160),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        const SizedBox(height: 8),
+                        MainBackgroundBouble(
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Stack(
+                                children: [
+                                  CachedNetworkImage(
+                                    imageUrl: '$baseUrl/storage/${state.planModel?.image}',
+                                    height: 300,
+                                    width: MediaQuery.sizeOf(context).width,
+                                    fit: BoxFit.fill,
+                                  ),
+                                  Positioned(
+                                    bottom: 16,
+                                    left: 0,
+                                    right: 0,
+                                    child: Row(
+                                      mainAxisAlignment: MainAxisAlignment.center,
+                                      children: [
+                                        InfoBouble(
                                           backgroundColor: appTheme.whiteA700,
                                           children: [
-                                            SvgPicture.asset(
-                                              'assets/icons/heart.svg',
-                                              width: 14,
-                                              height: 12,
-                                              colorFilter: state.planModel?.wasLikedByMe == true ? ColorFilter.mode(appTheme.blueA400, BlendMode.srcIn) : null,
-                                            ),
+                                            SvgPicture.asset('assets/icons/eye.svg', width: 18, height: 12),
                                             const SizedBox(width: 8),
                                             Text(
-                                              state.planModel?.totalLikes.toString() ?? '0',
+                                              state.planModel?.totalViews.toString() ?? '',
                                               style: TextStyles.textXSSemibold.copyWith(color: appTheme.black),
                                             ),
                                           ],
                                         ),
-                                      ),
-                                      const SizedBox(width: 12),
-                                      InfoBouble(
-                                        backgroundColor: appTheme.whiteA700,
-                                        children: [
-                                          SvgPicture.asset('assets/icons/comment2.svg', width: 13, height: 12),
-                                          const SizedBox(width: 8),
-                                          Text(
-                                            widget.plan.totalComments.toString(),
-                                            style: TextStyles.textXSSemibold.copyWith(color: appTheme.black),
+                                        const SizedBox(width: 12),
+                                        GestureDetector(
+                                          onTap: () {
+                                            context.read<AboutPlanCubit>().likePlan(slug: widget.slug, index: widget.index);
+                                          },
+                                          child: InfoBouble(
+                                            backgroundColor: appTheme.whiteA700,
+                                            children: [
+                                              SvgPicture.asset(
+                                                'assets/icons/heart.svg',
+                                                width: 14,
+                                                height: 12,
+                                                colorFilter:
+                                                    state.planModel?.wasLikedByMe == true ? ColorFilter.mode(appTheme.blueA400, BlendMode.srcIn) : null,
+                                              ),
+                                              const SizedBox(width: 8),
+                                              Text(
+                                                state.planModel?.totalLikes.toString() ?? '0',
+                                                style: TextStyles.textXSSemibold.copyWith(color: appTheme.black),
+                                              ),
+                                            ],
                                           ),
-                                        ],
-                                      ),
-                                    ],
+                                        ),
+                                        const SizedBox(width: 12),
+                                        InfoBouble(
+                                          backgroundColor: appTheme.whiteA700,
+                                          children: [
+                                            SvgPicture.asset('assets/icons/comment2.svg', width: 13, height: 12),
+                                            const SizedBox(width: 8),
+                                            Text(
+                                              state.planModel?.totalComments.toString() ?? '',
+                                              style: TextStyles.textXSSemibold.copyWith(color: appTheme.black),
+                                            ),
+                                          ],
+                                        ),
+                                      ],
+                                    ),
+                                  ),
+                                ],
+                              ),
+                              const SizedBox(height: 16),
+                              Padding(
+                                padding: const EdgeInsets.symmetric(horizontal: 16),
+                                child: Text(
+                                  s.about_plan,
+                                  style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
+                                ),
+                              ),
+                              const SizedBox(height: 12),
+                              InfoRow(plan: state.planModel, type: ProductType.plan),
+                              ExpandableText(
+                                text: state.planModel?.details ?? '',
+                              ),
+                              if (state.planModel != null) ...[
+                                const SizedBox(height: 20),
+                                Padding(
+                                  padding: const EdgeInsets.symmetric(horizontal: 16),
+                                  child: AuthorCard(
+                                    author: (state.planModel?.author)!,
+                                    title: s.plan_author,
                                   ),
                                 ),
                               ],
-                            ),
-                            const SizedBox(height: 16),
-                            Padding(
-                              padding: const EdgeInsets.symmetric(horizontal: 16),
-                              child: Text(
-                                s.about_plan,
-                                style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
-                              ),
-                            ),
-                            const SizedBox(height: 12),
-                            InfoRow(plan: state.planModel, type: ProductType.plan),
-                            ExpandableText(
-                              text: widget.plan.details,
-                            ),
-                            const SizedBox(height: 20),
-                            Padding(
-                              padding: const EdgeInsets.symmetric(horizontal: 16),
-                              child: AuthorCard(
-                                author: widget.plan.author,
-                                title: s.plan_author,
-                              ),
-                            ),
-                            const SizedBox(height: 16),
-                          ],
+                              const SizedBox(height: 16),
+                            ],
+                          ),
                         ),
-                      ),
-                      const SizedBox(height: 16),
-                      if (state.planModel?.packetsCount == 3) ...[
-                        OptionsTab(
-                          cost: [
-                            state.planModel?.packet1Options?.price ?? 0,
-                            state.planModel?.packet2Options?.price ?? 0,
-                            state.planModel?.packet3Options?.price ?? 0,
-                          ],
+                        const SizedBox(height: 16),
+                        if (state.planModel?.packetsCount == 3) ...[
+                          OptionsTab(
+                            cost: [
+                              state.planModel?.packet1Options?.price ?? 0,
+                              state.planModel?.packet2Options?.price ?? 0,
+                              state.planModel?.packet3Options?.price ?? 0,
+                            ],
+                          ),
+                          const SizedBox(height: 12),
+                        ],
+                        switch (state.chosenOptionIndex) {
+                          1 => OptionWidget(
+                              option: state.planModel?.packet2Options,
+                            ),
+                          2 => OptionWidget(
+                              option: state.planModel?.packet3Options,
+                            ),
+                          _ => OptionWidget(
+                              option: state.planModel?.packet1Options,
+                            ),
+                        },
+                        const SizedBox(
+                          height: 16,
                         ),
-                        const SizedBox(height: 12),
-                      ],
-                      switch (state.chosenOptionIndex) {
-                        1 => OptionWidget(
-                            option: state.planModel?.packet2Options,
-                          ),
-                        2 => OptionWidget(
-                            option: state.planModel?.packet3Options,
-                          ),
-                        _ => OptionWidget(
-                            option: state.planModel?.packet1Options,
-                          ),
-                      },
-                      const SizedBox(
-                        height: 16,
-                      ),
-                      MainBackgroundBouble(
-                        padding: const EdgeInsets.symmetric(vertical: 16),
-                        child: Column(
-                          children: [
-                            Container(
-                              padding: const EdgeInsets.symmetric(horizontal: 16),
-                              alignment: Alignment.centerLeft,
-                              child: Text(
-                                '${state.planModel?.totalComments ?? 0} ${getCommentForm(state.planModel?.totalComments ?? 0, s)}',
-                                style: TextStyles.textMMedium.copyWith(
-                                  color: appTheme.gray500,
+                        MainBackgroundBouble(
+                          padding: const EdgeInsets.symmetric(vertical: 16),
+                          child: Column(
+                            children: [
+                              Container(
+                                padding: const EdgeInsets.symmetric(horizontal: 16),
+                                alignment: Alignment.centerLeft,
+                                child: Text(
+                                  '${state.planModel?.totalComments ?? 0} ${getCommentForm(state.planModel?.totalComments ?? 0, s)}',
+                                  style: TextStyles.textMMedium.copyWith(
+                                    color: appTheme.gray500,
+                                  ),
                                 ),
                               ),
-                            ),
-                            const SizedBox(height: 16),
-                            if (commentsState is CommentsStateLoading) const Loader(),
-                            if (commentsState is CommentsStateLoaded)
-                              CommentsWidget(
-                                id: widget.plan.id.toString(),
-                                commentSourceType: CommentSourceType.plan,
-                                comment: commentsState.comment,
-                                replyId: replyId,
-                              ),
-                          ],
+                              const SizedBox(height: 16),
+                              if (commentsState is CommentsStateLoading) const Loader(),
+                              if (commentsState is CommentsStateLoaded)
+                                CommentsWidget(
+                                  id: state.planModel?.id.toString() ?? '',
+                                  commentSourceType: CommentSourceType.plan,
+                                  comment: commentsState.comment,
+                                  replyId: replyId,
+                                ),
+                            ],
+                          ),
                         ),
-                      ),
-                    ],
+                      ],
+                    ),
                   ),
-                ),
-              );
-            },
-          );
-        },
+                );
+              },
+            );
+          },
+        ),
       ),
     );
   }
diff --git a/lib/features/profile/models/chosen_diets_pagination_model.dart b/lib/features/profile/models/chosen_diets_pagination_model.dart
index ce81c3d6..323ed660 100644
--- a/lib/features/profile/models/chosen_diets_pagination_model.dart
+++ b/lib/features/profile/models/chosen_diets_pagination_model.dart
@@ -26,7 +26,7 @@ abstract class ChosenDietModel with _$ChosenDietModel {
   factory ChosenDietModel.fromJson(Map<String, dynamic> json) => _$ChosenDietModelFromJson(json);
 }
 
-int? _parseDietId(json) {
+int? _parseDietId(dynamic json) {
   if (json == null) return null;
   return json['id'] as int?;
 }
diff --git a/lib/features/profile/models/profile_model.dart b/lib/features/profile/models/profile_model.dart
index 8d13bc7e..03fd57f3 100644
--- a/lib/features/profile/models/profile_model.dart
+++ b/lib/features/profile/models/profile_model.dart
@@ -14,9 +14,12 @@ abstract class ProfileModel with _$ProfileModel {
     @JsonKey(name: "email") required String email,
     @JsonKey(name: "rating_place") int? ratingPlace,
     @JsonKey(name: "email_verified_at") DateTime? emailVerifiedAt,
+    @JsonKey(name: "phone_confirmation_state") required String phoneConfirmationState,
     @JsonKey(name: "created_at") DateTime? createdAt,
     @JsonKey(name: "updated_at") DateTime? updatedAt,
     @JsonKey(name: "is_public_profile", fromJson: parseBool) required bool isPublicProfile,
+    @JsonKey(name: "is_blocked_by_me", fromJson: parseBool) required bool isBlockedByMe,
+    @JsonKey(name: "is_blocked_by_user", fromJson: parseBool, defaultValue: false) required bool isBlockedByUser,
     @JsonKey(name: 'is_entity_subscribed_by_me') required bool isEntitySubscribedByMe,
     @JsonKey(name: "slug") required String slug,
     @JsonKey(name: "profile_photo_url") required String profilePhotoUrl,
diff --git a/lib/features/profile/presentation/bloc/plans_cubit/plans_cubit.dart b/lib/features/profile/presentation/bloc/plans_cubit/plans_cubit.dart
index 4b42c19b..4b5d86b6 100644
--- a/lib/features/profile/presentation/bloc/plans_cubit/plans_cubit.dart
+++ b/lib/features/profile/presentation/bloc/plans_cubit/plans_cubit.dart
@@ -11,7 +11,7 @@ class PlansCubit extends Cubit<PlansState> {
     required this.plansRepository,
   }) : super(const PlansState());
 
-  getPlans(String slug) async {
+  Future<void> getPlans(String slug) async {
     emit(const PlansState.loading());
     try {
       emit(PlansState.loaded(plansList: await plansRepository.getPlansBySlug(slug)));
diff --git a/lib/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart b/lib/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart
index 1312dea8..d0d7a932 100644
--- a/lib/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart
+++ b/lib/features/profile/presentation/bloc/profile_cubit/profile_cubit.dart
@@ -25,6 +25,7 @@ class ProfileCubit extends Cubit<ProfileState> {
   }) : super(const ProfileState.loading());
 
   Future<void> getProfileBySlug(String slug) async {
+    emit(const ProfileState.loading());
     try {
       final profile = await profileRepository.getProfileBySlug(slug);
       emit(
@@ -44,6 +45,7 @@ class ProfileCubit extends Cubit<ProfileState> {
   Future<void> getMyProfile({
     String period = '1',
   }) async {
+    emit(const ProfileState.loading());
     _currentPeriod = period;
     try {
       final profile = await profileRepository.getMyProfile();
@@ -63,7 +65,7 @@ class ProfileCubit extends Cubit<ProfileState> {
     }
   }
 
-  updateFeedBlogPostList(FeedBlogPostModel feedBlogPostModel, bool wasLikedByMe) {
+  void updateFeedBlogPostList(FeedBlogPostModel feedBlogPostModel, bool wasLikedByMe) {
     List<FeedBlogPostModel> feedBlogPostList = [...(state as ProfileStateLoaded).blogPosts];
     final int index = feedBlogPostList.indexOf(feedBlogPostModel);
     feedBlogPostList[index] = feedBlogPostModel.copyWith(
@@ -79,7 +81,7 @@ class ProfileCubit extends Cubit<ProfileState> {
     );
   }
 
-  addCircumference({
+  Future<void> addCircumference({
     required int chestCircumference,
     required int waistCircumference,
     required int hipCircumference,
@@ -96,7 +98,7 @@ class ProfileCubit extends Cubit<ProfileState> {
     }
   }
 
-  addWeight({
+  Future<void> addWeight({
     required double weight,
   }) async {
     try {
@@ -107,7 +109,7 @@ class ProfileCubit extends Cubit<ProfileState> {
     }
   }
 
-  getChatRoomIdBySlug({
+  Future<String?> getChatRoomIdBySlug({
     required Author author,
   }) async {
     try {
@@ -123,22 +125,24 @@ class ProfileCubit extends Cubit<ProfileState> {
         AppRouter.navigatorKey.currentContext?.pushNamed(
           'chatScreen',
           extra: {
-            'chatId': chatIdOrError,
+            'uuid': chatIdOrError,
           },
         );
+        return chatIdOrError;
       }
     } catch (e, st) {
       log(e.toString(), stackTrace: st);
       return '';
     }
+    return null;
   }
 
-  uploadPhoto(File file) async {
+  Future<void> uploadPhoto(File file) async {
     await profileRepository.uploadPhoto(await ImageCompressUtility.compressFile(file));
     return await getMyProfile();
   }
 
-  deletePhoto() async {
+  Future<void> deletePhoto() async {
     await profileRepository.deletePhoto();
     return await getMyProfile();
   }
diff --git a/lib/features/profile/presentation/bloc/sub_cubit/sub_cubit.dart b/lib/features/profile/presentation/bloc/sub_cubit/sub_cubit.dart
index 60e2c486..b6d40645 100644
--- a/lib/features/profile/presentation/bloc/sub_cubit/sub_cubit.dart
+++ b/lib/features/profile/presentation/bloc/sub_cubit/sub_cubit.dart
@@ -9,7 +9,7 @@ class SubCubit extends Cubit<SubState> {
     required this.profileRepository,
   }) : super(const SubState());
 
-  getSubscriptions(String slug, [String? query]) async {
+  Future<void> getSubscriptions(String slug, [String? query]) async {
     emit(const SubState.loading());
     try {
       emit(SubState.loaded(subList: await profileRepository.getSubscriptionsBySlug(slug, query)));
@@ -18,7 +18,7 @@ class SubCubit extends Cubit<SubState> {
     }
   }
 
-  getSubscribers(String slug, [String? query]) async {
+  Future<void> getSubscribers(String slug, [String? query]) async {
     emit(const SubState.loading());
     try {
       emit(SubState.loaded(subList: await profileRepository.getSubscribersBySlug(slug, query)));
@@ -27,11 +27,11 @@ class SubCubit extends Cubit<SubState> {
     }
   }
 
-  subscribe(String slug) async {
+  Future<void> subscribe(String slug) async {
     return await profileRepository.subscribe(slug);
   }
 
-  unsubscribe(String slug) async {
+  Future<void> unsubscribe(String slug) async {
     return await profileRepository.unsubscribe(slug);
   }
 }
diff --git a/lib/features/profile/presentation/pages/profile_screen.dart b/lib/features/profile/presentation/pages/profile_screen.dart
index d475d34b..990beed1 100644
--- a/lib/features/profile/presentation/pages/profile_screen.dart
+++ b/lib/features/profile/presentation/pages/profile_screen.dart
@@ -45,10 +45,7 @@ import 'package:url_launcher/url_launcher.dart';
 class ProfileScreen extends StatefulWidget {
   final Author? author;
 
-  const ProfileScreen({
-    super.key,
-    this.author,
-  });
+  const ProfileScreen({super.key, this.author});
 
   @override
   State<ProfileScreen> createState() => _ProfileScreenState();
@@ -91,11 +88,44 @@ class _ProfileScreenState extends State<ProfileScreen> {
             }
             if (isFirstFetch) {
               canSub = !state.profile.isEntitySubscribedByMe;
-              if (state.profile.roles.contains('consultant')) {
+              if (state.profile.roles.contains('consultant') && !hidePlans) {
                 plansCubit.getPlans(state.profile.slug);
               }
               isFirstFetch = false;
             }
+            
+            // Проверяем, заблокировал ли пользователь меня
+            if (state.profile.isBlockedByUser) {
+              return Scaffold(
+                appBar: AppBar(),
+                body: Center(
+                  child: Padding(
+                    padding: const EdgeInsets.all(32.0),
+                    child: Column(
+                      mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
+                        Icon(
+                          Icons.block,
+                          size: 64,
+                          color: Colors.grey[400],
+                        ),
+                        const SizedBox(height: 16),
+                        Text(
+                          'Пользователь ограничил доступ к своей странице',
+                          textAlign: TextAlign.center,
+                          style: TextStyle(
+                            fontSize: 18,
+                            fontWeight: FontWeight.w500,
+                            color: Colors.grey[600],
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              );
+            }
+            
             return widget.author == null || widget.author!.authorIsMe ? _myProfileScreen(state) : _profileScreen(state);
           } else if (state is ProfileStateError) {
             return Scaffold(
@@ -109,17 +139,14 @@ class _ProfileScreenState extends State<ProfileScreen> {
               ),
             );
           } else {
-            return Scaffold(
-              appBar: AppBar(),
-              body: const Loader(),
-            );
+            return Scaffold(appBar: AppBar(), body: const Loader());
           }
         },
       ),
     );
   }
 
-  _profileScreen(ProfileStateLoaded state) {
+  Scaffold _profileScreen(ProfileStateLoaded state) {
     return Scaffold(
       backgroundColor: Colors.grey.shade200,
       appBar: AppBar(),
@@ -130,15 +157,13 @@ class _ProfileScreenState extends State<ProfileScreen> {
             Container(
               decoration: const BoxDecoration(
                 color: Colors.white,
-                borderRadius: BorderRadius.vertical(
-                  bottom: Radius.circular(16),
-                ),
+                borderRadius: BorderRadius.vertical(bottom: Radius.circular(16)),
               ),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
                   _header(state),
-                  if (state.profile.roles.contains('consultant'))
+                  if (state.profile.roles.contains('consultant') && state.consultantInfo != null)
                     Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
@@ -147,28 +172,15 @@ class _ProfileScreenState extends State<ProfileScreen> {
                             const SizedBox(width: 16),
                             const Text(
                               'Консультант',
-                              style: TextStyle(
-                                fontSize: 16,
-                                fontWeight: FontWeight.w600,
-                                color: Color(
-                                  0xFF323F4B,
-                                ),
-                              ),
+                              style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xFF323F4B)),
                             ),
                             const SizedBox(width: 12),
                             Container(
                               padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
-                              decoration: BoxDecoration(
-                                color: const Color(0xFFF6FAFF),
-                                borderRadius: BorderRadius.circular(12),
-                              ),
+                              decoration: BoxDecoration(color: const Color(0xFFF6FAFF), borderRadius: BorderRadius.circular(12)),
                               child: Text(
                                 '${state.consultantInfo!.ratingPlace}-й в рейтинге',
-                                style: TextStyle(
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.w600,
-                                  color: appTheme.blueA400,
-                                ),
+                                style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: appTheme.blueA400),
                               ),
                             ),
                           ],
@@ -177,35 +189,28 @@ class _ProfileScreenState extends State<ProfileScreen> {
                           const Row(
                             children: [
                               SizedBox(width: 16),
-                              Icon(
-                                Icons.done_rounded,
-                                color: Colors.green,
-                              ),
+                              Icon(Icons.done_rounded, color: Colors.green),
                               Text(
                                 'Медицинское образование',
-                                style: TextStyle(
-                                  color: Color(0xFF323F4B),
-                                  fontSize: 14,
-                                  fontWeight: FontWeight.w600,
-                                ),
+                                style: TextStyle(color: Color(0xFF323F4B), fontSize: 14, fontWeight: FontWeight.w600),
                               ),
                             ],
                           ),
                       ],
                     ),
                   if (state.profileDetails.additionalInfo.isNotEmpty) _additionalInfo(state),
-                  const SizedBox(height: 8),
-                  _messageAndSubscribe(state),
-                  const SizedBox(height: 16),
+                  if (!state.profile.isBlockedByMe) const SizedBox(height: 8),
+                  if (!state.profile.isBlockedByMe) _messageAndSubscribe(state),
+                  if (!state.profile.isBlockedByMe) const SizedBox(height: 16),
                 ],
               ),
             ),
             _subscriptionsAndSubscribers(state),
             if (state.profile.badges.isNotEmpty) Padding(padding: const EdgeInsets.only(bottom: 16), child: _badges(state)),
-            if (state.profile.roles.contains('consultant')) _socialLinks(state),
-            if (state.profile.roles.contains('consultant')) _education(state),
-            if (state.profile.roles.contains('consultant')) _diplomasAndCertificates(state),
-            if (state.profile.roles.contains('consultant')) _activePlans(state),
+            if (state.profile.roles.contains('consultant') && state.consultantInfo != null && !state.profile.isBlockedByMe) _socialLinks(state),
+            if (state.profile.roles.contains('consultant') && state.consultantInfo != null && !state.profile.isBlockedByMe) _education(state),
+            if (state.profile.roles.contains('consultant') && state.consultantInfo != null && !state.profile.isBlockedByMe) _diplomasAndCertificates(state),
+            if (state.profile.roles.contains('consultant') && state.consultantInfo != null && !hidePlans && !state.profile.isBlockedByMe) _activePlans(state),
             _blogPosts(state),
           ],
         ),
@@ -213,10 +218,10 @@ class _ProfileScreenState extends State<ProfileScreen> {
     );
   }
 
-  _myProfileScreen(ProfileStateLoaded state) {
+  Scaffold _myProfileScreen(ProfileStateLoaded state) {
     return Scaffold(
       backgroundColor: Colors.grey.shade200,
-      appBar: AppBar(toolbarHeight: 0),
+      appBar: AppBar(toolbarHeight: widget.author == null ? 0 : null),
       body: SingleChildScrollView(
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
@@ -224,9 +229,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
             Container(
               decoration: const BoxDecoration(
                 color: Colors.white,
-                borderRadius: BorderRadius.vertical(
-                  bottom: Radius.circular(16),
-                ),
+                borderRadius: BorderRadius.vertical(bottom: Radius.circular(16)),
               ),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.center,
@@ -241,28 +244,15 @@ class _ProfileScreenState extends State<ProfileScreen> {
                             const SizedBox(width: 16),
                             const Text(
                               'Консультант',
-                              style: TextStyle(
-                                fontSize: 16,
-                                fontWeight: FontWeight.w600,
-                                color: Color(
-                                  0xFF323F4B,
-                                ),
-                              ),
+                              style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xFF323F4B)),
                             ),
                             const SizedBox(width: 12),
                             Container(
                               padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
-                              decoration: BoxDecoration(
-                                color: const Color(0xFFF6FAFF),
-                                borderRadius: BorderRadius.circular(12),
-                              ),
+                              decoration: BoxDecoration(color: const Color(0xFFF6FAFF), borderRadius: BorderRadius.circular(12)),
                               child: Text(
                                 '${state.consultantInfo!.ratingPlace}-й в рейтинге',
-                                style: TextStyle(
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.w600,
-                                  color: appTheme.blueA400,
-                                ),
+                                style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: appTheme.blueA400),
                               ),
                             ),
                           ],
@@ -271,17 +261,10 @@ class _ProfileScreenState extends State<ProfileScreen> {
                           const Row(
                             children: [
                               SizedBox(width: 16),
-                              Icon(
-                                Icons.done_rounded,
-                                color: Colors.green,
-                              ),
+                              Icon(Icons.done_rounded, color: Colors.green),
                               Text(
                                 'Медицинское образование',
-                                style: TextStyle(
-                                  color: Color(0xFF323F4B),
-                                  fontSize: 14,
-                                  fontWeight: FontWeight.w600,
-                                ),
+                                style: TextStyle(color: Color(0xFF323F4B), fontSize: 14, fontWeight: FontWeight.w600),
                               ),
                             ],
                           ),
@@ -297,7 +280,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
             if (state.profile.roles.contains('consultant')) _education(state),
             if (state.profile.roles.contains('consultant')) _diplomasAndCertificates(state),
             Padding(padding: const EdgeInsets.only(bottom: 16), child: _charts()),
-            if (state.profile.roles.contains('consultant')) _activePlans(state),
+            if (state.profile.roles.contains('consultant') && !hidePlans) _activePlans(state),
             _newBlogPostButton(),
             _blogPosts(state),
           ],
@@ -306,8 +289,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
     );
   }
 
-  _activePlans(ProfileStateLoaded state) {
-    if (!state.profile.roles.contains('consultant')) {
+  Widget _activePlans(ProfileStateLoaded state) {
+    if (!state.profile.roles.contains('consultant') || hidePlans) {
       return const SizedBox.shrink();
     }
     return BlocBuilder<PlansCubit, PlansState>(
@@ -326,12 +309,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
                   children: [
                     Text(
                       'Активные планы',
-                      style: TextStyle(
-                        color: Color(0xFF323F4B),
-                        fontSize: 24,
-                        height: 1,
-                        fontWeight: FontWeight.w600,
-                      ),
+                      style: TextStyle(color: Color(0xFF323F4B), fontSize: 24, height: 1, fontWeight: FontWeight.w600),
                     ),
                   ],
                 ),
@@ -341,10 +319,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
                 height: 781,
                 child: PageView.builder(
                   itemBuilder: (BuildContext context, int index) {
-                    return PlanWidget(
-                      plan: state.plansList[index],
-                      index: index,
-                    );
+                    return PlanWidget(plan: state.plansList[index], index: index);
                   },
                   onPageChanged: (bullet) {
                     setState(() {
@@ -365,38 +340,29 @@ class _ProfileScreenState extends State<ProfileScreen> {
     );
   }
 
-  _bullets(int currentBullet, int bulletCount) {
+  Container _bullets(int currentBullet, int bulletCount) {
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
-      decoration: BoxDecoration(
-        color: Colors.white,
-        borderRadius: BorderRadius.circular(20),
-      ),
+      decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(20)),
       child: Row(
         mainAxisSize: MainAxisSize.min,
         children: [
-          for (int i = 0; i < bulletCount; i++) ...[
-            _bullet(i == currentBullet),
-            i < bulletCount - 1 ? const SizedBox(width: 4) : const SizedBox.shrink(),
-          ],
+          for (int i = 0; i < bulletCount; i++) ...[_bullet(i == currentBullet), i < bulletCount - 1 ? const SizedBox(width: 4) : const SizedBox.shrink()],
         ],
       ),
     );
   }
 
-  _bullet(bool isActive) {
+  AnimatedContainer _bullet(bool isActive) {
     return AnimatedContainer(
       width: isActive ? 10 : 8,
       height: isActive ? 10 : 8,
       duration: const Duration(milliseconds: 150),
-      decoration: BoxDecoration(
-        color: isActive ? appTheme.blueA400 : const Color(0xFFD7D9DC),
-        shape: BoxShape.circle,
-      ),
+      decoration: BoxDecoration(color: isActive ? appTheme.blueA400 : const Color(0xFFD7D9DC), shape: BoxShape.circle),
     );
   }
 
-  _newBlogPostButton() {
+  Material _newBlogPostButton() {
     return Material(
       color: Colors.white,
       borderRadius: BorderRadius.circular(12),
@@ -409,25 +375,15 @@ class _ProfileScreenState extends State<ProfileScreen> {
           borderRadius: BorderRadius.circular(8),
           child: Ink(
             padding: const EdgeInsets.all(12),
-            decoration: BoxDecoration(
-              color: const Color(0xFFF6FAFF),
-              borderRadius: BorderRadius.circular(8),
-            ),
+            decoration: BoxDecoration(color: const Color(0xFFF6FAFF), borderRadius: BorderRadius.circular(8)),
             child: const Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                Icon(
-                  Icons.add_circle_outline_rounded,
-                  color: Color(0xFF2F80ED),
-                ),
+                Icon(Icons.add_circle_outline_rounded, color: Color(0xFF2F80ED)),
                 SizedBox(width: 12),
                 Text(
                   'Новая запись',
-                  style: TextStyle(
-                    fontSize: 18,
-                    fontWeight: FontWeight.w600,
-                    color: Color(0xFF2F80ED),
-                  ),
+                  style: TextStyle(fontSize: 18, fontWeight: FontWeight.w600, color: Color(0xFF2F80ED)),
                 ),
               ],
             ),
@@ -437,7 +393,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
     );
   }
 
-  _diplomasAndCertificates(ProfileStateLoaded state) {
+  SingleChildRenderObjectWidget _diplomasAndCertificates(ProfileStateLoaded state) {
     if (!state.profile.roles.contains('consultant') || state.consultantInfo!.photos.isEmpty) {
       return const SizedBox.shrink();
     }
@@ -452,12 +408,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
               children: [
                 const Text(
                   'Дипломы\nи сертификаты',
-                  style: TextStyle(
-                    color: Color(0xFF323F4B),
-                    fontSize: 24,
-                    height: 1,
-                    fontWeight: FontWeight.w600,
-                  ),
+                  style: TextStyle(color: Color(0xFF323F4B), fontSize: 24, height: 1, fontWeight: FontWeight.w600),
                 ),
                 GestureDetector(
                   onTap: () {
@@ -465,11 +416,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
                   },
                   child: Text(
                     widget.author == null || widget.author!.authorIsMe ? 'Редактировать' : '',
-                    style: const TextStyle(
-                      color: Color(0xFF2F80ED),
-                      fontSize: 16,
-                      fontWeight: FontWeight.w500,
-                    ),
+                    style: const TextStyle(color: Color(0xFF2F80ED), fontSize: 16, fontWeight: FontWeight.w500),
                   ),
                 ),
               ],
@@ -489,17 +436,14 @@ class _ProfileScreenState extends State<ProfileScreen> {
                 child: Row(
                   children: [
                     if (state.consultantInfo!.photos.isNotEmpty)
-                      ...List.generate(
-                        state.consultantInfo!.photos.length * 2 - 1,
-                        (index) {
-                          if (index.isEven) {
-                            final photo = state.consultantInfo!.photos[index ~/ 2];
-                            return _diplomaImage(photo.url);
-                          } else {
-                            return const SizedBox(width: 8);
-                          }
-                        },
-                      ),
+                      ...List.generate(state.consultantInfo!.photos.length * 2 - 1, (index) {
+                        if (index.isEven) {
+                          final photo = state.consultantInfo!.photos[index ~/ 2];
+                          return _diplomaImage(photo.url);
+                        } else {
+                          return const SizedBox(width: 8);
+                        }
+                      }),
                   ],
                 ),
               ),
@@ -510,33 +454,22 @@ class _ProfileScreenState extends State<ProfileScreen> {
     );
   }
 
-  _diplomaImage(String url) {
+  GestureDetector _diplomaImage(String url) {
     return GestureDetector(
       onTap: () {
-        context.pushTransparentRoute(
-          rootNavigator: true,
-          PhotoViewScreen(
-            imageUrls: [url],
-            index: 0,
-          ),
-        );
+        context.pushTransparentRoute(rootNavigator: true, PhotoViewScreen(imageUrls: [url], index: 0));
       },
       child: Hero(
         tag: url,
         child: ClipRRect(
           borderRadius: BorderRadius.circular(8),
-          child: CachedNetworkImage(
-            imageUrl: url,
-            fit: BoxFit.fitHeight,
-            width: MediaQuery.of(context).size.width / 3 - (60 / 3),
-            height: 160,
-          ),
+          child: CachedNetworkImage(imageUrl: url, fit: BoxFit.fitHeight, width: MediaQuery.of(context).size.width / 3 - (60 / 3), height: 160),
         ),
       ),
     );
   }
 
-  _education(ProfileStateLoaded state) {
+  SingleChildRenderObjectWidget _education(ProfileStateLoaded state) {
     if (!state.profile.roles.contains('consultant') ||
         state.consultantInfo!.educationModel.completedCourses == null ||
         (state.consultantInfo!.educationModel.completedCourses?.isEmpty ?? false)) {
@@ -553,11 +486,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
               children: [
                 const Text(
                   'Образование',
-                  style: TextStyle(
-                    color: Color(0xFF323F4B),
-                    fontSize: 24,
-                    fontWeight: FontWeight.w600,
-                  ),
+                  style: TextStyle(color: Color(0xFF323F4B), fontSize: 24, fontWeight: FontWeight.w600),
                 ),
                 GestureDetector(
                   onTap: () {
@@ -565,11 +494,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
                   },
                   child: Text(
                     widget.author == null || widget.author!.authorIsMe ? 'Редактировать' : '',
-                    style: const TextStyle(
-                      color: Color(0xFF2F80ED),
-                      fontSize: 16,
-                      fontWeight: FontWeight.w500,
-                    ),
+                    style: const TextStyle(color: Color(0xFF2F80ED), fontSize: 16, fontWeight: FontWeight.w500),
                   ),
                 ),
               ],
@@ -588,8 +513,10 @@ class _ProfileScreenState extends State<ProfileScreen> {
                     ListView.separated(
                       shrinkWrap: true,
                       physics: const NeverScrollableScrollPhysics(),
-                      itemBuilder: (context, index) => _educationBlock(state.consultantInfo!.educationModel.completedCourses![index].values.first.title,
-                          state.consultantInfo!.educationModel.completedCourses![index].values.first.date),
+                      itemBuilder: (context, index) => _educationBlock(
+                        state.consultantInfo!.educationModel.completedCourses![index].values.first.title,
+                        state.consultantInfo!.educationModel.completedCourses![index].values.first.date,
+                      ),
                       separatorBuilder: (context, index) => const SizedBox(height: 8),
                       itemCount: state.consultantInfo!.educationModel.completedCourses!.length,
                     ),
@@ -603,7 +530,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
     );
   }
 
-  _educationBlock(String title, String date) {
+  SizedBox _educationBlock(String title, String date) {
     final parsedDate = DateTime.tryParse(date);
     final formattedDate = parsedDate != null ? DateFormat('d MMMM y', 'ru_RU').format(parsedDate) : date;
 
@@ -619,22 +546,12 @@ class _ProfileScreenState extends State<ProfileScreen> {
             children: [
               Text(
                 title,
-                style: const TextStyle(
-                  height: 1,
-                  color: Color(0xFF323F4B),
-                  fontWeight: FontWeight.w500,
-                  fontSize: 16,
-                ),
+                style: const TextStyle(height: 1, color: Color(0xFF323F4B), fontWeight: FontWeight.w500, fontSize: 16),
               ),
               const SizedBox(height: 4),
               Text(
                 formattedDate,
-                style: const TextStyle(
-                  height: 1,
-                  color: Color(0xFF6D6F71),
-                  fontWeight: FontWeight.w500,
-                  fontSize: 14,
-                ),
+                style: const TextStyle(height: 1, color: Color(0xFF6D6F71), fontWeight: FontWeight.w500, fontSize: 14),
               ),
             ],
           ),
@@ -643,8 +560,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
     );
   }
 
-  _socialLinks(ProfileStateLoaded state) {
-    if (!state.profile.roles.contains('consultant')) {
+  SingleChildRenderObjectWidget _socialLinks(ProfileStateLoaded state) {
+    if (!state.profile.roles.contains('consultant') && state.consultantInfo != null) {
       return const SizedBox.shrink();
     }
     return Padding(
@@ -658,12 +575,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
             children: [
               _socialLinkButton(
                 () {
-                  launchUrl(
-                    Uri.parse(
-                      state.consultantInfo!.educationModel.vkLink ?? '',
-                    ),
-                    mode: LaunchMode.externalApplication,
-                  );
+                  launchUrl(Uri.parse(state.consultantInfo!.educationModel.vkLink ?? ''), mode: LaunchMode.externalApplication);
                 },
                 'assets/icons/vk.svg',
                 state.consultantInfo!.educationModel.vkLink!.isEmpty ? true : false,
@@ -671,12 +583,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
               const SizedBox(width: 12),
               _socialLinkButton(
                 () {
-                  launchUrl(
-                    Uri.parse(
-                      state.consultantInfo!.educationModel.tgLink ?? '',
-                    ),
-                    mode: LaunchMode.externalApplication,
-                  );
+                  launchUrl(Uri.parse(state.consultantInfo!.educationModel.tgLink ?? ''), mode: LaunchMode.externalApplication);
                 },
                 'assets/icons/telegram.svg',
                 state.consultantInfo!.educationModel.tgLink!.isEmpty ? true : false,
@@ -684,12 +591,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
               const SizedBox(width: 12),
               _socialLinkButton(
                 () {
-                  launchUrl(
-                    Uri.parse(
-                      state.consultantInfo!.educationModel.personalSiteLink ?? '',
-                    ),
-                    mode: LaunchMode.externalApplication,
-                  );
+                  launchUrl(Uri.parse(state.consultantInfo!.educationModel.personalSiteLink ?? ''), mode: LaunchMode.externalApplication);
                 },
                 'assets/icons/web.svg',
                 state.consultantInfo!.educationModel.personalSiteLink!.isEmpty ? true : false,
@@ -701,16 +603,13 @@ class _ProfileScreenState extends State<ProfileScreen> {
     );
   }
 
-  _socialLinkButton(Function() onTap, String icon, bool disabled) {
+  InkWell _socialLinkButton(Function() onTap, String icon, bool disabled) {
     return InkWell(
       onTap: disabled ? null : onTap,
       borderRadius: BorderRadius.circular(20),
       child: Ink(
         width: MediaQuery.of(context).size.width / 3 - (56 / 3),
-        decoration: BoxDecoration(
-          borderRadius: BorderRadius.circular(20),
-          color: const Color(0xFFF6F6F6),
-        ),
+        decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: const Color(0xFFF6F6F6)),
         child: Padding(
           padding: const EdgeInsets.symmetric(horizontal: 40, vertical: 16),
           child: SvgPicture.asset(
@@ -723,7 +622,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
     );
   }
 
-  _badges(ProfileStateLoaded state) {
+  Padding _badges(ProfileStateLoaded state) {
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: 4),
       child: InkWell(
@@ -732,20 +631,13 @@ class _ProfileScreenState extends State<ProfileScreen> {
         child: Ink(
           padding: const EdgeInsets.all(8),
           width: MediaQuery.of(context).size.width,
-          decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(12),
-            color: Colors.white,
-          ),
+          decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white),
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               const Text(
                 'Достижения',
-                style: TextStyle(
-                  color: Color(0xFF6D6F71),
-                  fontSize: 14,
-                  fontWeight: FontWeight.w600,
-                ),
+                style: TextStyle(color: Color(0xFF6D6F71), fontSize: 14, fontWeight: FontWeight.w600),
               ),
               const SizedBox(height: 8),
               SingleChildScrollView(
@@ -757,51 +649,25 @@ class _ProfileScreenState extends State<ProfileScreen> {
                           ? Tooltip(
                               message: state.profile.badges[i].description,
                               triggerMode: TooltipTriggerMode.tap,
-                              textStyle: const TextStyle(
-                                color: Colors.black,
-                                fontSize: 16,
-                                fontWeight: FontWeight.w500,
-                              ),
+                              textStyle: const TextStyle(color: Colors.black, fontSize: 16, fontWeight: FontWeight.w500),
                               decoration: BoxDecoration(
                                 color: Colors.white,
                                 borderRadius: BorderRadius.circular(4),
-                                boxShadow: [
-                                  BoxShadow(
-                                    color: Colors.black.withAlpha((255 * 0.2).toInt()),
-                                    blurRadius: 32,
-                                  )
-                                ],
-                              ),
-                              child: SvgPicture.network(
-                                '$baseUrl/storage/${state.profile.badges[i].image}',
-                                width: 40,
-                                height: 40,
+                                boxShadow: [BoxShadow(color: Colors.black.withAlpha((255 * 0.2).toInt()), blurRadius: 32)],
                               ),
+                              child: SvgPicture.network('$baseUrl/storage/${state.profile.badges[i].image}', width: 40, height: 40),
                             )
                           : Tooltip(
                               message: state.profile.badges[i].description,
                               margin: const EdgeInsets.symmetric(horizontal: 32),
                               triggerMode: TooltipTriggerMode.tap,
-                              textStyle: const TextStyle(
-                                color: Colors.black,
-                                fontSize: 16,
-                                fontWeight: FontWeight.w500,
-                              ),
+                              textStyle: const TextStyle(color: Colors.black, fontSize: 16, fontWeight: FontWeight.w500),
                               decoration: BoxDecoration(
                                 color: Colors.white,
                                 borderRadius: BorderRadius.circular(4),
-                                boxShadow: [
-                                  BoxShadow(
-                                    color: Colors.black.withAlpha((255 * 0.2).toInt()),
-                                    blurRadius: 32,
-                                  )
-                                ],
-                              ),
-                              child: CachedNetworkImage(
-                                imageUrl: '$baseUrl/storage/${state.profile.badges[i].image}',
-                                width: 40,
-                                height: 40,
+                                boxShadow: [BoxShadow(color: Colors.black.withAlpha((255 * 0.2).toInt()), blurRadius: 32)],
                               ),
+                              child: CachedNetworkImage(imageUrl: '$baseUrl/storage/${state.profile.badges[i].image}', width: 40, height: 40),
                             ),
                       i < state.profile.badges.length - 1 ? const SizedBox(width: 8) : const SizedBox.shrink(),
                     ],
@@ -815,27 +681,18 @@ class _ProfileScreenState extends State<ProfileScreen> {
     );
   }
 
-  _subscriptionsAndSubscribers(ProfileStateLoaded state) {
+  Padding _subscriptionsAndSubscribers(ProfileStateLoaded state) {
     return Padding(
       padding: const EdgeInsets.all(4),
       child: Row(
         children: [
           InkWell(
-            onTap: () => GoRouter.of(context).pushNamed(
-              'subsScreen',
-              extra: SubType.subscriptions,
-              pathParameters: {
-                'slug': state.profile.slug,
-              },
-            ),
+            onTap: () => GoRouter.of(context).pushNamed('subsScreen', extra: SubType.subscriptions, pathParameters: {'slug': state.profile.slug}),
             borderRadius: BorderRadius.circular(12),
             child: Ink(
               padding: const EdgeInsets.all(8),
               width: MediaQuery.of(context).size.width / 2 - 6,
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(12),
-                color: Colors.white,
-              ),
+              decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white),
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 crossAxisAlignment: CrossAxisAlignment.end,
@@ -845,47 +702,27 @@ class _ProfileScreenState extends State<ProfileScreen> {
                     children: [
                       const Text(
                         'Подписки',
-                        style: TextStyle(
-                          color: Color(0xFF6D6F71),
-                          fontSize: 14,
-                          fontWeight: FontWeight.w600,
-                        ),
+                        style: TextStyle(color: Color(0xFF6D6F71), fontSize: 14, fontWeight: FontWeight.w600),
                       ),
                       Text(
                         '${state.profile.subscriptions.length}',
-                        style: const TextStyle(
-                          color: Color(0xFF323F4B),
-                          fontSize: 22,
-                          fontWeight: FontWeight.w700,
-                        ),
+                        style: const TextStyle(color: Color(0xFF323F4B), fontSize: 22, fontWeight: FontWeight.w700),
                       ),
                     ],
                   ),
-                  Padding(
-                    padding: const EdgeInsets.only(right: 8),
-                    child: _miniAvatars(state.profile.subscriptions),
-                  ),
+                  Padding(padding: const EdgeInsets.only(right: 8), child: _miniAvatars(state.profile.subscriptions)),
                 ],
               ),
             ),
           ),
           const SizedBox(width: 4),
           InkWell(
-            onTap: () => GoRouter.of(context).pushNamed(
-              'subsScreen',
-              extra: SubType.subscribers,
-              pathParameters: {
-                'slug': state.profile.slug,
-              },
-            ),
+            onTap: () => GoRouter.of(context).pushNamed('subsScreen', extra: SubType.subscribers, pathParameters: {'slug': state.profile.slug}),
             borderRadius: BorderRadius.circular(12),
             child: Ink(
               padding: const EdgeInsets.all(8),
               width: MediaQuery.of(context).size.width / 2 - 6,
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(12),
-                color: Colors.white,
-              ),
+              decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), color: Colors.white),
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 crossAxisAlignment: CrossAxisAlignment.end,
@@ -895,26 +732,15 @@ class _ProfileScreenState extends State<ProfileScreen> {
                     children: [
                       const Text(
                         'Подписчики',
-                        style: TextStyle(
-                          color: Color(0xFF6D6F71),
-                          fontSize: 14,
-                          fontWeight: FontWeight.w600,
-                        ),
+                        style: TextStyle(color: Color(0xFF6D6F71), fontSize: 14, fontWeight: FontWeight.w600),
                       ),
                       Text(
                         '${state.profile.subscribers.length}',
-                        style: const TextStyle(
-                          color: Color(0xFF323F4B),
-                          fontSize: 22,
-                          fontWeight: FontWeight.w700,
-                        ),
+                        style: const TextStyle(color: Color(0xFF323F4B), fontSize: 22, fontWeight: FontWeight.w700),
                       ),
                     ],
                   ),
-                  Padding(
-                    padding: const EdgeInsets.only(right: 8),
-                    child: _miniAvatars(state.profile.subscribers),
-                  ),
+                  Padding(padding: const EdgeInsets.only(right: 8), child: _miniAvatars(state.profile.subscribers)),
                 ],
               ),
             ),
@@ -924,7 +750,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
     );
   }
 
-  _miniAvatars(List<String> urls) {
+  Row _miniAvatars(List<String> urls) {
     int maxLength = urls.length > 2 ? 3 : urls.length;
     return Row(
       mainAxisAlignment: MainAxisAlignment.center,
@@ -932,33 +758,24 @@ class _ProfileScreenState extends State<ProfileScreen> {
         for (int i = 0; i < maxLength; i++)
           Align(
             widthFactor: 0.8,
-            child: CircleAvatar(
-              radius: 14,
-              foregroundImage: NetworkImage(
-                urls[i],
-              ),
-              backgroundImage: const AssetImage('assets/images/no_avatar.png'),
-            ),
+            child: CircleAvatar(radius: 14, foregroundImage: NetworkImage(urls[i]), backgroundImage: const AssetImage('assets/images/no_avatar.png')),
           ),
       ],
     );
   }
 
-  _blogPosts(ProfileStateLoaded state) {
+  ListView _blogPosts(ProfileStateLoaded state) {
     return ListView.separated(
       padding: const EdgeInsets.symmetric(vertical: 16),
       shrinkWrap: true,
       physics: const NeverScrollableScrollPhysics(),
-      itemBuilder: (context, index) => ProfileBlogPostWidget(
-        index: index,
-        profileCubit: profileCubit,
-      ),
+      itemBuilder: (context, index) => ProfileBlogPostWidget(index: index, profileCubit: profileCubit),
       separatorBuilder: (context, index) => const SizedBox(height: 8),
       itemCount: state.blogPosts.length,
     );
   }
 
-  _additionalInfo(ProfileStateLoaded state) {
+  Container _additionalInfo(ProfileStateLoaded state) {
     String text = state.profileDetails.additionalInfo;
     if (state.profileDetails.additionalInfo.length > 250) {
       text = state.profileDetails.additionalInfo.substring(0, 250);
@@ -966,121 +783,102 @@ class _ProfileScreenState extends State<ProfileScreen> {
     return Container(
       alignment: Alignment.centerLeft,
       padding: const EdgeInsets.all(16),
-      child: Text(
-        text,
-        style: TextStyle(
-          color: Colors.black.withValues(alpha: 0.4),
-          height: 1,
-        ),
-      ),
+      child: Text(text, style: TextStyle(color: Colors.black.withValues(alpha: 0.4), height: 1)),
     );
   }
 
-  _header(ProfileStateLoaded state) {
+  Padding _header(ProfileStateLoaded state) {
     return Padding(
       padding: const EdgeInsets.all(16),
       child: Row(
         children: [
           PopupMenuButton(
-            onSelected: (value) async {
-              if (value == 'view') {
-                context.pushTransparentRoute(
-                  rootNavigator: true,
-                  PhotoViewScreen(
-                    imageUrls: [baseUrl + state.profile.profilePhotoUrl],
-                    index: 0,
-                  ),
-                );
-              }
-              if (value == 'replace') {
-                showCupertinoModalPopup<void>(
-                  context: context,
-                  builder: (context) {
-                    final s = S.of(context);
-                    return CupertinoActionSheet(
-                      actions: [
-                        CupertinoActionSheetAction(
-                          onPressed: () async {
-                            PermissionHandler.checkPermission(
-                              permission: Permission.camera,
-                              title: s.allowAccessToCamera,
-                              description: s.allowAccessToCameraDescription,
-                              onGranted: () async {
-                                AppRouter.navigatorKey.currentContext?.pop();
-                                final picker = ImagePicker();
-                                XFile? image = await picker.pickImage(source: ImageSource.camera);
-                                if (image != null) {
-                                  await profileCubit.uploadPhoto(File(image.path));
-                                  await sl<ProfileAvatarCubit>().getMyProfile();
-                                }
+            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+            color: Colors.white,
+            constraints: const BoxConstraints(minWidth: 260),
+            surfaceTintColor: Colors.transparent,
+            elevation: 2,
+            itemBuilder: (context) => [
+              _buildCompactItem(
+                icon: 'assets/icons/eye.svg',
+                text: 'Посмотреть',
+                onTap: () async {
+                  context.pushTransparentRoute(rootNavigator: true, PhotoViewScreen(imageUrls: [baseUrl + state.profile.profilePhotoUrl], index: 0));
+                },
+              ),
+              if (widget.author == null || widget.author!.authorIsMe) ...[
+                _buildDivider(),
+                _buildCompactItem(
+                  icon: 'assets/icons/edit_paint.svg',
+                  text: 'Заменить',
+                  onTap: () async {
+                    showCupertinoModalPopup<void>(
+                      context: context,
+                      builder: (context) {
+                        final s = S.of(context);
+                        return CupertinoActionSheet(
+                          actions: [
+                            CupertinoActionSheetAction(
+                              onPressed: () async {
+                                PermissionHandler.checkPermission(
+                                  permission: Permission.camera,
+                                  title: s.allowAccessToCamera,
+                                  description: s.allowAccessToCameraDescription,
+                                  onGranted: () async {
+                                    AppRouter.navigatorKey.currentContext?.pop();
+                                    final picker = ImagePicker();
+                                    XFile? image = await picker.pickImage(source: ImageSource.camera);
+                                    if (image != null) {
+                                      await profileCubit.uploadPhoto(File(image.path));
+                                      await sl<ProfileAvatarCubit>().getMyProfile();
+                                    }
+                                  },
+                                  context: context,
+                                );
                               },
-                              context: context,
-                            );
-                          },
-                          child: const Row(
-                            children: [
-                              Icon(Icons.photo_camera),
-                              SizedBox(width: 8),
-                              Text('Фото'),
-                            ],
-                          ),
-                        ),
-                        CupertinoActionSheetAction(
-                          onPressed: () async {
-                            PermissionHandler.checkPermission(
-                              permission: Permission.photos,
-                              title: s.allowAcessToGalery,
-                              description: s.allowAcessToGaleryDescription,
-                              onGranted: () async {
-                                AppRouter.navigatorKey.currentContext?.pop();
-                                final picker = ImagePicker();
-                                XFile? image = await picker.pickImage(source: ImageSource.gallery);
-                                if (image != null) {
-                                  await profileCubit.uploadPhoto(File(image.path));
-                                  await sl<ProfileAvatarCubit>().getMyProfile();
-                                }
+                              child: const Row(children: [Icon(Icons.photo_camera), SizedBox(width: 8), Text('Фото')]),
+                            ),
+                            CupertinoActionSheetAction(
+                              onPressed: () async {
+                                PermissionHandler.checkPermission(
+                                  permission: Permission.photos,
+                                  title: s.allowAcessToGalery,
+                                  description: s.allowAcessToGaleryDescription,
+                                  onGranted: () async {
+                                    AppRouter.navigatorKey.currentContext?.pop();
+                                    final picker = ImagePicker();
+                                    XFile? image = await picker.pickImage(source: ImageSource.gallery);
+                                    if (image != null) {
+                                      await profileCubit.uploadPhoto(File(image.path));
+                                      await sl<ProfileAvatarCubit>().getMyProfile();
+                                    }
+                                  },
+                                  context: context,
+                                );
                               },
-                              context: context,
-                            );
-                          },
-                          child: const Row(
-                            children: [
-                              Icon(Icons.photo),
-                              SizedBox(width: 8),
-                              Text('Галерея'),
-                            ],
+                              child: const Row(children: [Icon(Icons.photo), SizedBox(width: 8), Text('Галерея')]),
+                            ),
+                          ],
+                          cancelButton: CupertinoActionSheetAction(
+                            onPressed: () => Navigator.of(context).pop(),
+                            isDestructiveAction: true,
+                            child: const Text('Отмена'),
                           ),
-                        ),
-                      ],
-                      cancelButton: CupertinoActionSheetAction(
-                        onPressed: () => Navigator.of(context).pop(),
-                        isDestructiveAction: true,
-                        child: const Text('Отмена'),
-                      ),
+                        );
+                      },
                     );
                   },
-                );
-              }
-              if (value == 'delete') {
-                await profileCubit.deletePhoto();
-                await sl<ProfileAvatarCubit>().getMyProfile();
-              }
-            },
-            itemBuilder: (context) => [
-              const PopupMenuItem(
-                value: 'view',
-                child: Text('Посмотреть'),
-              ),
-              if (widget.author == null || widget.author!.authorIsMe)
-                const PopupMenuItem(
-                  value: 'replace',
-                  child: Text('Заменить'),
                 ),
-              if (widget.author == null || widget.author!.authorIsMe)
-                const PopupMenuItem(
-                  value: 'delete',
-                  child: Text('Удалить'),
+                _buildDivider(),
+                _buildCompactItem(
+                  icon: 'assets/icons/red_trash.svg',
+                  text: 'Удалить',
+                  onTap: () async {
+                    await profileCubit.deletePhoto();
+                    await sl<ProfileAvatarCubit>().getMyProfile();
+                  },
                 ),
+              ],
             ],
             child: Hero(
               tag: state.profile.profilePhotoUrl,
@@ -1099,12 +897,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
             children: [
               Text(
                 '${state.profileDetails.firstName} ${state.profileDetails.lastName}',
-                style: const TextStyle(
-                  color: Colors.black,
-                  fontWeight: FontWeight.w600,
-                  fontSize: 16,
-                  height: 1,
-                ),
+                style: const TextStyle(color: Colors.black, fontWeight: FontWeight.w600, fontSize: 16, height: 1),
               ),
               const SizedBox(height: 8),
               GestureDetector(
@@ -1122,11 +915,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
                         children: [
                           const Text(
                             'Подробнее',
-                            style: TextStyle(
-                              fontSize: 20,
-                              fontWeight: FontWeight.w700,
-                              color: Color(0xFF323F4B),
-                            ),
+                            style: TextStyle(fontSize: 20, fontWeight: FontWeight.w700, color: Color(0xFF323F4B)),
                           ),
                           const SizedBox(height: 16),
                           _additional('Дата рожденя: ', state.profileDetails.birthdate),
@@ -1146,19 +935,11 @@ class _ProfileScreenState extends State<ProfileScreen> {
                 },
                 child: const Row(
                   children: [
-                    Icon(
-                      Icons.info_outline,
-                      size: 20,
-                      color: Color(0xFF6D6F71),
-                    ),
+                    Icon(Icons.info_outline, size: 20, color: Color(0xFF6D6F71)),
                     SizedBox(width: 4),
                     Text(
                       'Дополнительно',
-                      style: TextStyle(
-                        color: Color(0xFF6D6F71),
-                        fontSize: 14,
-                        fontWeight: FontWeight.w500,
-                      ),
+                      style: TextStyle(color: Color(0xFF6D6F71), fontSize: 14, fontWeight: FontWeight.w500),
                     ),
                   ],
                 ),
@@ -1167,43 +948,68 @@ class _ProfileScreenState extends State<ProfileScreen> {
           ),
           const Spacer(),
           PopupMenuButton(
-            onSelected: (value) {
-              if (value == 'share') {
-                final box = context.findRenderObject() as RenderBox?;
-                SharePlus.instance.share(
-                  ShareParams(
-                    uri: Uri.parse('$baseUrl/ru/profile/${state.profile.slug}'),
-                    sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size,
-                  ),
-                );
-              } else if (value == 'block') {
-                sl<BlockedUsersCubit>().blockUser(state.profile.slug);
-              } else {
-                showModalBottomSheet(
-                  context: context,
-                  isScrollControlled: true,
-                  builder: (context) => ComplainingBottomSheet(
-                    complainedContentType: ComplainedContent.profile,
-                    slug: widget.author?.authorSlug,
-                  ),
-                );
-              }
-            },
+            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+            color: Colors.white,
+            constraints: const BoxConstraints(minWidth: 260),
+            surfaceTintColor: Colors.transparent,
+            elevation: 2,
             itemBuilder: (context) => [
-              const PopupMenuItem(
-                value: 'share',
-                child: Text('Поделиться'),
+              _buildCompactItem(
+                icon: 'assets/icons/share2.svg',
+                text: 'Поделиться',
+                onTap: () {
+                  final box = context.findRenderObject() as RenderBox?;
+                  SharePlus.instance.share(
+                    ShareParams(uri: Uri.parse('$baseUrl/ru/profile/${state.profile.slug}'), sharePositionOrigin: box!.localToGlobal(Offset.zero) & box.size),
+                  );
+                },
               ),
-              if (widget.author != null)
-                const PopupMenuItem(
-                  value: 'complain',
-                  child: Text('Пожаловаться'),
+              if (widget.author != null) ...[
+                _buildDivider(),
+                _buildCompactItem(
+                  icon: 'assets/icons/complain.svg',
+                  text: 'Пожаловаться',
+                  onTap: () {
+                    showModalBottomSheet(
+                      context: context,
+                      isScrollControlled: true,
+                      builder: (context) => ComplainingBottomSheet(complainedContentType: ComplainedContent.profile, slug: widget.author?.authorSlug),
+                    );
+                  },
                 ),
-              if (widget.author != null)
-                const PopupMenuItem(
-                  value: 'block',
-                  child: Text('Заблокировать'),
+              ],
+              if (widget.author != null && !state.profile.isBlockedByMe) ...[
+                _buildDivider(),
+                _buildCompactItem(
+                  icon: 'assets/icons/complain.svg',
+                  text: 'Заблокировать',
+                  onTap: () {
+                    isFirstFetch = true;
+                    sl<BlockedUsersCubit>().blockUser(state.profile.slug);
+                    widget.author == null || widget.author!.authorIsMe ? profileCubit.getMyProfile() : profileCubit.getProfileBySlug(widget.author!.authorSlug);
+                    if (state.profile.roles.contains('consultant')) {
+                      plansCubit.getPlans(state.profile.slug);
+                    }
+                    isFirstFetch = false;
+                  },
                 ),
+              ],
+              if (widget.author != null && state.profile.isBlockedByMe) ...[
+                _buildDivider(),
+                _buildCompactItem(
+                  icon: 'assets/icons/complain.svg',
+                  text: 'Разблокировать',
+                  onTap: () {
+                    isFirstFetch = true;
+                    sl<BlockedUsersCubit>().unblockUser(state.profile.slug);
+                    widget.author == null || widget.author!.authorIsMe ? profileCubit.getMyProfile() : profileCubit.getProfileBySlug(widget.author!.authorSlug);
+                    if (state.profile.roles.contains('consultant')) {
+                      plansCubit.getPlans(state.profile.slug);
+                    }
+                    isFirstFetch = false;
+                  },
+                ),
+              ],
             ],
             child: const Icon(Icons.more_horiz_rounded),
           ),
@@ -1212,30 +1018,49 @@ class _ProfileScreenState extends State<ProfileScreen> {
     );
   }
 
-  _additional(String title, String value) {
+  PopupMenuItem _buildCompactItem({required String icon, required String text, required Function() onTap}) {
+    return PopupMenuItem(
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+      height: 36,
+      onTap: onTap,
+      child: SizedBox(
+        width: double.infinity,
+        child: Row(
+          children: [
+            Text(text, style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w500)),
+            const Spacer(),
+            SvgPicture.asset(icon),
+          ],
+        ),
+      ),
+    );
+  }
+
+  PopupMenuItem _buildDivider() {
+    return PopupMenuItem(
+      enabled: false,
+      height: 1,
+      padding: EdgeInsets.zero,
+      child: Container(margin: const EdgeInsets.symmetric(horizontal: 12), height: 1, color: appTheme.dividerColor),
+    );
+  }
+
+  Row _additional(String title, String value) {
     return Row(
       children: [
         Text(
           title,
-          style: const TextStyle(
-            fontSize: 16,
-            fontWeight: FontWeight.w500,
-            color: Color(0xFF6D6F71),
-          ),
+          style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w500, color: Color(0xFF6D6F71)),
         ),
         Text(
           value,
-          style: const TextStyle(
-            fontSize: 16,
-            fontWeight: FontWeight.w500,
-            color: Color(0xFF323F4B),
-          ),
+          style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w500, color: Color(0xFF323F4B)),
         ),
       ],
     );
   }
 
-  _messageAndSubscribe(ProfileStateLoaded state) {
+  Row _messageAndSubscribe(ProfileStateLoaded state) {
     return Row(
       children: [
         const SizedBox(width: 16),
@@ -1245,16 +1070,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
             alignment: Alignment.center,
             padding: const EdgeInsets.all(8),
             width: (MediaQuery.of(context).size.width - 40) / 2,
-            decoration: BoxDecoration(
-              color: appTheme.blueA400.withValues(alpha: 0.1),
-              borderRadius: BorderRadius.circular(16),
-            ),
-            child: Text(
-              'Сообщение',
-              style: TextStyle(
-                color: appTheme.blueA400,
-              ),
-            ),
+            decoration: BoxDecoration(color: appTheme.blueA400.withValues(alpha: 0.1), borderRadius: BorderRadius.circular(16)),
+            child: Text('Сообщение', style: TextStyle(color: appTheme.blueA400)),
           ),
         ),
         const SizedBox(width: 8),
@@ -1269,16 +1086,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
             alignment: Alignment.center,
             padding: const EdgeInsets.all(8),
             width: (MediaQuery.of(context).size.width - 40) / 2,
-            decoration: BoxDecoration(
-              color: !canSub ? Colors.grey.shade200 : appTheme.blueA400,
-              borderRadius: BorderRadius.circular(16),
-            ),
-            child: Text(
-              !canSub ? 'Отписаться' : 'Подписаться',
-              style: TextStyle(
-                color: !canSub ? Colors.black : Colors.white,
-              ),
-            ),
+            decoration: BoxDecoration(color: !canSub ? Colors.grey.shade200 : appTheme.blueA400, borderRadius: BorderRadius.circular(16)),
+            child: Text(!canSub ? 'Отписаться' : 'Подписаться', style: TextStyle(color: !canSub ? Colors.black : Colors.white)),
           ),
         ),
         const SizedBox(width: 16),
@@ -1286,7 +1095,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
     );
   }
 
-  _charts() {
+  Material _charts() {
     return Material(
       color: Colors.white,
       borderRadius: BorderRadius.circular(16),
@@ -1297,33 +1106,17 @@ class _ProfileScreenState extends State<ProfileScreen> {
           SingleChildScrollView(
             padding: const EdgeInsets.symmetric(horizontal: 16),
             scrollDirection: Axis.horizontal,
-            child: Row(
-              children: [
-                _choiceChipWidget(0),
-                const SizedBox(width: 8),
-                _choiceChipWidget(1),
-                const SizedBox(width: 8),
-                _choiceChipWidget(2),
-              ],
-            ),
+            child: Row(children: [_choiceChipWidget(0), const SizedBox(width: 8), _choiceChipWidget(1), const SizedBox(width: 8), _choiceChipWidget(2)]),
           ),
           Builder(
             builder: (context) {
               switch (_selectedChipIndex) {
                 case 0:
-                  return WeightChartWidget(
-                    weightPoints: weightPoints,
-                    profileCubit: profileCubit,
-                  );
+                  return WeightChartWidget(weightPoints: weightPoints, profileCubit: profileCubit);
                 case 1:
-                  return CircumferenceChartWidget(
-                    circumferencePoints: circumferencePoints,
-                    profileCubit: profileCubit,
-                  );
+                  return CircumferenceChartWidget(circumferencePoints: circumferencePoints, profileCubit: profileCubit);
                 case 2:
-                  return ImtChartWidget(
-                    weightPoints: weightPoints,
-                  );
+                  return ImtChartWidget(weightPoints: weightPoints);
                 default:
                   return const SizedBox.shrink();
               }
@@ -1350,22 +1143,16 @@ class _ProfileScreenState extends State<ProfileScreen> {
     );
   }
 
-  _choiceIntervalChipWidget(int index) {
+  ChoiceChip _choiceIntervalChipWidget(int index) {
     return ChoiceChip(
       selectedColor: Colors.grey.withValues(alpha: 0.1),
       pressElevation: 0,
       showCheckmark: false,
       side: BorderSide.none,
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(16),
-      ),
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
       padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
       label: Text(chipsIntervalLabelList[index]),
-      labelStyle: TextStyle(
-        color: appTheme.gray600,
-        fontWeight: FontWeight.w500,
-        fontSize: 12,
-      ),
+      labelStyle: TextStyle(color: appTheme.gray600, fontWeight: FontWeight.w500, fontSize: 12),
       selected: _selectedIntervalChipIndex == index,
       onSelected: (bool selected) {
         profileCubit.getMyProfile(period: chipsIntervalList[index]);
@@ -1376,22 +1163,16 @@ class _ProfileScreenState extends State<ProfileScreen> {
     );
   }
 
-  _choiceChipWidget(int index) {
+  ChoiceChip _choiceChipWidget(int index) {
     return ChoiceChip(
       selectedColor: appTheme.blueA400,
       pressElevation: 0,
       showCheckmark: false,
       side: BorderSide.none,
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(16),
-      ),
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
       padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
       label: Text(chipsLabelList[index]),
-      labelStyle: TextStyle(
-        color: index == _selectedChipIndex ? Colors.white : appTheme.gray600,
-        fontWeight: FontWeight.w500,
-        fontSize: 12,
-      ),
+      labelStyle: TextStyle(color: index == _selectedChipIndex ? Colors.white : appTheme.gray600, fontWeight: FontWeight.w500, fontSize: 12),
       selected: _selectedChipIndex == index,
       backgroundColor: appTheme.gray100,
       onSelected: (bool selected) {
diff --git a/lib/features/profile/presentation/pages/subs_screen.dart b/lib/features/profile/presentation/pages/subs_screen.dart
index 1893b189..d5d782f2 100644
--- a/lib/features/profile/presentation/pages/subs_screen.dart
+++ b/lib/features/profile/presentation/pages/subs_screen.dart
@@ -79,7 +79,7 @@ class _SubsScreenState extends State<SubsScreen> {
     );
   }
 
-  _buildStates(SubState state) {
+  StatelessWidget? _buildStates(SubState state) {
     if (state is SubStateLoading) {
       return const Loader();
     }
@@ -94,5 +94,6 @@ class _SubsScreenState extends State<SubsScreen> {
         itemCount: state.subList.length,
       );
     }
+    return null;
   }
 }
diff --git a/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart b/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart
index 68c29a0a..0f0408d8 100644
--- a/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart
+++ b/lib/features/profile/presentation/widgets/profile_blog_post_widget.dart
@@ -47,7 +47,7 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
             borderRadius: BorderRadius.circular(12),
             onTap: () => GoRouter.of(context).pushNamed(
               'blogPostScreen',
-              extra: state.blogPosts[widget.index],
+              extra: state.blogPosts[widget.index].id,
             ),
             child: Ink(
               decoration: BoxDecoration(
@@ -128,8 +128,8 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
                       padding: const EdgeInsets.symmetric(horizontal: 4),
                       child: Html(
                         data: state.blogPosts[widget.index].description.length > 200
-                            ? state.blogPosts[widget.index].description.substring(0, 200)
-                            : state.blogPosts[widget.index].description,
+                            ? state.blogPosts[widget.index].description.substring(0, 200).replaceAll('\n', '<br>')
+                            : state.blogPosts[widget.index].description.replaceAll('\n', '<br>'),
                         style: {
                           "*": Style(
                             fontSize: FontSize(16),
@@ -191,7 +191,7 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
                             isLiked
                                 ? await context.read<FeedCubit>().likePost(state.blogPosts[widget.index].id)
                                 : await context.read<FeedCubit>().unlikedPost(state.blogPosts[widget.index].id);
-                            await widget.profileCubit.updateFeedBlogPostList(
+                            widget.profileCubit.updateFeedBlogPostList(
                               state.blogPosts[widget.index],
                               isLiked ? false : true,
                             );
@@ -211,7 +211,7 @@ class _ProfileBlogPostWidgetState extends State<ProfileBlogPostWidget> {
                           text: state.blogPosts[widget.index].totalComments.toString(),
                           onTap: () => GoRouter.of(context).pushNamed(
                             'blogPostScreen',
-                            extra: state.blogPosts[widget.index],
+                            extra: state.blogPosts[widget.index].id,
                           ),
                         ),
                         const SizedBox(width: 8),
diff --git a/lib/features/profile/presentation/widgets/sub_action_button_widget.dart b/lib/features/profile/presentation/widgets/sub_action_button_widget.dart
index bca5e3da..55b4a095 100644
--- a/lib/features/profile/presentation/widgets/sub_action_button_widget.dart
+++ b/lib/features/profile/presentation/widgets/sub_action_button_widget.dart
@@ -69,7 +69,7 @@ class _SubActionButtonWidgetState extends State<SubActionButtonWidget> {
           GoRouter.of(context).pushNamed(
             'chatScreen',
             extra: {
-              'chatId': await sl<ProfileCubit>().getChatRoomIdBySlug(
+              'uuid': await sl<ProfileCubit>().getChatRoomIdBySlug(
                 author: Author(
                   authorSlug: widget.slug,
                   authorName: widget.name,
diff --git a/lib/features/profile/repositories/profile_repository.dart b/lib/features/profile/repositories/profile_repository.dart
index 75879d15..531cf589 100644
--- a/lib/features/profile/repositories/profile_repository.dart
+++ b/lib/features/profile/repositories/profile_repository.dart
@@ -12,9 +12,7 @@ import 'package:eatvio_app/features/profile/services/profile_service.dart';
 class ProfileRepository {
   final ProfileService profileService;
 
-  ProfileRepository({
-    required this.profileService,
-  });
+  ProfileRepository({required this.profileService});
 
   Future<ProfileModel> getProfileBySlug(String slug) async {
     try {
@@ -48,11 +46,7 @@ class ProfileRepository {
     }
   }
 
-  Future<void> addCircumference({
-    required int chestCircumference,
-    required int waistCircumference,
-    required int hipCircumference,
-  }) async {
+  Future<void> addCircumference({required int chestCircumference, required int waistCircumference, required int hipCircumference}) async {
     try {
       return (await profileService.addCircumference(
         chestCircumference: chestCircumference,
@@ -64,9 +58,7 @@ class ProfileRepository {
     }
   }
 
-  Future<void> addWeight({
-    required double weight,
-  }) async {
+  Future<void> addWeight({required double weight}) async {
     try {
       return (await profileService.addWeight(weight: weight));
     } catch (e) {
@@ -74,52 +66,32 @@ class ProfileRepository {
     }
   }
 
-  Future<List<FeedBlogPostModel>> getBlogPostsByAuthorSlug({
-    required String slug,
-  }) async {
+  Future<List<FeedBlogPostModel>> getBlogPostsByAuthorSlug({required String slug}) async {
     try {
-      return (await profileService.getBlogPostByAuthorSlug(
-        slug: slug,
-      ));
+      return (await profileService.getBlogPostByAuthorSlug(slug: slug));
     } catch (e) {
       rethrow;
     }
   }
 
-  Future<List<WeightModel>> getWeight({
-    required String period,
-    String? slug,
-  }) async {
+  Future<List<WeightModel>> getWeight({required String period, String? slug}) async {
     try {
       if (slug != null) {
-        return (await profileService.getWeightBySlug(
-          period: period,
-          slug: slug,
-        ));
+        return (await profileService.getWeightBySlug(period: period, slug: slug));
       } else {
-        return (await profileService.getWeight(
-          period: period,
-        ));
+        return (await profileService.getWeight(period: period));
       }
     } catch (e) {
       rethrow;
     }
   }
 
-  Future<List<CircumferenceModel>> getCircumferences({
-    required String period,
-    String? slug,
-  }) async {
+  Future<List<CircumferenceModel>> getCircumferences({required String period, String? slug}) async {
     try {
       if (slug != null) {
-        return (await profileService.getCircumferencesBySlug(
-          period: period,
-          slug: slug,
-        ));
+        return (await profileService.getCircumferencesBySlug(period: period, slug: slug));
       } else {
-        return (await profileService.getCircumferences(
-          period: period,
-        ));
+        return (await profileService.getCircumferences(period: period));
       }
     } catch (e) {
       rethrow;
@@ -184,7 +156,8 @@ class ProfileRepository {
 
   Future<String> getPassKey(String phone) async {
     return (jsonDecode(
-        (await profileService.getPassKey(json: '{"route_name": "user_detailz.change-phone-verify", "route_params": {"phone": "$phone"}}'))))['key_is']!;
+      (await profileService.getPassKey(json: '{"route_name": "user_detailz.change-phone-verify", "route_params": {"phone": "$phone"}}')),
+    ))['key_is']!;
   }
 
   Future<String> getMyPhone() async {
@@ -203,4 +176,12 @@ class ProfileRepository {
       return false;
     }
   }
+
+  Future<void> deleteAccount() async {
+    try {
+      await profileService.deleteAccount();
+    } catch (e) {
+      rethrow;
+    }
+  }
 }
diff --git a/lib/features/profile/services/profile_service.dart b/lib/features/profile/services/profile_service.dart
index 06af37b9..bddd46f8 100644
--- a/lib/features/profile/services/profile_service.dart
+++ b/lib/features/profile/services/profile_service.dart
@@ -64,7 +64,7 @@ abstract class ProfileService {
     @Path() required String period,
   });
 
-  @GET('/api/profile/measure/circumferences/{period}/{user}')
+  @GET('/api/profile/measure/circumferences/{period}/{slug}')
   Future<List<CircumferenceModel>> getCircumferencesBySlug({
     @Path() required String period,
     @Path() required String slug,
@@ -119,4 +119,7 @@ abstract class ProfileService {
   Future<void> tryVerifyEmailByCode({
     @Body() required String code,
   });
+
+  @DELETE('/api/profile/delete_my_account')
+  Future<void> deleteAccount();
 }
diff --git a/lib/features/recipe/presentation/cubit/my_recipes_cubit/my_recieps_cubit.dart b/lib/features/recipe/presentation/cubit/my_recipes_cubit/my_recieps_cubit.dart
index df454594..44481c3a 100644
--- a/lib/features/recipe/presentation/cubit/my_recipes_cubit/my_recieps_cubit.dart
+++ b/lib/features/recipe/presentation/cubit/my_recipes_cubit/my_recieps_cubit.dart
@@ -17,7 +17,7 @@ class MyRecipesCubit extends Cubit<MyRecipesState> {
     required this.aboutRecipeRepository,
   }) : super(const MyRecipesState.loading());
 
-  getMyRecipes() async {
+  Future<void> getMyRecipes() async {
     emit(const MyRecipesState.loading());
     try {
       final myRecipes = await myRecipesRepository.getMyRecipes();
@@ -28,7 +28,7 @@ class MyRecipesCubit extends Cubit<MyRecipesState> {
     }
   }
 
-  setActiveState() async {
+  Future<void> setActiveState() async {
     emit(const MyRecipesState.loading());
     try {
       final myRecipes = await myRecipesRepository.getMyRecipes();
@@ -39,7 +39,7 @@ class MyRecipesCubit extends Cubit<MyRecipesState> {
     }
   }
 
-  setArchivedState() async {
+  Future<void> setArchivedState() async {
     emit(const MyRecipesState.loading());
     try {
       final myRecipes = await myRecipesRepository.getMyRecipes();
diff --git a/lib/features/recipe/presentation/pages/about_recipe_screen.dart b/lib/features/recipe/presentation/pages/about_recipe_screen.dart
index 36051709..f23ac880 100644
--- a/lib/features/recipe/presentation/pages/about_recipe_screen.dart
+++ b/lib/features/recipe/presentation/pages/about_recipe_screen.dart
@@ -16,9 +16,8 @@ import 'package:eatvio_app/features/diets/presentation/widgets/author_card.dart'
 import 'package:eatvio_app/features/diets/presentation/widgets/expandable_text.dart';
 import 'package:eatvio_app/features/diets/presentation/widgets/info_bouble.dart';
 import 'package:eatvio_app/core/widgets/main_background_bouble.dart';
-import 'package:eatvio_app/features/feed/models/recipes_model.dart';
-import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_cubit.dart';
-import 'package:eatvio_app/features/feed/presentation/bloc/comments_cubit/comments_state.dart';
+import 'package:eatvio_app/core/comments/comments_cubit/comments_cubit.dart';
+import 'package:eatvio_app/core/comments/comments_cubit/comments_state.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/feed_cubit/feed_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/widgets/comments_widget.dart';
 import 'package:eatvio_app/features/recipe/presentation/cubit/about_recipe_cubit.dart';
@@ -32,14 +31,15 @@ import 'package:eatvio_app/core/theme/theme_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:go_router/go_router.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class AboutRecipeScreen extends StatefulWidget {
-  final Recipe recipe;
+  final String recipeSlug;
   final int? index;
   final bool navigateToComments;
 
-  const AboutRecipeScreen({super.key, required this.recipe, required this.index, required this.navigateToComments});
+  const AboutRecipeScreen({super.key, required this.recipeSlug, required this.index, required this.navigateToComments});
 
   @override
   State<AboutRecipeScreen> createState() => _AboutRecipeScreenState();
@@ -57,7 +57,7 @@ class _AboutRecipeScreenState extends State<AboutRecipeScreen> {
   @override
   void initState() {
     super.initState();
-    context.read<FeedCubit>().viewRecipe(widget.recipe.slug);
+    context.read<FeedCubit>().viewRecipe(widget.recipeSlug);
     scrollController.addListener(() {
       if (isMoreOptionsVisible) {
         setState(() {
@@ -76,9 +76,9 @@ class _AboutRecipeScreenState extends State<AboutRecipeScreen> {
   Widget build(BuildContext context) {
     final s = S.of(context);
     return BlocProvider(
-      create: (context) => recipeCubit..getRecipe(widget.recipe.slug),
+      create: (context) => recipeCubit..getRecipe(widget.recipeSlug),
       child: BlocProvider<CommentsCubit>(
-        create: (BuildContext context) => commentsCubit..getComments(widget.recipe.slug.toString(), CommentSourceType.recipe, true),
+        create: (BuildContext context) => commentsCubit..getComments(widget.recipeSlug, CommentSourceType.recipe, true),
         child: BlocConsumer<CommentsCubit, CommentsState>(
           listener: (BuildContext context, CommentsState commentsState) {
             if (commentsState is CommentsStateLoaded) {
@@ -170,7 +170,7 @@ class _AboutRecipeScreenState extends State<AboutRecipeScreen> {
                                   onTap: () {
                                     if (textEditingController.text.length > 2) {
                                       commentsCubit.sendComment(
-                                        id: widget.recipe.slug,
+                                        id: widget.recipeSlug,
                                         commentText: textEditingController.text,
                                         parentCommentId: replyId,
                                         commentSourceType: CommentSourceType.recipe,
@@ -181,7 +181,7 @@ class _AboutRecipeScreenState extends State<AboutRecipeScreen> {
                                         replyId = null;
                                       });
                                       Future.delayed(const Duration(milliseconds: 500), () {
-                                        recipeCubit.getRecipe(widget.recipe.slug, index: widget.index);
+                                        recipeCubit.getRecipe(widget.recipeSlug, index: widget.index);
                                       });
                                       FocusManager.instance.primaryFocus?.unfocus();
                                     }
@@ -204,8 +204,17 @@ class _AboutRecipeScreenState extends State<AboutRecipeScreen> {
                     ),
                     appBar: AppBar(
                       centerTitle: true,
+                      leading: BackButton(
+                        onPressed: () {
+                          if (context.canPop()) {
+                            GoRouter.of(context).pop();
+                            return;
+                          }
+                          GoRouter.of(context).go('/feed-screen');
+                        },
+                      ),
                       title: Text(
-                        widget.recipe.title ?? '',
+                        recipeState.recipe.title ?? '',
                         maxLines: 2,
                         textAlign: TextAlign.center,
                         overflow: TextOverflow.ellipsis,
@@ -214,12 +223,12 @@ class _AboutRecipeScreenState extends State<AboutRecipeScreen> {
                       ),
                       actions: [
                         CustomPopup(
-                          isAuthor: widget.recipe.author.authorIsMe,
-                          path: 'recipe/${widget.recipe.slug}',
+                          isAuthor: recipeState.recipe.author.authorIsMe,
+                          path: 'recipe/${widget.recipeSlug}',
                           complainedContentType: ComplainedContent.recipe,
-                          slug: widget.recipe.slug,
-                          recipe: widget.recipe,
-                          userSlug: widget.recipe.author.authorSlug,
+                          slug: widget.recipeSlug,
+                          recipe: recipeState.recipe,
+                          userSlug: recipeState.recipe.author.authorSlug,
                         ),
                         const SizedBox(width: 16),
                       ],
@@ -238,7 +247,7 @@ class _AboutRecipeScreenState extends State<AboutRecipeScreen> {
                                 Stack(
                                   children: [
                                     CachedNetworkImage(
-                                      imageUrl: '$baseUrl/storage/${widget.recipe.image}',
+                                      imageUrl: '$baseUrl/storage/${recipeState.recipe.image}',
                                       height: 300,
                                       width: MediaQuery.sizeOf(context).width,
                                       fit: BoxFit.fill,
@@ -255,13 +264,13 @@ class _AboutRecipeScreenState extends State<AboutRecipeScreen> {
                                             children: [
                                               SvgPicture.asset('assets/icons/eye.svg', width: 18, height: 12),
                                               const SizedBox(width: 8),
-                                              Text(widget.recipe.viewsCount.toString(), style: TextStyles.textXSSemibold.copyWith(color: appTheme.black)),
+                                              Text(recipeState.recipe.viewsCount.toString(), style: TextStyles.textXSSemibold.copyWith(color: appTheme.black)),
                                             ],
                                           ),
                                           const SizedBox(width: 12),
                                           GestureDetector(
                                             onTap: () {
-                                              recipeCubit.likeRecipe(widget.recipe.slug, widget.index);
+                                              recipeCubit.likeRecipe(widget.recipeSlug, widget.index);
                                             },
                                             child: InfoBouble(
                                               backgroundColor: appTheme.whiteA700,
@@ -300,9 +309,9 @@ class _AboutRecipeScreenState extends State<AboutRecipeScreen> {
                                       child: BookmarkButton(
                                         onTap: () async {
                                           if (recipeState.recipe.isFavorite) {
-                                            await context.read<AboutRecipeCubit>().removeFromFavorite(widget.recipe.slug, widget.index);
+                                            await context.read<AboutRecipeCubit>().removeFromFavorite(widget.recipeSlug, widget.index);
                                           } else {
-                                            await context.read<AboutRecipeCubit>().addToFavorite(widget.recipe.slug, widget.index);
+                                            await context.read<AboutRecipeCubit>().addToFavorite(widget.recipeSlug, widget.index);
                                           }
                                         },
                                         color: appTheme.whiteA700,
@@ -321,14 +330,14 @@ class _AboutRecipeScreenState extends State<AboutRecipeScreen> {
                                   child: Text(s.about_recipe, style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black)),
                                 ),
                                 const SizedBox(height: 12),
-                                InfoRow(recipe: widget.recipe, type: ProductType.recipe),
-                                if (widget.recipe.videoUrl != null && widget.recipe.videoUrl!.isNotEmpty)
+                                InfoRow(recipe: recipeState.recipe, type: ProductType.recipe),
+                                if (recipeState.recipe.videoUrl != null && recipeState.recipe.videoUrl!.isNotEmpty)
                                   Padding(
                                     padding: const EdgeInsets.only(left: 16, bottom: 12, top: 12),
                                     child: GestureDetector(
                                       onTap: () async {
                                         try {
-                                          final uri = Uri.parse(widget.recipe.videoUrl!);
+                                          final uri = Uri.parse(recipeState.recipe.videoUrl!);
                                           if (await canLaunchUrl(uri)) {
                                             await launchUrl(uri, mode: LaunchMode.externalApplication);
                                           }
@@ -347,19 +356,20 @@ class _AboutRecipeScreenState extends State<AboutRecipeScreen> {
                                       ),
                                     ),
                                   ),
-                                ExpandableText(text: widget.recipe.description),
+                                const SizedBox(height: 12),
+                                ExpandableText(text: recipeState.recipe.description),
                                 const SizedBox(height: 20),
                                 Padding(
                                   padding: const EdgeInsets.symmetric(horizontal: 16),
-                                  child: AuthorCard(author: widget.recipe.author, title: s.recipe_author),
+                                  child: AuthorCard(author: recipeState.recipe.author, title: s.recipe_author),
                                 ),
                                 const SizedBox(height: 16),
                               ],
                             ),
                           ),
                           const SizedBox(height: 12),
-                          if (widget.recipe.ingredients?.isNotEmpty == true) IngredientsWidget(recipe: widget.recipe),
-                          if (widget.recipe.steps?.isNotEmpty == true) ...[const SizedBox(height: 12), StepsWidget(recipe: widget.recipe)],
+                          if (recipeState.recipe.ingredients?.isNotEmpty == true) IngredientsWidget(recipe: recipeState.recipe),
+                          if (recipeState.recipe.steps?.isNotEmpty == true) ...[const SizedBox(height: 12), StepsWidget(recipe: recipeState.recipe)],
                           const SizedBox(height: 8),
                           MainBackgroundBouble(
                             padding: const EdgeInsets.symmetric(vertical: 16),
@@ -369,14 +379,15 @@ class _AboutRecipeScreenState extends State<AboutRecipeScreen> {
                                   padding: const EdgeInsets.symmetric(horizontal: 16),
                                   alignment: Alignment.centerLeft,
                                   child: Text(
-                                    '${recipeState.recipe.commentsCount} ${getCommentForm(widget.recipe.commentsCount, s)}',
+                                    '${recipeState.recipe.commentsCount} ${getCommentForm(recipeState.recipe.commentsCount, s)}',
                                     style: TextStyles.textMMedium.copyWith(color: appTheme.gray500),
                                   ),
                                 ),
                                 const SizedBox(height: 16),
                                 if (state is CommentsStateLoading) const Loader(),
                                 if (state is CommentsStateLoaded)
-                                  CommentsWidget(id: widget.recipe.slug, commentSourceType: CommentSourceType.recipe, comment: state.comment, replyId: replyId),
+                                  CommentsWidget(
+                                      id: recipeState.recipe.slug, commentSourceType: CommentSourceType.recipe, comment: state.comment, replyId: replyId),
                               ],
                             ),
                           ),
@@ -389,51 +400,47 @@ class _AboutRecipeScreenState extends State<AboutRecipeScreen> {
                   return Scaffold(
                     appBar: AppBar(
                       centerTitle: true,
+                      leading: BackButton(
+                        onPressed: () {
+                          if (context.canPop()) {
+                            GoRouter.of(context).pop();
+                            return;
+                          }
+                          GoRouter.of(context).go('/feed-screen');
+                        },
+                      ),
                       title: Text(
-                        widget.recipe.title ?? '',
+                        '',
                         maxLines: 2,
                         textAlign: TextAlign.center,
                         overflow: TextOverflow.ellipsis,
                         softWrap: true,
                         style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
                       ),
-                      actions: [
-                        CustomPopup(
-                          isAuthor: widget.recipe.author.authorIsMe,
-                          path: 'recipe/${widget.recipe.slug}',
-                          complainedContentType: ComplainedContent.recipe,
-                          slug: widget.recipe.slug,
-                          recipe: widget.recipe,
-                          userSlug: widget.recipe.author.authorSlug,
-                        ),
-                        const SizedBox(width: 16),
-                      ],
                     ),
-                    body: DataErrorWidget(onReload: () => context.read<AboutRecipeCubit>().getRecipe(widget.recipe.slug, index: widget.index)),
+                    body: DataErrorWidget(onReload: () => context.read<AboutRecipeCubit>().getRecipe(widget.recipeSlug, index: widget.index)),
                   );
                 }
                 return Scaffold(
                   appBar: AppBar(
                     centerTitle: true,
+                    leading: BackButton(
+                      onPressed: () {
+                        if (context.canPop()) {
+                          GoRouter.of(context).pop();
+                          return;
+                        }
+                        GoRouter.of(context).go('/feed-screen');
+                      },
+                    ),
                     title: Text(
-                      widget.recipe.title ?? '',
+                      '',
                       maxLines: 2,
                       textAlign: TextAlign.center,
                       overflow: TextOverflow.ellipsis,
                       softWrap: true,
                       style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black),
                     ),
-                    actions: [
-                      CustomPopup(
-                        isAuthor: widget.recipe.author.authorIsMe,
-                        path: 'recipe/${widget.recipe.slug}',
-                        complainedContentType: ComplainedContent.recipe,
-                        slug: widget.recipe.slug,
-                        recipe: widget.recipe,
-                        userSlug: widget.recipe.author.authorSlug,
-                      ),
-                      const SizedBox(width: 16),
-                    ],
                   ),
                   body: const Loader(),
                 );
diff --git a/lib/features/recipe/presentation/widgets/my_recipe_widget.dart b/lib/features/recipe/presentation/widgets/my_recipe_widget.dart
index 370b4756..2610ca13 100644
--- a/lib/features/recipe/presentation/widgets/my_recipe_widget.dart
+++ b/lib/features/recipe/presentation/widgets/my_recipe_widget.dart
@@ -64,7 +64,7 @@ class _MyRecipeWidgetState extends State<MyRecipeWidget> {
                 onTap: () async => GoRouter.of(context).pushNamed(
                   'aboutRecipesScreen',
                   extra: {
-                    'recipe': await context.read<MyRecipesCubit>().getRecipeById(widget.recipe.slug),
+                    'recipe': widget.recipe.slug,
                     'navigateToComments': false,
                   },
                 ),
@@ -111,7 +111,9 @@ class _MyRecipeWidgetState extends State<MyRecipeWidget> {
                 Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 16),
                   child: Html(
-                    data: widget.recipe.description.length > 200 ? '${widget.recipe.description.substring(0, 200)}...' : widget.recipe.description,
+                    data: widget.recipe.description.length > 200
+                        ? '${widget.recipe.description.substring(0, 200).replaceAll('\n', '<br>')}...'
+                        : widget.recipe.description.replaceAll('\n', '<br>'),
                     style: {
                       "*": Style(
                         margin: Margins.zero,
@@ -187,7 +189,7 @@ class _MyRecipeWidgetState extends State<MyRecipeWidget> {
     );
   }
 
-  _iconButton(String iconPath, [String? text]) {
+  Container _iconButton(String iconPath, [String? text]) {
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
       decoration: BoxDecoration(
diff --git a/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart b/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart
index 1ccbde80..c9426674 100644
--- a/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart
+++ b/lib/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart
@@ -1,9 +1,10 @@
 import 'dart:developer';
 
 import 'package:eatvio_app/core/app_router.dart';
+import 'package:eatvio_app/core/firebase_api.dart';
+import 'package:eatvio_app/core/locator_service.dart';
 
 import 'package:eatvio_app/core/token_storage.dart';
-import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_state.dart';
 import 'package:eatvio_app/features/registration/repositories/registration_repository.dart';
@@ -48,28 +49,22 @@ class RegistrationCubit extends Cubit<RegistrationState> {
           ),
         );
 
-  updateSheet(UserRegistrationSheet sheet) => emit(RegistrationState(sheet: sheet));
+  void updateSheet(UserRegistrationSheet sheet) => emit(RegistrationState(sheet: sheet));
 
   Future<void> tryRegistration() async {
-    if (await registrationRepository.emailIsReachable(state.sheet.email)) {
-      try {
-        final token = await registrationRepository.tryRegister(
-          state.sheet.copyWith(
-            phone: state.sheet.phone.replaceAll(' ', '').replaceAll('(', '').replaceAll(')', ''),
-            responseBody: '{}',
-          ),
-        );
-        await TokenStorage.saveTokenInStorage(token);
-        AppRouter.navigatorKey.currentContext?.pushNamed('verifyEmailScreen');
-      } catch (e) {
-        log(e.toString());
-      }
-    } else {
-      showErrorDialog(
-        AppRouter.navigatorKey.currentContext!,
-        title: 'Ошибка регистрации',
-        description: 'Несуществующая почта.',
+    try {
+      final token = await registrationRepository.tryRegister(
+        state.sheet.copyWith(
+          phone: state.sheet.phone.replaceAll(' ', '').replaceAll('(', '').replaceAll(')', ''),
+          responseBody: '{}',
+        ),
       );
+      await TokenStorage.saveTokenInStorage(token);
+      await sl<FirebaseApi>().registerPushToken();
+      AppRouter.navigatorKey.currentContext?.replaceNamed('verifyEmailScreen');
+    } catch (e, st) {
+      log(e.toString(), stackTrace: st);
+      emit(RegistrationState(sheet: state.sheet, error: e.toString()));
     }
   }
 
diff --git a/lib/features/registration/presentation/bloc/registration_cubit/registration_state.dart b/lib/features/registration/presentation/bloc/registration_cubit/registration_state.dart
index e4347d20..6a280864 100644
--- a/lib/features/registration/presentation/bloc/registration_cubit/registration_state.dart
+++ b/lib/features/registration/presentation/bloc/registration_cubit/registration_state.dart
@@ -7,5 +7,6 @@ part 'registration_state.freezed.dart';
 abstract class RegistrationState with _$RegistrationState {
   const factory RegistrationState({
     required UserRegistrationSheet sheet,
+    String? error,
   }) = _RegistrationState;
 }
diff --git a/lib/features/registration/presentation/bloc/verify_email_cubit/verify_email_cubit.dart b/lib/features/registration/presentation/bloc/verify_email_cubit/verify_email_cubit.dart
index 864951ae..649c1fb8 100644
--- a/lib/features/registration/presentation/bloc/verify_email_cubit/verify_email_cubit.dart
+++ b/lib/features/registration/presentation/bloc/verify_email_cubit/verify_email_cubit.dart
@@ -9,7 +9,7 @@ class VerifyEmailCubit extends Cubit<VerifyEmailState> {
     required this.profileRepository,
   }) : super(const VerifyEmailState.loading());
 
-  sendEmailCode() async {
+  Future<void> sendEmailCode() async {
     try {
       final profile = await profileRepository.getMyProfile();
       await profileRepository.sendEmailCode();
@@ -19,7 +19,7 @@ class VerifyEmailCubit extends Cubit<VerifyEmailState> {
     }
   }
 
-  tryVerify(String code) async {
+  Future<void> tryVerify(String code) async {
     try {
       emit(const VerifyEmailState.verifyLoading());
       final result = await profileRepository.tryVerifyEmailByCode(code);
diff --git a/lib/features/registration/presentation/pages/date_of_birth_screen.dart b/lib/features/registration/presentation/pages/date_of_birth_screen.dart
index 089cb180..f97167fd 100644
--- a/lib/features/registration/presentation/pages/date_of_birth_screen.dart
+++ b/lib/features/registration/presentation/pages/date_of_birth_screen.dart
@@ -61,7 +61,7 @@ class _DateOfBirthScreenState extends State<DateOfBirthScreen> {
     );
   }
 
-  onTapCalendar(BuildContext context) {
+  Null Function() onTapCalendar(BuildContext context) {
     return () {
       _showDialog(
         CupertinoDatePicker(
diff --git a/lib/features/registration/presentation/pages/gender_screen.dart b/lib/features/registration/presentation/pages/gender_screen.dart
index 4403b54e..e58df3d4 100644
--- a/lib/features/registration/presentation/pages/gender_screen.dart
+++ b/lib/features/registration/presentation/pages/gender_screen.dart
@@ -27,48 +27,46 @@ class _GenderScreenState extends State<GenderScreen> {
       padding: const EdgeInsets.only(bottom: 80, top: 16, left: 16, right: 16),
       child: Column(
         children: [
-          RadioListTile(
-            contentPadding: EdgeInsets.zero,
-            shape: RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(16),
-            ),
-            title: const Text('Мужской'),
-            value: 'male',
-            groupValue: currentValue,
-            onChanged: (newValue) {
-              final registrationCubit = context.read<RegistrationCubit>();
-              registrationCubit.updateSheet(registrationCubit.state.sheet.copyWith(gender: 'male'));
-              setState(() {
-                currentValue = 'male';
-              });
-            },
-            secondary: Image.asset(
-              'assets/images/img_male.png',
-              width: 40,
-              height: 40,
-            ),
+          Row(
+            children: [
+              Radio<String>(
+                value: 'male',
+                // ignore: deprecated_member_use
+                groupValue: currentValue,
+                // ignore: deprecated_member_use
+                onChanged: (newValue) {
+                  final registrationCubit = context.read<RegistrationCubit>();
+                  registrationCubit.updateSheet(registrationCubit.state.sheet.copyWith(gender: 'male'));
+                  setState(() {
+                    currentValue = 'male';
+                  });
+                },
+              ),
+              Expanded(
+                child: Row(children: [Image.asset('assets/images/img_male.png', width: 40, height: 40), const SizedBox(width: 8), const Text('Мужской')]),
+              ),
+            ],
           ),
           const SizedBox(height: 16),
-          RadioListTile(
-            contentPadding: EdgeInsets.zero,
-            shape: RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(16),
-            ),
-            title: const Text('Женский'),
-            value: 'female',
-            groupValue: currentValue,
-            onChanged: (newValue) {
-              final registrationCubit = context.read<RegistrationCubit>();
-              registrationCubit.updateSheet(registrationCubit.state.sheet.copyWith(gender: 'female'));
-              setState(() {
-                currentValue = 'female';
-              });
-            },
-            secondary: Image.asset(
-              'assets/images/img_female.png',
-              width: 40,
-              height: 40,
-            ),
+          Row(
+            children: [
+              Radio<String>(
+                value: 'female',
+                // ignore: deprecated_member_use
+                groupValue: currentValue,
+                // ignore: deprecated_member_use
+                onChanged: (newValue) {
+                  final registrationCubit = context.read<RegistrationCubit>();
+                  registrationCubit.updateSheet(registrationCubit.state.sheet.copyWith(gender: 'female'));
+                  setState(() {
+                    currentValue = 'female';
+                  });
+                },
+              ),
+              Expanded(
+                child: Row(children: [Image.asset('assets/images/img_female.png', width: 40, height: 40), const SizedBox(width: 8), const Text('Женский')]),
+              ),
+            ],
           ),
         ],
       ),
diff --git a/lib/features/registration/presentation/pages/registration_screen.dart b/lib/features/registration/presentation/pages/registration_screen.dart
index 69ae62d5..86514be8 100644
--- a/lib/features/registration/presentation/pages/registration_screen.dart
+++ b/lib/features/registration/presentation/pages/registration_screen.dart
@@ -43,142 +43,161 @@ class _RegistrationScreenState extends State<RegistrationScreen> {
   Widget build(BuildContext context) {
     return BlocProvider<RegistrationCubit>(
       create: (BuildContext context) => registrationCubit,
-      child: BlocBuilder<RegistrationCubit, RegistrationState>(
-        builder: (BuildContext context, RegistrationState state) {
-          return Scaffold(
-            floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
-            floatingActionButton: Row(
-              children: [
-                Container(
-                  height: 48,
-                  width: MediaQuery.of(context).size.width * 0.2,
-                  padding: const EdgeInsets.only(left: 16, right: 4),
-                  child: FloatingActionButton.extended(
-                    heroTag: 'backButtonRegistration',
-                    highlightElevation: 0,
-                    focusElevation: 0,
-                    elevation: 0,
-                    shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(20),
-                    ),
-                    backgroundColor: const Color(0xFFEAF2FD),
-                    onPressed: () async {
-                      setState(() {
-                        pageController.previousPage(
-                          duration: const Duration(milliseconds: 350),
-                          curve: Curves.easeInOut,
-                        );
-                      });
-                    },
-                    label: Icon(
-                      Icons.arrow_back_ios_new_rounded,
-                      color: appTheme.blueA400,
-                    ),
+      child: BlocListener<RegistrationCubit, RegistrationState>(
+        listener: (context, state) {
+          if (state.error != null && state.error!.isNotEmpty) {
+            showDialog(
+              context: context,
+              builder: (context) => AlertDialog(
+                title: const Text('Ошибка при регистрации'),
+                content: Text(state.error!),
+                actions: [
+                  TextButton(
+                    onPressed: () => Navigator.pop(context),
+                    child: const Text('OK'),
                   ),
-                ),
-                Container(
-                  height: 48,
-                  width: MediaQuery.of(context).size.width * 0.8,
-                  padding: const EdgeInsets.only(left: 4, right: 16),
-                  child: FloatingActionButton.extended(
-                    heroTag: 'nextButtonRegistration',
-                    highlightElevation: 0,
-                    elevation: 0,
-                    focusElevation: 0,
-                    shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(20),
-                    ),
-                    backgroundColor: appTheme.blueA400,
-                    onPressed: () async {
-                      if (await canGoNext(state, context)) {
+                ],
+              ),
+            );
+          }
+        },
+        child: BlocBuilder<RegistrationCubit, RegistrationState>(
+          builder: (BuildContext context, RegistrationState state) {
+            return Scaffold(
+              floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat,
+              floatingActionButton: Row(
+                children: [
+                  Container(
+                    height: 48,
+                    width: MediaQuery.of(context).size.width * 0.2,
+                    padding: const EdgeInsets.only(left: 16, right: 4),
+                    child: FloatingActionButton.extended(
+                      heroTag: 'backButtonRegistration',
+                      highlightElevation: 0,
+                      focusElevation: 0,
+                      elevation: 0,
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(20),
+                      ),
+                      backgroundColor: const Color(0xFFEAF2FD),
+                      onPressed: () async {
                         setState(() {
-                          pageController.nextPage(
+                          pageController.previousPage(
                             duration: const Duration(milliseconds: 350),
                             curve: Curves.easeInOut,
                           );
                         });
-                      }
-                    },
-                    label: Text(
-                      'Продолжить',
-                      style: theme.textTheme.titleSmall!.copyWith(color: Colors.white),
+                      },
+                      label: Icon(
+                        Icons.arrow_back_ios_new_rounded,
+                        color: appTheme.blueA400,
+                      ),
                     ),
                   ),
-                ),
-              ],
-            ),
-            appBar: AppBar(
-              automaticallyImplyLeading: false,
-              leading: Builder(
-                builder: (context) => IconButton(
-                  icon: const Icon(Icons.close_rounded),
-                  onPressed: () => GoRouter.of(context).pop(),
-                ),
-              ),
-              centerTitle: true,
-              title: SvgPicture.asset(
-                ImageConstant.imgLogoEatvio,
-                height: 48,
-                fit: BoxFit.contain,
-              ),
-              actions: [
-                Padding(
-                  padding: const EdgeInsets.only(right: 16),
-                  child: Text('шаг $step из 15'),
-                ),
-              ],
-              bottom: PreferredSize(
-                preferredSize: Size(MediaQuery.of(context).size.width, 32),
-                child: Padding(
-                  padding: const EdgeInsets.all(16),
-                  child: TweenAnimationBuilder<double>(
-                    duration: const Duration(milliseconds: 350),
-                    curve: Curves.easeInOut,
-                    tween: Tween<double>(
-                      begin: 1 / 15,
-                      end: progressValue,
+                  Container(
+                    height: 48,
+                    width: MediaQuery.of(context).size.width * 0.8,
+                    padding: const EdgeInsets.only(left: 4, right: 16),
+                    child: FloatingActionButton.extended(
+                      heroTag: 'nextButtonRegistration',
+                      highlightElevation: 0,
+                      elevation: 0,
+                      focusElevation: 0,
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(20),
+                      ),
+                      backgroundColor: appTheme.blueA400,
+                      onPressed: () async {
+                        if (await canGoNext(state, context)) {
+                          setState(() {
+                            pageController.nextPage(
+                              duration: const Duration(milliseconds: 350),
+                              curve: Curves.easeInOut,
+                            );
+                          });
+                        }
+                      },
+                      label: Text(
+                        'Продолжить',
+                        style: theme.textTheme.titleSmall!.copyWith(color: Colors.white),
+                      ),
                     ),
-                    builder: (context, value, _) => LinearProgressIndicator(
-                      value: value,
-                      borderRadius: BorderRadius.circular(16),
-                      minHeight: 8,
-                      backgroundColor: Colors.grey.shade100,
-                      valueColor: AlwaysStoppedAnimation<Color>(appTheme.blueA400),
+                  ),
+                ],
+              ),
+              appBar: AppBar(
+                automaticallyImplyLeading: false,
+                leading: Builder(
+                  builder: (context) => IconButton(
+                    icon: const Icon(Icons.close_rounded),
+                    onPressed: () => GoRouter.of(context).pop(),
+                  ),
+                ),
+                centerTitle: true,
+                title: SvgPicture.asset(
+                  ImageConstant.imgLogoEatvio,
+                  height: 48,
+                  fit: BoxFit.contain,
+                ),
+                actions: [
+                  Padding(
+                    padding: const EdgeInsets.only(right: 16),
+                    child: Text('шаг $step из 15'),
+                  ),
+                ],
+                bottom: PreferredSize(
+                  preferredSize: Size(MediaQuery.of(context).size.width, 32),
+                  child: Padding(
+                    padding: const EdgeInsets.all(16),
+                    child: TweenAnimationBuilder<double>(
+                      duration: const Duration(milliseconds: 350),
+                      curve: Curves.easeInOut,
+                      tween: Tween<double>(
+                        begin: 1 / 15,
+                        end: progressValue,
+                      ),
+                      builder: (context, value, _) => LinearProgressIndicator(
+                        value: value,
+                        borderRadius: BorderRadius.circular(16),
+                        minHeight: 8,
+                        backgroundColor: Colors.grey.shade100,
+                        valueColor: AlwaysStoppedAnimation<Color>(appTheme.blueA400),
+                      ),
                     ),
                   ),
                 ),
               ),
-            ),
-            body: PageView(
-              physics: const NeverScrollableScrollPhysics(),
-              controller: pageController,
-              onPageChanged: (index) {
-                setState(() {
-                  step = index + 1;
-                  progressValue = step / 15;
-                });
-              },
-              children: [
-                // LanguageSelectScreen(sheet: state.sheet),
-                PhoneScreen(sheet: state.sheet),
-                CredentialsScreen(sheet: state.sheet),
-                NameScreen(sheet: state.sheet),
-                GenderScreen(sheet: state.sheet),
-                DateOfBirthScreen(sheet: state.sheet),
-                CityOfLivingScreen(sheet: state.sheet),
-                BodyCircumferencesScreen(sheet: state.sheet),
-                WeightScreen(sheet: state.sheet),
-                HeightScreen(sheet: state.sheet),
-                BloodPressureScreen(sheet: state.sheet),
-                AllergiesScreen(sheet: state.sheet),
-                MedicineIntakeScreen(sheet: state.sheet),
-                FavoriteSportsScreen(sheet: state.sheet),
-                FavoriteFoodsScreen(sheet: state.sheet),
-                AdditionalInformationScreen(sheet: state.sheet),
-              ],
-            ),
-          );
-        },
+              body: PageView(
+                physics: const NeverScrollableScrollPhysics(),
+                controller: pageController,
+                onPageChanged: (index) {
+                  setState(() {
+                    step = index + 1;
+                    progressValue = step / 15;
+                  });
+                },
+                children: [
+                  // LanguageSelectScreen(sheet: state.sheet),
+                  PhoneScreen(sheet: state.sheet),
+                  CredentialsScreen(sheet: state.sheet),
+                  NameScreen(sheet: state.sheet),
+                  GenderScreen(sheet: state.sheet),
+                  DateOfBirthScreen(sheet: state.sheet),
+                  CityOfLivingScreen(sheet: state.sheet),
+                  BodyCircumferencesScreen(sheet: state.sheet),
+                  WeightScreen(sheet: state.sheet),
+                  HeightScreen(sheet: state.sheet),
+                  BloodPressureScreen(sheet: state.sheet),
+                  AllergiesScreen(sheet: state.sheet),
+                  MedicineIntakeScreen(sheet: state.sheet),
+                  FavoriteSportsScreen(sheet: state.sheet),
+                  FavoriteFoodsScreen(sheet: state.sheet),
+                  AdditionalInformationScreen(sheet: state.sheet),
+                ],
+              ),
+            );
+          },
+        ),
       ),
     );
   }
diff --git a/lib/features/registration/presentation/pages/verify_email_screen.dart b/lib/features/registration/presentation/pages/verify_email_screen.dart
index ed4ea11f..f50d4960 100644
--- a/lib/features/registration/presentation/pages/verify_email_screen.dart
+++ b/lib/features/registration/presentation/pages/verify_email_screen.dart
@@ -1,5 +1,10 @@
+import 'dart:async';
+
 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/utils/toasts.dart';
+import 'package:eatvio_app/core/widgets/custom_outlined_button.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_cubit.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_state.dart';
 import 'package:flutter/material.dart';
@@ -18,11 +23,14 @@ class _VerifyEmailScreenState extends State<VerifyEmailScreen> {
   final List<TextEditingController> _controllers = List.generate(4, (_) => TextEditingController());
   String email = '';
   late final GoRouter goRouter;
-
+  late Timer _timer;
+  int _secondsRemaining = 60;
+  bool _canSendAgain = false;
   @override
   void initState() {
     super.initState();
-    goRouter = GoRouter.of(context);
+    goRouter = GoRouter.of(context);    
+    _startTimer();
   }
 
   @override
@@ -36,6 +44,23 @@ class _VerifyEmailScreenState extends State<VerifyEmailScreen> {
     super.dispose();
   }
 
+  void _startTimer() {
+    setState(() {
+      _canSendAgain = false;
+      _secondsRemaining = 60;
+    });
+    _timer = Timer.periodic(const Duration(seconds: 1), (timer) {
+      setState(() {
+        if (_secondsRemaining > 0) {
+          _secondsRemaining--;
+        } else {
+          _canSendAgain = true;
+          _timer.cancel();
+        }
+      });
+    });
+  }
+
   void _checkAndSubmitCode(BuildContext context) {
     final code = _controllers.map((c) => c.text).join();
     if (code.length == 4) {
@@ -74,18 +99,25 @@ class _VerifyEmailScreenState extends State<VerifyEmailScreen> {
                 children: [
                   Text("Код отправлен на почту\n$email", textAlign: TextAlign.center),
                   const SizedBox(height: 20),
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                    children: List.generate(4, (index) => _buildCodeField(context, index)),
-                  ),
-                  const SizedBox(height: 20),
-                  const Text("Запросить код повторно", style: TextStyle(color: Colors.grey)),
-                  TextButton(
-                    onPressed: () {
-                      context.read<VerifyEmailCubit>().sendEmailCode();
+                  Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: List.generate(4, (index) => _buildCodeField(context, index))),
+                  const SizedBox(height: 40),
+                  CustomOutlinedButton(
+                    text: 'Запросить код повторно',
+                    height: 52,
+                    isDisabled: !_canSendAgain,
+                    buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
+                    buttonStyle: ButtonStyle(
+                      side: const WidgetStatePropertyAll(BorderSide.none),
+                      backgroundColor: WidgetStatePropertyAll(_canSendAgain ? appTheme.blueA400 : appTheme.gray),
+                    ),
+                    onPressed: () async {
+                      await context.read<VerifyEmailCubit>().sendEmailCode();
+                      _startTimer();
                     },
-                    child: const Text("Не приходит код?"),
                   ),
+                  const SizedBox(height: 8),
+                  if (!_canSendAgain)
+                    Text("Зпросить код повторно можно через $_secondsRemaining с.", style: TextStyles.textSMedium.copyWith(color: appTheme.gray)),
                 ],
               ),
             ),
diff --git a/lib/features/registration/presentation/pages/verify_screen.dart b/lib/features/registration/presentation/pages/verify_screen.dart
index 7f8aede5..637dba5b 100644
--- a/lib/features/registration/presentation/pages/verify_screen.dart
+++ b/lib/features/registration/presentation/pages/verify_screen.dart
@@ -1,5 +1,6 @@
 import 'package:eatvio_app/core/const.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/core/widgets/loader.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:lottie/lottie.dart';
@@ -19,6 +20,7 @@ class VerifyScreen extends StatefulWidget {
 
 class _VerifyScreenState extends State<VerifyScreen> {
   late final WebViewController _controller;
+  bool _isLoading = true;
 
   @override
   void initState() {
@@ -27,6 +29,11 @@ class _VerifyScreenState extends State<VerifyScreen> {
       ..setJavaScriptMode(JavaScriptMode.unrestricted)
       ..setNavigationDelegate(
         NavigationDelegate(
+          onPageFinished: (url) {
+            setState(() {
+              _isLoading = false;
+            });
+          },
           onNavigationRequest: (NavigationRequest request) async {
             if (request.url.contains('user_detailz') && !request.url.contains('change-phone-verify') || request.url.contains('email/verify')) {
               GoRouter.of(context).pop();
@@ -105,11 +112,17 @@ class _VerifyScreenState extends State<VerifyScreen> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
-        toolbarHeight: 0,
-      ),
+      appBar: AppBar(toolbarHeight: 0),
       body: SafeArea(
-        child: WebViewWidget(controller: _controller),
+        child: Stack(
+          children: [
+            WebViewWidget(controller: _controller),
+            if (_isLoading)
+              const Center(
+                child: Loader(),
+              ),
+          ],
+        ),
       ),
     );
   }
diff --git a/lib/features/registration/repositories/registration_repository.dart b/lib/features/registration/repositories/registration_repository.dart
index 7a4a14ae..548684b9 100644
--- a/lib/features/registration/repositories/registration_repository.dart
+++ b/lib/features/registration/repositories/registration_repository.dart
@@ -3,6 +3,7 @@ import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/features/registration/models/user_registration_model.dart';
 import 'package:eatvio_app/features/registration/models/location_model.dart';
 import 'package:eatvio_app/features/registration/services/registration_service.dart';
+import 'package:eatvio_app/core/env_config.dart';
 
 class RegistrationRepository {
   final RegistrationService registrationService;
@@ -11,8 +12,56 @@ class RegistrationRepository {
 
   Future<String> tryRegister(UserRegistrationSheet sheet) async {
     try {
-      return (await registrationService.register(sheet: sheet.toJson()))['token']!;
-    } catch (e) {
+      final response = await registrationService.register(sheet: sheet.toJson());
+      if (response.containsKey('token')) {
+        return response['token']!;
+      } else {
+        // Если нет токена, но есть message или errors
+        String errorMsg = '';
+        if (response.containsKey('message')) {
+          errorMsg += '${response['message']!}\n';
+        }
+        if (response.containsKey('errors')) {
+          final errors = response['errors'];
+          if (errors != null && errors is Map) {
+            (errors as Map).forEach((key, value) {
+              if (value is List && value.isNotEmpty) {
+                errorMsg += '${value.join('\n')}\n';
+              }
+            });
+          }
+        }
+        if (errorMsg.isNotEmpty) {
+          throw errorMsg.trim();
+        } else {
+          throw 'Ошибка регистрации: $response';
+        }
+      }
+    } on DioException catch (e) {
+      if (e.response != null && e.response?.statusCode == 422) {
+        final data = e.response?.data;
+        String errorMsg = '';
+        if (data is Map<String, dynamic>) {
+          if (data.containsKey('message')) {
+            errorMsg += data['message'] + '\n';
+          }
+          if (data.containsKey('errors')) {
+            final errors = data['errors'];
+            if (errors != null && errors is Map) {
+              (errors).forEach((key, value) {
+                if (value is List && value.isNotEmpty) {
+                  errorMsg += '${value.join('\n')}\n';
+                }
+              });
+            }
+          }
+        }
+        if (errorMsg.isNotEmpty) {
+          throw errorMsg.trim();
+        } else {
+          throw 'Ошибка регистрации: $data';
+        }
+      }
       rethrow;
     }
   }
@@ -35,7 +84,7 @@ class RegistrationRepository {
 
   Future<bool> emailIsReachable(String email) async {
     try {
-      final response = await sl<Dio>().getUri(Uri.parse('https://api.validate.email/validate?email=$email'));
+      final response = await sl<Dio>().getUri(Uri.parse('${EnvConfig.emailValidationApiUrl}?email=$email'));
       if (response.data['result']['reachable'] != 'invalid') {
         return true;
       } else {
diff --git a/lib/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart b/lib/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart
index 1bc68637..ae498824 100644
--- a/lib/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart
+++ b/lib/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart
@@ -22,7 +22,11 @@ class SettingsCubit extends Cubit<SettingsState> {
     final profile = await profileRepository.getMyProfile();
     late final ConsultationRequestModel? consultantInfo;
     try {
-      consultantInfo = await consultantRepository.getMyRequestStatus(profile.slug);
+      if (profile.phoneConfirmationState.contains('confirmed')) {
+        consultantInfo = await consultantRepository.getMyRequestStatus(profile.slug);
+      } else {
+        consultantInfo = null;
+      }
     } catch (e) {
       consultantInfo = null;
     }
@@ -40,7 +44,7 @@ class SettingsCubit extends Cubit<SettingsState> {
     }
   }
 
-  updateProfileDetails({
+  Future<void> updateProfileDetails({
     required ProfileDetailsModel profileDetailsModel,
   }) async {
     try {
@@ -54,7 +58,7 @@ class SettingsCubit extends Cubit<SettingsState> {
     }
   }
 
-  updateProfileSettings({
+  Future<void> updateProfileSettings({
     required ProfileSettingsModel profileSettingsModel,
   }) async {
     try {
@@ -67,4 +71,13 @@ class SettingsCubit extends Cubit<SettingsState> {
       await init();
     }
   }
+
+  Future<bool> deleteAccount() async {
+    try {
+      await profileRepository.deleteAccount();
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
 }
diff --git a/lib/features/settings/presentation/pages/general_info_screen.dart b/lib/features/settings/presentation/pages/general_info_screen.dart
index 9e12ee19..0e7600ce 100644
--- a/lib/features/settings/presentation/pages/general_info_screen.dart
+++ b/lib/features/settings/presentation/pages/general_info_screen.dart
@@ -151,7 +151,7 @@ class _GeneralInfoScreenState extends State<GeneralInfoScreen> {
     );
   }
 
-  onTapCalendar(BuildContext context) {
+  Null Function() onTapCalendar(BuildContext context) {
     return () {
       _showDialog(
         CupertinoDatePicker(
@@ -187,7 +187,7 @@ class _GeneralInfoScreenState extends State<GeneralInfoScreen> {
     );
   }
 
-  _saveButton() {
+  InkWell _saveButton() {
     return InkWell(
       onTap: () {
         widget.settingsEntity.settingsCubit.updateProfileDetails(
diff --git a/lib/features/settings/presentation/pages/other_info_screen.dart b/lib/features/settings/presentation/pages/other_info_screen.dart
index 555eb97e..840d8bbe 100644
--- a/lib/features/settings/presentation/pages/other_info_screen.dart
+++ b/lib/features/settings/presentation/pages/other_info_screen.dart
@@ -129,7 +129,7 @@ class _OtherInfoScreenState extends State<OtherInfoScreen> {
     );
   }
 
-  _saveButton() {
+  InkWell _saveButton() {
     return InkWell(
       onTap: () {
         widget.settingsEntity.settingsCubit.updateProfileDetails(
diff --git a/lib/features/settings/presentation/pages/physical_activity_screen.dart b/lib/features/settings/presentation/pages/physical_activity_screen.dart
index c3ef542f..df91a4f6 100644
--- a/lib/features/settings/presentation/pages/physical_activity_screen.dart
+++ b/lib/features/settings/presentation/pages/physical_activity_screen.dart
@@ -7,10 +7,7 @@ import 'package:go_router/go_router.dart';
 class PhysicalActivityScreen extends StatefulWidget {
   final SettingsEntity settingsEntity;
 
-  const PhysicalActivityScreen({
-    super.key,
-    required this.settingsEntity,
-  });
+  const PhysicalActivityScreen({super.key, required this.settingsEntity});
 
   @override
   State<PhysicalActivityScreen> createState() => _PhysicalActivityScreenState();
@@ -46,69 +43,108 @@ class _PhysicalActivityScreenState extends State<PhysicalActivityScreen> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
-        title: const Text('Физическая нагрузка'),
-      ),
+      appBar: AppBar(title: const Text('Физическая нагрузка')),
       bottomSheet: _saveButton(),
       body: SingleChildScrollView(
         physics: const BouncingScrollPhysics(),
         padding: const EdgeInsets.only(top: 16, bottom: 80),
         child: Column(
           children: [
-            RadioListTile<PhysicalActivity>(
-              contentPadding: const EdgeInsets.only(left: 8, right: 16),
-              title: const Text('1,2 — минимальный (сидячая работа, отсутствие физических нагрузок);'),
-              value: PhysicalActivity.minimum,
-              groupValue: _physicalActivity,
-              onChanged: (PhysicalActivity? value) {
-                setState(() {
-                  _physicalActivity = value;
-                });
-              },
+            Row(
+              children: [
+                Radio<PhysicalActivity>(
+                  value: PhysicalActivity.minimum,
+                  // ignore: deprecated_member_use
+                  groupValue: _physicalActivity,
+                  // ignore: deprecated_member_use
+                  onChanged: (PhysicalActivity? value) {
+                    setState(() {
+                      _physicalActivity = value;
+                    });
+                  },
+                ),
+                const Expanded(
+                  child: Padding(
+                    padding: EdgeInsets.only(left: 8, right: 16),
+                    child: Text('1,2 — минимальный (сидячая работа, отсутствие физических нагрузок);'),
+                  ),
+                ),
+              ],
             ),
-            RadioListTile<PhysicalActivity>(
-              contentPadding: const EdgeInsets.only(left: 8, right: 16),
-              title: const Text('1,375 — низкий (тренировки не менее 20 мин 1–3 раза в неделю);'),
-              value: PhysicalActivity.low,
-              groupValue: _physicalActivity,
-              onChanged: (PhysicalActivity? value) {
-                setState(() {
-                  _physicalActivity = value;
-                });
-              },
+            Row(
+              children: [
+                Radio<PhysicalActivity>(
+                  value: PhysicalActivity.low,
+                  // ignore: deprecated_member_use
+                  groupValue: _physicalActivity,
+                  // ignore: deprecated_member_use
+                  onChanged: (PhysicalActivity? value) {
+                    setState(() {
+                      _physicalActivity = value;
+                    });
+                  },
+                ),
+                const Expanded(
+                  child: Padding(padding: EdgeInsets.only(left: 8, right: 16), child: Text('1,375 — низкий (тренировки не менее 20 мин 1–3 раза в неделю);')),
+                ),
+              ],
             ),
-            RadioListTile<PhysicalActivity>(
-              contentPadding: const EdgeInsets.only(left: 8, right: 16),
-              title: const Text('1,55 — умеренный (тренировки 30–60 мин 3–4 раза в неделю);'),
-              value: PhysicalActivity.medium,
-              groupValue: _physicalActivity,
-              onChanged: (PhysicalActivity? value) {
-                setState(() {
-                  _physicalActivity = value;
-                });
-              },
+            Row(
+              children: [
+                Radio<PhysicalActivity>(
+                  value: PhysicalActivity.medium,
+                  // ignore: deprecated_member_use
+                  groupValue: _physicalActivity,
+                  // ignore: deprecated_member_use
+                  onChanged: (PhysicalActivity? value) {
+                    setState(() {
+                      _physicalActivity = value;
+                    });
+                  },
+                ),
+                const Expanded(
+                  child: Padding(padding: EdgeInsets.only(left: 8, right: 16), child: Text('1,55 — умеренный (тренировки 30–60 мин 3–4 раза в неделю);')),
+                ),
+              ],
             ),
-            RadioListTile<PhysicalActivity>(
-              contentPadding: const EdgeInsets.only(left: 8, right: 16),
-              title: const Text('1,7 — высокий (тренировки 30–60 мин 5–7 раза в неделю; тяжёлая физическая работа);'),
-              value: PhysicalActivity.high,
-              groupValue: _physicalActivity,
-              onChanged: (PhysicalActivity? value) {
-                setState(() {
-                  _physicalActivity = value;
-                });
-              },
+            Row(
+              children: [
+                Radio<PhysicalActivity>(
+                  value: PhysicalActivity.high,
+                  // ignore: deprecated_member_use
+                  groupValue: _physicalActivity,
+                  // ignore: deprecated_member_use
+                  onChanged: (PhysicalActivity? value) {
+                    setState(() {
+                      _physicalActivity = value;
+                    });
+                  },
+                ),
+                const Expanded(
+                  child: Padding(
+                    padding: EdgeInsets.only(left: 8, right: 16),
+                    child: Text('1,7 — высокий (тренировки 30–60 мин 5–7 раза в неделю; тяжёлая физическая работа);'),
+                  ),
+                ),
+              ],
             ),
-            RadioListTile<PhysicalActivity>(
-              contentPadding: const EdgeInsets.only(left: 8, right: 16),
-              title: const Text('1,9 — экстремальный (несколько интенсивных тренировок в день'),
-              value: PhysicalActivity.extreme,
-              groupValue: _physicalActivity,
-              onChanged: (PhysicalActivity? value) {
-                setState(() {
-                  _physicalActivity = value;
-                });
-              },
+            Row(
+              children: [
+                Radio<PhysicalActivity>(
+                  value: PhysicalActivity.extreme,
+                  // ignore: deprecated_member_use
+                  groupValue: _physicalActivity,
+                  // ignore: deprecated_member_use
+                  onChanged: (PhysicalActivity? value) {
+                    setState(() {
+                      _physicalActivity = value;
+                    });
+                  },
+                ),
+                const Expanded(
+                  child: Padding(padding: EdgeInsets.only(left: 8, right: 16), child: Text('1,9 — экстремальный (несколько интенсивных тренировок в день')),
+                ),
+              ],
             ),
           ],
         ),
@@ -116,7 +152,7 @@ class _PhysicalActivityScreenState extends State<PhysicalActivityScreen> {
     );
   }
 
-  _saveButton() {
+  InkWell _saveButton() {
     return InkWell(
       onTap: () {
         late final double activityCoefficient;
@@ -141,8 +177,8 @@ class _PhysicalActivityScreenState extends State<PhysicalActivityScreen> {
         }
         widget.settingsEntity.settingsCubit.updateProfileDetails(
           profileDetailsModel: (widget.settingsEntity.settingsCubit.state as SettingsStateLoaded).profileDetails.copyWith(
-                activityCoefficient: activityCoefficient,
-              ),
+            activityCoefficient: activityCoefficient,
+          ),
         );
         GoRouter.of(context).pop();
       },
@@ -150,19 +186,11 @@ class _PhysicalActivityScreenState extends State<PhysicalActivityScreen> {
       child: Ink(
         height: 52,
         width: MediaQuery.of(context).size.width - 32,
-        decoration: BoxDecoration(
-          borderRadius: BorderRadius.circular(20),
-          color: appTheme.blueA400,
-        ),
+        decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: appTheme.blueA400),
         child: const Center(
           child: Text(
             'Сохранить',
-            style: TextStyle(
-              color: Colors.white,
-              height: 1,
-              fontWeight: FontWeight.w600,
-              fontSize: 18,
-            ),
+            style: TextStyle(color: Colors.white, height: 1, fontWeight: FontWeight.w600, fontSize: 18),
           ),
         ),
       ),
diff --git a/lib/features/settings/presentation/pages/physical_form_screen.dart b/lib/features/settings/presentation/pages/physical_form_screen.dart
index 8574d222..0c22cf85 100644
--- a/lib/features/settings/presentation/pages/physical_form_screen.dart
+++ b/lib/features/settings/presentation/pages/physical_form_screen.dart
@@ -100,7 +100,7 @@ class _PhysicalFormScreenState extends State<PhysicalFormScreen> {
     );
   }
 
-  _saveButton() {
+  InkWell _saveButton() {
     return InkWell(
       onTap: () {
         widget.settingsEntity.settingsCubit.updateProfileDetails(
diff --git a/lib/features/settings/presentation/pages/pressure_screen.dart b/lib/features/settings/presentation/pages/pressure_screen.dart
index 1a155dcb..287744a9 100644
--- a/lib/features/settings/presentation/pages/pressure_screen.dart
+++ b/lib/features/settings/presentation/pages/pressure_screen.dart
@@ -106,7 +106,7 @@ class _PressureScreenState extends State<PressureScreen> {
     );
   }
 
-  _saveButton() {
+  InkWell _saveButton() {
     return InkWell(
       onTap: () {
         widget.settingsEntity.settingsCubit.updateProfileDetails(
diff --git a/lib/features/settings/presentation/pages/settings_screen.dart b/lib/features/settings/presentation/pages/settings_screen.dart
index 8afe8cd7..b7aa0d59 100644
--- a/lib/features/settings/presentation/pages/settings_screen.dart
+++ b/lib/features/settings/presentation/pages/settings_screen.dart
@@ -1,17 +1,22 @@
-import 'package:eatvio_app/core/const.dart';
+import 'package:eatvio_app/core/app_router.dart';
+import 'package:eatvio_app/core/theme/custom_text_style.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/data_error_widget.dart';
 import 'package:eatvio_app/core/widgets/loader.dart';
+import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
 import 'package:eatvio_app/features/consultant/become_consultant/models/consultation_request_model.dart';
 import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
 import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart';
 import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_state.dart';
 import 'package:eatvio_app/core/locator_service.dart';
 import 'package:eatvio_app/core/theme/theme_helper.dart';
+import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
-import 'package:url_launcher/url_launcher.dart';
 
 class SettingsScreen extends StatefulWidget {
   const SettingsScreen({super.key});
@@ -44,9 +49,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
         builder: (BuildContext context, SettingsState state) {
           if (state is SettingsStateLoaded) {
             return Scaffold(
-              appBar: AppBar(
-                title: const Text('Настройки'),
-              ),
+              appBar: AppBar(title: const Text('Настройки')),
               body: SafeArea(
                 child: SingleChildScrollView(
                   padding: const EdgeInsets.symmetric(vertical: 16),
@@ -57,10 +60,8 @@ class _SettingsScreenState extends State<SettingsScreen> {
                       const SizedBox(height: 12),
                       _notifications(state),
                       const SizedBox(height: 12),
-                      _aboutEatvio(state),
-                      const SizedBox(height: 12),
                       _becomeConsultantButton(state),
-                      _deleteAccountButton(state),
+                      _deleteAccountButton(state, settingsCubit),
                     ],
                   ),
                 ),
@@ -69,16 +70,12 @@ class _SettingsScreenState extends State<SettingsScreen> {
           }
           if (state is SettingsStateError) {
             return Scaffold(
-              appBar: AppBar(
-                title: const Text('Настройки'),
-              ),
+              appBar: AppBar(title: const Text('Настройки')),
               body: DataErrorWidget(onReload: () => settingsCubit.init()),
             );
           }
           return Scaffold(
-            appBar: AppBar(
-              title: const Text('Настройки'),
-            ),
+            appBar: AppBar(title: const Text('Настройки')),
             body: const Loader(),
           );
         },
@@ -86,7 +83,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
     );
   }
 
-  _additionalInfo(SettingsStateLoaded state) {
+  Column _additionalInfo(SettingsStateLoaded state) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -94,22 +91,13 @@ class _SettingsScreenState extends State<SettingsScreen> {
           padding: EdgeInsets.symmetric(horizontal: 16),
           child: Text(
             'Дополнительаная информация',
-            style: TextStyle(
-              fontSize: 16,
-              height: 1,
-              color: Colors.grey,
-              fontFamily: 'Mulish',
-            ),
+            style: TextStyle(fontSize: 16, height: 1, color: Colors.grey, fontFamily: 'Mulish'),
           ),
         ),
         _tile(
           onTap: () => GoRouter.of(context).pushNamed(
             'generalInfoScreen',
-            extra: SettingsEntity(
-              profileSettingsModel: state.profileSettings,
-              profileDetailsModel: state.profileDetails,
-              settingsCubit: settingsCubit,
-            ),
+            extra: SettingsEntity(profileSettingsModel: state.profileSettings, profileDetailsModel: state.profileDetails, settingsCubit: settingsCubit),
           ),
           title: 'Общая информация',
         ),
@@ -117,11 +105,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
         _tile(
           onTap: () => GoRouter.of(context).pushNamed(
             'physicalFormScreen',
-            extra: SettingsEntity(
-              profileSettingsModel: state.profileSettings,
-              profileDetailsModel: state.profileDetails,
-              settingsCubit: settingsCubit,
-            ),
+            extra: SettingsEntity(profileSettingsModel: state.profileSettings, profileDetailsModel: state.profileDetails, settingsCubit: settingsCubit),
           ),
           title: 'Физическая форма',
         ),
@@ -129,11 +113,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
         _tile(
           onTap: () => GoRouter.of(context).pushNamed(
             'pressureScreen',
-            extra: SettingsEntity(
-              profileSettingsModel: state.profileSettings,
-              profileDetailsModel: state.profileDetails,
-              settingsCubit: settingsCubit,
-            ),
+            extra: SettingsEntity(profileSettingsModel: state.profileSettings, profileDetailsModel: state.profileDetails, settingsCubit: settingsCubit),
           ),
           title: 'Давление',
         ),
@@ -141,11 +121,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
         _tile(
           onTap: () => GoRouter.of(context).pushNamed(
             'otherInfoScreen',
-            extra: SettingsEntity(
-              profileSettingsModel: state.profileSettings,
-              profileDetailsModel: state.profileDetails,
-              settingsCubit: settingsCubit,
-            ),
+            extra: SettingsEntity(profileSettingsModel: state.profileSettings, profileDetailsModel: state.profileDetails, settingsCubit: settingsCubit),
           ),
           title: 'Прочая информация',
         ),
@@ -153,35 +129,17 @@ class _SettingsScreenState extends State<SettingsScreen> {
         _tile(
           onTap: () => GoRouter.of(context).pushNamed(
             'physicalActivityScreen',
-            extra: SettingsEntity(
-              profileSettingsModel: state.profileSettings,
-              profileDetailsModel: state.profileDetails,
-              settingsCubit: settingsCubit,
-            ),
+            extra: SettingsEntity(profileSettingsModel: state.profileSettings, profileDetailsModel: state.profileDetails, settingsCubit: settingsCubit),
           ),
           title: 'Физическая нагрузка',
         ),
         _divider(context),
-        _tile(
-          onTap: () => GoRouter.of(context).pushNamed(
-            'changePasswordScreen',
-            extra: SettingsEntity(
-              profileSettingsModel: state.profileSettings,
-              profileDetailsModel: state.profileDetails,
-              settingsCubit: settingsCubit,
-            ),
-          ),
-          title: 'Сменить пароль',
-        ),
+        _tile(onTap: () => GoRouter.of(context).pushNamed('forgetPasswordScreen', extra: true), title: 'Сменить пароль'),
         _divider(context),
         _tile(
           onTap: () => GoRouter.of(context).pushNamed(
             'changeEmailScreen',
-            extra: SettingsEntity(
-              profileSettingsModel: state.profileSettings,
-              profileDetailsModel: state.profileDetails,
-              settingsCubit: settingsCubit,
-            ),
+            extra: SettingsEntity(profileSettingsModel: state.profileSettings, profileDetailsModel: state.profileDetails, settingsCubit: settingsCubit),
           ),
           title: 'Сменить Email',
         ),
@@ -189,20 +147,13 @@ class _SettingsScreenState extends State<SettingsScreen> {
     );
   }
 
-  _notifications(SettingsStateLoaded state) {
+  Column _notifications(SettingsStateLoaded state) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         const Padding(
           padding: EdgeInsets.symmetric(horizontal: 16),
-          child: Text(
-            'Уведомления',
-            style: TextStyle(
-              fontSize: 16,
-              height: 1,
-              color: Colors.grey,
-            ),
-          ),
+          child: Text('Уведомления', style: TextStyle(fontSize: 16, height: 1, color: Colors.grey)),
         ),
         _tile(
           padding: const EdgeInsets.symmetric(horizontal: 16),
@@ -210,11 +161,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
             setState(() {
               updatesNotificationsSwitchState = !updatesNotificationsSwitchState;
             });
-            settingsCubit.updateProfileSettings(
-              profileSettingsModel: state.profileSettings.copyWith(
-                newUpdatesNotifications: updatesNotificationsSwitchState,
-              ),
-            );
+            settingsCubit.updateProfileSettings(profileSettingsModel: state.profileSettings.copyWith(newUpdatesNotifications: updatesNotificationsSwitchState));
           },
           title: 'Уведомление о новых обновлениях',
           trailing: CupertinoSwitch(
@@ -225,9 +172,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                 updatesNotificationsSwitchState = newValue;
               });
               settingsCubit.updateProfileSettings(
-                profileSettingsModel: state.profileSettings.copyWith(
-                  newUpdatesNotifications: updatesNotificationsSwitchState,
-                ),
+                profileSettingsModel: state.profileSettings.copyWith(newUpdatesNotifications: updatesNotificationsSwitchState),
               );
             },
           ),
@@ -240,9 +185,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
               fillDiaryNotificationsSwitchState = !fillDiaryNotificationsSwitchState;
             });
             settingsCubit.updateProfileSettings(
-              profileSettingsModel: state.profileSettings.copyWith(
-                diaryReminderNotifications: fillDiaryNotificationsSwitchState,
-              ),
+              profileSettingsModel: state.profileSettings.copyWith(diaryReminderNotifications: fillDiaryNotificationsSwitchState),
             );
           },
           title: 'Напоминание о заполнении дневника',
@@ -254,9 +197,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                 fillDiaryNotificationsSwitchState = newValue;
               });
               settingsCubit.updateProfileSettings(
-                profileSettingsModel: state.profileSettings.copyWith(
-                  diaryReminderNotifications: fillDiaryNotificationsSwitchState,
-                ),
+                profileSettingsModel: state.profileSettings.copyWith(diaryReminderNotifications: fillDiaryNotificationsSwitchState),
               );
             },
           ),
@@ -268,11 +209,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
             setState(() {
               moodSwitchState = !moodSwitchState;
             });
-            settingsCubit.updateProfileSettings(
-              profileSettingsModel: state.profileSettings.copyWith(
-                isMoodFillable: moodSwitchState,
-              ),
-            );
+            settingsCubit.updateProfileSettings(profileSettingsModel: state.profileSettings.copyWith(isMoodFillable: moodSwitchState));
           },
           title: 'Указывать “настроение” в заполнение дневника',
           trailing: CupertinoSwitch(
@@ -282,11 +219,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
               setState(() {
                 moodSwitchState = newValue;
               });
-              settingsCubit.updateProfileSettings(
-                profileSettingsModel: state.profileSettings.copyWith(
-                  isMoodFillable: moodSwitchState,
-                ),
-              );
+              settingsCubit.updateProfileSettings(profileSettingsModel: state.profileSettings.copyWith(isMoodFillable: moodSwitchState));
             },
           ),
         ),
@@ -297,11 +230,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
             setState(() {
               bedTimeSwitchState = !bedTimeSwitchState;
             });
-            settingsCubit.updateProfileSettings(
-              profileSettingsModel: state.profileSettings.copyWith(
-                isBedtimeFillable: bedTimeSwitchState,
-              ),
-            );
+            settingsCubit.updateProfileSettings(profileSettingsModel: state.profileSettings.copyWith(isBedtimeFillable: bedTimeSwitchState));
           },
           title: 'Указывать “отход ко сну” в заполнение дневника',
           trailing: CupertinoSwitch(
@@ -311,11 +240,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
               setState(() {
                 bedTimeSwitchState = newValue;
               });
-              settingsCubit.updateProfileSettings(
-                profileSettingsModel: state.profileSettings.copyWith(
-                  isBedtimeFillable: bedTimeSwitchState,
-                ),
-              );
+              settingsCubit.updateProfileSettings(profileSettingsModel: state.profileSettings.copyWith(isBedtimeFillable: bedTimeSwitchState));
             },
           ),
         ),
@@ -323,35 +248,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
     );
   }
 
-  _aboutEatvio(SettingsStateLoaded state) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        const Padding(
-          padding: EdgeInsets.symmetric(horizontal: 16),
-          child: Text(
-            'О Eatvio',
-            style: TextStyle(
-              fontSize: 16,
-              height: 1,
-              color: Colors.grey,
-            ),
-          ),
-        ),
-        _tile(
-          title: 'О компании',
-          onTap: () async => await launchUrl(Uri.parse('$baseUrl/ru/company-details')),
-        ),
-        _divider(context),
-        _tile(
-          title: 'Пользовательское соглашение',
-          onTap: () async => await launchUrl(Uri.parse('$baseUrl/oferta_bs.pdf')),
-        ),
-      ],
-    );
-  }
-
-  _becomeConsultantButton(SettingsStateLoaded state) {
+  SingleChildRenderObjectWidget _becomeConsultantButton(SettingsStateLoaded state) {
     if (state.consultationRequestModel == null) {
       return Padding(
         padding: const EdgeInsets.symmetric(horizontal: 16) + const EdgeInsets.only(bottom: 8),
@@ -361,19 +258,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
           child: Ink(
             height: 52,
             width: MediaQuery.of(context).size.width - 16,
-            decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(20),
-              color: appTheme.blueA400,
-            ),
+            decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: appTheme.blueA400),
             child: const Center(
-              child: Text(
-                'Стать консультантом',
-                style: TextStyle(
-                  color: Colors.white,
-                  height: 1,
-                  fontSize: 18,
-                ),
-              ),
+              child: Text('Стать консультантом', style: TextStyle(color: Colors.white, height: 1, fontSize: 18)),
             ),
           ),
         ),
@@ -385,19 +272,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
           child: Ink(
             height: 52,
             width: MediaQuery.of(context).size.width - 16,
-            decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(20),
-              color: const Color(0xFFEAEAEA),
-            ),
+            decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: const Color(0xFFEAEAEA)),
             child: const Center(
-              child: Text(
-                'Данные на проверке',
-                style: TextStyle(
-                  color: Colors.black,
-                  height: 1,
-                  fontSize: 18,
-                ),
-              ),
+              child: Text('Данные на проверке', style: TextStyle(color: Colors.black, height: 1, fontSize: 18)),
             ),
           ),
         );
@@ -410,19 +287,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
             child: Ink(
               height: 52,
               width: MediaQuery.of(context).size.width - 16,
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(20),
-                color: const Color(0x33FFCC00),
-              ),
+              decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: const Color(0x33FFCC00)),
               child: const Center(
-                child: Text(
-                  'Заявка обработана',
-                  style: TextStyle(
-                    color: Colors.black,
-                    height: 1,
-                    fontSize: 18,
-                  ),
-                ),
+                child: Text('Заявка обработана', style: TextStyle(color: Colors.black, height: 1, fontSize: 18)),
               ),
             ),
           ),
@@ -432,69 +299,104 @@ class _SettingsScreenState extends State<SettingsScreen> {
     return const SizedBox.shrink();
   }
 
-  _deleteAccountButton(SettingsStateLoaded state) {
+  Padding _deleteAccountButton(SettingsStateLoaded state, SettingsCubit settingsCubit) {
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: 16),
       child: InkWell(
-        onTap: () {},
+        onTap: () async {
+          showBottomSheetWithBlur(
+            userRootNavigator: true,
+            context: context,
+            height: null,
+            child: DeleteAccountBottomSheet(cubit: settingsCubit),
+          );
+        },
         borderRadius: BorderRadius.circular(20),
         child: Ink(
           height: 52,
           width: MediaQuery.of(context).size.width - 16,
-          decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(20),
-            color: const Color(0xFFEAEAEA),
-          ),
+          decoration: BoxDecoration(borderRadius: BorderRadius.circular(20), color: const Color(0xFFEAEAEA)),
           child: const Center(
-            child: Text(
-              'Удалить аккаунт',
-              style: TextStyle(
-                color: Colors.black,
-                height: 1,
-                fontSize: 18,
-              ),
-            ),
+            child: Text('Удалить аккаунт', style: TextStyle(color: Colors.black, height: 1, fontSize: 18)),
           ),
         ),
       ),
     );
   }
 
-  _tile({
-    required String title,
-    required Function() onTap,
-    Widget? trailing,
-    EdgeInsets? padding,
-  }) {
+  ListTile _tile({required String title, required Function() onTap, Widget? trailing, EdgeInsets? padding}) {
     return ListTile(
       contentPadding: padding,
       onTap: onTap,
-      title: Text(
-        title,
-        style: const TextStyle(
-          fontSize: 16,
-          fontWeight: FontWeight.w500,
-          height: 1,
-        ),
-      ),
-      trailing: trailing ??
-          const Icon(
-            Icons.arrow_forward_ios_rounded,
-            size: 12,
-            color: Colors.black38,
-          ),
+      title: Text(title, style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w500, height: 1)),
+      trailing: trailing ?? const Icon(Icons.arrow_forward_ios_rounded, size: 12, color: Colors.black38),
     );
   }
 
-  _divider(BuildContext context) {
+  Center _divider(BuildContext context) {
     return Center(
       child: Container(
         height: 0.4,
         width: MediaQuery.of(context).size.width - 32,
-        decoration: BoxDecoration(
-          color: Colors.black26,
-          borderRadius: BorderRadius.circular(16),
-        ),
+        decoration: BoxDecoration(color: Colors.black26, borderRadius: BorderRadius.circular(16)),
+      ),
+    );
+  }
+}
+
+class DeleteAccountBottomSheet extends StatefulWidget {
+  const DeleteAccountBottomSheet({super.key, required this.cubit});
+  final SettingsCubit cubit;
+
+  @override
+  State<DeleteAccountBottomSheet> createState() => _DeleteAccountBottomSheet();
+}
+
+class _DeleteAccountBottomSheet extends State<DeleteAccountBottomSheet> {
+  bool? isFailure;
+  @override
+  Widget build(BuildContext context) {
+    final s = S.of(context);
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 12.0),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          const SizedBox(height: 8),
+          const BottomSheetHandlerBar(),
+          const SizedBox(height: 20),
+          Text(s.accountDeleting, style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black)),
+          const SizedBox(height: 16),
+          Text(
+            s.youShureYouWantToDeleteAccount,
+            style: TextStyles.textSMedium.copyWith(color: appTheme.black),
+            textAlign: TextAlign.center,
+          ),
+          const SizedBox(height: 8),
+          Text(
+            s.itCantBeRecovered,
+            style: TextStyles.textSMedium.copyWith(color: appTheme.black),
+            textAlign: TextAlign.center,
+          ),
+          const SizedBox(height: 8),
+          CustomOutlinedButton(
+            text: s.delete,
+            height: 52,
+            buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700),
+            buttonStyle: ButtonStyle(side: const WidgetStatePropertyAll(BorderSide.none), backgroundColor: WidgetStatePropertyAll(appTheme.blueA400)),
+            onPressed: () async {
+              final result = await widget.cubit.deleteAccount();
+              if (result == true) {
+                AppRouter.navigatorKey.currentContext?.go('/auth-screen');
+                return;
+              }
+              AppRouter.navigatorKey.currentContext?.pop();
+              if (!context.mounted) return;
+              showErrorDialog(context, description: s.cannotDeleteAccount);
+            },
+          ),
+          const SizedBox(height: 40),
+        ],
       ),
     );
   }
diff --git a/lib/features/support/presentation/pages/support_screen.dart b/lib/features/support/presentation/pages/support_screen.dart
index b550040f..6aa44a42 100644
--- a/lib/features/support/presentation/pages/support_screen.dart
+++ b/lib/features/support/presentation/pages/support_screen.dart
@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:url_launcher/url_launcher.dart';
+import 'package:eatvio_app/core/env_config.dart';
 
 class SupportScreen extends StatelessWidget {
   const SupportScreen({super.key});
@@ -15,48 +16,28 @@ class SupportScreen extends StatelessWidget {
     final s = S.of(context);
 
     return Scaffold(
-      appBar: AppBar(
-        title: const Text('Поддержка'),
-      ),
+      appBar: AppBar(title: const Text('Поддержка')),
       body: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           const Padding(
             padding: EdgeInsets.all(16),
-            child: Text(
-              'Если у вас есть вопросы по работе нашего приложения, вы можете задать их, перейдя по ссылке:',
-              style: TextStyle(
-                fontSize: 16,
-              ),
-            ),
+            child: Text('Если у вас есть вопросы по работе нашего приложения, вы можете задать их, перейдя по ссылке:', style: TextStyle(fontSize: 16)),
           ),
           InkWell(
             onTap: () {
-              launchUrl(
-                Uri.parse('https://t.me/eatvio'),
-                mode: LaunchMode.externalApplication,
-              );
+              launchUrl(Uri.parse(EnvConfig.telegramSupportUrl), mode: LaunchMode.externalApplication);
             },
             borderRadius: BorderRadius.circular(16),
             child: Ink(
               width: double.infinity,
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(16),
-              ),
+              decoration: BoxDecoration(borderRadius: BorderRadius.circular(16)),
               padding: const EdgeInsets.all(16),
               child: Row(
                 children: [
-                  SvgPicture.asset(
-                    'assets/icons/telegram.svg',
-                    colorFilter: const ColorFilter.mode(Colors.black, BlendMode.srcIn),
-                  ),
+                  SvgPicture.asset('assets/icons/telegram.svg', colorFilter: const ColorFilter.mode(Colors.black, BlendMode.srcIn)),
                   const SizedBox(width: 12),
-                  const Text(
-                    'Telegram: t.me/eatvio',
-                    style: TextStyle(
-                      fontSize: 16,
-                    ),
-                  ),
+                  Text('Telegram: ${EnvConfig.telegramSupportUrl.replaceFirst('https://', '')}', style: const TextStyle(fontSize: 16)),
                 ],
               ),
             ),
@@ -64,26 +45,19 @@ class SupportScreen extends StatelessWidget {
           const SizedBox(height: 8),
           InkWell(
             onTap: () {
-              Clipboard.setData(const ClipboardData(text: 'help@eatv.io'));
+              Clipboard.setData(ClipboardData(text: EnvConfig.supportEmail));
               showInfoToast(s.mail_was_copied);
             },
             borderRadius: BorderRadius.circular(16),
             child: Ink(
-              decoration: BoxDecoration(
-                borderRadius: BorderRadius.circular(16),
-              ),
+              decoration: BoxDecoration(borderRadius: BorderRadius.circular(16)),
               width: double.infinity,
               padding: const EdgeInsets.all(16),
-              child: const Row(
+              child: Row(
                 children: [
-                  Icon(Icons.alternate_email_rounded),
-                  SizedBox(width: 12),
-                  Text(
-                    'E-mail: help@eatv.io',
-                    style: TextStyle(
-                      fontSize: 16,
-                    ),
-                  ),
+                  const Icon(Icons.alternate_email_rounded),
+                  const SizedBox(width: 12),
+                  Text('E-mail: ${EnvConfig.supportEmail}', style: const TextStyle(fontSize: 16)),
                 ],
               ),
             ),
@@ -92,40 +66,26 @@ class SupportScreen extends StatelessWidget {
           const SizedBox(height: 16),
           const Padding(
             padding: EdgeInsets.symmetric(horizontal: 16),
-            child: Text(
-              'Правовые документы',
-              style: TextStyle(
-                fontSize: 20,
-                fontWeight: FontWeight.w500,
-              ),
-            ),
+            child: Text('Правовые документы', style: TextStyle(fontSize: 20, fontWeight: FontWeight.w500)),
           ),
           const SizedBox(height: 12),
-          InkWell(
-            onTap: () async => await launchUrl(Uri.parse('$baseUrl/docs/public_offer.pdf')),
-            borderRadius: BorderRadius.circular(16),
-            child: const Padding(
-              padding: EdgeInsets.symmetric(horizontal: 16, vertical: 4),
-              child: Text(
-                'Публичная офёрта',
-                style: TextStyle(
-                  fontSize: 16,
-                ),
+          if (!hidePlans) ...[
+            InkWell(
+              onTap: () async => await launchUrl(Uri.parse('$baseUrl/docs/public_offer.pdf')),
+              borderRadius: BorderRadius.circular(16),
+              child: const Padding(
+                padding: EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+                child: Text('Публичная офёрта', style: TextStyle(fontSize: 16)),
               ),
             ),
-          ),
-          const SizedBox(height: 8),
+            const SizedBox(height: 8),
+          ],
           InkWell(
             onTap: () async => await launchUrl(Uri.parse('$baseUrl/docs/privacy.pdf')),
             borderRadius: BorderRadius.circular(16),
             child: const Padding(
               padding: EdgeInsets.symmetric(horizontal: 16, vertical: 4),
-              child: Text(
-                'Политика конфиденциальности',
-                style: TextStyle(
-                  fontSize: 16,
-                ),
-              ),
+              child: Text('Политика конфиденциальности', style: TextStyle(fontSize: 16)),
             ),
           ),
           const SizedBox(height: 8),
@@ -134,12 +94,7 @@ class SupportScreen extends StatelessWidget {
             borderRadius: BorderRadius.circular(16),
             child: const Padding(
               padding: EdgeInsets.symmetric(horizontal: 16, vertical: 4),
-              child: Text(
-                'О компании',
-                style: TextStyle(
-                  fontSize: 16,
-                ),
-              ),
+              child: Text('О компании', style: TextStyle(fontSize: 16)),
             ),
           ),
         ],
diff --git a/lib/features/update_screen/presentation/update_screen.dart b/lib/features/update_screen/presentation/update_screen.dart
index 186987c2..68ec9640 100644
--- a/lib/features/update_screen/presentation/update_screen.dart
+++ b/lib/features/update_screen/presentation/update_screen.dart
@@ -6,6 +6,7 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import '../../../../core/theme/theme_helper.dart';
+import '../../../../core/env_config.dart';
 
 class UpdateScreen extends StatelessWidget {
   const UpdateScreen({super.key});
@@ -17,16 +18,7 @@ class UpdateScreen extends StatelessWidget {
       body: Stack(
         clipBehavior: Clip.none,
         children: [
-          Positioned(
-            left: -20,
-            top: -20,
-            right: -20,
-            bottom: -20,
-            child: Image.asset(
-              'assets/images/bg_welcome.png',
-              fit: BoxFit.cover,
-            ),
-          ),
+          Positioned(left: -20, top: -20, right: -20, bottom: -20, child: Image.asset('assets/images/bg_welcome.png', fit: BoxFit.cover)),
           Positioned.fill(
             child: SafeArea(
               child: Padding(
@@ -48,47 +40,26 @@ class UpdateScreen extends StatelessWidget {
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
                               const SizedBox(height: 16),
-                              const Text(
-                                'Пора обновиться! ⚡',
-                                style: TextStyle(
-                                  fontSize: 28,
-                                  fontWeight: FontWeight.w800,
-                                  height: 1,
-                                ),
-                              ),
+                              const Text('Пора обновиться! ⚡', style: TextStyle(fontSize: 28, fontWeight: FontWeight.w800, height: 1)),
                               const SizedBox(height: 20),
                               const Text(
                                 'Мы выпустили важное обновление\nс новыми функциями и исправлениями.\nЧтобы продолжить пользоваться\nприложением без сбоев, обновите\nего прямо сейчас.',
-                                style: TextStyle(
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.w500,
-                                  height: 1.15,
-                                ),
+                                style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500, height: 1.15),
                               ),
                               const SizedBox(height: 32),
                               InkWell(
                                 onTap: () async {
-                                  final Uri url = Platform.isAndroid
-                                      ? Uri.parse('https://www.rustore.ru/catalog/app/com.eatvioapp.app')
-                                      : Uri.parse('https://apps.apple.com/app/idYOUR_APP_ID');
+                                  final Uri url = Platform.isAndroid ? Uri.parse(EnvConfig.rustoreUrl) : Uri.parse(EnvConfig.appStoreUrl);
                                   await launchUrl(url);
                                 },
                                 borderRadius: BorderRadius.circular(8),
                                 child: Ink(
                                   height: 52,
-                                  decoration: BoxDecoration(
-                                    color: appTheme.blueA400,
-                                    borderRadius: BorderRadius.circular(8),
-                                  ),
+                                  decoration: BoxDecoration(color: appTheme.blueA400, borderRadius: BorderRadius.circular(8)),
                                   child: const Center(
                                     child: Text(
                                       'Обновить',
-                                      style: TextStyle(
-                                        fontSize: 16,
-                                        fontWeight: FontWeight.w600,
-                                        height: 1,
-                                        color: Colors.white,
-                                      ),
+                                      style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, height: 1, color: Colors.white),
                                     ),
                                   ),
                                 ),
diff --git a/lib/features/user_details/presentation/cubit/user_details_cubit.dart b/lib/features/user_details/presentation/cubit/user_details_cubit.dart
index c6eb36b7..0ce0bd93 100644
--- a/lib/features/user_details/presentation/cubit/user_details_cubit.dart
+++ b/lib/features/user_details/presentation/cubit/user_details_cubit.dart
@@ -20,19 +20,11 @@ class UserDetailsCubit extends Cubit<UserDetailsState> {
     }
   }
 
-  void getChartData({
-    String period = '1',
-    required String slug,
-  }) async {
+  void getChartData({String period = '1', required String slug}) async {
     try {
-      final weightPoints = await profileRepository.getWeight(period: period);
-      final circumferencePoints = await profileRepository.getCircumferences(period: period);
-      emit(
-        state.copyWith(
-          weightPoints: weightPoints,
-          circumferencePoints: circumferencePoints,
-        ),
-      );
+      final weightPoints = await profileRepository.getWeight(period: period, slug: slug);
+      final circumferencePoints = await profileRepository.getCircumferences(period: period, slug: slug);
+      emit(state.copyWith(weightPoints: weightPoints, circumferencePoints: circumferencePoints));
     } catch (e, stackTrace) {
       log(e.toString(), stackTrace: stackTrace);
       emit(state.copyWith(error: e.toString(), isLoading: false));
diff --git a/lib/features/user_details/presentation/user_details_screen.dart b/lib/features/user_details/presentation/user_details_screen.dart
index e13b3c7a..4907e3dd 100644
--- a/lib/features/user_details/presentation/user_details_screen.dart
+++ b/lib/features/user_details/presentation/user_details_screen.dart
@@ -31,9 +31,7 @@ class UserDetailsScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     return BlocProvider(
       create: (context) => sl<UserDetailsCubit>()..getUserDetails(slug),
-      child: UserDetailsContent(
-        slug: slug,
-      ),
+      child: UserDetailsContent(slug: slug),
     );
   }
 }
@@ -79,27 +77,15 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
               actions: [
                 PortalTarget(
                   visible: isMoreOptionsVisible,
-                  portalFollower: MoreOptions(
-                    path: 'profile/${widget.slug}',
-                    complainedContentType: ComplainedContent.profile,
-                    slug: widget.slug,
-                  ),
-                  anchor: const Aligned(
-                    shiftToWithinBound: AxisFlag(x: true, y: true),
-                    follower: Alignment.topRight,
-                    target: Alignment.bottomRight,
-                  ),
+                  portalFollower: MoreOptions(path: 'profile/${widget.slug}', complainedContentType: ComplainedContent.profile, slug: widget.slug),
+                  anchor: const Aligned(shiftToWithinBound: AxisFlag(x: true, y: true), follower: Alignment.topRight, target: Alignment.bottomRight),
                   child: IconButton(
                     onPressed: () {
                       setState(() {
                         isMoreOptionsVisible = !isMoreOptionsVisible;
                       });
                     },
-                    icon: SvgPicture.asset(
-                      'assets/icons/more_button.svg',
-                      width: 20,
-                      height: 20,
-                    ),
+                    icon: SvgPicture.asset('assets/icons/more_button.svg', width: 20, height: 20),
                   ),
                 ),
               ],
@@ -124,25 +110,16 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
                       initiallyExpanded: true,
                       title: s.general_info,
                       children: [
-                        Text(
-                          s.date_of_birth,
-                          style: TextStyles.textSMedium.copyWith(color: appTheme.black),
-                        ),
+                        Text(s.date_of_birth, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
                         const SizedBox(height: 4),
                         CustomTextFormField(
                           readOnly: true,
                           controller: TextEditingController(text: DateTime.parse(profileDetails.birthdate).format('dd.MM.yyyy')),
                         ),
                         const SizedBox(height: 16),
-                        Text(
-                          s.sex,
-                          style: TextStyles.textSMedium.copyWith(color: appTheme.black),
-                        ),
+                        Text(s.sex, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
                         const SizedBox(height: 4),
-                        CustomTextFormField(
-                          readOnly: true,
-                          controller: TextEditingController(text: profileDetails.gender.parseGender()),
-                        ),
+                        CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.gender.parseGender())),
                         const SizedBox(height: 16),
                       ],
                     ),
@@ -155,15 +132,9 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
                               child: Column(
                                 crossAxisAlignment: CrossAxisAlignment.start,
                                 children: [
-                                  Text(
-                                    s.height,
-                                    style: TextStyles.textSMedium.copyWith(color: appTheme.black),
-                                  ),
+                                  Text(s.height, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
                                   const SizedBox(height: 4),
-                                  CustomTextFormField(
-                                    readOnly: true,
-                                    controller: TextEditingController(text: profileDetails.height.toString()),
-                                  ),
+                                  CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.height.toString())),
                                 ],
                               ),
                             ),
@@ -172,15 +143,9 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
                               child: Column(
                                 crossAxisAlignment: CrossAxisAlignment.start,
                                 children: [
-                                  Text(
-                                    s.weight,
-                                    style: TextStyles.textSMedium.copyWith(color: appTheme.black),
-                                  ),
+                                  Text(s.weight, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
                                   const SizedBox(height: 4),
-                                  CustomTextFormField(
-                                    readOnly: true,
-                                    controller: TextEditingController(text: profileDetails.weight.toStringAsFixed(0)),
-                                  ),
+                                  CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.weight.toStringAsFixed(0))),
                                 ],
                               ),
                             ),
@@ -193,15 +158,9 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
                               child: Column(
                                 crossAxisAlignment: CrossAxisAlignment.start,
                                 children: [
-                                  Text(
-                                    s.chest_circumference,
-                                    style: TextStyles.textSMedium.copyWith(color: appTheme.black),
-                                  ),
+                                  Text(s.chest_circumference, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
                                   const SizedBox(height: 4),
-                                  CustomTextFormField(
-                                    readOnly: true,
-                                    controller: TextEditingController(text: profileDetails.chestCircumference.toString()),
-                                  ),
+                                  CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.chestCircumference.toString())),
                                 ],
                               ),
                             ),
@@ -210,15 +169,9 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
                               child: Column(
                                 crossAxisAlignment: CrossAxisAlignment.start,
                                 children: [
-                                  Text(
-                                    s.waist_circumference,
-                                    style: TextStyles.textSMedium.copyWith(color: appTheme.black),
-                                  ),
+                                  Text(s.waist_circumference, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
                                   const SizedBox(height: 4),
-                                  CustomTextFormField(
-                                    readOnly: true,
-                                    controller: TextEditingController(text: profileDetails.waistCircumference.toString()),
-                                  ),
+                                  CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.waistCircumference.toString())),
                                 ],
                               ),
                             ),
@@ -227,15 +180,9 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
                               child: Column(
                                 crossAxisAlignment: CrossAxisAlignment.start,
                                 children: [
-                                  Text(
-                                    s.hip_circumference,
-                                    style: TextStyles.textSMedium.copyWith(color: appTheme.black),
-                                  ),
+                                  Text(s.hip_circumference, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
                                   const SizedBox(height: 4),
-                                  CustomTextFormField(
-                                    readOnly: true,
-                                    controller: TextEditingController(text: profileDetails.hipCircumference.toString()),
-                                  ),
+                                  CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.hipCircumference.toString())),
                                 ],
                               ),
                             ),
@@ -253,15 +200,9 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
                               child: Column(
                                 crossAxisAlignment: CrossAxisAlignment.start,
                                 children: [
-                                  Text(
-                                    s.upper,
-                                    style: TextStyles.textSMedium.copyWith(color: appTheme.black),
-                                  ),
+                                  Text(s.upper, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
                                   const SizedBox(height: 4),
-                                  CustomTextFormField(
-                                    readOnly: true,
-                                    controller: TextEditingController(text: profileDetails.bloodPressureUp.toString()),
-                                  ),
+                                  CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.bloodPressureUp.toString())),
                                 ],
                               ),
                             ),
@@ -270,10 +211,7 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
                               child: Column(
                                 crossAxisAlignment: CrossAxisAlignment.start,
                                 children: [
-                                  Text(
-                                    s.lower,
-                                    style: TextStyles.textSMedium.copyWith(color: appTheme.black),
-                                  ),
+                                  Text(s.lower, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
                                   const SizedBox(height: 4),
                                   CustomTextFormField(
                                     readOnly: true,
@@ -291,15 +229,9 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
                               child: Column(
                                 crossAxisAlignment: CrossAxisAlignment.start,
                                 children: [
-                                  Text(
-                                    s.has_hypo,
-                                    style: TextStyles.textSMedium.copyWith(color: appTheme.black),
-                                  ),
+                                  Text(s.has_hypo, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
                                   const SizedBox(height: 4),
-                                  CustomTextFormField(
-                                    readOnly: true,
-                                    controller: TextEditingController(text: profileDetails.hasHypo.toString()),
-                                  ),
+                                  CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.hasHypo.toString())),
                                 ],
                               ),
                             ),
@@ -308,15 +240,9 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
                               child: Column(
                                 crossAxisAlignment: CrossAxisAlignment.start,
                                 children: [
-                                  Text(
-                                    s.has_hyper,
-                                    style: TextStyles.textSMedium.copyWith(color: appTheme.black),
-                                  ),
+                                  Text(s.has_hyper, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
                                   const SizedBox(height: 4),
-                                  CustomTextFormField(
-                                    readOnly: true,
-                                    controller: TextEditingController(text: profileDetails.hasHyper.toString()),
-                                  ),
+                                  CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.hasHyper.toString())),
                                 ],
                               ),
                             ),
@@ -328,60 +254,27 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
                     ExpandableBouble(
                       title: s.other_info,
                       children: [
-                        Text(
-                          s.has_alergy,
-                          style: TextStyles.textSMedium.copyWith(color: appTheme.black),
-                        ),
+                        Text(s.has_alergy, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
                         const SizedBox(height: 4),
-                        CustomTextFormField(
-                          readOnly: true,
-                          controller: TextEditingController(text: profileDetails.aboutAlergy),
-                        ),
+                        CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.aboutAlergy)),
                         const SizedBox(height: 16),
-                        Text(
-                          s.takes_pills,
-                          style: TextStyles.textSMedium.copyWith(color: appTheme.black),
-                        ),
+                        Text(s.takes_pills, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
                         const SizedBox(height: 4),
-                        CustomTextFormField(
-                          readOnly: true,
-                          controller: TextEditingController(text: profileDetails.aboutTakingPils),
-                        ),
+                        CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.aboutTakingPils)),
                         const SizedBox(height: 16),
-                        Text(
-                          s.sport_hobbies,
-                          style: TextStyles.textSMedium.copyWith(color: appTheme.black),
-                        ),
+                        Text(s.sport_hobbies, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
                         const SizedBox(height: 4),
-                        CustomTextFormField(
-                          readOnly: true,
-                          controller: TextEditingController(text: profileDetails.aboutSportHobbies),
-                        ),
+                        CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.aboutSportHobbies)),
                         const SizedBox(height: 16),
-                        Text(
-                          s.liked_groceries,
-                          style: TextStyles.textSMedium.copyWith(color: appTheme.black),
-                        ),
+                        Text(s.liked_groceries, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
                         const SizedBox(height: 4),
-                        CustomTextFormField(
-                          readOnly: true,
-                          controller: TextEditingController(text: profileDetails.favoriteFoods),
-                        ),
+                        CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.favoriteFoods)),
                         const SizedBox(height: 16),
-                        Text(
-                          s.not_liked_groceries,
-                          style: TextStyles.textSMedium.copyWith(color: appTheme.black),
-                        ),
+                        Text(s.not_liked_groceries, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
                         const SizedBox(height: 4),
-                        CustomTextFormField(
-                          readOnly: true,
-                          controller: TextEditingController(text: profileDetails.unfavoriteFoods),
-                        ),
+                        CustomTextFormField(readOnly: true, controller: TextEditingController(text: profileDetails.unfavoriteFoods)),
                         const SizedBox(height: 16),
-                        Text(
-                          s.additional_information,
-                          style: TextStyles.textSMedium.copyWith(color: appTheme.black),
-                        ),
+                        Text(s.additional_information, style: TextStyles.textSMedium.copyWith(color: appTheme.black)),
                         const SizedBox(height: 4),
                         SizedBox(
                           height: 112,
@@ -413,15 +306,12 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
             ),
           );
         }
-        return Scaffold(
-          appBar: AppBar(),
-          body: const Loader(),
-        );
+        return Scaffold(appBar: AppBar(), body: const Loader());
       },
     );
   }
 
-  _charts() {
+  Material _charts() {
     return Material(
       color: Colors.white,
       borderRadius: BorderRadius.circular(16),
@@ -432,31 +322,17 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
           SingleChildScrollView(
             padding: const EdgeInsets.symmetric(horizontal: 16),
             scrollDirection: Axis.horizontal,
-            child: Row(
-              children: [
-                _choiceChipWidget(0),
-                const SizedBox(width: 8),
-                _choiceChipWidget(1),
-                const SizedBox(width: 8),
-                _choiceChipWidget(2),
-              ],
-            ),
+            child: Row(children: [_choiceChipWidget(0), const SizedBox(width: 8), _choiceChipWidget(1), const SizedBox(width: 8), _choiceChipWidget(2)]),
           ),
           Builder(
             builder: (context) {
               switch (_selectedChipIndex) {
                 case 0:
-                  return WeightChartWidget(
-                    weightPoints: weightPoints,
-                  );
+                  return WeightChartWidget(weightPoints: weightPoints);
                 case 1:
-                  return CircumferenceChartWidget(
-                    circumferencePoints: circumferencePoints,
-                  );
+                  return CircumferenceChartWidget(circumferencePoints: circumferencePoints);
                 case 2:
-                  return ImtChartWidget(
-                    weightPoints: weightPoints,
-                  );
+                  return ImtChartWidget(weightPoints: weightPoints);
                 default:
                   return const SizedBox.shrink();
               }
@@ -483,22 +359,16 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
     );
   }
 
-  _choiceIntervalChipWidget(int index) {
+  ChoiceChip _choiceIntervalChipWidget(int index) {
     return ChoiceChip(
       selectedColor: Colors.grey.withValues(alpha: 0.1),
       pressElevation: 0,
       showCheckmark: false,
       side: BorderSide.none,
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(16),
-      ),
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
       padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
       label: Text(chipsIntervalLabelList[index]),
-      labelStyle: TextStyle(
-        color: appTheme.gray600,
-        fontWeight: FontWeight.w500,
-        fontSize: 12,
-      ),
+      labelStyle: TextStyle(color: appTheme.gray600, fontWeight: FontWeight.w500, fontSize: 12),
       selected: _selectedIntervalChipIndex == index,
       onSelected: (bool selected) {
         context.read<UserDetailsCubit>().getChartData(period: chipsIntervalList[index], slug: widget.slug);
@@ -509,22 +379,16 @@ class _UserDetailsContentState extends State<UserDetailsContent> {
     );
   }
 
-  _choiceChipWidget(int index) {
+  ChoiceChip _choiceChipWidget(int index) {
     return ChoiceChip(
       selectedColor: appTheme.blueA400,
       pressElevation: 0,
       showCheckmark: false,
       side: BorderSide.none,
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(16),
-      ),
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
       padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
       label: Text(chipsLabelList[index]),
-      labelStyle: TextStyle(
-        color: index == _selectedChipIndex ? Colors.white : appTheme.gray600,
-        fontWeight: FontWeight.w500,
-        fontSize: 12,
-      ),
+      labelStyle: TextStyle(color: index == _selectedChipIndex ? Colors.white : appTheme.gray600, fontWeight: FontWeight.w500, fontSize: 12),
       selected: _selectedChipIndex == index,
       backgroundColor: appTheme.gray100,
       onSelected: (bool selected) {
diff --git a/lib/firebase_options.dart b/lib/firebase_options.dart
index dcf61a5d..6450332e 100644
--- a/lib/firebase_options.dart
+++ b/lib/firebase_options.dart
@@ -1,8 +1,8 @@
 // File generated by FlutterFire CLI.
 // ignore_for_file: type=lint
 import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
-import 'package:flutter/foundation.dart'
-    show defaultTargetPlatform, kIsWeb, TargetPlatform;
+import 'package:flutter/foundation.dart' show defaultTargetPlatform, kIsWeb, TargetPlatform;
+import 'package:eatvio_app/core/env_config.dart';
 
 /// Default [FirebaseOptions] for use with your Firebase apps.
 ///
@@ -43,28 +43,26 @@ class DefaultFirebaseOptions {
           'you can reconfigure this by running the FlutterFire CLI again.',
         );
       default:
-        throw UnsupportedError(
-          'DefaultFirebaseOptions are not supported for this platform.',
-        );
+        throw UnsupportedError('DefaultFirebaseOptions are not supported for this platform.');
     }
   }
 
-  static const FirebaseOptions android = FirebaseOptions(
-    apiKey: 'AIzaSyBUe1UqAAMfgMcd4hWdRoLF1Os-yn-HE9k',
-    appId: '1:613980912922:android:4de95e5f2d50ba69ecc0a3',
-    messagingSenderId: '613980912922',
-    projectId: 'eatvio-3467b',
-    databaseURL: 'https://eatvio-3467b-default-rtdb.europe-west1.firebasedatabase.app',
-    storageBucket: 'eatvio-3467b.firebasestorage.app',
+  static FirebaseOptions get android => FirebaseOptions(
+    apiKey: EnvConfig.firebaseAndroidApiKey,
+    appId: EnvConfig.firebaseAndroidAppId,
+    messagingSenderId: EnvConfig.firebaseMessagingSenderId,
+    projectId: EnvConfig.firebaseProjectId,
+    databaseURL: EnvConfig.firebaseDatabaseUrl,
+    storageBucket: EnvConfig.firebaseStorageBucket,
   );
 
-  static const FirebaseOptions ios = FirebaseOptions(
-    apiKey: 'AIzaSyBnE8tQjL9_1HuXrTnqNy6qbXpoenO36yQ',
-    appId: '1:613980912922:ios:c557d140a1212e63ecc0a3',
-    messagingSenderId: '613980912922',
-    projectId: 'eatvio-3467b',
-    databaseURL: 'https://eatvio-3467b-default-rtdb.europe-west1.firebasedatabase.app',
-    storageBucket: 'eatvio-3467b.firebasestorage.app',
-    iosBundleId: 'com.eatvioapp.app',
+  static FirebaseOptions get ios => FirebaseOptions(
+    apiKey: EnvConfig.firebaseIosApiKey,
+    appId: EnvConfig.firebaseIosAppId,
+    messagingSenderId: EnvConfig.firebaseMessagingSenderId,
+    projectId: EnvConfig.firebaseProjectId,
+    databaseURL: EnvConfig.firebaseDatabaseUrl,
+    storageBucket: EnvConfig.firebaseStorageBucket,
+    iosBundleId: EnvConfig.firebaseIosBundleId,
   );
 }
diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
index e318c962..373b48eb 100644
--- a/lib/generated/intl/messages_en.dart
+++ b/lib/generated/intl/messages_en.dart
@@ -51,6 +51,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "about_diet": MessageLookupByLibrary.simpleMessage("Об этой диете"),
     "about_plan": MessageLookupByLibrary.simpleMessage("Об этом плане"),
     "about_recipe": MessageLookupByLibrary.simpleMessage("Об этом рецепте"),
+    "accountDeleting": MessageLookupByLibrary.simpleMessage(
+      "Удаление аккаунта",
+    ),
     "active": MessageLookupByLibrary.simpleMessage("Активен"),
     "active_consultations_count": MessageLookupByLibrary.simpleMessage(
       "Кол-во активных консультаций",
@@ -124,6 +127,9 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "cancel_diet": MessageLookupByLibrary.simpleMessage("Отменить диету?"),
     "cancel_order": MessageLookupByLibrary.simpleMessage("Отменить заказ"),
+    "cannotDeleteAccount": MessageLookupByLibrary.simpleMessage(
+      "Не получилось удалить ваш аккаунт",
+    ),
     "carb_type": MessageLookupByLibrary.simpleMessage("Мучное"),
     "carb_type_desc": MessageLookupByLibrary.simpleMessage(
       "Если вы любите мучные продукты, но хотите придерживаться диеты, вам подходит диета с добавленим мучных блюд на основе цельнозерновых вариантов. В них больше сложных углеводов и клетчатки, что способствует длительному чувству сытости и поддерживает здоровье пищеварительной системы.",
@@ -200,6 +206,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "continueButton": MessageLookupByLibrary.simpleMessage("Продолжить"),
     "continue_": MessageLookupByLibrary.simpleMessage("Продолжить"),
     "copied": MessageLookupByLibrary.simpleMessage("cкопирован"),
+    "copy": MessageLookupByLibrary.simpleMessage("Скопировать"),
     "copy_link": MessageLookupByLibrary.simpleMessage("Скопировать ссылку"),
     "copy_referral_link": MessageLookupByLibrary.simpleMessage(
       "Скопировать пригласительную ссылку",
@@ -255,6 +262,10 @@ class MessageLookup extends MessageLookupByLibrary {
     ),
     "days": MessageLookupByLibrary.simpleMessage("дней"),
     "deception": MessageLookupByLibrary.simpleMessage("Обман"),
+    "delete": MessageLookupByLibrary.simpleMessage("Удалить"),
+    "deleteComment": MessageLookupByLibrary.simpleMessage(
+      "Удалить комментарий",
+    ),
     "deleted": MessageLookupByLibrary.simpleMessage("Удалена"),
     "diary": MessageLookupByLibrary.simpleMessage("Дневник"),
     "diet": MessageLookupByLibrary.simpleMessage("Диета"),
@@ -407,6 +418,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "invited_people_count": MessageLookupByLibrary.simpleMessage(
       "Количество приглашенных",
     ),
+    "itCantBeRecovered": MessageLookupByLibrary.simpleMessage(
+      "Его нельзя будет восстановить",
+    ),
     "label": MessageLookupByLibrary.simpleMessage("Название"),
     "language": MessageLookupByLibrary.simpleMessage("Язык"),
     "last_name": MessageLookupByLibrary.simpleMessage("Фамилия"),
@@ -619,6 +633,8 @@ class MessageLookup extends MessageLookupByLibrary {
     "removeFromActive": MessageLookupByLibrary.simpleMessage(
       "Снять с публикации",
     ),
+    "reply": MessageLookupByLibrary.simpleMessage("Ответить"),
+    "resend": MessageLookupByLibrary.simpleMessage("Отправить повторно"),
     "save": MessageLookupByLibrary.simpleMessage("Сохранить"),
     "send": MessageLookupByLibrary.simpleMessage("Отправить"),
     "send_complain": MessageLookupByLibrary.simpleMessage("Отправить жалобу"),
@@ -775,6 +791,9 @@ class MessageLookup extends MessageLookupByLibrary {
     "youShureYouWantToCancelOrder": MessageLookupByLibrary.simpleMessage(
       "Вы уверены, что хотите отменить заказ?",
     ),
+    "youShureYouWantToDeleteAccount": MessageLookupByLibrary.simpleMessage(
+      "Вы уверены, что хотите удалить аккаунт?",
+    ),
     "you_can_not_open_this_day": MessageLookupByLibrary.simpleMessage(
       "Вы не можете перейти в этот день",
     ),
diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
index 9f338062..25d71d68 100644
--- a/lib/generated/l10n.dart
+++ b/lib/generated/l10n.dart
@@ -3394,6 +3394,81 @@ class S {
       args: [],
     );
   }
+
+  /// `Скопировать`
+  String get copy {
+    return Intl.message('Скопировать', name: 'copy', desc: '', args: []);
+  }
+
+  /// `Ответить`
+  String get reply {
+    return Intl.message('Ответить', name: 'reply', desc: '', args: []);
+  }
+
+  /// `Удалить комментарий`
+  String get deleteComment {
+    return Intl.message(
+      'Удалить комментарий',
+      name: 'deleteComment',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Удаление аккаунта`
+  String get accountDeleting {
+    return Intl.message(
+      'Удаление аккаунта',
+      name: 'accountDeleting',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Вы уверены, что хотите удалить аккаунт?`
+  String get youShureYouWantToDeleteAccount {
+    return Intl.message(
+      'Вы уверены, что хотите удалить аккаунт?',
+      name: 'youShureYouWantToDeleteAccount',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Его нельзя будет восстановить`
+  String get itCantBeRecovered {
+    return Intl.message(
+      'Его нельзя будет восстановить',
+      name: 'itCantBeRecovered',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Удалить`
+  String get delete {
+    return Intl.message('Удалить', name: 'delete', desc: '', args: []);
+  }
+
+  /// `Не получилось удалить ваш аккаунт`
+  String get cannotDeleteAccount {
+    return Intl.message(
+      'Не получилось удалить ваш аккаунт',
+      name: 'cannotDeleteAccount',
+      desc: '',
+      args: [],
+    );
+  }
+
+  /// `Отправить повторно`
+  String get resend {
+    return Intl.message(
+      'Отправить повторно',
+      name: 'resend',
+      desc: '',
+      args: [],
+    );
+  }
 }
 
 class AppLocalizationDelegate extends LocalizationsDelegate<S> {
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
index 96ddc4be..7424fe87 100644
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -402,6 +402,15 @@
   "allowAcessToGaleryDescription": "Предоставление доступа позволит вам добавлять фото к записям",
   "allowAccessToCamera": "Разрешите доступ к камере",
   "allowAccessToCameraDescription": "Предоставление доступа позволит вам делать фотографии и добавлять к записям",
-  "allowAccess": "Разрешить доступ"
+  "allowAccess": "Разрешить доступ"  ,
+  "copy": "Скопировать",
+  "reply": "Ответить",
+  "deleteComment": "Удалить комментарий",
+  "accountDeleting": "Удаление аккаунта",
+  "youShureYouWantToDeleteAccount": "Вы уверены, что хотите удалить аккаунт?",
+  "itCantBeRecovered": "Его нельзя будет восстановить",
+  "delete": "Удалить",
+  "cannotDeleteAccount": "Не получилось удалить ваш аккаунт",
+  "resend": "Отправить повторно"
 }
 
diff --git a/lib/main.dart b/lib/main.dart
index 005afaac..6b44348c 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,3 +1,4 @@
+import 'dart:io' as io;
 import 'package:eatvio_app/core/app_router.dart';
 import 'package:eatvio_app/core/locator_service.dart' as di;
 import 'package:eatvio_app/core/locator_service.dart';
@@ -11,6 +12,8 @@ import 'package:eatvio_app/features/internet_connection_checker/internet_connect
 import 'package:eatvio_app/firebase_options.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:firebase_core/firebase_core.dart';
+import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
@@ -18,22 +21,28 @@ import 'package:flutter_native_splash/flutter_native_splash.dart';
 import 'package:flutter_portal/flutter_portal.dart';
 import 'package:keyboard_dismisser/keyboard_dismisser.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:eatvio_app/core/env_config.dart';
 
 Future<void> main() async {
   WidgetsBinding widgetsBinding = SentryWidgetsFlutterBinding.ensureInitialized();
   FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
 
+  await dotenv.load(fileName: "env/.env");
+
   await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
+  await FirebaseMessaging.instance.requestPermission();
   await di.init();
 
-  await SentryFlutter.init(
-    (options) {
-      options.dsn = 'http://ba7f2653067776f3034e6e89850e85a1@sentry.md-desk.ru:9000/2';
-      options.tracesSampleRate = 1.0;
-      options.debug = false;
-    },
-    appRunner: () => runApp(const MyApp()),
-  );
+  if (kDebugMode) {
+    io.HttpClient.enableTimelineLogging = true;
+  }
+
+  await SentryFlutter.init((options) {
+    options.dsn = EnvConfig.sentryDsn;
+    options.tracesSampleRate = 1.0;
+    options.debug = false;
+  }, appRunner: () => runApp(const MyApp()));
 }
 
 class MyApp extends StatelessWidget {
diff --git a/pubspec.yaml b/pubspec.yaml
index d11956ec..3b33303b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,10 +1,10 @@
 name: eatvio_app
 description: A new Flutter project.
-version: 1.1.14+44
+version: 1.2.10+70
 publish_to: 'none'
 
 environment:
-  sdk: '>=3.3.4 <4.0.0'
+  sdk: '>=3.8.0 <4.0.0'
 
 dependencies:
   flutter:
@@ -13,39 +13,38 @@ dependencies:
   flutter_localizations:
     sdk: flutter
 
-  flutter_secure_storage: ^9.2.4
   flutter_bloc: ^9.1.1
   cached_network_image: ^3.4.1
-  flutter_svg: ^2.1.0
+  flutter_svg: ^2.2.0
   equatable: ^2.0.7
-  freezed_annotation: ^3.0.0
+  freezed_annotation: ^3.1.0
   json_annotation: ^4.9.0
   validators: ^3.0.0
   path_provider: ^2.1.5
-  carousel_slider_plus: ^7.1.0
-  flutter_form_builder: ^10.0.1
-  image_picker: ^1.1.2
+  carousel_slider_plus: ^7.1.1
+  flutter_form_builder: ^10.2.0
+  image_picker: ^1.2.0
   flutter_typeahead: ^5.2.0
-  go_router: ^15.2.3
+  go_router: ^16.1.0
   keyboard_dismisser: ^3.0.0
-  retrofit: ^4.4.2
-  get_it: ^8.0.3
-  dio: ^5.8.0+1
+  retrofit: ^4.7.1
+  get_it: ^8.2.0
+  dio: ^5.9.0
   dart_pusher_channels: ^1.2.3
   photo_view: ^0.15.0
   dismissible_page: ^1.0.2
-  url_launcher: ^6.3.1
+  url_launcher: ^6.3.2
   easy_debounce: ^2.0.3
   badges: ^3.1.2
-  google_fonts: ^6.2.1
-  syncfusion_flutter_charts: ^30.1.37
-  syncfusion_flutter_gauges: ^30.1.37
+  google_fonts: ^6.3.0
+  syncfusion_flutter_charts: ^30.2.5
+  syncfusion_flutter_gauges: ^30.2.5
   table_calendar: ^3.2.0
   flutter_keyboard_visibility: ^6.0.0
-  share_plus: ^11.0.0
+  share_plus: ^11.1.0
   flutter_html: ^3.0.0
-  file_picker: ^10.1.9
-  audioplayers: ^6.4.0
+  file_picker: ^10.3.1
+  audioplayers: ^6.5.0
   intl: ^0.20.2
   mask_text_input_formatter: ^2.9.0
   lottie: ^3.3.1
@@ -54,31 +53,33 @@ dependencies:
   flutter_rating_bar: ^4.0.1
   flutter_image_compress: ^2.4.0
   image: ^4.5.4
-  dotted_border: ^3.0.1
-  http: ^1.4.0
+  dotted_border: ^3.1.0
+  http: ^1.5.0
   flutter_native_splash: ^2.4.6
-  webview_flutter: ^4.12.0
-  sentry_flutter: ^8.14.2
-  connectivity_plus: ^6.1.4
+  webview_flutter: ^4.13.0
+  sentry_flutter: ^9.6.0
+  connectivity_plus: ^6.1.5
   visibility_detector: ^0.4.0+2
-  firebase_core: ^3.13.1
-  firebase_messaging: ^15.2.6
+  firebase_core: ^4.0.0
+  firebase_messaging: ^16.0.0
   http_parser: ^4.1.2
   path: ^1.9.1
   collection: ^1.19.1
   shared_preferences: ^2.5.3
   version: ^3.0.2
-  package_info_plus: ^8.3.0
-  device_info_plus: ^11.4.0
-  permission_handler: ^12.0.0+1
+  package_info_plus: ^8.3.1
+  device_info_plus: ^11.5.0
+  permission_handler: ^12.0.1
   qr_code_scanner_plus: ^2.0.10+1
+  flutter_dotenv: ^5.2.1
+  uuid: ^4.5.1
 
 dev_dependencies:
-  build_runner: ^2.4.15
-  freezed: ^3.0.6
-  json_serializable: ^6.9.5
-  retrofit_generator: ^9.2.0
-  mockito: ^5.4.6
+  build_runner: ^2.7.0
+  freezed: ^3.2.0
+  json_serializable: ^6.10.0
+  retrofit_generator: ^10.0.2
+  mockito: ^5.5.0
 
   flutter_test:
     sdk: flutter
@@ -88,6 +89,7 @@ dev_dependencies:
 flutter:
   uses-material-design: true
   assets:
+    - env/.env
     - assets/
     - assets/images/
     - assets/audio/
diff --git a/test/features/profile/services/profile_service_test.dart b/test/features/profile/services/profile_service_test.dart
index e735602c..8c666344 100644
--- a/test/features/profile/services/profile_service_test.dart
+++ b/test/features/profile/services/profile_service_test.dart
@@ -17,10 +17,13 @@ void main() {
         (_) async => await Future.value(
           const ProfileModel(
             id: 0,
+            isBlockedByUser: false,
             name: 'Alexander Avanesyan',
             email: 'mso7nueh@mail.ru',
+            phoneConfirmationState: '',
             isPublicProfile: true,
             isEntitySubscribedByMe: false,
+            isBlockedByMe: false,
             slug: 'slug',
             profilePhotoUrl: '',
             roles: ['user'],
diff --git a/test/features/profile/services/profile_service_test.mocks.dart b/test/features/profile/services/profile_service_test.mocks.dart
deleted file mode 100644
index 22c3af52..00000000
--- a/test/features/profile/services/profile_service_test.mocks.dart
+++ /dev/null
@@ -1,526 +0,0 @@
-// Mocks generated by Mockito 5.4.6 from annotations
-// in eatvio_app/test/features/profile/services/profile_service_test.dart.
-// Do not manually edit this file.
-
-// ignore_for_file: no_leading_underscores_for_library_prefixes
-import 'dart:async' as _i6;
-import 'dart:io' as _i10;
-
-import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart'
-    as _i7;
-import 'package:eatvio_app/features/profile/models/chosen_diets_pagination_model.dart'
-    as _i4;
-import 'package:eatvio_app/features/profile/models/circumference_model.dart'
-    as _i9;
-import 'package:eatvio_app/features/profile/models/profile_model.dart' as _i2;
-import 'package:eatvio_app/features/profile/models/sub_model.dart' as _i3;
-import 'package:eatvio_app/features/profile/models/weight_model.dart' as _i8;
-import 'package:eatvio_app/features/profile/services/profile_service.dart'
-    as _i5;
-import 'package:mockito/mockito.dart' as _i1;
-import 'package:mockito/src/dummies.dart' as _i11;
-
-// ignore_for_file: type=lint
-// ignore_for_file: avoid_redundant_argument_values
-// ignore_for_file: avoid_setters_without_getters
-// ignore_for_file: comment_references
-// ignore_for_file: deprecated_member_use
-// ignore_for_file: deprecated_member_use_from_same_package
-// ignore_for_file: implementation_imports
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-// ignore_for_file: must_be_immutable
-// ignore_for_file: prefer_const_constructors
-// ignore_for_file: unnecessary_parenthesis
-// ignore_for_file: camel_case_types
-// ignore_for_file: subtype_of_sealed_class
-
-class _FakeProfileModel_0 extends _i1.SmartFake implements _i2.ProfileModel {
-  _FakeProfileModel_0(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeProfileDetailsModel_1 extends _i1.SmartFake
-    implements _i2.ProfileDetailsModel {
-  _FakeProfileDetailsModel_1(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeSubPaginationModel_2 extends _i1.SmartFake
-    implements _i3.SubPaginationModel {
-  _FakeSubPaginationModel_2(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-class _FakeChosenDietsPaginationModel_3 extends _i1.SmartFake
-    implements _i4.ChosenDietsPaginationModel {
-  _FakeChosenDietsPaginationModel_3(
-    Object parent,
-    Invocation parentInvocation,
-  ) : super(
-          parent,
-          parentInvocation,
-        );
-}
-
-/// A class which mocks [ProfileService].
-///
-/// See the documentation for Mockito's code generation for more information.
-class MockProfileService extends _i1.Mock implements _i5.ProfileService {
-  @override
-  _i6.Future<_i2.ProfileModel> getProfileBySlug({required String? slug}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getProfileBySlug,
-          [],
-          {#slug: slug},
-        ),
-        returnValue: _i6.Future<_i2.ProfileModel>.value(_FakeProfileModel_0(
-          this,
-          Invocation.method(
-            #getProfileBySlug,
-            [],
-            {#slug: slug},
-          ),
-        )),
-        returnValueForMissingStub:
-            _i6.Future<_i2.ProfileModel>.value(_FakeProfileModel_0(
-          this,
-          Invocation.method(
-            #getProfileBySlug,
-            [],
-            {#slug: slug},
-          ),
-        )),
-      ) as _i6.Future<_i2.ProfileModel>);
-
-  @override
-  _i6.Future<_i2.ProfileModel> getMyProfile() => (super.noSuchMethod(
-        Invocation.method(
-          #getMyProfile,
-          [],
-        ),
-        returnValue: _i6.Future<_i2.ProfileModel>.value(_FakeProfileModel_0(
-          this,
-          Invocation.method(
-            #getMyProfile,
-            [],
-          ),
-        )),
-        returnValueForMissingStub:
-            _i6.Future<_i2.ProfileModel>.value(_FakeProfileModel_0(
-          this,
-          Invocation.method(
-            #getMyProfile,
-            [],
-          ),
-        )),
-      ) as _i6.Future<_i2.ProfileModel>);
-
-  @override
-  _i6.Future<_i2.ProfileDetailsModel> getMyProfileDetails() =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getMyProfileDetails,
-          [],
-        ),
-        returnValue: _i6.Future<_i2.ProfileDetailsModel>.value(
-            _FakeProfileDetailsModel_1(
-          this,
-          Invocation.method(
-            #getMyProfileDetails,
-            [],
-          ),
-        )),
-        returnValueForMissingStub: _i6.Future<_i2.ProfileDetailsModel>.value(
-            _FakeProfileDetailsModel_1(
-          this,
-          Invocation.method(
-            #getMyProfileDetails,
-            [],
-          ),
-        )),
-      ) as _i6.Future<_i2.ProfileDetailsModel>);
-
-  @override
-  _i6.Future<_i2.ProfileDetailsModel> getProfileDetailsBySlug(
-          {required String? slug}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getProfileDetailsBySlug,
-          [],
-          {#slug: slug},
-        ),
-        returnValue: _i6.Future<_i2.ProfileDetailsModel>.value(
-            _FakeProfileDetailsModel_1(
-          this,
-          Invocation.method(
-            #getProfileDetailsBySlug,
-            [],
-            {#slug: slug},
-          ),
-        )),
-        returnValueForMissingStub: _i6.Future<_i2.ProfileDetailsModel>.value(
-            _FakeProfileDetailsModel_1(
-          this,
-          Invocation.method(
-            #getProfileDetailsBySlug,
-            [],
-            {#slug: slug},
-          ),
-        )),
-      ) as _i6.Future<_i2.ProfileDetailsModel>);
-
-  @override
-  _i6.Future<void> addCircumference({
-    required int? chestCircumference,
-    required int? waistCircumference,
-    required int? hipCircumference,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #addCircumference,
-          [],
-          {
-            #chestCircumference: chestCircumference,
-            #waistCircumference: waistCircumference,
-            #hipCircumference: hipCircumference,
-          },
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
-
-  @override
-  _i6.Future<void> addWeight({required double? weight}) => (super.noSuchMethod(
-        Invocation.method(
-          #addWeight,
-          [],
-          {#weight: weight},
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
-
-  @override
-  _i6.Future<List<_i7.FeedBlogPostModel>> getBlogPostByAuthorSlug(
-          {required String? slug}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getBlogPostByAuthorSlug,
-          [],
-          {#slug: slug},
-        ),
-        returnValue: _i6.Future<List<_i7.FeedBlogPostModel>>.value(
-            <_i7.FeedBlogPostModel>[]),
-        returnValueForMissingStub:
-            _i6.Future<List<_i7.FeedBlogPostModel>>.value(
-                <_i7.FeedBlogPostModel>[]),
-      ) as _i6.Future<List<_i7.FeedBlogPostModel>>);
-
-  @override
-  _i6.Future<List<_i8.WeightModel>> getWeight({required String? period}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getWeight,
-          [],
-          {#period: period},
-        ),
-        returnValue:
-            _i6.Future<List<_i8.WeightModel>>.value(<_i8.WeightModel>[]),
-        returnValueForMissingStub:
-            _i6.Future<List<_i8.WeightModel>>.value(<_i8.WeightModel>[]),
-      ) as _i6.Future<List<_i8.WeightModel>>);
-
-  @override
-  _i6.Future<List<_i8.WeightModel>> getWeightBySlug({
-    required String? period,
-    required String? slug,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getWeightBySlug,
-          [],
-          {
-            #period: period,
-            #slug: slug,
-          },
-        ),
-        returnValue:
-            _i6.Future<List<_i8.WeightModel>>.value(<_i8.WeightModel>[]),
-        returnValueForMissingStub:
-            _i6.Future<List<_i8.WeightModel>>.value(<_i8.WeightModel>[]),
-      ) as _i6.Future<List<_i8.WeightModel>>);
-
-  @override
-  _i6.Future<List<_i9.CircumferenceModel>> getCircumferences(
-          {required String? period}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getCircumferences,
-          [],
-          {#period: period},
-        ),
-        returnValue: _i6.Future<List<_i9.CircumferenceModel>>.value(
-            <_i9.CircumferenceModel>[]),
-        returnValueForMissingStub:
-            _i6.Future<List<_i9.CircumferenceModel>>.value(
-                <_i9.CircumferenceModel>[]),
-      ) as _i6.Future<List<_i9.CircumferenceModel>>);
-
-  @override
-  _i6.Future<List<_i9.CircumferenceModel>> getCircumferencesBySlug({
-    required String? period,
-    required String? slug,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getCircumferencesBySlug,
-          [],
-          {
-            #period: period,
-            #slug: slug,
-          },
-        ),
-        returnValue: _i6.Future<List<_i9.CircumferenceModel>>.value(
-            <_i9.CircumferenceModel>[]),
-        returnValueForMissingStub:
-            _i6.Future<List<_i9.CircumferenceModel>>.value(
-                <_i9.CircumferenceModel>[]),
-      ) as _i6.Future<List<_i9.CircumferenceModel>>);
-
-  @override
-  _i6.Future<_i3.SubPaginationModel> getSubscribers({
-    required String? slug,
-    String? query,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getSubscribers,
-          [],
-          {
-            #slug: slug,
-            #query: query,
-          },
-        ),
-        returnValue:
-            _i6.Future<_i3.SubPaginationModel>.value(_FakeSubPaginationModel_2(
-          this,
-          Invocation.method(
-            #getSubscribers,
-            [],
-            {
-              #slug: slug,
-              #query: query,
-            },
-          ),
-        )),
-        returnValueForMissingStub:
-            _i6.Future<_i3.SubPaginationModel>.value(_FakeSubPaginationModel_2(
-          this,
-          Invocation.method(
-            #getSubscribers,
-            [],
-            {
-              #slug: slug,
-              #query: query,
-            },
-          ),
-        )),
-      ) as _i6.Future<_i3.SubPaginationModel>);
-
-  @override
-  _i6.Future<_i3.SubPaginationModel> getSubscriptions({
-    required String? slug,
-    String? query,
-  }) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getSubscriptions,
-          [],
-          {
-            #slug: slug,
-            #query: query,
-          },
-        ),
-        returnValue:
-            _i6.Future<_i3.SubPaginationModel>.value(_FakeSubPaginationModel_2(
-          this,
-          Invocation.method(
-            #getSubscriptions,
-            [],
-            {
-              #slug: slug,
-              #query: query,
-            },
-          ),
-        )),
-        returnValueForMissingStub:
-            _i6.Future<_i3.SubPaginationModel>.value(_FakeSubPaginationModel_2(
-          this,
-          Invocation.method(
-            #getSubscriptions,
-            [],
-            {
-              #slug: slug,
-              #query: query,
-            },
-          ),
-        )),
-      ) as _i6.Future<_i3.SubPaginationModel>);
-
-  @override
-  _i6.Future<void> subscribe({required String? slug}) => (super.noSuchMethod(
-        Invocation.method(
-          #subscribe,
-          [],
-          {#slug: slug},
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
-
-  @override
-  _i6.Future<void> unsubscribe({required String? slug}) => (super.noSuchMethod(
-        Invocation.method(
-          #unsubscribe,
-          [],
-          {#slug: slug},
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
-
-  @override
-  _i6.Future<void> uploadPhoto({required _i10.File? photo}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #uploadPhoto,
-          [],
-          {#photo: photo},
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
-
-  @override
-  _i6.Future<void> deletePhoto() => (super.noSuchMethod(
-        Invocation.method(
-          #deletePhoto,
-          [],
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
-
-  @override
-  _i6.Future<_i4.ChosenDietsPaginationModel> getChosenDiets() =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #getChosenDiets,
-          [],
-        ),
-        returnValue: _i6.Future<_i4.ChosenDietsPaginationModel>.value(
-            _FakeChosenDietsPaginationModel_3(
-          this,
-          Invocation.method(
-            #getChosenDiets,
-            [],
-          ),
-        )),
-        returnValueForMissingStub:
-            _i6.Future<_i4.ChosenDietsPaginationModel>.value(
-                _FakeChosenDietsPaginationModel_3(
-          this,
-          Invocation.method(
-            #getChosenDiets,
-            [],
-          ),
-        )),
-      ) as _i6.Future<_i4.ChosenDietsPaginationModel>);
-
-  @override
-  _i6.Future<String> getPassKey({required String? json}) => (super.noSuchMethod(
-        Invocation.method(
-          #getPassKey,
-          [],
-          {#json: json},
-        ),
-        returnValue: _i6.Future<String>.value(_i11.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getPassKey,
-            [],
-            {#json: json},
-          ),
-        )),
-        returnValueForMissingStub:
-            _i6.Future<String>.value(_i11.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getPassKey,
-            [],
-            {#json: json},
-          ),
-        )),
-      ) as _i6.Future<String>);
-
-  @override
-  _i6.Future<String> getMyPhone() => (super.noSuchMethod(
-        Invocation.method(
-          #getMyPhone,
-          [],
-        ),
-        returnValue: _i6.Future<String>.value(_i11.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getMyPhone,
-            [],
-          ),
-        )),
-        returnValueForMissingStub:
-            _i6.Future<String>.value(_i11.dummyValue<String>(
-          this,
-          Invocation.method(
-            #getMyPhone,
-            [],
-          ),
-        )),
-      ) as _i6.Future<String>);
-
-  @override
-  _i6.Future<void> sendEmailCode() => (super.noSuchMethod(
-        Invocation.method(
-          #sendEmailCode,
-          [],
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
-
-  @override
-  _i6.Future<void> tryVerifyEmailByCode({required String? code}) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #tryVerifyEmailByCode,
-          [],
-          {#code: code},
-        ),
-        returnValue: _i6.Future<void>.value(),
-        returnValueForMissingStub: _i6.Future<void>.value(),
-      ) as _i6.Future<void>);
-}