fix functional bugs

fix order history, add CheckUser check before starting the trip, fix dialog for cancel the order, add dialog for finish the order
add notification, fix appbar,fix style subscription
2026-05-29 11:40:55 +03:00 · 2026-05-21 18:00:26 +03:00 · 2026-05-21 12:19:06 +03:00
115 changed files with 2057 additions and 1576 deletions
--- a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/assets/fonts/DigitalNumbers-Regular.ttf
+++ b/assets/fonts/DigitalNumbers-Regular.ttf
--- a/assets/icons/qr_icon_order.png
+++ b/assets/icons/qr_icon_order.png
--- a/assets/icons/scooter_reserved_placemark_fill.png
+++ b/assets/icons/scooter_reserved_placemark_fill.png
--- a/assets/icons/timer.png
+++ b/assets/icons/timer.png
--- a/assets/news_def.png
+++ b/assets/news_def.png
--- a/assets/splash_logo.png
+++ b/assets/splash_logo.png
--- a/assets/splash_map.png
+++ b/assets/splash_map.png
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -20,5 +20,7 @@
  <string>????</string>
  <key>CFBundleVersion</key>
  <string>1.0</string>
+  <key>MinimumOSVersion</key>
+  <string>12.0</string>
 </dict>
 </plist>
--- a/ios/Flutter/Debug.xcconfig
+++ b/ios/Flutter/Debug.xcconfig
@@ -1,6 +1 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
-#include? "Secrets.xcconfig"
-YANDEX_MAPKIT_API_KEY=a0ef1404-2650-4f28-9891-c965ecc09174
-// Переопределение Pods/ML Kit: arm64 для симулятора на Apple Silicon (M1/M4)
-EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386
--- a/ios/Flutter/Profile.xcconfig
+++ b/ios/Flutter/Profile.xcconfig
@@ -1,5 +0,0 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"
-#include "Generated.xcconfig"
-#include? "Secrets.xcconfig"
-YANDEX_MAPKIT_API_KEY=a0ef1404-2650-4f28-9891-c965ecc09174
-EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386
--- a/ios/Flutter/Release.xcconfig
+++ b/ios/Flutter/Release.xcconfig
@@ -1,5 +1 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
-#include? "Secrets.xcconfig"
-YANDEX_MAPKIT_API_KEY=a0ef1404-2650-4f28-9891-c965ecc09174
-EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386
--- a/ios/Flutter/Secrets.xcconfig
+++ b/ios/Flutter/Secrets.xcconfig
@@ -1,2 +0,0 @@
-// Локальные переопределения (опционально). Не задавайте YANDEX_MAPKIT_API_KEY плейсхолдером —
-// рабочий ключ задаётся в конце Debug/Release/Profile.xcconfig после этого include.
--- a/ios/Flutter/Secrets.xcconfig.example
+++ b/ios/Flutter/Secrets.xcconfig.example
@@ -1,3 +0,0 @@
-// Скопируй в ios/Flutter/Secrets.xcconfig (файл в .gitignore) для своих локальных xcconfig-переменных.
-// Ключ MapKit задаётся в конце Debug/Release/Profile.xcconfig — не подставляйте туда тестовый плейсхолдер вместо реального ключа.
-// https://developer.tech.yandex.ru/
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -1,48 +0,0 @@
-# image_picker_ios и др. требуют минимум iOS 13
-platform :ios, '13.0'
-
-# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
-ENV['COCOAPODS_DISABLE_STATS'] = 'true'
-
-project 'Runner', {
-  'Debug' => :debug,
-  'Profile' => :release,
-  'Release' => :release,
-}
-
-def flutter_root
-  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
-  unless File.exist?(generated_xcode_build_settings_path)
-    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
-  end
-
-  File.foreach(generated_xcode_build_settings_path) do |line|
-    matches = line.match(/FLUTTER_ROOT\=(.*)/)
-    return matches[1].strip if matches
-  end
-  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
-end
-
-require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
-
-flutter_ios_podfile_setup
-
-target 'Runner' do
-  use_frameworks!
-
-  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
-  target 'RunnerTests' do
-    inherit! :search_paths
-  end
-end
-
-post_install do |installer|
-  installer.pods_project.targets.each do |target|
-    flutter_additional_ios_build_settings(target)
-    target.build_configurations.each do |config|
-      # ML Kit исключает arm64 для симулятора → сборка только x86_64.
-      # На M1 это ещё могло работать через Rosetta; на M4 симулятор только arm64.
-      config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'i386'
-    end
-  end
-end
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,81 +0,0 @@
-PODS:
-  - device_info_plus (0.0.1):
-    - Flutter
-  - Flutter (1.0.0)
-  - flutter_secure_storage (6.0.0):
-    - Flutter
-  - geolocator_apple (1.2.0):
-    - Flutter
-    - FlutterMacOS
-  - image_picker_ios (0.0.1):
-    - Flutter
-  - mobile_scanner (7.0.0):
-    - Flutter
-    - FlutterMacOS
-  - path_provider_foundation (0.0.1):
-    - Flutter
-    - FlutterMacOS
-  - shared_preferences_foundation (0.0.1):
-    - Flutter
-    - FlutterMacOS
-  - url_launcher_ios (0.0.1):
-    - Flutter
-  - yandex_mapkit (0.0.1):
-    - Flutter
-    - YandexMapsMobile (= 4.22.0-lite)
-  - YandexMapsMobile (4.22.0-lite)
-
-DEPENDENCIES:
-  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
-  - Flutter (from `Flutter`)
-  - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
-  - geolocator_apple (from `.symlinks/plugins/geolocator_apple/darwin`)
-  - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
-  - mobile_scanner (from `.symlinks/plugins/mobile_scanner/darwin`)
-  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
-  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
-  - yandex_mapkit (from `.symlinks/plugins/yandex_mapkit/ios`)
-
-SPEC REPOS:
-  trunk:
-    - YandexMapsMobile
-
-EXTERNAL SOURCES:
-  device_info_plus:
-    :path: ".symlinks/plugins/device_info_plus/ios"
-  Flutter:
-    :path: Flutter
-  flutter_secure_storage:
-    :path: ".symlinks/plugins/flutter_secure_storage/ios"
-  geolocator_apple:
-    :path: ".symlinks/plugins/geolocator_apple/darwin"
-  image_picker_ios:
-    :path: ".symlinks/plugins/image_picker_ios/ios"
-  mobile_scanner:
-    :path: ".symlinks/plugins/mobile_scanner/darwin"
-  path_provider_foundation:
-    :path: ".symlinks/plugins/path_provider_foundation/darwin"
-  shared_preferences_foundation:
-    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
-  url_launcher_ios:
-    :path: ".symlinks/plugins/url_launcher_ios/ios"
-  yandex_mapkit:
-    :path: ".symlinks/plugins/yandex_mapkit/ios"
-
-SPEC CHECKSUMS:
-  device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
-  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
-  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
-  geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
-  image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326
-  mobile_scanner: 9157936403f5a0644ca3779a38ff8404c5434a93
-  path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
-  shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
-  url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
-  yandex_mapkit: bac34ca1bdf97e87252a8c6d09a95b1fe39ba103
-  YandexMapsMobile: c73844c6096bbb240d1491adc511c2ef4a88d88d
-
-PODFILE CHECKSUM: 715b1068ab8815ca4115a24e305e836709652b69
-
-COCOAPODS: 1.16.2
--- a/ios/README.md
+++ b/ios/README.md
@@ -1,23 +0,0 @@
-# Запуск на симуляторе (Mac)
-
-**Терминал** (⌘ + `):
-
-```bash
-cd /Users/commercesparkit.by/Desktop/projekt/be_happy_public
-export LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8
-open -a Simulator
-flutter run
-```
-
-Первый раз или после обновления кода:
-
-```bash
-cd /Users/commercesparkit.by/Desktop/projekt/be_happy_public
-export LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8
-flutter pub get
-cd ios && pod install && cd ..
-open -a Simulator
-flutter run
-```
-
-Важно: команды только из папки `be_happy_public`, не из `~`.
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -10,12 +10,10 @@
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
-		6D33173F8CCB65895D564988 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BB22D9E6003D7254B27B141 /* Pods_RunnerTests.framework */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
-		FB3C1019114E649A3758FC7D /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 151F40E0A8A0B88D7F9715D8 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@@ -42,20 +40,14 @@
 /* End PBXCopyFilesBuildPhase section */

 /* Begin PBXFileReference section */
-		0EB91AA8815BC4C23E9C769C /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		151F40E0A8A0B88D7F9715D8 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		4BB22D9E6003D7254B27B141 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		4D0302F803C0949E93DDCE44 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
-		525F1415727A8E2A6F5CA828 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
-		9740EEB41CF90195004384FC /* Profile.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Profile.xcconfig; path = Flutter/Profile.xcconfig; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -63,25 +55,13 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		BAF1C86965EF66AE2F0839BD /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
-		BE9A8C77364E79EA4C6EE36B /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
-		D24CB1920C4748F67C854B22 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
-		83F4E53737A5B4793588BFEB /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				6D33173F8CCB65895D564988 /* Pods_RunnerTests.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		97C146EB1CF9000F007C117D /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				FB3C1019114E649A3758FC7D /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -102,7 +82,6 @@
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
-				9740EEB41CF90195004384FC /* Profile.xcconfig */,
 				9740EEB31CF90195004384FC /* Generated.xcconfig */,
 			);
 			name = Flutter;
@@ -115,8 +94,6 @@
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
 				331C8082294A63A400263BE5 /* RunnerTests */,
-				991E98147265C7C44D711731 /* Pods */,
-				E94B50B8FA90842D98EF918A /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -144,29 +121,6 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
-		991E98147265C7C44D711731 /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				4D0302F803C0949E93DDCE44 /* Pods-Runner.debug.xcconfig */,
-				0EB91AA8815BC4C23E9C769C /* Pods-Runner.release.xcconfig */,
-				525F1415727A8E2A6F5CA828 /* Pods-Runner.profile.xcconfig */,
-				BAF1C86965EF66AE2F0839BD /* Pods-RunnerTests.debug.xcconfig */,
-				D24CB1920C4748F67C854B22 /* Pods-RunnerTests.release.xcconfig */,
-				BE9A8C77364E79EA4C6EE36B /* Pods-RunnerTests.profile.xcconfig */,
-			);
-			name = Pods;
-			path = Pods;
-			sourceTree = "<group>";
-		};
-		E94B50B8FA90842D98EF918A /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				151F40E0A8A0B88D7F9715D8 /* Pods_Runner.framework */,
-				4BB22D9E6003D7254B27B141 /* Pods_RunnerTests.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */

 /* Begin PBXNativeTarget section */
@@ -174,10 +128,8 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
 			buildPhases = (
-				1D742F73AAFC432DF3836D7E /* [CP] Check Pods Manifest.lock */,
 				331C807D294A63A400263BE5 /* Sources */,
 				331C807F294A63A400263BE5 /* Resources */,
-				83F4E53737A5B4793588BFEB /* Frameworks */,
 			);
 			buildRules = (
 			);
@@ -193,15 +145,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				8734FCBECF65F25CB259DF82 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				25F6FF3856E913FFAF963081 /* [CP] Embed Pods Frameworks */,
-				FF12327738E91E5AA87207B8 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -273,45 +222,6 @@
 /* End PBXResourcesBuildPhase section */

 /* Begin PBXShellScriptBuildPhase section */
-		1D742F73AAFC432DF3836D7E /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		25F6FF3856E913FFAF963081 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -328,28 +238,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
-		8734FCBECF65F25CB259DF82 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -365,23 +253,6 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
-		FF12327738E91E5AA87207B8 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */

 /* Begin PBXSourcesBuildPhase section */
@@ -475,7 +346,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -486,7 +357,7 @@
 		};
 		249021D4217E4FDB00AE95B9 /* Profile */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 9740EEB41CF90195004384FC /* Profile.xcconfig */;
+			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
@@ -507,7 +378,6 @@
 		};
 		331C8088294A63A400263BE5 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = BAF1C86965EF66AE2F0839BD /* Pods-RunnerTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -525,7 +395,6 @@
 		};
 		331C8089294A63A400263BE5 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D24CB1920C4748F67C854B22 /* Pods-RunnerTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -541,7 +410,6 @@
 		};
 		331C808A294A63A400263BE5 /* Profile */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = BE9A8C77364E79EA4C6EE36B /* Pods-RunnerTests.profile.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -559,7 +427,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -604,7 +472,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -616,7 +484,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -655,7 +523,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
--- a/ios/Runner.xcworkspace/contents.xcworkspacedata
+++ b/ios/Runner.xcworkspace/contents.xcworkspacedata
@@ -4,7 +4,4 @@
   <FileRef
      location = "group:Runner.xcodeproj">
   </FileRef>
-   <FileRef
-      location = "group:Pods/Pods.xcodeproj">
-   </FileRef>
 </Workspace>
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -1,29 +1,13 @@
 import Flutter
 import UIKit
-import YandexMapsMobile

@main
-@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
+@objc class AppDelegate: FlutterAppDelegate {
  override func application(
    _ application: UIApplication,
    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
  ) -> Bool {
-    let apiKey =
-      (Bundle.main.object(forInfoDictionaryKey: "YandexMapKitApiKey") as? String ?? "")
-      .trimmingCharacters(in: .whitespacesAndNewlines)
-    #if DEBUG
-    if apiKey.isEmpty || apiKey.contains("$(") {
-      assertionFailure(
-        "YandexMapKitApiKey пустой или не подставился из xcconfig — проверь YANDEX_MAPKIT_API_KEY в ios/Flutter/*.xcconfig"
-      )
-    }
-    #endif
-    YMKMapKit.setLocale(Locale.current.identifier)
-    YMKMapKit.setApiKey(apiKey)
+    GeneratedPluginRegistrant.register(with: self)
    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
  }
-
-  func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
-    GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
-  }
 }
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,122 +1 @@
-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
+{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
--- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
+++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -26,29 +24,6 @@
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>UIApplicationSceneManifest</key>
-	<dict>
-		<key>UIApplicationSupportsMultipleScenes</key>
-		<false/>
-		<key>UISceneConfigurations</key>
-		<dict>
-			<key>UIWindowSceneSessionRoleApplication</key>
-			<array>
-				<dict>
-					<key>UISceneClassName</key>
-					<string>UIWindowScene</string>
-					<key>UISceneConfigurationName</key>
-					<string>flutter</string>
-					<key>UISceneDelegateClassName</key>
-					<string>FlutterSceneDelegate</string>
-					<key>UISceneStoryboardFile</key>
-					<string>Main</string>
-				</dict>
-			</array>
-		</dict>
-	</dict>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -66,7 +41,9 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>YandexMapKitApiKey</key>
-	<string>$(YANDEX_MAPKIT_API_KEY)</string>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>
--- a/lib.rar
+++ b/lib.rar
--- a/lib/data/network/api_service.dart
+++ b/lib/data/network/api_service.dart
@@ -20,6 +20,7 @@ import 'package:path/path.dart';
 import 'package:flutter_client_sse/constants/sse_request_type_enum.dart';
 import 'package:flutter_client_sse/flutter_client_sse.dart';

+import '../../domain/entities/client_subscription.dart';
 import '../../domain/entities/point.dart';
 import '../../domain/entities/user_profile.dart';
 import '../../domain/entities/payment_card.dart';
@@ -137,7 +138,8 @@ class ApiService {
        if (avatarId != null && profileData["avatar"] != null) {
          final String? avatarPath = profileData["avatar"]["path"];
          if (avatarPath != null && avatarPath.isNotEmpty) {
-            avatarUrl = Uri.parse(fileBaseUrl).resolve(avatarPath).toString();          }
+            avatarUrl = Uri.parse(fileBaseUrl).resolve(avatarPath).toString();
+          }
        }

        dynamic balanceRaw = profileData["balance"];
@@ -394,10 +396,7 @@ class ApiService {
    final url = "$baseUrl/scooter/$title/code";

    try {
-      final response = await _dio.get(
-        url,
-        options: await _getAuthOptions(),
-      );
+      final response = await _dio.get(url, options: await _getAuthOptions());

      if (response.statusCode == 200 || response.statusCode == 201) {
        return Scooter.fromJson(response.data);
@@ -463,7 +462,7 @@ class ApiService {
    }
  }

-  Future<List<Subscription>> getClientSubscriptions() async {
+  Future<List<ClientSubscription>> getClientSubscriptions() async {
    const url = "$baseUrl/scootersubscription/client";

    try {
@@ -474,14 +473,7 @@ class ApiService {
        final List<dynamic> items = responseData['data'] ?? [];

        return items.map((item) {
-          final Map<String, dynamic> subscriptionMap =
-              Map<String, dynamic>.from(item['subscription'] ?? {});
-
-          if (item['expiredAt'] != null) {
-            subscriptionMap['activeTo'] = item['expiredAt'];
-          }
-
-          return Subscription.fromJson(subscriptionMap);
+          return ClientSubscription.fromJson(item);
        }).toList();
      }
      return [];
@@ -547,7 +539,7 @@ class ApiService {
    }
  }

-  Future<int> addPaymentCard({
+  Future<void> addPaymentCard({
    required String cardNumber,
    required String cardHolder,
    required int expirationMonth,
@@ -571,8 +563,9 @@ class ApiService {
      );

      if (response.statusCode == 200 || response.statusCode == 201) {
-        return response.data['id'] as int;
+        return;
      }
+
      throw AuthException('Непредвиденный статус: ${response.statusCode}', 0);
    } on DioException catch (e) {
      final data = e.response?.data;
@@ -674,7 +667,9 @@ class ApiService {
          final firstError = data['message'][0]['message'].toString();

          if (firstError.contains("Wrong start zone")) {
-            throw WrongZoneException(message: "Некорректная зона для начала поездки.");
+            throw WrongZoneException(
+              message: "Некорректная зона для начала поездки.",
+            );
          }
        }

@@ -705,7 +700,9 @@ class ApiService {
          final firstError = data['message'][0]['message'].toString();

          if (firstError.contains("Wrong start zone")) {
-            throw WrongZoneException(message: "Некорректная зона для начала поездки.");
+            throw WrongZoneException(
+              message: "Некорректная зона для начала поездки.",
+            );
          }
        }

@@ -791,7 +788,9 @@ class ApiService {
          final firstError = data['message'][0]['message'].toString();

          if (firstError.contains("Wrong start zone")) {
-            throw WrongZoneException(message: "Некорректная зона для завершения поездки.");
+            throw WrongZoneException(
+              message: "Некорректная зона для завершения поездки.",
+            );
          }
        }

@@ -803,7 +802,7 @@ class ApiService {
    }
  }

-  Future<ScooterOrder?> payRide(int orderId) async {
+  Future<void> payRide(int orderId) async {
    try {
      final response = await _dio.put(
        "$baseUrl/scooterorder/$orderId/pay",
@@ -811,12 +810,12 @@ class ApiService {
      );

      if (response.statusCode == 200 || response.statusCode == 201) {
-        return ScooterOrder.fromJson(response.data);
+        // return ScooterOrder.fromJson(response.data);
+        return;
      }
-      return null;
    } on DioException catch (e) {
      _handleDioError(e);
-      return null;
+      return;
    }
  }

@@ -878,7 +877,7 @@ class ApiService {
    }
  }

-  Future<ScooterOrder?> payScooterOrderWithPhotos({
+  Future<void> payScooterOrderWithPhotos({
    required int orderId,
    required int? cardId,
    required bool isBalance,
@@ -891,12 +890,10 @@ class ApiService {
      );

      if (response.statusCode == 200 || response.statusCode == 201) {
-        return ScooterOrder.fromJson(response.data);
+        return;
      }
-      return null;
    } on DioException catch (e) {
      _handleDioError(e);
-      return null;
    }
  }

@@ -918,7 +915,6 @@ class ApiService {
    }
  }

-
  Future<List<Point>> getScooterOrderRouteHistory({required int id}) async {
    try {
      final response = await _dio.get(
@@ -930,13 +926,19 @@ class ApiService {
        final String routeString = response.data['route'] ?? '[]';
        final List<dynamic> routeList = json.decode(routeString);

-        return routeList.map((item) => Point(
+        return routeList
+            .map(
+              (item) => Point(
                (item[1] as num).toDouble(),
                (item[0] as num).toDouble(),
-        )).toList();
+              ),
+            )
+            .toList();
      }

-      throw RouteHistoryNotFoundException(message: "История маршрута не найдена");
+      throw RouteHistoryNotFoundException(
+        message: "История маршрута не найдена",
+      );
    } on DioException catch (e) {
      if (e.response?.statusCode == 401) throw UnauthorizedException();
      if (e.response?.statusCode == 403) throw AuthBlockException();
@@ -1038,6 +1040,57 @@ class ApiService {
    return controller.stream;
  }

+  Future<List<Map<String, dynamic>>> getNotifications() async {
+    final url = Uri.parse('$baseUrl/notification/client');
+
+    final accessToken = await _securityService.getAccessToken();
+    if (accessToken == null) {
+      print("APISERVICE Error: Access token is null.");
+      throw UnauthorizedException();
+    }
+
+    print("GET NOTIFICATIONS REQUEST:");
+    print("URL: $url");
+
+    final response = await http.get(
+      url,
+      headers: {
+        "Content-Type": "application/json",
+        "Authorization": "Bearer $accessToken",
+      },
+    );
+
+    print("GET NOTIFICATIONS RESPONSE:");
+    print("STATUS: ${response.statusCode}");
+    print("BODY: ${response.body}");
+
+    if (response.statusCode == 200) {
+      final data = jsonDecode(utf8.decode(response.bodyBytes));
+
+      // ✅ Проверяем, является ли ответ массивом или объектом с data[]
+      if (data is List) {
+        return data.cast<Map<String, dynamic>>();
+      } else if (data is Map<String, dynamic>) {
+        final list = data['data'];
+        if (list is List) {
+          return list.cast<Map<String, dynamic>>();
+        } else {
+          throw Exception(
+            'Expected a List under "data" but got ${list.runtimeType}',
+          );
+        }
+      } else {
+        throw Exception('Expected a List or Map but got ${data.runtimeType}');
+      }
+    } else if (response.statusCode == 401) {
+      throw UnauthorizedException();
+    } else if (response.statusCode == 403) {
+      throw AuthBlockException();
+    }
+
+    throw Exception('Ошибка сервера: ${response.statusCode}');
+  }
+
  Future<List<Certificate>> getCertificates() async {
    try {
      final response = await _dio.get(
--- a/lib/data/repositories/notification_repository_impl.dart
+++ b/lib/data/repositories/notification_repository_impl.dart
@@ -33,4 +33,22 @@ class NotificationRepositoryImpl implements NotificationRepository {
  void closeStream() {
    // соединение закрывается автоматически при отписке от stream
  }
+
+  @override
+  Future<List<ClientNotification>> getNotifications() async {
+    try {
+      final List<Map<String, dynamic>> data = await _apiService.getNotifications();
+      final notifications = data.map((json) {
+        final dto = ClientNotificationDto.fromJson(json);
+        return dto.toEntity();
+      }).toList();
+
+      // dev.log('NotificationRepository: Загружено ${notifications.length} уведомлений');
+
+      return notifications;
+    } catch (e, stackTrace) {
+      // dev.log('NotificationRepository: Ошибка: $e', stackTrace: stackTrace);
+      throw Exception('Не удалось загрузить уведомления: $e');
+    }
+  }
 }
--- a/lib/data/repositories/payment_repository_impl.dart
+++ b/lib/data/repositories/payment_repository_impl.dart
@@ -40,7 +40,7 @@ class PaymentRepositoryImpl implements PaymentRepository {
    required String cvv,
  }) async {
    try {
-      final cardId = await apiService.addPaymentCard(
+      await apiService.addPaymentCard(
        cardNumber: cardNumber,
        cardHolder: cardHolder,
        expirationMonth: int.parse(expiryMonth),
@@ -48,8 +48,7 @@ class PaymentRepositoryImpl implements PaymentRepository {
        cvv: cvv,
      );

-      // Сохраняем полный номер карты локально
-      await securityService.saveCardFullNumber(cardId, cardNumber);
+      // await securityService.saveCardFullNumber(cardId, cardNumber);

      return Success(null);
    } on AuthException catch (e) {
--- a/lib/data/repositories/scooter_repository_impl.dart
+++ b/lib/data/repositories/scooter_repository_impl.dart
@@ -10,6 +10,7 @@ import 'package:be_happy/domain/repositories/scooter_repository.dart';
 import '../../core/failures.dart';
 import '../../core/result.dart';
 import '../../domain/entities/active_scooter_order.dart';
+import '../../domain/entities/client_subscription.dart';
 import '../../domain/entities/scooter.dart';
 import '../../domain/entities/tariff.dart';
 import '../../domain/entities/subscription.dart';
@@ -127,8 +128,8 @@ class ScooterRepositoryImpl extends ScooterRepository {
  }

  @override
-  Future<Result<List<Subscription>>> getClientSubscriptions() async {
-    late final Result<List<Subscription>> result;
+  Future<Result<List<ClientSubscription>>> getClientSubscriptions() async {
+    late final Result<List<ClientSubscription>> result;
    try {
      final subscriptions = await _apiService.getClientSubscriptions();
      result = Success(subscriptions);
@@ -268,15 +269,12 @@ class ScooterRepositoryImpl extends ScooterRepository {
  }

  @override
-  Future<Result<ScooterOrder>> payRide(int orderId) async {
-    late final Result<ScooterOrder> result;
+  Future<Result<void>> payRide(int orderId) async {
+    late final Result<void> result;
    try {
-      final order = await _apiService.payRide(orderId);
-      if (order != null) {
-        result = Success(order);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
+      await _apiService.payRide(orderId);
+      result = Success(null);
+
    } on AuthException catch (e) {
      result = Failure(AuthFailure(e.attemptsLeft));
    } catch (e) {
@@ -335,23 +333,19 @@ class ScooterRepositoryImpl extends ScooterRepository {
  }

  @override
-  Future<Result<ScooterOrder>> payScooterOrderWithPhotos({
+  Future<Result<void>> payScooterOrderWithPhotos({
    required int orderId,
    required int? cardId,
    required bool isBalance,
  }) async {
-    late final Result<ScooterOrder> result;
+    late final Result<void> result;
    try {
      final order = await _apiService.payScooterOrderWithPhotos(
        orderId: orderId,
        cardId: cardId,
        isBalance: isBalance,
      );
-      if (order != null) {
-        result = Success(order);
-      } else {
-        result = Failure(UnknownFailure("Неизвестная ошибка"));
-      }
+        result = Success(null);
    } on AuthException catch (e) {
      result = Failure(AuthFailure(e.attemptsLeft));
    } catch (e) {
--- a/lib/di/service_locator.dart
+++ b/lib/di/service_locator.dart
@@ -92,6 +92,7 @@ import '../domain/service/device_info_service.dart';
 import '../domain/usecase/activate_subscription_usecase.dart';
 import '../domain/usecase/get_client_subscriptions_usecase.dart';
 import '../domain/usecase/get_news_by_id_usecase.dart';
+import '../domain/usecase/get_notifications_usecase.dart';
 import '../domain/usecase/get_scooter_by_title_usecase.dart';
 import '../domain/usecase/get_scooter_order_history_usecase.dart';
 import '../domain/usecase/remove_payment_card_usecase.dart';
@@ -100,6 +101,7 @@ import '../presentation/viewmodel/auth_bloc.dart';
 import '../presentation/viewmodel/edit_profile_bloc.dart';
 import '../presentation/viewmodel/map_bloc.dart';
 import '../presentation/viewmodel/news_bloc.dart';
+import '../presentation/viewmodel/notifications_bloc.dart';
 import '../presentation/viewmodel/order_history_bloc.dart';
 import '../presentation/viewmodel/scooter_detail_modal_bloc.dart';
 import '../presentation/viewmodel/subscription_list_bloc.dart';
@@ -110,7 +112,7 @@ final getIt = GetIt.instance;
 Future<void> setupDependencies() async {
  final sharedPreferences = await SharedPreferences.getInstance();
  final dio = Dio();
-  dio.interceptors.add(LogInterceptor(responseBody: true, requestBody: true));
+  dio.interceptors.add(LogInterceptor(/*requestHeader: false, responseHeader:false, */responseBody: true, requestBody: true));
  dio.interceptors.add(AuthInterceptor());
  // HTTP
  getIt.registerSingleton<http.Client>(http.Client());
@@ -286,6 +288,13 @@ Future<void> setupDependencies() async {
  getIt.registerSingleton<GetScooterByTitleUsecase>(
    GetScooterByTitleUsecase(getIt()),
  );
+  getIt.registerSingleton<GetNotificationsUsecase>(
+    GetNotificationsUsecase(getIt<NotificationRepository>()),
+  );
+  getIt.registerFactory<NotificationsBloc>(
+        () => NotificationsBloc(getIt<GetNotificationsUsecase>()),
+  );
+

  // Blocs
  getIt.registerLazySingleton<SplashBloc>(() => SplashBloc(getIt()));
@@ -310,6 +319,7 @@ Future<void> setupDependencies() async {
      getIt(),
      getIt(),
      getIt(),
+      getIt(),
    ),
  );

--- a/lib/domain/entities/client_subscription.dart
+++ b/lib/domain/entities/client_subscription.dart
@@ -0,0 +1,24 @@
+import 'package:be_happy/domain/entities/subscription.dart';
+
+class ClientSubscription {
+  final int id;
+  final int subscriptionId;
+  final Subscription subscription;
+  final DateTime? expiredAt;
+
+  ClientSubscription({
+    required this.id,
+    required this.subscriptionId,
+    required this.subscription,
+    this.expiredAt,
+  });
+
+  factory ClientSubscription.fromJson(Map<String, dynamic> json) {
+    return ClientSubscription(
+      id: json['id'] ?? 0,
+      subscriptionId: json['subscriptionId'] ?? 0,
+      subscription: Subscription.fromJson(json['subscription'] as Map<String, dynamic>),
+      expiredAt: json['expiredAt'] != null ? DateTime.parse(json['expiredAt']) : null,
+    );
+  }
+}
--- a/lib/domain/entities/scooter.dart
+++ b/lib/domain/entities/scooter.dart
@@ -43,8 +43,9 @@ class Scooter {
    );
  }

+
  @override
  String toString() {
-    return 'Scooter{id: $id, title: $title}';
+    return 'Scooter{id: $id, title: $title, status: $status, latitude: $latitude, longitude: $longitude, batteryLevel: $batteryLevel, isOnline: $isOnline}';
  }
 }
--- a/lib/domain/entities/scooter_order.dart
+++ b/lib/domain/entities/scooter_order.dart
@@ -3,7 +3,7 @@ import 'scooter.dart';
 class ScooterOrder {
  final int id;
  final int scooterId;
-  final Scooter? scooter;
+  final Scooter scooter;
  final int? planId;
  final ScooterPlan? plan;
  final int clientId;
@@ -33,7 +33,7 @@ class ScooterOrder {
  ScooterOrder({
    required this.id,
    required this.scooterId,
-    this.scooter,
+    required this.scooter,
    this.planId,
    this.plan,
    required this.clientId,
@@ -65,7 +65,7 @@ class ScooterOrder {
    return ScooterOrder(
      id: json['id'] ?? 0,
      scooterId: json['scooterId'] ?? 0,
-      scooter: json['scooter'] != null ? Scooter.fromJson(json['scooter']) : null,
+      scooter: Scooter.fromJson(json['scooter']),
      planId: json['planId'],
      plan: json['plan'] != null ? ScooterPlan.fromJson(json['plan']) : null,
      clientId: json['clientId'] ?? 0,
--- a/lib/domain/entities/subscription.dart
+++ b/lib/domain/entities/subscription.dart
@@ -8,6 +8,7 @@ class Subscription {
  final String fullDescription;
  final int planId;
  final bool isActive;
+  final bool isCurrent;
  final String currency;
  final DateTime? activeFrom;
  final DateTime? activeTo;
@@ -28,6 +29,7 @@ class Subscription {
    this.activeTo,
    required this.createdAt,
    required this.updatedAt,
+    required this.isCurrent,
    required this.options,
  });

@@ -48,6 +50,7 @@ class Subscription {
      activeTo: json['activeTo'] != null ? DateTime.parse(json['activeTo']) : null,
      createdAt: json['createdAt'] != null ? DateTime.parse(json['createdAt']) : DateTime.now(),
      updatedAt: json['updatedAt'] != null ? DateTime.parse(json['updatedAt']) : DateTime.now(),
+      isCurrent: json['isCurrent'] ?? false,
      options: optionsData.map((e) => SubscriptionPeriod.fromJson(e as Map<String, dynamic>)).toList(),
    );
  }
--- a/lib/domain/repositories/notification_repository.dart
+++ b/lib/domain/repositories/notification_repository.dart
@@ -9,4 +9,7 @@ abstract class NotificationRepository {

  /// Закрывает SSE-соединение
  void closeStream();
+
+  /// получить список уведомлений
+  Future<List<ClientNotification>> getNotifications();
 }
--- a/lib/domain/repositories/scooter_repository.dart
+++ b/lib/domain/repositories/scooter_repository.dart
@@ -4,6 +4,7 @@ import 'dart:io';
 import 'package:be_happy/domain/entities/active_scooter_order.dart';

 import '../../core/result.dart';
+import '../entities/client_subscription.dart';
 import '../entities/point.dart';
 import '../entities/scooter.dart';
 import '../entities/subscription.dart';
@@ -16,7 +17,7 @@ abstract class ScooterRepository {
  Future<Result<List<Tariff>>> getAvailableTariffs(int scooterId);
  Future<Result<List<Subscription>>> getAvailableSubscriptions();
  Future<Result<Subscription>> getSubscriptionById(int id);
-  Future<Result<List<Subscription>>> getClientSubscriptions();
+  Future<Result<List<ClientSubscription>>> getClientSubscriptions();
  Future<Result<ScooterOrder>> bookScooter({
    required int scooterId,
    required int planId,
@@ -30,13 +31,13 @@ abstract class ScooterRepository {
  Future<Result<ScooterOrder>> pauseRide(int orderId);
  Future<Result<ScooterOrder>> resumeRide(int orderId);
  Future<Result<ScooterOrder>> finishRide(int orderId, List<int> files);
-  Future<Result<ScooterOrder>> payRide(int orderId);
+  Future<Result<void>> payRide(int orderId);
  Future<Result<List<ScooterOrder>>> getClientOrders();
  Future<Result<List<int>>> uploadScooterPhotos(List<File> images);
  Future<Result<ActiveScooterOrder>> updateScooterOrderData({
    required int orderId,
  });
-  Future<Result<ScooterOrder>> payScooterOrderWithPhotos({
+  Future<Result<void>> payScooterOrderWithPhotos({
    required int orderId,
    required int? cardId,
    required bool isBalance,
--- a/lib/domain/usecase/get_client_subscriptions_usecase.dart
+++ b/lib/domain/usecase/get_client_subscriptions_usecase.dart
@@ -1,6 +1,7 @@
 import 'package:be_happy/core/result.dart';
 import 'package:be_happy/domain/entities/scooter_order.dart';

+import '../entities/client_subscription.dart';
 import '../repositories/scooter_repository.dart';


@@ -14,7 +15,7 @@ class GetClientSubscriptionsUsecase {

  GetClientSubscriptionsUsecase(this.repository);

-  Future<Result<List<Subscription>>> call() {
+  Future<Result<List<ClientSubscription>>> call() {
    return repository.getClientSubscriptions();
  }
 }
--- a/lib/domain/usecase/get_notifications_usecase.dart
+++ b/lib/domain/usecase/get_notifications_usecase.dart
@@ -0,0 +1,12 @@
+import '../entities/client_notification.dart';
+import '../repositories/notification_repository.dart';
+
+class GetNotificationsUsecase {
+  final NotificationRepository repository;
+
+  GetNotificationsUsecase(this.repository);
+
+  Future<List<ClientNotification>> call() {
+    return repository.getNotifications();
+  }
+}
--- a/lib/domain/usecase/pay_ride_usecase.dart
+++ b/lib/domain/usecase/pay_ride_usecase.dart
@@ -7,7 +7,7 @@ class PayRideUsecase {

  PayRideUsecase(this.repository);

-  Future<Result<ScooterOrder>> call(int orderId,  int? cardId,
+  Future<Result<void>> call(int orderId,  int? cardId,
       bool isBalance) {
    return repository.payScooterOrderWithPhotos(orderId: orderId, cardId: cardId, isBalance: isBalance);
  }
--- a/lib/domain/usecase/pay_scooter_order_with_photos_usecase.dart
+++ b/lib/domain/usecase/pay_scooter_order_with_photos_usecase.dart
@@ -7,7 +7,7 @@ class PayScooterOrderWithPhotosUsecase {

  PayScooterOrderWithPhotosUsecase(this.repository);

-  Future<Result<ScooterOrder>> call({
+  Future<Result<void>> call({
    required int orderId,
    required int cardId,
    required bool isBalance,
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -23,9 +23,21 @@ import 'di/service_locator.dart';
 void main() async {
  WidgetsFlutterBinding.ensureInitialized();

-  SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky);
+  SystemChrome.setEnabledSystemUIMode(
+    SystemUiMode.manual,
+    overlays: [SystemUiOverlay.top],
+  );
+
+  SystemChrome.setSystemUIOverlayStyle(
+    const SystemUiOverlayStyle(
+      statusBarColor: Colors.transparent,
+      statusBarIconBrightness: Brightness.light,
+      statusBarBrightness: Brightness.dark,
+    ),
+  );

  await setupDependencies();
+
  runApp(const MyApp());
 }

--- a/lib/presentation/components/dialog/cancel_booking_dialog.dart
+++ b/lib/presentation/components/dialog/cancel_booking_dialog.dart
@@ -3,11 +3,8 @@ import 'package:flutter/material.dart';
 class CancelBookingDialog extends StatelessWidget {
  const CancelBookingDialog({super.key});

-
  @override
  Widget build(BuildContext context) {
-    bool result = false;
-
    return Dialog(
      backgroundColor: Colors.transparent,
      insetPadding: const EdgeInsets.symmetric(horizontal: 40),
@@ -42,6 +39,7 @@ class CancelBookingDialog extends StatelessWidget {
            ),
            const SizedBox(height: 24),

+            // 🔹 Кнопка "Отменить" — ПЕРВАЯ, зелёная (градиент), возвращает true
            Container(
              width: double.infinity,
              height: 52,
@@ -52,10 +50,7 @@ class CancelBookingDialog extends StatelessWidget {
                ),
              ),
              child: ElevatedButton(
-                onPressed: () => {
-                  result = false,
-                  Navigator.pop(context, result)
-                },
+                onPressed: () => Navigator.pop(context, true), // ✅ true = отменить
                style: ElevatedButton.styleFrom(
                  backgroundColor: Colors.transparent,
                  shadowColor: Colors.transparent,
@@ -64,9 +59,9 @@ class CancelBookingDialog extends StatelessWidget {
                  ),
                ),
                child: const Text(
-                  "Оставить",
+                  "Отменить",
                  style: TextStyle(
-                    color: Color(0xFF1D273A),
+                    color: Color(0xFF1D273A), // тёмный текст на светлом градиенте
                    fontSize: 16,
                    fontWeight: FontWeight.bold,
                  ),
@@ -74,14 +69,13 @@ class CancelBookingDialog extends StatelessWidget {
              ),
            ),
            const SizedBox(height: 12),
+
+            // 🔹 Кнопка "Оставить" — ВТОРАЯ, тёмная, возвращает false
            SizedBox(
              width: double.infinity,
              height: 52,
              child: ElevatedButton(
-                onPressed: () {
-                  result = true;
-                  Navigator.pop(context, result);
-                },
+                onPressed: () => Navigator.pop(context, false), // ❌ false = оставить
                style: ElevatedButton.styleFrom(
                  backgroundColor: const Color(0xFF0D1024),
                  shape: RoundedRectangleBorder(
@@ -89,7 +83,7 @@ class CancelBookingDialog extends StatelessWidget {
                  ),
                ),
                child: const Text(
-                  "Отменить",
+                  "Оставить",
                  style: TextStyle(color: Colors.white, fontSize: 16),
                ),
              ),
--- a/lib/presentation/components/dialog/finish_ride_confirmation_dialog.dart
+++ b/lib/presentation/components/dialog/finish_ride_confirmation_dialog.dart
@@ -0,0 +1,96 @@
+import 'package:flutter/material.dart';
+
+class FinishRideConfirmationDialog extends StatelessWidget {
+  const FinishRideConfirmationDialog({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Dialog(
+      backgroundColor: Colors.transparent,
+      insetPadding: const EdgeInsets.symmetric(horizontal: 40),
+      child: Container(
+        padding: const EdgeInsets.all(24),
+        decoration: BoxDecoration(
+          color: const Color(0xFF2E3253).withOpacity(0.95),
+          borderRadius: BorderRadius.circular(28),
+        ),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            const Text(
+              "Завершить поездку?",
+              textAlign: TextAlign.center,
+              style: TextStyle(
+                color: Colors.white,
+                fontSize: 22,
+                fontWeight: FontWeight.w600,
+                height: 1.2,
+              ),
+            ),
+            const SizedBox(height: 16),
+            const Text(
+              "Вы действительно хотите завершить поездку?",
+              textAlign: TextAlign.center,
+              style: TextStyle(
+                color: Colors.white70,
+                fontSize: 14,
+                height: 1.4,
+              ),
+            ),
+            const SizedBox(height: 24),
+
+            // 🔹 Кнопка "Завершить" — ПЕРВАЯ, зелёная (градиент), возвращает true
+            Container(
+              width: double.infinity,
+              height: 52,
+              decoration: BoxDecoration(
+                borderRadius: BorderRadius.circular(26),
+                gradient: const LinearGradient(
+                  colors: [Color(0xFF8EFEB5), Color(0xFF86FEF1)],
+                ),
+              ),
+              child: ElevatedButton(
+                onPressed: () => Navigator.pop(context, true), // ✅ true = завершить
+                style: ElevatedButton.styleFrom(
+                  backgroundColor: Colors.transparent,
+                  shadowColor: Colors.transparent,
+                  shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(26),
+                  ),
+                ),
+                child: const Text(
+                  "Завершить",
+                  style: TextStyle(
+                    color: Color(0xFF1D273A), // тёмный текст на светлом градиенте
+                    fontSize: 16,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+              ),
+            ),
+            const SizedBox(height: 12),
+
+            // 🔹 Кнопка "Отмена" — ВТОРАЯ, тёмная, возвращает false
+            SizedBox(
+              width: double.infinity,
+              height: 52,
+              child: ElevatedButton(
+                onPressed: () => Navigator.pop(context, false), // ❌ false = отмена
+                style: ElevatedButton.styleFrom(
+                  backgroundColor: const Color(0xFF0D1024),
+                  shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(26),
+                  ),
+                ),
+                child: const Text(
+                  "Отмена",
+                  style: TextStyle(color: Colors.white, fontSize: 16),
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
--- a/lib/presentation/components/map_settings_sheet.dart
+++ b/lib/presentation/components/map_settings_sheet.dart
@@ -1,141 +0,0 @@
-import 'dart:ui';
-import 'package:be_happy/presentation/event/map_event.dart';
-import 'package:be_happy/presentation/event/map_settings_modal_event.dart';
-import 'package:be_happy/presentation/state/map_settings_modal_state.dart';
-import 'package:be_happy/presentation/viewmodel/map_settings_modal_bloc.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
-
-import '../viewmodel/map_bloc.dart';
-
-class MapSettingsSheet extends StatelessWidget {
-  final VoidCallback? onClose;
-
-  const MapSettingsSheet({super.key, this.onClose});
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocBuilder<MapSettingsModalBloc, MapSettingsModalState>(
-      builder: (context, state) {
-        final List<_SettingItemData> items = [
-          _SettingItemData(
-            label: 'Геоточки',
-            icon: Icons.location_on_outlined,
-            color: const Color(0xFF66E3C4),
-            isActive: state.isAllGeomarksActive,
-            onChanged: (val) => context.read<MapSettingsModalBloc>().add(AllGeomarksToggled(val)),
-          ),
-          _SettingItemData(
-            label: 'Геозоны',
-            icon: Icons.gps_fixed_outlined,
-            color: const Color(0xFF86EFAC),
-            isActive: state.isAllGeozonesActive,
-            onChanged: (val) => context.read<MapSettingsModalBloc>().add(AllGeozonesToggled(val)),
-          ),
-          _SettingItemData(
-            label: 'Парковка',
-            icon: Icons.home_outlined,
-            color: const Color(0xFFA78BFA),
-            isActive: state.isParkingZoneActive,
-            onChanged: (val) => context.read<MapSettingsModalBloc>().add(ParkingZonesToggled(val)),
-          ),
-          _SettingItemData(
-            label: 'Парковка запрещена',
-            icon: Icons.block_outlined,
-            color: const Color(0xFFF59E0B),
-            isActive: state.isRestrictedParkingZoneActive,
-            onChanged: (val) => context.read<MapSettingsModalBloc>().add(RestrictedParkingZonesToggled(val)),
-          ),
-          _SettingItemData(
-            label: 'Запрещено кататься',
-            icon: Icons.warning_amber_outlined,
-            color: const Color(0xFFEF4444),
-            isActive: state.isRestrictedDrivingZoneActive,
-            onChanged: (val) => context.read<MapSettingsModalBloc>().add(RestrictedDrivingZonesToggled(val)),
-          ),
-        ];
-
-        return Align(
-          alignment: Alignment.bottomCenter,
-          child: ClipRRect(
-            borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
-            child: BackdropFilter(
-              filter: ImageFilter.blur(sigmaX: 20, sigmaY: 20),
-              child: Container(
-                height: 365,
-                decoration: BoxDecoration(
-                  color: const Color(0xFF000032).withOpacity(0.88),
-                  borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
-                ),
-                child: Column(
-                  children: [
-                    Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
-                      child: Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        children: [
-                          const Text(
-                            'Параметры карты',
-                            style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w600),
-                          ),
-                          TextButton(
-                            onPressed: () {
-                              context.read<MapSettingsModalBloc>().add(ApllyButtonClick());
-                              context.read<MapBloc>().add(UpdateMap());
-                              Navigator.of(context).pop();
-                            },
-                            child: const Text(
-                              'Готово',
-                              style: TextStyle(color: Color(0xFF66E3C4), fontSize: 16, fontWeight: FontWeight.w600),
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                    Expanded(
-                      child: ListView.builder(
-                        padding: const EdgeInsets.symmetric(horizontal: 10),
-                        itemCount: items.length,
-                        itemBuilder: (context, index) {
-                          final item = items[index];
-                          return ListTile(
-                            leading: Icon(item.icon, color: item.color),
-                            title: Text(item.label, style: const TextStyle(color: Colors.white)),
-                            trailing: Switch.adaptive(
-                              value: item.isActive,
-                              onChanged: item.onChanged,
-                              activeTrackColor: const Color(0xFF66E3C4),
-                              inactiveThumbColor: Colors.white,
-                            ),
-                          );
-                        },
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ),
-        );
-      },
-    );
-  }
-}
-
-// Вспомогательный класс для описания строк
-class _SettingItemData {
-  final String label;
-  final IconData icon;
-  final Color color;
-  final bool isActive;
-  final ValueChanged<bool> onChanged;
-
-  _SettingItemData({
-    required this.label,
-    required this.icon,
-    required this.color,
-    required this.isActive,
-    required this.onChanged,
-  });
-}
--- a/lib/presentation/components/sheet/active_ride_sheet.dart
+++ b/lib/presentation/components/sheet/active_ride_sheet.dart
@@ -1,13 +1,17 @@
 import 'dart:async';
 import 'dart:ui';
+import 'package:be_happy/domain/entities/scooter.dart';
 import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
 import '../../../di/service_locator.dart';
 import '../../event/active_ride_event.dart';
+import '../../event/map_event.dart';
 import '../../state/active_ride_state.dart';
 import '../../viewmodel/active_ride_bloc.dart';
+import '../../viewmodel/map_bloc.dart';
+import '../dialog/finish_ride_confirmation_dialog.dart';
 import '../notification_toast.dart';

 class ActiveRideSheet extends StatefulWidget {
@@ -55,7 +59,7 @@ class _ActiveRideSheetState extends State<ActiveRideSheet> {
    return BlocProvider.value(
      value: _bloc,
      child: BlocConsumer<ActiveRideBloc, ActiveRideState>(
-        listenWhen: (previous, current) => previous.inZone != current.inZone,
+        listenWhen: (previous, current) => previous.inZone != current.inZone || previous.status != current.status,
        listener: (context, state) {
          if (!state.inZone) {
            BotToast.showCustomNotification(
@@ -70,6 +74,15 @@ class _ActiveRideSheetState extends State<ActiveRideSheet> {
              },
            );
          }
+
+          if (state.status == ActiveRideStatus.success && state.order != null) {
+            final scooter = state.order!.scooter;
+            context.read<MapBloc>().add(FocusOnScooter(Scooter(id: scooter.id,
+                title: scooter.title, status: scooter.status,
+                latitude: state.longitude, longitude: state.latitude,
+                batteryLevel: scooter.batteryLevel, isOnline: scooter.isOnline,
+                maxSpeed: scooter.maxSpeed, number: scooter.number)));
+          }
        },
        builder: (context, state) {
          // Логика отображения загрузки и ошибок остается прежней
@@ -202,7 +215,7 @@ class _ActiveRideSheetState extends State<ActiveRideSheet> {
                          color: Colors.white,
                          fontSize: 32,
                          fontWeight: FontWeight.bold,
-                          fontFeatures: [FontFeature.tabularFigures()],
+                          fontFeatures: const [FontFeature.tabularFigures()],
                          fontFamily: 'DigitalNumbers',
                        ),
                      ),
@@ -290,13 +303,23 @@ class _ActiveRideSheetState extends State<ActiveRideSheet> {
                            child: InkWell(
                              onTap: state.status == ActiveRideStatus.loading
                                  ? null
-                                  : () {
+                                  : () async {
+                                // 🔹 Показываем диалог подтверждения
+                                final result = await showDialog<bool>(
+                                  context: context,
+                                  builder: (context) => const FinishRideConfirmationDialog(),
+                                );
+
+                                // 🔹 Если пользователь подтвердил — завершаем и переходим
+                                if (result == true) {
                                  _bloc.add(FinishRide(widget.orderId));
-                                      Navigator.pop(context);
+                                  Navigator.pop(context); // закрываем ActiveRideSheet
                                  context.go("/home/order-photos/${widget.orderId}");
+                                }
+                                // 🔹 Если отменил — ничего не делаем, диалог уже закрылся
                              },
                              borderRadius: BorderRadius.circular(16),
-                              child: Column(
+                              child: Column( // ✅ Вернули Column с иконкой и текстом
                                mainAxisAlignment: MainAxisAlignment.center,
                                children: [
                                  const Icon(
--- a/lib/presentation/components/sheet/current_rides_sheet.dart
+++ b/lib/presentation/components/sheet/current_rides_sheet.dart
@@ -219,11 +219,11 @@ class _RideCardState extends State<_RideCard> {
      displayTime = _elapsedTime;
    }
    final timeString = _formatDuration(displayTime);
-    final statusText = _getStatusText(widget.order.status);
-    final statusColor = _getStatusColor(widget.order.status);
+    final statusText = widget.order.status == 'Booking' ? 'Забронирован' : "Активный";
+    final statusColor = widget.order.status == 'Booking' ?  Color(0xFFFFCC00) : Color(0xFF8bffaa);

    final scooterNumber =
-        widget.order.scooter?.number ?? widget.order.scooterId.toString();
+        widget.order.scooter.number ?? widget.order.scooterId.toString();

    return Container(
      padding: const EdgeInsets.all(16),
@@ -261,7 +261,7 @@ class _RideCardState extends State<_RideCard> {
                    Text(
                      statusText,
                      style: TextStyle(
-                        color: Colors.white,
+                        color: statusColor,
                        fontSize: 14,
                        fontWeight: FontWeight.w600,
                      ),
@@ -269,6 +269,10 @@ class _RideCardState extends State<_RideCard> {
                  ],
                ),
                const SizedBox(height: 4),
+                Row(
+                  children: [
+                    Image.asset("assets/icons/qr_icon_order.png"),
+                    const SizedBox(width: 6),
                    Text(
                      scooterNumber,
                      style: const TextStyle(
@@ -277,14 +281,39 @@ class _RideCardState extends State<_RideCard> {
                        fontWeight: FontWeight.w600,
                      ),
                    ),
-                const SizedBox(height: 4),
+                  ],
+                ),
+
+                if (isReserved)
+                  Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      const SizedBox(height: 8),
                      Text(
-                  _getLocationText(),
+                        "Тариф",
                        style: TextStyle(
-                    color: Colors.white.withOpacity(0.6),
-                    fontSize: 13,
+                          color: Color(0xFF8bffaa),
+                          fontSize: 11,
                        ),
                      ),
+                      const SizedBox(height: 4),
+                      Row(
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        children: [
+                          Image.asset("assets/icons/timer.png", width: 14,),
+                          const SizedBox(width: 4),
+                          Text(
+                            widget.order.plan?.title ?? "Название тарифа",
+                            style: TextStyle(
+                              color: Color(0xFF8bffaa),
+                              fontWeight: FontWeight.bold,
+                              fontSize: 16,
+                            ),
+                          ),
+                        ],
+                      )
+                    ],
+                  )
              ],
            ),
          ),
@@ -301,7 +330,7 @@ class _RideCardState extends State<_RideCard> {
                      timeString,
                      style: TextStyle(
                        color: statusColor,
-                        fontSize: 26,
+                        fontSize: 20,
                        fontWeight: FontWeight.bold,
                        fontFeatures: const [FontFeature.tabularFigures()],
                        fontFamily: 'DigitalNumbers',
@@ -360,7 +389,7 @@ class _RideCardState extends State<_RideCard> {
    switch (status.toLowerCase()) {
      case 'reserved':
      case 'holding':
-        return 'Забронировано';
+        return 'Забронирован';
      case 'active':
      case 'in_progress':
        return 'Активно';
--- a/lib/presentation/components/sheet/map_settings_sheet.dart
+++ b/lib/presentation/components/sheet/map_settings_sheet.dart
@@ -5,8 +5,6 @@ import 'package:be_happy/presentation/state/map_settings_modal_state.dart';
 import 'package:be_happy/presentation/viewmodel/map_settings_modal_bloc.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
-
 import '../../viewmodel/map_bloc.dart';

 class MapSettingsSheet extends StatelessWidget {
@@ -19,13 +17,6 @@ class MapSettingsSheet extends StatelessWidget {
    return BlocBuilder<MapSettingsModalBloc, MapSettingsModalState>(
      builder: (context, state) {
        final List<_SettingItemData> items = [
-          _SettingItemData(
-            label: 'Геоточки',
-            icon: Icons.location_on_outlined,
-            color: const Color(0xFF66E3C4),
-            isActive: state.isAllGeomarksActive,
-            onChanged: (val) => context.read<MapSettingsModalBloc>().add(AllGeomarksToggled(val)),
-          ),
          _SettingItemData(
            label: 'Геозоны',
            icon: Icons.gps_fixed_outlined,
@@ -41,9 +32,9 @@ class MapSettingsSheet extends StatelessWidget {
            onChanged: (val) => context.read<MapSettingsModalBloc>().add(ParkingZonesToggled(val)),
          ),
          _SettingItemData(
-            label: 'Разрешено кататься',
+            label: 'Парковка запрещена',
            icon: Icons.block_outlined,
-            color: const Color(0xFF5ECD4C),
+            color: const Color(0xFFF59E0B),
            isActive: state.isRestrictedParkingZoneActive,
            onChanged: (val) => context.read<MapSettingsModalBloc>().add(RestrictedParkingZonesToggled(val)),
          ),
--- a/lib/presentation/components/sheet/payment_method_sheet.dart
+++ b/lib/presentation/components/sheet/payment_method_sheet.dart
@@ -12,11 +12,13 @@ import '../../state/payment_method_sheet_state.dart';
 import '../../viewmodel/payment_method_sheet_bloc.dart';

 class PaymentMethodSheet extends StatefulWidget {
-  final PaymentCard? initialSelectedCard; // Добавляем это поле
+  final PaymentCard? initialSelectedCard;
+  final bool showBalance;

  const PaymentMethodSheet({
    super.key,
-    this.initialSelectedCard, // Инициализируем в конструкторе
+    this.initialSelectedCard,
+    this.showBalance = true,
  });

  @override
@@ -92,7 +94,7 @@ class _PaymentMethodSheetState extends State<PaymentMethodSheet> {
            _selectedPaymentMethod = initialIndex != -1 ? initialIndex : -1;
          } else {
            final mainCardIndex = state.cards.indexWhere((card) => card.isMain);
-            _selectedPaymentMethod = mainCardIndex != -1 ? mainCardIndex : -1;
+            _selectedPaymentMethod = mainCardIndex != -1 ? mainCardIndex : (widget.showBalance ? -1 : 0);
          }
        }

@@ -169,6 +171,7 @@ class _PaymentMethodSheetState extends State<PaymentMethodSheet> {
                        padding: const EdgeInsets.symmetric(horizontal: 20),
                        child: Column(
                          children: [
+                            if (widget.showBalance) ...[
                              PaymentOption(
                                title: 'Баланс',
                                subtitle: '${state.balance.toStringAsFixed(2)} BYN',
@@ -180,8 +183,8 @@ class _PaymentMethodSheetState extends State<PaymentMethodSheet> {
                                  Navigator.pop(context, 'balance');
                                },
                              ),
-
                              const SizedBox(height: 12),
+                            ],

                            ...state.cards.asMap().entries.map((entry) {
                              final index = entry.key;
--- a/lib/presentation/components/sheet/reserved_ride_sheet.dart
+++ b/lib/presentation/components/sheet/reserved_ride_sheet.dart
@@ -60,7 +60,10 @@ class _ReservedRideSheetState extends State<ReservedRideSheet> {
  Widget build(BuildContext context) {
    return BlocProvider.value(
      value: _bloc,
-      child: Align(
+      child: Scaffold(
+        backgroundColor: Colors.transparent,
+        resizeToAvoidBottomInset: false,
+        body: Align(
          alignment: Alignment.bottomCenter,
          child: ClipRRect(
            borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
@@ -70,7 +73,9 @@ class _ReservedRideSheetState extends State<ReservedRideSheet> {
                padding: const EdgeInsets.only(top: 20, bottom: 10),
                decoration: BoxDecoration(
                  color: const Color(0xFF000032).withOpacity(0.5),
-                borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
+                  borderRadius: const BorderRadius.vertical(
+                    top: Radius.circular(30),
+                  ),
                ),
                child: Column(
                  mainAxisSize: MainAxisSize.min,
@@ -143,7 +148,10 @@ class _ReservedRideSheetState extends State<ReservedRideSheet> {
                          Expanded(
                            flex: 3,
                            child: Container(
-                            padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 16),
+                              padding: const EdgeInsets.symmetric(
+                                horizontal: 12,
+                                vertical: 16,
+                              ),
                              decoration: BoxDecoration(
                                color: Colors.white.withOpacity(0.1),
                                borderRadius: BorderRadius.circular(12),
@@ -163,7 +171,8 @@ class _ReservedRideSheetState extends State<ReservedRideSheet> {
                                  // Инфо
                                  Expanded(
                                    child: Column(
-                                    crossAxisAlignment: CrossAxisAlignment.start,
+                                      crossAxisAlignment:
+                                          CrossAxisAlignment.start,
                                      mainAxisSize: MainAxisSize.min,
                                      children: [
                                        Row(
@@ -228,9 +237,12 @@ class _ReservedRideSheetState extends State<ReservedRideSheet> {
                                orderId: widget.orderId,
                              ),
                            );
-                        } else if (state.status == ReservedRideStatus.failure) {
+                          } else if (state.status ==
+                              ReservedRideStatus.failure) {
                            ScaffoldMessenger.of(context).showSnackBar(
-                            SnackBar(content: Text(state.errorMessage ?? 'Ошибка')),
+                              SnackBar(
+                                content: Text(state.errorMessage ?? 'Ошибка'),
+                              ),
                            );
                          }
                        },
@@ -256,9 +268,12 @@ class _ReservedRideSheetState extends State<ReservedRideSheet> {
                        listener: (context, state) {
                          if (state.rideCancelled) {
                            Navigator.pop(context);
-                        } else if (state.status == ReservedRideStatus.failure) {
+                          } else if (state.status ==
+                              ReservedRideStatus.failure) {
                            ScaffoldMessenger.of(context).showSnackBar(
-                            SnackBar(content: Text(state.errorMessage ?? 'Ошибка')),
+                              SnackBar(
+                                content: Text(state.errorMessage ?? 'Ошибка'),
+                              ),
                            );
                          }
                        },
@@ -277,16 +292,22 @@ class _ReservedRideSheetState extends State<ReservedRideSheet> {
                              onTap: () async {
                                final result = await showDialog<bool>(
                                  context: context,
-                                builder: (context) => const CancelBookingDialog(),
+                                  builder: (context) =>
+                                      const CancelBookingDialog(),
                                );
                                if (result != null && result) {
                                  _bloc.add(CancelRide(widget.orderId));
                                }
                              },
                              borderRadius: BorderRadius.circular(24),
-                            child: BlocBuilder<ReservedRideBloc, ReservedRideState>(
+                              child:
+                                  BlocBuilder<
+                                    ReservedRideBloc,
+                                    ReservedRideState
+                                  >(
                                    builder: (context, state) {
-                                if (state.status == ReservedRideStatus.loading) {
+                                      if (state.status ==
+                                          ReservedRideStatus.loading) {
                                        return const Center(
                                          child: SizedBox(
                                            width: 20,
@@ -323,6 +344,7 @@ class _ReservedRideSheetState extends State<ReservedRideSheet> {
            ),
          ),
        ),
+      ),
    );
  }

--- a/lib/presentation/components/subscription_card.dart
+++ b/lib/presentation/components/subscription_card.dart
@@ -1,13 +1,18 @@
+import 'package:be_happy/presentation/components/gradient_button.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';

 import '../../domain/entities/subscription.dart';
+import '../event/subscription_list_event.dart';

 class SubscriptionCard extends StatelessWidget {
  final Subscription subscription;
  final bool isActive;
+  final DateTime? expiredAt;
+  final VoidCallback? onRefresh;

-  const SubscriptionCard({super.key, required this.subscription, required this.isActive});
+  const SubscriptionCard({super.key, required this.subscription, required this.isActive, this.expiredAt, this.onRefresh});

  @override
  Widget build(BuildContext context) {
@@ -15,9 +20,9 @@ class SubscriptionCard extends StatelessWidget {
        ? subscription.options.reduce((a, b) => a.price < b.price ? a : b)
        : null;

-    final maxDaysOption = subscription.options.isNotEmpty
+    /*final maxDaysOption = subscription.options.isNotEmpty
        ? subscription.options.reduce((a, b) => a.days > b.days ? a : b)
-        : null;
+        : null;*/

    return Container(
      margin: const EdgeInsets.symmetric(vertical: 8, horizontal: 16),
@@ -43,7 +48,7 @@ class SubscriptionCard extends StatelessWidget {
                padding: EdgeInsets.all(4),
                decoration: BoxDecoration(
                  color: Colors.white.withOpacity(0.3),
-                  borderRadius: BorderRadius.circular(12), // Опционально: скругление углов
+                  borderRadius: BorderRadius.circular(12),
                ),
                child: Text(
                  "АКТИВНА",
@@ -64,12 +69,19 @@ class SubscriptionCard extends StatelessWidget {
            subscription.shortDescription,
            style: TextStyle(color: Colors.white.withOpacity(0.7), fontSize: 14),
          ),
+          if (isActive && expiredAt != null) ...[
            const SizedBox(height: 16),
-          if (maxDaysOption != null) ...[
-            const SizedBox(height: 16),
-            Text(
-              "Период действия: до ${maxDaysOption.days} дней",
+            Builder(
+              builder: (context) {
+                final day = expiredAt!.day.toString().padLeft(2, '0');
+                final month = expiredAt!.month.toString().padLeft(2, '0');
+                final year = expiredAt!.year;
+
+                return Text(
+                  "Период действия: до $day.$month.$year",
                  style: const TextStyle(color: Colors.white, fontSize: 14),
+                );
+              },
            ),
          ],
          const SizedBox(height: 20),
@@ -83,15 +95,17 @@ class SubscriptionCard extends StatelessWidget {
                )
              else
                const SizedBox.shrink(),
-              ElevatedButton(
-                onPressed: () => context.push("/home/subscriptions/${subscription.id}"),
-                style: ElevatedButton.styleFrom(
-                  backgroundColor: const Color(0xFF80FFD1),
-                  foregroundColor: Colors.black,
-                  shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
-                  padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 12),
-                ),
-                child: const Text("Подробнее", style: TextStyle(fontWeight: FontWeight.bold)),
+              GradientButton(
+                onTap: () async {
+                  final isSubscribed = await context.push<bool>("/home/subscriptions/${subscription.id}");
+                  if (isSubscribed == true && onRefresh != null) {
+                    onRefresh!();
+                  }
+                },
+                text: "Подробнее",
+                enabled: true,
+                width: 120,
+                height: 40,
              ),
            ],
          ),
--- a/lib/presentation/event/map_event.dart
+++ b/lib/presentation/event/map_event.dart
@@ -30,4 +30,14 @@ class NotificationReceived extends ScooterEvent {
  NotificationReceived(this.notification);
 }

+class FocusOnScooter extends ScooterEvent {
+  final Scooter scooter;
+  FocusOnScooter(this.scooter);
+}
+
+class ClearMapPlacemarks extends ScooterEvent {}
+class ClearMapFocus extends ScooterEvent {}
+
+
+

--- a/lib/presentation/event/notifications_event.dart
+++ b/lib/presentation/event/notifications_event.dart
@@ -0,0 +1,3 @@
+sealed class NotificationsEvent {}
+
+class NotificationsFetchRequested extends NotificationsEvent {}
--- a/lib/presentation/navigation/app_router.dart
+++ b/lib/presentation/navigation/app_router.dart
@@ -58,9 +58,9 @@ import '../../domain/usecase/remove_payment_card_usecase.dart';
 import '../../domain/usecase/save_map_settings_usecase.dart';
 import '../../domain/usecase/set_main_payment_card_usecase.dart';
 import '../../domain/usecase/verify_pin_usecase.dart';
-import '../components/map_settings_sheet.dart';
 import '../components/scooter_bottom_sheet.dart';
 import '../components/sheet/current_rides_sheet.dart';
+import '../components/sheet/map_settings_sheet.dart';
 import '../components/sheet/payment_method_sheet.dart';
 import '../components/sheet/reserved_ride_sheet.dart';
 import '../components/sheet/tariff_sheet.dart';
@@ -75,6 +75,7 @@ import '../event/tariff_sheet_event.dart';
 import '../event/top_up_event.dart';
 import '../screens/add_card_screen.dart'; // ← новый импорт
 import '../screens/license_agreement_screen.dart';
+import '../screens/notifications_screen.dart';
 import '../screens/order_history_screen.dart';
 import '../screens/payment_methods_screen.dart';
 import '../screens/phone_login_screen.dart';
@@ -371,6 +372,7 @@ class AppRouter {
                    SubscriptionDetailsBloc(
                      getIt<GetSubscriptionByIdUsecase>(),
                      getIt<ActivateSubscriptionUsecase>(),
+                      getIt<GetClientSubscriptionsUsecase>(),
                    )
                      ..add(
                        LoadDetailsEvent(
@@ -456,6 +458,10 @@ class AppRouter {
            builder: (context, state) => const OrderHistoryScreen(),
            routes: []
          ),
+          GoRoute(
+            path: 'notifications',
+            builder: (context, state) => const NotificationsScreen(),
+          ),
        ],
      ),
    ],
--- a/lib/presentation/screens/add_card_screen.dart
+++ b/lib/presentation/screens/add_card_screen.dart
@@ -19,11 +19,14 @@ class AddCardScreen extends StatelessWidget {
  Widget build(BuildContext context) {
    return Scaffold(
        body: BlocListener<AddCardBloc, AddCardState>(
-          listenWhen: (previous, current) =>
-          previous.status != current.status &&
-              current.status == AddCardStatus.success,
+          listenWhen: (previous, current) {
+            print(
+                'Смена статуса: ${previous.status} -> ${current.status} ${current.errorMessage}');
+            return previous.status != current.status &&
+                current.status == AddCardStatus.success;
+          },
          listener: (context, state) {
-            context.pop();
+            context.pop(true);
          },
          child: Container(
            decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
@@ -35,6 +38,7 @@ class AddCardScreen extends StatelessWidget {
                      padding: const EdgeInsets.symmetric(horizontal: 20),
                      child: Column(
                        children: [
+                          const SizedBox(height: 16),
                          const CustomAppBar(title: 'Добавление карты'),
                          const SizedBox(height: 24),

@@ -148,10 +152,7 @@ class AddCardScreen extends StatelessWidget {
                                        child: InkWell(
                                          onTap: state.isFormValid
                                              ? () => {
-                                            context.read<AddCardBloc>().add(
-                                                AddCardSubmitted()),
-                                            context.read<PaymentMethodsBloc>()..add(PaymentMethodsStarted()),
-                                            context.pop()
+                                            context.read<AddCardBloc>().add(AddCardSubmitted()),
                                          }
                                              : null,
                                          borderRadius: BorderRadius.circular(
--- a/lib/presentation/screens/documents_screen.dart
+++ b/lib/presentation/screens/documents_screen.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:url_launcher/url_launcher.dart';
 import '../../core/app_colors.dart';
 import '../components/custom_app_bar.dart';
@@ -17,12 +18,10 @@ class DocumentsScreen extends StatelessWidget {
            padding: const EdgeInsets.symmetric(horizontal: 20),
            child: Column(
              children: [
-                // ✅ Используем общий AppBar
                const SizedBox(height: 16),
                CustomAppBar(title: 'Документы'),
                const SizedBox(height: 32),

-                // Список ссылок
                LinkRow(
                  icon: 'assets/icons/doc.png',
                  title: 'Договор аренды',
@@ -33,14 +32,14 @@ class DocumentsScreen extends StatelessWidget {
                LinkRow(
                  icon: 'assets/icons/doc.png',
                  title: 'Политика конфиденциальности',
-                  onTap: () => openLink('https://...'),
+                  onTap: () => context.push('/privacy-policy')
                ),
                const Divider(height: 1, color: Colors.white24),
                const SizedBox(height: 12),
                LinkRow(
                  icon: 'assets/icons/doc.png',
                  title: 'Правила вождения',
-                  onTap: () => openLink('https://...'),
+                  onTap: () => openLink('https://behappybel.by/#rule'),
                ),
                const Divider(height: 1, color: Colors.white24),
                const SizedBox(height: 12),
--- a/lib/presentation/screens/license_agreement_screen.dart
+++ b/lib/presentation/screens/license_agreement_screen.dart
@@ -14,7 +14,7 @@ class LicenseAgreementScreen extends StatelessWidget {
        child: SafeArea(
          child: Column(
            children: [
-              // 🔹 APPBAR С КНОПКОЙ НАЗАД
+              const SizedBox(height: 16),
              const Padding(
                padding: EdgeInsets.symmetric(horizontal: 20),
                child: CustomAppBar(title: ' '),
--- a/lib/presentation/screens/map_screen.dart
+++ b/lib/presentation/screens/map_screen.dart
@@ -93,7 +93,9 @@ class _MapScreenState extends State<MapScreen> {
                listenWhen: (previous, current) {
                  return current.lastNotification !=
                      previous.lastNotification ||
-                      current.flags != previous.flags;
+                      current.flags != previous.flags ||
+                      previous.selectedScooterForFocus?.id
+                          != current.selectedScooterForFocus?.id;
                },

                listener: (context, state) {
@@ -164,14 +166,39 @@ class _MapScreenState extends State<MapScreen> {
                      );
                    }
                  }
+
+                  if (state.selectedScooterForFocus != null) {
+                    final targetScooter = state.selectedScooterForFocus!;
+
+                    print("RESERVED SCOOTER: $targetScooter");
+
+                    _moveCameraToPoint(
+                      targetScooter.longitude,
+                      targetScooter.latitude,
+                      zoom: 17,
+                    );
+
+                    context.read<MapBloc>().add(ClearMapFocus());
+                  }
                },
-                buildWhen: (previous, current) =>
-                previous.scooters != current.scooters ||
-                    previous.zones != current.zones,
+                buildWhen: (previous, current) {
+                  return previous.scooters != current.scooters ||
+                      previous.reservedScooters != current.reservedScooters ||
+                      previous.zones != current.zones ||
+                      previous.status != current.status;
+                },
+
                builder: (context, state) {
-                  final scooters = _buildScooterPlacemarks(
-                    state.scooters,
-                    state.address ?? "Unknown address",
+                  final freeScooters = _buildScooterPlacemarks(
+                    scooters: state.scooters,
+                    iconAsset: 'assets/icons/scooter_placemark_fill.png',
+                    isClickable: true,
+                  );
+
+                  final reservedScooters = _buildScooterPlacemarks(
+                    scooters: state.reservedScooters ?? [],
+                    iconAsset: 'assets/icons/scooter_reserved_placemark_fill.png',
+                    isClickable: false,
                  );

                  final zonePolygons = _buildZonePolygons(state.zones);
@@ -193,9 +220,10 @@ class _MapScreenState extends State<MapScreen> {
                      },
                      mapObjects: [
                        ...zonePolygons,
+                        ...reservedScooters,
                        ClusterizedPlacemarkCollection(
                          mapId: const MapObjectId('scooters_cluster'),
-                          placemarks: scooters,
+                          placemarks: freeScooters,
                          radius: 30,
                          minZoom: 15,
                          consumeTapEvents: true,
@@ -232,7 +260,6 @@ class _MapScreenState extends State<MapScreen> {
                },
              ),

-              // Индикатор загрузки (отдельный строитель для статуса)
              BlocBuilder<MapBloc, ScooterState>(
                buildWhen: (previous, current) =>
                previous.status != current.status,
@@ -378,70 +405,42 @@ class _MapScreenState extends State<MapScreen> {
  }

  void _onMarkerTap(List<Scooter> scooters) async {
+    context.read<MapBloc>().add(CheckUser());
+    final flags = context.read<MapBloc>().state.flags;
+
+    if (!flags.hasCard) {
+      _showExistingNotification(
+        child: PaymentNotificationCard(
+          onBindCard: () {
+            BotToast.cleanAll();
+            context.push("/home/payment-methods");
+          },
+          onClose: () => BotToast.cleanAll(),
+        ),
+      );
+      return;
+    }
+    if (flags.hasUnpaidOrder) {
+      _showExistingNotification(
+        child: UnpaidOrderNotificationCard(
+          onClose: () => BotToast.cleanAll(),
+        ),
+      );
+      return;
+    }
+    if (flags.hasFine) {
+      _showExistingNotification(
+        child: FineNotificationCard(
+          onClose: () => BotToast.cleanAll(),
+        ),
+      );
+      return;
+    }
+
    context.push(
      "/home/scooter-sheet",
      extra: {'scooters': scooters, 'currentLocation': _currentPosition},
    );
-
-    /*final scoot = await showModalBottomSheet<Scooter>(
-      context: context,
-      isScrollControlled: true,
-      backgroundColor: Colors.transparent,
-      isDismissible: true,
-      builder: (context) {
-        return BlocProvider(
-          create: (context) =>
-              ScooterDetailModalBloc(
-                getIt<GetAddressByPointUsecase>(),
-                getIt<GetScooterUsecase>(),
-                getIt<GetPedestrianRoutesUsecase>(),
-              )..add(
-                ScooterDetailModalStarted(
-                  scooters,
-                  _currentPosition!.latitude,
-                  _currentPosition!.longitude,
-                ),
-              ),
-          child: ScooterBottomSheet(),
-        );
-      },
-    );*/
-    /*bool? isBooking = false;
-    if (scoot != null) {
-      final result = await context.push('/home/scooter/${scoot.id}');
-
-      if (result == true) {
-        // Даем небольшую задержку, чтобы навигация завершилась корректно
-        await Future.delayed(Duration(milliseconds: 300), () async {
-          isBooking = await showModalBottomSheet<bool>(
-            context: context,
-            isScrollControlled: true,
-            backgroundColor: Colors.transparent,
-            isDismissible: true,
-            builder: (context) => BlocProvider(
-              create: (context) => TariffSheetBloc(
-                getIt<GetAvailableTariffsUsecase>(),
-                getIt<GetPaymentCardsUsecase>(),
-                getIt<BookScooterUsecase>(),
-              ),
-              child: TariffSheet(scooter: scoot),
-            ),
-          );
-        });
-      }
-    }
-
-    if (isBooking ?? false) {
-      showModalBottomSheet(
-        context: context,
-        builder: (context) => BlocProvider(
-          create: (context) =>
-              CurrentRidesBloc(getIt<GetClientOrdersUsecase>())
-                ..add(LoadClientOrders(1)),
-          child: CurrentRidesSheet(clientId: 1),
-        ),
-      );
-    }*/
  }

  void _onMapSettingsTap() {
@@ -582,26 +581,26 @@ class _MapScreenState extends State<MapScreen> {
    await ClusterIconPainter.initImage('assets/icons/scooter_placemark.png');
  }

-  List<PlacemarkMapObject> _buildScooterPlacemarks(
-    List<Scooter> scooters,
-    String address,
-  ) {
+  List<PlacemarkMapObject> _buildScooterPlacemarks({
+    required List<Scooter> scooters,
+    required String iconAsset,
+    required bool isClickable,
+  }) {
    return scooters.map((scooter) {
      return PlacemarkMapObject(
-        mapId: MapObjectId('${scooter.id}'),
+        mapId: MapObjectId('${isClickable ? "" : "reserved_"}${scooter.id}'), // уникальный ID для карты
        point: Point(latitude: scooter.longitude, longitude: scooter.latitude),
        icon: PlacemarkIcon.single(
          PlacemarkIconStyle(
-            image: BitmapDescriptor.fromAssetImage(
-              'assets/icons/scooter_placemark_fill.png',
-            ),
+            image: BitmapDescriptor.fromAssetImage(iconAsset),
            scale: 0.2,
          ),
        ),
        opacity: 1.0,
-        onTap: (object, point) async => {
-          _onMarkerTap([scooter]),
-        },
+        consumeTapEvents: isClickable,
+        onTap: isClickable
+            ? (object, point) async => _onMarkerTap([scooter])
+            : null,
      );
    }).toList();
  }
@@ -696,13 +695,13 @@ class _MapScreenState extends State<MapScreen> {
            children: [
              _RoundIconButton(
                icon: Icons.notifications_sharp,
-                onPressed: _onNotificationTap,
+                onPressed: () => context.push("/home/notifications"),
              ),
              const SizedBox(height: 12),
-              _RoundIconButton(
-                icon: Icons.directions_run,
+              _RoundButton(
+                imagePath: 'assets/icons/scooter_placemark.png',
                onPressed: () => context.push("/home/current-rides-sheet"),
-              ),
+              )
            ],
          ),
        ),
@@ -717,7 +716,42 @@ class _MapScreenState extends State<MapScreen> {
      right: 0,
      child: Center(
        child: GestureDetector(
-          onTap: () => context.push("/home/qr-info"),
+          onTap: () {
+            final flags = context.read<MapBloc>().state.flags;
+
+            // 🔹 Проверка флагов — показываем те же карточки, что и в listener
+            if (!flags.hasCard) {
+              _showExistingNotification(
+                child: PaymentNotificationCard(
+                  onBindCard: () {
+                    BotToast.cleanAll();
+                    context.push("/home/payment-methods");
+                  },
+                  onClose: () => BotToast.cleanAll(),
+                ),
+              );
+              return;
+            }
+            if (flags.hasUnpaidOrder) {
+              _showExistingNotification(
+                child: UnpaidOrderNotificationCard(
+                  onClose: () => BotToast.cleanAll(),
+                ),
+              );
+              return;
+            }
+            if (flags.hasFine) {
+              _showExistingNotification(
+                child: FineNotificationCard(
+                  onClose: () => BotToast.cleanAll(),
+                ),
+              );
+              return;
+            }
+
+            // ✅ Все проверки пройдены — переход на сканирование
+            context.push("/home/qr-info");
+          },
          child: Container(
            width: 64,
            height: 64,
@@ -810,6 +844,40 @@ class _RoundIconButton extends StatelessWidget {
  }
 }

+class _RoundButton extends StatelessWidget {
+  final String imagePath;
+  final VoidCallback onPressed;
+
+  const _RoundButton({
+    required this.imagePath,
+    required this.onPressed,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: 40,
+      height: 40,
+      decoration: BoxDecoration(
+        color: AppColors.darkBlue,
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: GestureDetector(
+        onTap: onPressed,
+        child: Center(
+          child: Image.asset(
+            imagePath,
+            width: 20,
+            height: 20,
+            fit: BoxFit.contain,
+            color: Colors.white,
+          ),
+        ),
+      ),
+    );
+  }
+}
+
 class _CircleIconButton extends StatelessWidget {
  final IconData icon;
  final VoidCallback onPressed;
@@ -832,3 +900,18 @@ class _CircleIconButton extends StatelessWidget {
    );
  }
 }
+
+void _showExistingNotification({required Widget child}) {
+  BotToast.showCustomNotification(
+    duration: null, // не исчезает, пока пользователь не закроет
+    toastBuilder: (_) {
+      return Container(
+        margin: const EdgeInsets.only(top: 120), // тот же отступ, что в listener
+        child: Material(
+          color: Colors.transparent,
+          child: child, // PaymentNotificationCard / UnpaidOrderNotificationCard / FineNotificationCard
+        ),
+      );
+    },
+  );
+}
--- a/lib/presentation/screens/news_detail_screen.dart
+++ b/lib/presentation/screens/news_detail_screen.dart
@@ -61,7 +61,7 @@ class _NewsDetailScreenState extends State<NewsDetailScreen> {
        child: SafeArea(
          child: Column(
            children: [
-              // 🔹 Заголовок в AppBar
+              const SizedBox(height: 16),
              Padding(
                padding: const EdgeInsets.symmetric(horizontal: 20),
                child: CustomAppBar(title: widget.title),
--- a/lib/presentation/screens/news_screen.dart
+++ b/lib/presentation/screens/news_screen.dart
@@ -4,6 +4,7 @@ import 'dart:developer' as dev;
 import '../../core/app_colors.dart';
 import '../../di/service_locator.dart';
 import '../components/custom_app_bar.dart';
+import '../components/gradient_button.dart';
 import '../event/news_event.dart';
 import '../state/news_state.dart';
 import '../viewmodel/news_bloc.dart';
@@ -14,11 +15,8 @@ class NewsScreen extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    dev.log('🔍 NewsScreen: Создание экрана новостей');
-
    return BlocProvider(
      create: (context) {
-        dev.log('🔍 NewsScreen: Создание NewsBloc');
        return getIt<NewsBloc>()..add(const NewsFetchRequested());
      },
      child: const NewsView(),
@@ -31,7 +29,6 @@ class NewsView extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    dev.log('🔍 NewsView: Построение UI');

    return Scaffold(
      body: Container(
@@ -48,7 +45,6 @@ class NewsView extends StatelessWidget {
              Expanded(
                child: BlocBuilder<NewsBloc, NewsState>(
                  builder: (context, state) {
-                    dev.log('🔍 NewsView: Состояние ${state.status}, новостей: ${state.news.length}');

                    if (state.status == NewsStatus.initial || state.status == NewsStatus.loading) {
                      return const Center(
@@ -84,7 +80,6 @@ class NewsView extends StatelessWidget {
                            const SizedBox(height: 24),
                            ElevatedButton(
                              onPressed: () {
-                                dev.log('🔍 NewsView: Повторная загрузка');
                                context.read<NewsBloc>().add(const NewsFetchRequested());
                              },
                              style: ElevatedButton.styleFrom(
@@ -173,7 +168,7 @@ class _NewsCard extends StatelessWidget {
      margin: const EdgeInsets.only(bottom: 16),
      padding: const EdgeInsets.all(16),
      decoration: BoxDecoration(
-        color: const Color(0xFF141530),
+        color: const Color(0xFF0A0F2E).withOpacity(0.7),
        borderRadius: BorderRadius.circular(16),
      ),
      child: Column(
@@ -196,6 +191,18 @@ class _NewsCard extends StatelessWidget {
            ),
          ),
          const SizedBox(height: 8),
+          Container(
+            width: double.infinity,
+            height: 80,
+            decoration: BoxDecoration(
+              image: DecorationImage(
+                image: AssetImage('assets/news_def.png'),
+                fit: BoxFit.cover,
+              ),
+              borderRadius: BorderRadius.circular(8),
+            ),
+          ),
+          const SizedBox(height: 16),
          Text(
            news.previewText,
            style: const TextStyle(
@@ -205,10 +212,14 @@ class _NewsCard extends StatelessWidget {
            ),
          ),
          const SizedBox(height: 16),
-          SizedBox(
-            height: 40,
-            child: OutlinedButton(
-              onPressed: () {
+
+          Align(
+            alignment: Alignment.centerRight,
+            child: ConstrainedBox(
+              constraints: const BoxConstraints(maxWidth: 150),
+              child: GradientButton(
+                text: 'Подробнее',
+                onTap: () {
                  Navigator.push(
                    context,
                    MaterialPageRoute(
@@ -219,37 +230,10 @@ class _NewsCard extends StatelessWidget {
                    ),
                  );
                },
-              style: OutlinedButton.styleFrom(
-                shape: RoundedRectangleBorder(
-                  borderRadius: BorderRadius.circular(24),
-                ),
-                side: BorderSide(color: AppColors.smsDigit.withOpacity(0.3)),
-                padding: const EdgeInsets.symmetric(horizontal: 20),
-              ),
-              child: Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  const Text(
-                    'Подробнее',
-                    style: TextStyle(color: AppColors.smsDigit),
-                  ),
-                  const SizedBox(width: 8),
-                  Icon(
-                    Icons.arrow_forward_ios_sharp,
-                    size: 12,
-                    color: AppColors.smsDigit,
-                  ),
-                  Icon(
-                    Icons.arrow_forward_ios_sharp,
-                    size: 12,
-                    color: AppColors.smsDigit.withOpacity(0.6),
-                  ),
-                  Icon(
-                    Icons.arrow_forward_ios_sharp,
-                    size: 12,
-                    color: AppColors.smsDigit.withOpacity(0.3),
-                  ),
-                ],
+                showArrows: true,
+                fontSize: 14,
+                height: 40,
+                width: double.infinity,
              ),
            ),
          ),
--- a/lib/presentation/screens/notifications_screen.dart
+++ b/lib/presentation/screens/notifications_screen.dart
@@ -0,0 +1,350 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:go_router/go_router.dart';
+import 'dart:developer' as dev;
+
+import '../../core/app_colors.dart';
+import '../../di/service_locator.dart';
+import '../../domain/entities/client_notification.dart';
+import '../components/custom_app_bar.dart';
+import '../event/notifications_event.dart';
+import '../state/notifications_state.dart';
+import '../viewmodel/notifications_bloc.dart';
+
+enum NotificationFilter {
+  all,
+  auth,
+  payment,
+  order,
+}
+
+class NotificationsScreen extends StatelessWidget {
+  const NotificationsScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return _NotificationsScreenContent();
+  }
+}
+
+class _NotificationsScreenContent extends StatefulWidget {
+  const _NotificationsScreenContent();
+
+  @override
+  State<_NotificationsScreenContent> createState() => _NotificationsScreenContentState();
+}
+
+class _NotificationsScreenContentState extends State<_NotificationsScreenContent> {
+  NotificationFilter _filter = NotificationFilter.all;
+
+  void _setFilter(NotificationFilter filter) {
+    setState(() {
+      _filter = filter;
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (context) => getIt<NotificationsBloc>()..add(NotificationsFetchRequested()),
+      child: NotificationsView(
+        filter: _filter,
+        onFilterChanged: _setFilter,
+      ),
+    );
+  }
+}
+
+class NotificationsView extends StatelessWidget {
+  final NotificationFilter filter;
+  final ValueChanged<NotificationFilter> onFilterChanged;
+
+  const NotificationsView({
+    super.key,
+    this.filter = NotificationFilter.all,
+    required this.onFilterChanged,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
+        child: SafeArea(
+          child: Column(
+            children: [
+              const SizedBox(height: 16),
+              const Padding(
+                padding: EdgeInsets.symmetric(horizontal: 20),
+                child: CustomAppBar(title: 'Уведомления'),
+              ),
+              const SizedBox(height: 16),
+
+              _buildFilterBar(),
+
+              const SizedBox(height: 16),
+
+              Expanded(
+                child: BlocBuilder<NotificationsBloc, NotificationsState>(
+                  builder: (context, state) {
+                    if (state.status == NotificationsStatus.loading) {
+                      return const Center(child: CircularProgressIndicator(color: Colors.white));
+                    }
+
+                    if (state.status == NotificationsStatus.failure) {
+                      return Center(
+                        child: Column(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            const Text(
+                              'Ошибка загрузки уведомлений',
+                              style: TextStyle(
+                                color: Colors.white,
+                                fontSize: 16,
+                                fontWeight: FontWeight.w600,
+                              ),
+                            ),
+                            const SizedBox(height: 16),
+                            Padding(
+                              padding: const EdgeInsets.symmetric(horizontal: 40),
+                              child: Text(
+                                state.errorMessage ?? '',
+                                style: TextStyle(
+                                  color: Colors.white.withOpacity(0.6),
+                                  fontSize: 14,
+                                ),
+                                textAlign: TextAlign.center,
+                              ),
+                            ),
+                            const SizedBox(height: 24),
+                            ElevatedButton(
+                              onPressed: () {
+                                context.read<NotificationsBloc>().add(NotificationsFetchRequested());
+                              },
+                              child: const Text('Повторить'),
+                            ),
+                          ],
+                        ),
+                      );
+                    }
+
+                    final filtered = state.notifications.where((n) {
+                      switch (filter) {
+                        case NotificationFilter.all:
+                          return true;
+                        case NotificationFilter.auth:
+                          return n.category == NotificationCategory.auth;
+                        case NotificationFilter.payment:
+                          return n.category == NotificationCategory.payment;
+                        case NotificationFilter.order:
+                          return n.category == NotificationCategory.scooter;
+                              // || n.category == NotificationCategory.adminInfo
+                              // || n.category == NotificationCategory.companyInfo;
+
+                        default:
+                          return true;
+                      }
+                    }).toList();
+
+                    if (filtered.isEmpty) {
+                      return const _EmptyState();
+                    }
+
+                    return RefreshIndicator(
+                      onRefresh: () async {
+                        context.read<NotificationsBloc>().add(NotificationsFetchRequested());
+                      },
+                      child: ListView.builder(
+                        padding: const EdgeInsets.symmetric(horizontal: 20),
+                        itemCount: filtered.length,
+                        itemBuilder: (context, index) {
+                          return _NotificationCard(notification: filtered[index]);
+                        },
+                      ),
+                    );
+                  },
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildFilterBar() {
+    final items = [
+      {'label': 'Все', 'value': NotificationFilter.all},
+      {'label': 'Авторизация', 'value': NotificationFilter.auth},
+      {'label': 'Оплата', 'value': NotificationFilter.payment},
+      {'label': 'Поездка', 'value': NotificationFilter.order},
+    ];
+
+    return Container(
+      height: 40,
+      padding: const EdgeInsets.symmetric(horizontal: 20),
+      child: SingleChildScrollView(
+        scrollDirection: Axis.horizontal,
+        child: Row(
+          children: items.map((item) {
+            final isActive = item['value'] == filter;
+            return Padding(
+              padding: const EdgeInsets.only(right: 12),
+              child: GestureDetector(
+                onTap: () => onFilterChanged(item['value'] as NotificationFilter),
+                child: Container(
+                  height: 32,
+                  padding: const EdgeInsets.symmetric(horizontal: 16),
+                  alignment: Alignment.center,
+                  decoration: BoxDecoration(
+                    gradient: isActive ? AppColors.activeButtonGradient : null,
+                    color: isActive ? null : Colors.transparent,
+                    borderRadius: BorderRadius.circular(20),
+                    border: Border.all(
+                      color: isActive
+                          ? Colors.transparent
+                          : Colors.white.withOpacity(0.4),
+                      width: 1,
+                    ),
+                  ),
+                  child: Text(
+                    item['label'] as String,
+                    textAlign: TextAlign.center,
+                    style: TextStyle(
+                      color: isActive
+                          ? AppColors.activeButtonText
+                          : Colors.white,
+                      fontSize: 14,
+                      fontWeight: isActive ? FontWeight.bold : FontWeight.normal,
+                    ),
+                  ),
+                ),
+              ),
+            );
+          }).toList(),
+        ),
+      ),
+    );
+  }
+}
+
+class _EmptyState extends StatelessWidget {
+  const _EmptyState();
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        Image.asset(
+          'assets/notification_empty.png',
+          width: 280,
+          height: 280,
+          fit: BoxFit.contain,
+          errorBuilder: (context, error, stackTrace) {
+            return const Icon(
+              Icons.notifications_none_outlined,
+              size: 120,
+              color: Colors.white38,
+            );
+          },
+        ),
+        const SizedBox(height: 32),
+        const Padding(
+          padding: EdgeInsets.symmetric(horizontal: 40),
+          child: Text(
+            'У вас пока нет уведомлений.',
+            textAlign: TextAlign.center,
+            style: TextStyle(
+              color: Colors.white70,
+              fontSize: 16,
+              height: 1.5,
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class _NotificationCard extends StatelessWidget {
+  final ClientNotification notification;
+
+  const _NotificationCard({required this.notification});
+
+  @override
+  Widget build(BuildContext context) {
+    final date = _formatDate(notification.createdAt);
+
+    return Container(
+      margin: const EdgeInsets.only(bottom: 12),
+      padding: const EdgeInsets.all(16),
+      decoration: BoxDecoration(
+        color: const Color(0xFF141530).withOpacity(0.7),
+        borderRadius: BorderRadius.circular(16),
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            date,
+            style: TextStyle(
+              color: Colors.white.withOpacity(0.6),
+              fontSize: 12,
+            ),
+          ),
+          const SizedBox(height: 8),
+          Text(
+            notification.content,
+            style: const TextStyle(
+              color: Colors.white,
+              fontSize: 14,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  String _formatDate(DateTime date) {
+    final now = DateTime.now();
+    final difference = now.difference(date);
+
+    if (difference.inDays == 0) {
+      return 'Сегодня, ${date.hour.toString().padLeft(2, '0')}:${date.minute.toString().padLeft(2, '0')}';
+    } else if (difference.inDays == 1) {
+      return 'Вчера, ${date.hour.toString().padLeft(2, '0')}:${date.minute.toString().padLeft(2, '0')}';
+    } else {
+      return '${date.day.toString().padLeft(2, '0')}.${date.month.toString().padLeft(2, '0')}.${date.year}';
+    }
+  }
+
+  String _getTypeLabel(NotificationType type) {
+    switch (type) {
+      case NotificationType.info:
+        return 'Информация';
+      case NotificationType.attention:
+        return 'Внимание';
+      case NotificationType.warning:
+        return 'Предупреждение';
+    }
+  }
+
+  String _getCategoryLabel(NotificationCategory category) {
+    switch (category) {
+      case NotificationCategory.auth:
+        return 'Авторизация';
+      case NotificationCategory.zone:
+        return 'Зоны';
+      case NotificationCategory.payment:
+        return 'Оплата';
+      case NotificationCategory.companyInfo:
+        return 'Акции';
+      case NotificationCategory.adminInfo:
+        return 'Админ';
+      case NotificationCategory.scooter:
+        return 'Самокат';
+    }
+  }
+}
--- a/lib/presentation/screens/order_history_detail_screen.dart
+++ b/lib/presentation/screens/order_history_detail_screen.dart
@@ -32,7 +32,7 @@ class OrderHistoryDetailScreen extends StatelessWidget {
        child: SafeArea(
          child: Column(
            children: [
-              // 🔹 HEADER
+              const SizedBox(height: 16),
              Padding(
                padding: const EdgeInsets.symmetric(horizontal: 20),
                child: CustomAppBar(title: 'Поездка $date'),
--- a/lib/presentation/screens/order_history_screen.dart
+++ b/lib/presentation/screens/order_history_screen.dart
@@ -32,6 +32,7 @@ class OrderHistoryView extends StatelessWidget {
        child: SafeArea(
          child: Column(
            children: [
+              const SizedBox(height: 16),
              const Padding(
                padding: EdgeInsets.symmetric(horizontal: 20),
                child: CustomAppBar(title: 'История поездок'),
--- a/lib/presentation/screens/payment_confirm_screen.dart
+++ b/lib/presentation/screens/payment_confirm_screen.dart
@@ -9,9 +9,11 @@ import '../components/custom_app_bar.dart';
 import '../components/gradient_button.dart';
 import '../components/payment_option.dart';
 import '../components/sheet/payment_method_sheet.dart';
+import '../event/map_event.dart';
 import '../event/payment_confirm_event.dart';
 import '../event/payment_method_sheet_event.dart';
 import '../state/payment_confirm_state.dart';
+import '../viewmodel/map_bloc.dart';
 import '../viewmodel/payment_confirm_bloc.dart';
 import '../viewmodel/payment_method_sheet_bloc.dart';

@@ -62,6 +64,7 @@ class _PaymentConfirmScreenContent extends StatelessWidget {
              Column(
                crossAxisAlignment: CrossAxisAlignment.start,
                children: [
+                  const SizedBox(height: 16),
                  const Padding(
                    padding: EdgeInsets.symmetric(horizontal: 20),
                    child: CustomAppBar(title: 'Завершение поездки'),
@@ -77,6 +80,7 @@ class _PaymentConfirmScreenContent extends StatelessWidget {

                        listener: (context, state) {
                          if (state.status == PaymentConfirmStatus.success && state.paymentCompleted) {
+                            context.read<MapBloc>().add(ClearMapPlacemarks());
                            context.go('/home');
                          } else if (state.status == PaymentConfirmStatus.failure) {
                            ScaffoldMessenger.of(context).hideCurrentSnackBar();
--- a/lib/presentation/screens/payment_methods_screen.dart
+++ b/lib/presentation/screens/payment_methods_screen.dart
@@ -17,14 +17,6 @@ class PaymentMethodsScreen extends StatelessWidget {
      body: Container(
        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
        child: SafeArea(
-          child: Column(
-            children: [
-              const Padding(
-                padding: EdgeInsets.symmetric(horizontal: 20),
-                child: CustomAppBar(title: 'Способы оплаты'),
-              ),
-              const SizedBox(height: 24),
-              Expanded(
          child: BlocConsumer<PaymentMethodsBloc, PaymentMethodsState>(
            listener: (context, state) {
              if (state.status == PaymentMethodsStatus.failure) {
@@ -34,11 +26,26 @@ class PaymentMethodsScreen extends StatelessWidget {
              }
            },
            builder: (context, state) {
-                    if (state.status == PaymentMethodsStatus.loading && state.cards.isEmpty) {
-                      return const Center(child: CircularProgressIndicator(color: Color(0xFF00D4AA)));
-                    }
+              final isNetworkProcessing = state.status == PaymentMethodsStatus.loading ||
+                  (state.isDeleting ?? false) ||
+                  (state.isSettingMain ?? false);

-                    return SingleChildScrollView(
+              return Stack(
+                children: [
+                  Column(
+                    children: [
+                      const SizedBox(height: 16),
+                      const Padding(
+                        padding: EdgeInsets.symmetric(horizontal: 20),
+                        child: CustomAppBar(title: 'Способы оплаты'),
+                      ),
+                      const SizedBox(height: 24),
+                      Expanded(
+                        child: state.cards.isEmpty && state.status == PaymentMethodsStatus.loading
+                            ? const Center(
+                          child: CircularProgressIndicator(color: Color(0xFF00D4AA)),
+                        )
+                            : SingleChildScrollView(
                          padding: const EdgeInsets.symmetric(horizontal: 20),
                          child: Column(
                            crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -48,12 +55,26 @@ class PaymentMethodsScreen extends StatelessWidget {
                              _buildCardsList(context, state),
                            ],
                          ),
-                    );
-                  },
                        ),
                      ),
                    ],
                  ),
+
+                  if (isNetworkProcessing && state.cards.isNotEmpty)
+                    Positioned.fill(
+                      child: Container(
+                        color: Colors.black.withOpacity(0.4),
+                        child: const Center(
+                          child: CircularProgressIndicator(
+                            color: Color(0xFF00D4AA),
+                          ),
+                        ),
+                      ),
+                    ),
+                ],
+              );
+            },
+          ),
        ),
      ),
    );
@@ -162,7 +183,13 @@ class PaymentMethodsScreen extends StatelessWidget {
      child: Material(
        color: Colors.transparent,
        child: InkWell(
-          onTap: () => context.go('/home/payment-methods/add-card'),
+          onTap: () async {
+            final isCardAdded = await context.push<bool>('/home/payment-methods/add-card');
+
+            if (isCardAdded == true && context.mounted) {
+              context.read<PaymentMethodsBloc>().add(PaymentMethodsStarted());
+            }
+          },
          borderRadius: BorderRadius.circular(24),
          child: const Padding(
            padding: EdgeInsets.symmetric(horizontal: 16),
--- a/lib/presentation/screens/privacy_policy_screen.dart
+++ b/lib/presentation/screens/privacy_policy_screen.dart
@@ -14,6 +14,7 @@ class PrivacyPolicyScreen extends StatelessWidget {
        child: SafeArea(
          child: Column(
            children: [
+              const SizedBox(height: 16),
              const Padding(
                padding: EdgeInsets.symmetric(horizontal: 20),
                child: CustomAppBar(title: ''),
--- a/lib/presentation/screens/profile_screen.dart
+++ b/lib/presentation/screens/profile_screen.dart
@@ -50,7 +50,9 @@ class _ProfileScreenState extends State<ProfileScreen> {
  Widget build(BuildContext context) {
    return Scaffold(
      body: Container(
-        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
+        decoration: const BoxDecoration(
+          gradient: AppColors.phoneScreenBg,
+        ),
        child: SafeArea(
          child: BlocBuilder<ProfileBloc, ProfileState>(
            builder: (context, state) {
@@ -70,33 +72,53 @@ class _ProfileScreenState extends State<ProfileScreen> {
              }

              final profile = state.profile!;
+
+              return LayoutBuilder(
+                builder: (context, constraints) {
                  return SingleChildScrollView(
+                    child: ConstrainedBox(
+                      constraints: BoxConstraints(
+                        minHeight: constraints.maxHeight,
+                      ),
+                      child: Padding(
                        padding: const EdgeInsets.symmetric(horizontal: 20),
                        child: Column(
                          children: [
                            const SizedBox(height: 16),
                            CustomAppBar(title: 'Профиль'),
                            const SizedBox(height: 32),
+
                            Stack(
                              alignment: Alignment.topRight,
                              children: [
-
                                CircleAvatar(
                                  radius: 60,
                                  backgroundColor: AppColors.checkboxFill,
-                          backgroundImage: (profile.avatarUrl != null && profile.avatarUrl!.isNotEmpty)
-                              ? NetworkImage("${profile.avatarUrl!}?v=${DateTime.now().minute}")
-                              : null,
-                          child: (profile.avatarUrl == null || profile.avatarUrl!.isEmpty)
-                              ? Text(
-                            profile.name.isNotEmpty ? profile.name[0].toUpperCase() : '',
-                            style: const TextStyle(fontSize: 50, color: AppColors.darkBlue),
+                                  backgroundImage:
+                                  (profile.avatarUrl != null &&
+                                      profile.avatarUrl!.isNotEmpty)
+                                      ? NetworkImage(
+                                    "${profile.avatarUrl!}?v=${DateTime.now().minute}",
                                  )
                                      : null,
-                        ),                        GestureDetector(
+                                  child:
+                                  (profile.avatarUrl == null ||
+                                      profile.avatarUrl!.isEmpty)
+                                      ? Text(
+                                    profile.name.isNotEmpty
+                                        ? profile.name[0].toUpperCase()
+                                        : '',
+                                    style: const TextStyle(
+                                      fontSize: 50,
+                                      color: AppColors.darkBlue,
+                                    ),
+                                  )
+                                      : null,
+                                ),
+
+                                GestureDetector(
                                  onTap: _pickImage,
                                  child: Container(
-                            margin: const EdgeInsets.only(top: 0, right: 0),
                                    child: Image.asset(
                                      'assets/icons/edit.png',
                                      width: 24,
@@ -106,20 +128,26 @@ class _ProfileScreenState extends State<ProfileScreen> {
                                ),
                              ],
                            ),
+
                            const SizedBox(height: 32),
+
                            _ProfileInfoBlock(
                              profile: profile,
                              onEditTap: () => context.go("/home/profile/edit"),
                            ),
-                    const SizedBox(height: 24),
-                    _SettingsBlock(
-                      notificationsEnabled: notificationsEnabled,
-                      onNotificationsChanged: (v) =>
-                          setState(() => notificationsEnabled = v),
-                    ),
-                    const SizedBox(height: 24),
+
+                            // const SizedBox(height: 24),
+                            // _SettingsBlock(
+                            //   notificationsEnabled: notificationsEnabled,
+                            //   onNotificationsChanged: (v) =>
+                            //   setState(() => notificationsEnabled = v),
+                            // ),
                          ],
                        ),
+                      ),
+                    ),
+                  );
+                },
              );
            },
          ),
--- a/lib/presentation/screens/promo_code_screen.dart
+++ b/lib/presentation/screens/promo_code_screen.dart
@@ -45,6 +45,7 @@ class _PromoCodeScreenState extends State<PromoCodeScreen> {
                  padding: const EdgeInsets.symmetric(horizontal: 20),
                  child: Column(
                    children: [
+                      const SizedBox(height: 16),
                      CustomAppBar(title: 'Промокоды'),
                      const SizedBox(height: 32),

--- a/lib/presentation/screens/qr_scan_info_screen.dart
+++ b/lib/presentation/screens/qr_scan_info_screen.dart
@@ -17,6 +17,7 @@ class QRScanInfoScreen extends StatelessWidget {
        child: SafeArea(
          child: Column(
            children: [
+              const SizedBox(height: 16),
              Padding(
                padding: const EdgeInsets.symmetric(horizontal: 20),
                child: CustomAppBar(title: "Сканирование QR-кода"),
--- a/lib/presentation/screens/qr_scan_screen.dart
+++ b/lib/presentation/screens/qr_scan_screen.dart
@@ -6,6 +6,7 @@ import 'package:mobile_scanner/mobile_scanner.dart';
 import 'package:go_router/go_router.dart';
 import 'package:be_happy/di/service_locator.dart';
 import 'package:be_happy/domain/usecase/get_scooter_by_title_usecase.dart';
+import '../components/custom_app_bar.dart';
 import '../components/gradient_button.dart';

 class QrScanScreen extends StatefulWidget {
@@ -149,11 +150,13 @@ class _QrScanScreenState extends State<QrScanScreen> {
            ),
          ),

+          // ✅ ИЗМЕНЕНО: прижимаем аппбар к левому краю
          SafeArea(
-            child: Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 40),
              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start, // ✅ Выравнивание по левому краю
                children: [
+                  const SizedBox(height: 16),
+                  CustomAppBar(title: "Сканирование QR-кода"),
                  const SizedBox(height: 60),
                  const Text(
                    'Наведите рамку на QR-код — номер будет распознан автоматически',
@@ -170,7 +173,6 @@ class _QrScanScreenState extends State<QrScanScreen> {
                ],
              ),
            ),
-          ),

          SafeArea(
            child: Align(
--- a/lib/presentation/screens/scooter_code_input_screen.dart
+++ b/lib/presentation/screens/scooter_code_input_screen.dart
@@ -58,6 +58,7 @@ class _ScooterCodeInputScreenState extends State<ScooterCodeInputScreen> {
              child: SafeArea(
          child: Column(
          children: [
+            const SizedBox(height: 16),
              Padding(
              padding: const EdgeInsets.symmetric(horizontal: 20),
          child: CustomAppBar(title: "Ввод QR-кода"),
--- a/lib/presentation/screens/scooter_detail_screen.dart
+++ b/lib/presentation/screens/scooter_detail_screen.dart
@@ -70,6 +70,7 @@ class ScooterDetailScreen extends StatelessWidget {
                  padding: const EdgeInsets.symmetric(horizontal: 24),
                  child: Column(
                    children: [
+                      const SizedBox(height: 16),
                      CustomAppBar(
                        title: scooter?.title != null ? 'Самокат ${scooter!.title}' : 'Самокат',
                      ),
@@ -101,6 +102,7 @@ class ScooterDetailScreen extends StatelessWidget {
                          context.pushReplacement('/home/tarif-sheet', extra: scooter);
                        },
                      ),
+                      const SizedBox(height: 30)
                    ],
                  ),
                ),
--- a/lib/presentation/screens/send_photo_screen.dart
+++ b/lib/presentation/screens/send_photo_screen.dart
@@ -123,6 +123,11 @@ class _SendPhotoViewState extends State<SendPhotoView> {
        child: SafeArea(
          child: Column(
            children: [
+              const SizedBox(height: 16),
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 20),
+                child: CustomAppBar(title: "Отправить фото"),
+              ),
              Padding(
                padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 100),
                child: Text(
--- a/lib/presentation/screens/splash_screen.dart
+++ b/lib/presentation/screens/splash_screen.dart
@@ -1,13 +1,8 @@
-
+import 'dart:math' as math;
 import 'package:be_happy/presentation/event/spalsh_event.dart';
 import 'package:be_happy/presentation/viewmodel/splash_bloc.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-// Подключи сюда свои реальные экраны:
-import 'phone_screen.dart';
-import 'pin_login_screen.dart';

 class SplashScreen extends StatefulWidget {
  const SplashScreen({super.key});
@@ -19,35 +14,61 @@ class SplashScreen extends StatefulWidget {
 class _SplashScreenState extends State<SplashScreen>
    with SingleTickerProviderStateMixin {
  late final AnimationController _controller;
-  late final Animation<double> _revealAnimation;

-  static const double logoSize = 300;
+  // Фаза 1: Заполнение цветом слева направо (0.0 -> 0.5)
+  late final Animation<double> _fillProgress;
+
+  // Фаза 2: Укатывание вправо (0.6 -> 1.0)
+  late final Animation<double> _rollTranslation;
+  late final Animation<double> _rollRotation;
+
+  // Уменьшенный размер логотипа по вашему запросу
+  static const double logoSize = 130;

  @override
  void initState() {
    super.initState();

-    // контроллер анимации
    _controller = AnimationController(
      vsync: this,
-      duration: const Duration(milliseconds: 2500),
+      duration: const Duration(milliseconds: 3000),
    );

-    // анимация движения "затемняющего" прямоугольника
-    _revealAnimation = Tween<double>(begin: 0.0, end: 1.0).animate(
-      CurvedAnimation(parent: _controller, curve: Curves.easeInOut),
+    _fillProgress = Tween<double>(begin: 0.0, end: 1.0).animate(
+      CurvedAnimation(
+        parent: _controller,
+        curve: const Interval(0.0, 0.5, curve: Curves.easeInOut),
+      ),
    );

-    // запускаем анимацию
-    _controller.forward().then((_) async {
-      // небольшая пауза после анимации
-      await Future.delayed(const Duration(milliseconds: 800));
-      if (!mounted) {
-        return;
-      }
+    _rollTranslation = Tween<double>(begin: 0.0, end: 1.0).animate(
+      CurvedAnimation(
+        parent: _controller,
+        curve: const Interval(0.6, 1.0, curve: Curves.easeInCubic),
+      ),
+    );
+
+    _rollRotation = Tween<double>(begin: 0.0, end: 2 * math.pi).animate(
+      CurvedAnimation(
+        parent: _controller,
+        curve: const Interval(0.6, 1.0, curve: Curves.easeIn),
+      ),
+    );
+
+    // Добавляем задержку перед стартом, чтобы пользователь успел увидеть экран
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      if (!mounted) return;
+
+      // Ждем 500мс после того, как первый кадр отрисовался
+      await Future.delayed(const Duration(milliseconds: 500));
+
+      if (!mounted) return;
+      // Запускаем анимацию
+      _controller.forward().then((_) {
+        if (!mounted) return;
        context.read<SplashBloc>().add(AuthCheckRequested());
      });
-
+    });
  }

  @override
@@ -56,69 +77,102 @@ class _SplashScreenState extends State<SplashScreen>
    super.dispose();
  }

-  @override
  @override
  Widget build(BuildContext context) {
+    final double screenWidth = MediaQuery.of(context).size.width;
+    final double endTranslation = screenWidth / 2 + logoSize;
+
    return Scaffold(
-      backgroundColor: const Color(0xFF3A3A3A),
-      body: Center(
+      body: Stack(
+        children: [
+          Positioned.fill(
+            child: Container(
+              decoration: const BoxDecoration(
+                gradient: LinearGradient(
+                  begin: Alignment.topCenter,
+                  end: Alignment.bottomCenter,
+                  colors: [
+                    Color(0xFF293A69),
+                    Color(0xFF202741),
+                  ],
+                ),
+              ),
+            ),
+          ),
+
+          // 2. Волна
+          Positioned(
+            top: 0,
+            left: 0,
+            right: 0,
+            child: Image.asset(
+              'assets/wave.png',
+              fit: BoxFit.contain,
+            ),
+          ),
+
+          Positioned(
+            bottom: 0,
+            left: 0,
+            right: 0,
+            child: Image.asset(
+              'assets/splash_map.png',
+              fit: BoxFit.contain,
+            ),
+          ),
+
+          Center(
            child: AnimatedBuilder(
              animation: _controller,
-          builder: (context, _) {
-            final double offset = _revealAnimation.value * (logoSize * 1.2);
+              builder: (context, child) {
+                final double translationX = _rollTranslation.value * endTranslation;

-            return Stack(
+                return Transform(
+                  transform: Matrix4.translationValues(translationX, 0, 0)
+                    ..rotateZ(_rollRotation.value),
                  alignment: Alignment.center,
-              children: [
-                // Цветной логотип (на заднем плане)
-                Image.asset(
-                  'assets/logo_color.png',
+                  // Используем ShaderMask для эффекта заполнения/проявления
+                  child: ShaderMask(
+                    shaderCallback: (bounds) {
+                      return LinearGradient(
+                        begin: Alignment.centerLeft,
+                        end: Alignment.centerRight,
+                        // Используем _fillProgress для сдвига жесткой границы градиента
+                        colors: const [Colors.white, Colors.transparent],
+                        stops: [_fillProgress.value, _fillProgress.value],
+                      ).createShader(bounds);
+                    },
+                    blendMode: BlendMode.dstIn, // Оставляет только ту часть логотипа, где градиент белый
+                    child: Image.asset(
+                      'assets/splash_logo.png',
                      width: logoSize,
                      height: logoSize,
                      fit: BoxFit.contain,
                    ),
-
-                // Прямоугольник, который "уезжает" вправо, открывая логотип
-                ClipRect(
-                  child: Align(
-                    alignment: Alignment.centerLeft,
-                    child: FractionallySizedBox(
-                      widthFactor: 1,
-                      child: Container(
-                        width: logoSize,
-                        height: logoSize,
-                        color: const Color(0xFF3A3A3A),
-                        transform: Matrix4.translationValues(offset, 0, 0),
                  ),
-                    ),
-                  ),
-                ),
-
-                // Обводка логотипа (поверх)
-                Image.asset(
-                  'assets/logo_outline.png',
-                  width: logoSize * 1.01,
-                  height: logoSize * 1.01,
-                  fit: BoxFit.contain,
-                ),
-              ],
                );
              },
            ),
          ),

-      bottomNavigationBar: Padding(
-        padding: const EdgeInsets.only(bottom: 24),
+          // 5. Версия приложения
+          Positioned(
+            left: 0,
+            right: 0,
+            bottom: 24,
            child: Text(
              'Версия приложения 1.0',
              textAlign: TextAlign.center,
              style: TextStyle(
-            color: Colors.white.withOpacity(0.8),
+                color: Colors.white.withOpacity(0.6),
                fontSize: 12,
+                fontWeight: FontWeight.w300,
+                letterSpacing: 0.5,
              ),
            ),
          ),
+        ],
+      ),
    );
  }
-
 }
--- a/lib/presentation/screens/subscription_details_screen.dart
+++ b/lib/presentation/screens/subscription_details_screen.dart
@@ -2,7 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';

+import '../../core/app_colors.dart';
 import '../components/app_checkbox.dart';
+import '../components/custom_app_bar.dart'; // ✅ Добавь импорт
 import '../components/gradient_button.dart';
 import '../components/period_selector.dart';
 import '../event/subscription_details_event.dart';
@@ -17,25 +19,42 @@ class SubscriptionDetailsScreen extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Scaffold(
-      backgroundColor: const Color(0xFF1A2355),
-      appBar: AppBar(
-        backgroundColor: Colors.transparent,
-        elevation: 0,
-        leading: IconButton(
-          icon: const Icon(Icons.arrow_back_ios, color: Colors.white),
-          onPressed: () => context.pop(),
-        ),
-        title: BlocBuilder<SubscriptionDetailsBloc, SubscriptionDetailsState>(
-          builder: (context, state) {
-            if (state is DetailsContentState) {
-              return Text(state.subscription.title);
+      body: Container(
+        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
+        child: SafeArea(
+          child: Column(
+            children: [
+              const SizedBox(height: 16),
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 20),
+                child:
+                    BlocConsumer<
+                      SubscriptionDetailsBloc,
+                      SubscriptionDetailsState
+                    >(
+                      listenWhen: (previous, current) =>
+                          current is DetailsContentState && current.isSuccess,
+                      listener: (context, state) {
+                        if (state is DetailsContentState && state.isSuccess) {
+                          context.pop(true);
                        }
-            return const Text("Загрузка...");
+                      },
+                      builder: (context, state) {
+                        String title = "Загрузка...";
+                        if (state is DetailsContentState) {
+                          title = state.subscription.title;
+                        }
+                        return CustomAppBar(title: title);
                      },
                    ),
              ),
-      body: Stack(
+              const SizedBox(height: 20),
+
+              // 🔹 Контент
+              Expanded(
+                child: Stack(
                  children: [
+                    // Волна снизу
                    Positioned(
                      bottom: 0,
                      left: 0,
@@ -45,11 +64,16 @@ class SubscriptionDetailsScreen extends StatelessWidget {
                        child: Image.asset('assets/wave.png'),
                      ),
                    ),
-          BlocBuilder<SubscriptionDetailsBloc, SubscriptionDetailsState>(
+                    BlocBuilder<
+                      SubscriptionDetailsBloc,
+                      SubscriptionDetailsState
+                    >(
                      builder: (context, state) {
                        if (state is DetailsLoading) {
                          return const Center(
-                  child: CircularProgressIndicator(color: Color(0xFF80FFD1)),
+                            child: CircularProgressIndicator(
+                              color: Color(0xFF80FFD1),
+                            ),
                          );
                        }
                        if (state is DetailsError) {
@@ -67,16 +91,19 @@ class SubscriptionDetailsScreen extends StatelessWidget {
                      },
                    ),
                  ],
-      )
-
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
    );
-
-
  }

  Widget _buildContent(BuildContext context, DetailsContentState state) {
+    final bool isAvailableForPurchase = state.subscription.isActive;
    return SingleChildScrollView(
-      padding: const EdgeInsets.all(20.0),
+      padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 20),
      child: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
@@ -88,6 +115,8 @@ class SubscriptionDetailsScreen extends StatelessWidget {
              height: 1.5,
            ),
          ),
+
+          if (isAvailableForPurchase) ...[
            const SizedBox(height: 30),

            _ActionCard(state: state),
@@ -95,16 +124,21 @@ class SubscriptionDetailsScreen extends StatelessWidget {
            const SizedBox(height: 30),

            GradientButton(
-            text: 'Активировать',
-            onTap: () => context.read<SubscriptionDetailsBloc>().add(
+              text: state.isAlreadyPurchased ? 'Продлить' : 'Активировать',
+              onTap: () {
+                context.read<SubscriptionDetailsBloc>().add(
                  ActivateSubscriptionPressed(),
-            ),
+                );
+              },
+              enabled: state.isAgreed,
              width: double.infinity,
              height: 56,
              fontSize: 16,
              showArrows: true,
            ),
          ],
+          const SizedBox(height: 20),
+        ],
      ),
    );
  }
@@ -125,9 +159,6 @@ class _ActionCard extends StatelessWidget {
      state.selectedPeriod,
    );

-    context.read<SubscriptionDetailsBloc>().add(
-        SelectPeriodEvent(state.subscription.options[selectedIndex]));
-
    return Container(
      padding: const EdgeInsets.all(24),
      decoration: BoxDecoration(
@@ -205,7 +236,7 @@ class _PriceRow extends StatelessWidget {
        mainAxisAlignment: MainAxisAlignment.center,
        children: [
          Image.asset("assets/icons/money_icon.png", width: 72, height: 72),
-          SizedBox(width: 15),
+          const SizedBox(width: 15),
          Column(
            crossAxisAlignment: CrossAxisAlignment.start,
            children: [
@@ -225,4 +256,3 @@ class _PriceRow extends StatelessWidget {
    );
  }
 }
-
--- a/lib/presentation/screens/subscription_list_screen.dart
+++ b/lib/presentation/screens/subscription_list_screen.dart
@@ -1,3 +1,4 @@
+import 'package:be_happy/presentation/event/subscription_list_event.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
@@ -21,6 +22,7 @@ class SubscriptionsListScreen extends StatelessWidget {
        child: SafeArea(
          child: Column(
            children: [
+              const SizedBox(height: 16),
              Padding(
                padding: const EdgeInsets.symmetric(horizontal: 20),
                child: CustomAppBar(title: 'Абонементы'),
@@ -43,17 +45,26 @@ class SubscriptionsListScreen extends StatelessWidget {
                        if (state is SubscriptionsLoading) {
                          return const Center(child: CircularProgressIndicator());
                        } else if (state is SubscriptionsLoaded) {
-                          final activeIds = state.activeSubscriptions.map((e) => e.id).toSet();
+                          final clientSubsMap = {
+                            for (var sub in state.activeSubscriptions) sub.subscriptionId: sub
+                          };
+
                          return ListView.builder(
                            padding: const EdgeInsets.only(top: 20),
                            itemCount: state.subscriptions.length,
                            itemBuilder: (context, index) {
                              final subscription = state.subscriptions[index];
-                              final bool isActive = activeIds.contains(subscription.id);
+
+                              final bool isPurchased = subscription.isCurrent;
+
+                              final clientSub = clientSubsMap[subscription.id];
+                              final DateTime? expirationDate = isPurchased ? clientSub?.expiredAt : null;

                              return SubscriptionCard(
                                subscription: subscription,
-                                isActive: isActive,
+                                isActive: isPurchased,
+                                expiredAt: expirationDate,
+                                onRefresh: () { context.read<SubscriptionListBloc>().add(LoadSubscriptionsEvent());},
                              );
                            },
                          );
--- a/lib/presentation/screens/top_up_screen.dart
+++ b/lib/presentation/screens/top_up_screen.dart
@@ -21,8 +21,9 @@ class TopUpScreen extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Scaffold(
-      backgroundColor: const Color(0xFF1A234E),
-      body: SafeArea(
+      body: Container(
+        decoration: const BoxDecoration(gradient: AppColors.phoneScreenBg),
+        child: SafeArea(
          child: Padding(
            padding: const EdgeInsets.symmetric(horizontal: 20),
            child: Column(
@@ -68,6 +69,7 @@ class TopUpScreen extends StatelessWidget {
              ],
            ),
          ),
+        )
      ),
    );
  }
@@ -168,7 +170,7 @@ class TopUpScreen extends StatelessWidget {
              create: (context) =>
              PaymentMethodSheetBloc(getIt<GetPaymentCardsUsecase>())
                ..add(PaymentMethodSheetStarted()),
-              child: const PaymentMethodSheet(),
+              child: const PaymentMethodSheet(showBalance: false,),
            ),
          );

--- a/lib/presentation/state/active_ride_state.dart
+++ b/lib/presentation/state/active_ride_state.dart
@@ -12,6 +12,8 @@ class ActiveRideState {
  final double cost;
  final bool isPaused;
  final bool inZone;
+  final double latitude;
+  final double longitude;

  const ActiveRideState({
    this.status = ActiveRideStatus.initial,
@@ -20,6 +22,8 @@ class ActiveRideState {
    this.elapsedTime = Duration.zero,
    this.speed = 0.0,
    this.distance = 0.0,
+    this.latitude = 0.0,
+    this.longitude = 0.0,
    this.cost = 0.0,
    this.isPaused = false,
    this.inZone = true,
@@ -33,6 +37,8 @@ class ActiveRideState {
    double? speed,
    double? distance,
    double? cost,
+    double? longitude,
+    double? latitude,
    bool? isPaused,
    bool? inZone,
  }) {
@@ -44,6 +50,8 @@ class ActiveRideState {
      speed: speed ?? this.speed,
      distance: distance ?? this.distance,
      cost: cost ?? this.cost,
+      latitude: latitude ?? this.latitude,
+      longitude: longitude ?? this.longitude,
      isPaused: isPaused ?? this.isPaused,
      inZone: inZone ?? this.inZone,
    );
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Polyanka1	134ffdde60	fix functional bugs	2026-05-29 11:40:55 +03:00
Polyanka1	591265a7fc	fix order history, add CheckUser check before starting the trip, fix dialog for cancel the order, add dialog for finish the order	2026-05-21 18:00:26 +03:00
Polyanka1	c996d0847f	add notification, fix appbar,fix style subscription	2026-05-21 12:19:06 +03:00